October 2017 - openSUSE Commits - openSUSE Mailing Lists

commit powerstat for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package powerstat for openSUSE:Factory checked in at 2017-10-30 21:18:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerstat (Old) and /work/SRC/openSUSE:Factory/.powerstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "powerstat" Mon Oct 30 21:18:45 2017 rev:3 rq:537434 version:0.02.13 Changes: -------- --- /work/SRC/openSUSE:Factory/powerstat/powerstat.changes 2017-06-26 15:53:21.606381349 +0200 +++ /work/SRC/openSUSE:Factory/.powerstat.new/powerstat.changes 2017-10-30 21:19:02.573979725 +0100 @@ -1,0 +2,14 @@ +Fri Oct 20 13:25:40 UTC 2017 - mardnh(a)gmx.de + +- update to version 0.02.13 + * Makefile: bump version + * Increase temp buf from 16 to 32 bytes, cleans up gcc warning + * Add more scanf sanity checking + * debian/control: update Standards-version to 4.1.1 + * voidify function returns + * use sizeof an object rather than the objects type + * Don't use sentinel for end of signals[], use array size instead + * include <sys/uio.h> for writev + * powerstat: break wide macro over 2 lines + +------------------------------------------------------------------- Old: ---- powerstat-0.02.12.tar.gz New: ---- powerstat-0.02.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerstat.spec ++++++ --- /var/tmp/diff_new_pack.9ur6MG/_old 2017-10-30 21:19:03.229955874 +0100 +++ /var/tmp/diff_new_pack.9ur6MG/_new 2017-10-30 21:19:03.229955874 +0100 @@ -18,7 +18,7 @@ Name: powerstat -Version: 0.02.12 +Version: 0.02.13 Release: 0 Summary: Laptop power measuring tool License: GPL-2.0 ++++++ powerstat-0.02.12.tar.gz -> powerstat-0.02.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerstat-0.02.12/Makefile new/powerstat-0.02.13/Makefile --- old/powerstat-0.02.12/Makefile 2017-06-20 15:06:38.000000000 +0200 +++ new/powerstat-0.02.13/Makefile 2017-10-19 10:07:38.000000000 +0200 @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -VERSION=0.02.12 +VERSION=0.02.13 CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerstat-0.02.12/powerstat.c new/powerstat-0.02.13/powerstat.c --- old/powerstat-0.02.12/powerstat.c 2017-06-20 15:06:38.000000000 +0200 +++ new/powerstat-0.02.13/powerstat.c 2017-10-19 10:07:38.000000000 +0200 @@ -43,6 +43,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> +#include <sys/uio.h> #include <fcntl.h> #include <linux/connector.h> @@ -79,6 +80,8 @@ #define I915_ENERGY_UJ "/sys/kernel/debug/dri/0/i915_energy_uJ" +#define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0])) + #define MAX(x, y) (x) > (y) ? (x) : (y) #define MIN(x, y) (x) > (y) ? (y) : (x) @@ -202,7 +205,8 @@ #define SYS_FIELD_AMPS_LEFT "POWER_SUPPLY_CHARGE_NOW=" #define SYS_FIELD_STATUS_DISCHARGING "POWER_SUPPLY_STATUS=Discharging" -#if defined(__x86_64__) || defined(__x86_64) || defined(__i386__) || defined(__i386) +#if defined(__x86_64__) || defined(__x86_64) || \ + defined(__i386__) || defined(__i386) #define POWERSTAT_X86 #endif @@ -325,7 +329,6 @@ #ifdef SIGVTALRM SIGVTALRM, #endif - -1, }; /* @@ -351,7 +354,7 @@ if ((max = sched_get_priority_max(sched)) < 0) return; - memset(&param, 0, sizeof(param)); + (void)memset(&param, 0, sizeof(param)); param.sched_priority = max; (void)sched_setscheduler(getpid(), sched, &param); } @@ -418,7 +421,7 @@ } } - snprintf(buffer, sizeof(buffer), "%5.2f %-3s", + (void)snprintf(buffer, sizeof(buffer), "%5.2f %-3s", freq / scale, suffix); return buffer; @@ -438,7 +441,7 @@ unsigned int got = 0; *is_thread = false; - snprintf(path, sizeof(path), "/proc/%u/status", pid); + (void)snprintf(path, sizeof(path), "/proc/%u/status", pid); if ((fp = fopen(path, "r")) == NULL) return 0; @@ -459,7 +462,7 @@ } } } - fclose(fp); + (void)fclose(fp); if ((got & GOT_ALL) == GOT_ALL) { /* TGID and PID are not the same if it is a thread */ @@ -524,7 +527,7 @@ struct timeval tv; if (gettimeofday(&tv, NULL) < 0) { - fprintf(stderr, "gettimeofday failed: errno=%d (%s).\n", + (void)fprintf(stderr, "gettimeofday failed: errno=%d (%s).\n", errno, strerror(errno)); return -1.0; } @@ -579,14 +582,14 @@ (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); va_end(ap); - if ((log_item = calloc(1, sizeof(log_item_t))) == NULL) { - fprintf(stderr, "Out of memory allocating log item.\n"); + if ((log_item = calloc(1, sizeof(*log_item))) == NULL) { + (void)fprintf(stderr, "Out of memory allocating log item.\n"); return -1; } len = strlen(buffer) + strlen(tmbuffer) + 1; if ((log_item->text = calloc(1, len)) == NULL) { free(log_item); - fprintf(stderr, "Out of memory allocating log item text.\n"); + (void)fprintf(stderr, "Out of memory allocating log item text.\n"); return -1; } (void)snprintf(log_item->text, len, "%s%s", tmbuffer, buffer); @@ -610,10 +613,10 @@ log_item_t *log_item; if (infolog.head != NULL) - printf("\nLog of fork()/exec()/exit() calls:\n"); + (void)printf("\nLog of fork()/exec()/exit() calls:\n"); for (log_item = infolog.head; log_item; log_item = log_item->next) - printf("%s", log_item->text); + (void)printf("%s", log_item->text); } /* @@ -657,18 +660,18 @@ if ((sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR)) < 0) { if (errno == EPROTONOSUPPORT) return -EPROTONOSUPPORT; - fprintf(stderr, "socket failed: errno=%d (%s).\n", + (void)fprintf(stderr, "socket failed: errno=%d (%s).\n", errno, strerror(errno)); return -1; } - memset(&addr, 0, sizeof(addr)); + (void)memset(&addr, 0, sizeof(addr)); addr.nl_pid = getpid(); addr.nl_family = AF_NETLINK; addr.nl_groups = CN_IDX_PROC; if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "Bind failed: errno=%d (%s).\n", + (void)fprintf(stderr, "Bind failed: errno=%d (%s).\n", errno, strerror(errno)); (void)close(sock); return -1; @@ -688,14 +691,14 @@ struct cn_msg cn_msg; enum proc_cn_mcast_op op; - memset(&nlmsghdr, 0, sizeof(nlmsghdr)); + (void)memset(&nlmsghdr, 0, sizeof(nlmsghdr)); nlmsghdr.nlmsg_len = NLMSG_LENGTH(sizeof(cn_msg) + sizeof(op)); nlmsghdr.nlmsg_pid = getpid(); nlmsghdr.nlmsg_type = NLMSG_DONE; iov[0].iov_base = &nlmsghdr; iov[0].iov_len = sizeof(nlmsghdr); - memset(&cn_msg, 0, sizeof(cn_msg)); + (void)memset(&cn_msg, 0, sizeof(cn_msg)); cn_msg.id.idx = CN_IDX_PROC; cn_msg.id.val = CN_VAL_PROC; cn_msg.len = sizeof(enum proc_cn_mcast_op); @@ -761,7 +764,7 @@ char path[PATH_MAX]; uint64_t freq; - snprintf(path, sizeof(path), + (void)snprintf(path, sizeof(path), "/sys/devices/system/cpu/%s/cpufreq/scaling_cur_freq", name); if (file_get_uint64(path, &freq) == 0) { @@ -802,7 +805,7 @@ } if ((fp = fopen("/proc/stat", "r")) == NULL) { - fprintf(stderr, "Cannot read /proc/stat, errno=%d (%s).\n", + (void)fprintf(stderr, "Cannot read /proc/stat, errno=%d (%s).\n", errno, strerror(errno)); return -1; } @@ -942,30 +945,30 @@ uint8_t i; if (opts & OPTS_USE_NETLINK) - printf(" Time User Nice Sys Idle IO Run Ctxt/s IRQ/s Fork Exec Exit Watts"); + (void)printf(" Time User Nice Sys Idle IO Run Ctxt/s IRQ/s Fork Exec Exit Watts"); else - printf(" Time User Nice Sys Idle IO Run Ctxt/s IRQ/s Watts"); + (void)printf(" Time User Nice Sys Idle IO Run Ctxt/s IRQ/s Watts"); if (opts & (OPTS_DOMAIN_STATS | OPTS_THERMAL_ZONE | OPTS_CPU_FREQ | OPTS_GPU)) - putchar(' '); + (void)putchar(' '); if (opts & OPTS_DOMAIN_STATS) { for (i = 0; i < power_domains; i++) - printf(" %6.6s", + (void)printf(" %6.6s", get_domain ? get_domain(i) : "unknown"); } if (opts & OPTS_THERMAL_ZONE) { for (i = 0; i < thermal_zones; i++) - printf(" %6.6s", tz_get_type(i)); + (void)printf(" %6.6s", tz_get_type(i)); } if (opts & OPTS_CPU_FREQ) - printf(" %9.9s", "CPU Freq"); + (void)printf(" %9.9s", "CPU Freq"); if (opts & OPTS_GPU) - printf(" %6.6s", "GPU W"); - printf("\n"); + (void)printf(" %6.6s", "GPU W"); + (void)printf("\n"); } /* @@ -977,23 +980,23 @@ uint8_t i; if (opts & OPTS_USE_NETLINK) - printf("-------- ----- ----- ----- ----- ----- ---- ------ ------ ---- ---- ---- ------ "); + (void)printf("-------- ----- ----- ----- ----- ----- ---- ------ ------ ---- ---- ---- ------ "); else - printf("-------- ----- ----- ----- ----- ----- ---- ------ ------ ------ "); + (void)printf("-------- ----- ----- ----- ----- ----- ---- ------ ------ ------ "); if (opts & OPTS_DOMAIN_STATS) { for (i = 0; i < power_domains; i++) - printf(" ------"); + (void)printf(" ------"); } if (opts & OPTS_THERMAL_ZONE) { for (i = 0; i < thermal_zones; i++) - printf(" ------"); + (void)printf(" ------"); } if (opts & OPTS_CPU_FREQ) - printf(" ---------"); + (void)printf(" ---------"); if (opts & OPTS_GPU) - printf(" ------"); - printf("\n"); + (void)printf(" ------"); + (void)printf("\n"); } /* @@ -1043,7 +1046,7 @@ "%4.1f %6.1f %6.1f %4.1f %4.1f %4.1f %s" : "%8.8s %5.1f %5.1f %5.1f %5.1f %5.1f " "%4.0f %6.0f %6.0f %4.0f %4.0f %4.0f %s"; - printf(fmt, + (void)printf(fmt, prefix, s->value[CPU_USER], s->value[CPU_NICE], s->value[CPU_SYS], s->value[CPU_IDLE], @@ -1057,7 +1060,7 @@ "%4.1f %6.1f %6.1f %s" : "%8.8s %5.1f %5.1f %5.1f %5.1f %5.1f " "%4.0f %6.0f %6.0f %s"; - printf(fmt, + (void)printf(fmt, prefix, s->value[CPU_USER], s->value[CPU_NICE], s->value[CPU_SYS], s->value[CPU_IDLE], @@ -1067,21 +1070,21 @@ } if (opts & OPTS_DOMAIN_STATS) { for (i = 0; i < power_domains; i++) - printf(" %6.2f", s->value[POWER_DOMAIN_0 + i]); + (void)printf(" %6.2f", s->value[POWER_DOMAIN_0 + i]); } if (opts & OPTS_THERMAL_ZONE) { for (i = 0; i < thermal_zones; i++) - printf(" %6.2f", s->value[THERMAL_ZONE_0 + i]); + (void)printf(" %6.2f", s->value[THERMAL_ZONE_0 + i]); } if (opts & OPTS_CPU_FREQ) - printf(" %s", cpu_freq_format(s->value[CPU_FREQ])); + (void)printf(" %s", cpu_freq_format(s->value[CPU_FREQ])); if (opts & OPTS_GPU) { if (s->inaccurate[POWER_GPU]) - printf(" -N/A-"); + (void)printf(" -N/A-"); else - printf(" %6.2f", s->value[POWER_GPU]); + (void)printf(" %6.2f", s->value[POWER_GPU]); } - printf("\n"); + (void)printf("\n"); } /* @@ -1157,9 +1160,9 @@ int i, valid, digits = 0, width; double min = DBL_MAX, max = -DBL_MAX, division, prev; unsigned int bucket[MAX_DIVISIONS], max_bucket = 0; - char buf[32]; + char buf[64]; - memset(bucket, 0, sizeof(bucket)); + (void)memset(bucket, 0, sizeof(bucket)); for (valid = 0, i = 0; i < num; i++) { if (!stats[i].inaccurate[value]) { @@ -1176,7 +1179,7 @@ return; if (FLOAT_CMP(max - min, 0.0)) { - printf("\nRange is zero, cannot produce histogram of %s\n", short_title); + (void)printf("\nRange is zero, cannot produce histogram of %s\n", short_title); return; } division = ((max * 1.000001) - min) / (MAX_DIVISIONS); @@ -1190,27 +1193,27 @@ } } - putchar('\n'); - printf(title, num); - snprintf(buf, sizeof(buf), "%.0f", max); + (void)putchar('\n'); + (void)printf(title, num); + (void)snprintf(buf, sizeof(buf), "%.0f", max); digits = strlen(buf) + 4; digits = (digits < 5) ? 5 : digits; width = 3 + (digits * 2); - snprintf(buf, sizeof(buf), "%*s%s", + (void)snprintf(buf, sizeof(buf), "%*s%s", (width - 13) / 2, "", label); - printf("%-*s Count\n", width, buf); - snprintf(buf, sizeof(buf), "%%%d.3f - %%%d.3f %%5u ", + (void)printf("%-*s Count\n", width, buf); + (void)snprintf(buf, sizeof(buf), "%%%d.3f - %%%d.3f %%5u ", digits, digits); prev = min; for (i = 0; i < MAX_DIVISIONS; i++) { unsigned int j; - printf(buf, prev, prev + division - 0.001, bucket[i]); + (void)printf(buf, prev, prev + division - 0.001, bucket[i]); for (j = 0; j < HISTOGRAM_WIDTH * bucket[i] / max_bucket; j++) - putchar('#'); - putchar('\n'); + (void)putchar('#'); + (void)putchar('\n'); prev += division; } } @@ -1359,7 +1362,7 @@ *discharging = false; if ((dir = opendir(SYS_CLASS_POWER_SUPPLY)) == NULL) { - fprintf(stderr, "Device does not have %s, " + (void)fprintf(stderr, "Device does not have %s, " "cannot run the test.\n", SYS_CLASS_POWER_SUPPLY); return -1; @@ -1387,7 +1390,7 @@ (void)snprintf(path, sizeof(path), "%s/%s/uevent", SYS_CLASS_POWER_SUPPLY, dirent->d_name); if ((fp = fopen(path, "r")) == NULL) { - fprintf(stderr, "Battery %s present but under " + (void)fprintf(stderr, "Battery %s present but under " "supported - no state present.", dirent->d_name); (void)closedir(dir); @@ -1400,38 +1403,38 @@ double watts_rate = 0.0; double watts_left = 0.0; - while (fgets(buffer, sizeof(buffer)-1, fp) != NULL) { + while (fgets(buffer, sizeof(buffer) - 1, fp) != NULL) { if (strstr(buffer, SYS_FIELD_STATUS_DISCHARGING)) *discharging = true; if (strstr(buffer, SYS_FIELD_AMPS_LEFT) && strlen(buffer) > sizeof(SYS_FIELD_AMPS_LEFT) - 1) { - sscanf(buffer + sizeof(SYS_FIELD_AMPS_LEFT) - 1, "%12d", &val); - amps_left = (double)val / 1000000.0; + if (sscanf(buffer + sizeof(SYS_FIELD_AMPS_LEFT) - 1, "%12d", &val) == 1) + amps_left = (double)val / 1000000.0; } if (strstr(buffer, SYS_FIELD_WATTS_LEFT) && strlen(buffer) > sizeof(SYS_FIELD_WATTS_LEFT) - 1) { - sscanf(buffer + sizeof(SYS_FIELD_WATTS_LEFT) - 1, "%12d", &val); - watts_left = (double)val / 1000000.0; + if (sscanf(buffer + sizeof(SYS_FIELD_WATTS_LEFT) - 1, "%12d", &val) == 1) + watts_left = (double)val / 1000000.0; } if (strstr(buffer, SYS_FIELD_AMPS_RATE) && strlen(buffer) > sizeof(SYS_FIELD_AMPS_RATE) - 1) { - sscanf(buffer + sizeof(SYS_FIELD_AMPS_RATE) - 1, "%12d", &val); - amps_rate = (double)val / 1000000.0; + if (sscanf(buffer + sizeof(SYS_FIELD_AMPS_RATE) - 1, "%12d", &val) == 1) + amps_rate = (double)val / 1000000.0; } if (strstr(buffer, SYS_FIELD_WATTS_RATE) && strlen(buffer) > sizeof(SYS_FIELD_WATTS_RATE) - 1) { - sscanf(buffer + sizeof(SYS_FIELD_WATTS_RATE) - 1, "%12d", &val); - watts_rate = (double)val / 1000000.0; + if (sscanf(buffer + sizeof(SYS_FIELD_WATTS_RATE) - 1, "%12d", &val) == 1) + watts_rate = (double)val / 1000000.0; } if (strstr(buffer, SYS_FIELD_VOLTAGE) && strlen(buffer) > sizeof(SYS_FIELD_VOLTAGE) - 1) { - sscanf(buffer + sizeof(SYS_FIELD_VOLTAGE) - 1, "%12d", &val); - voltage = (double)val / 1000000.0; + if (sscanf(buffer + sizeof(SYS_FIELD_VOLTAGE) - 1, "%12d", &val) == 1) + voltage = (double)val / 1000000.0; } } total_watts += watts_rate + voltage * amps_rate; @@ -1448,7 +1451,7 @@ *discharging = true; /* Lie */ return 0; } - printf("Device is not discharging, cannot measure power usage.\n"); + (void)printf("Device is not discharging, cannot measure power usage.\n"); return -1; } @@ -1487,7 +1490,7 @@ *discharging = false; if ((dir = opendir(PROC_ACPI_BATTERY)) == NULL) { - fprintf(stderr, "Device does not have %s, " + (void)fprintf(stderr, "Device does not have %s, " "cannot run the test.\n", PROC_ACPI_BATTERY); return -1; @@ -1508,11 +1511,11 @@ if (strlen(dirent->d_name) < 3) continue; - sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); + (void)sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); if ((file = fopen(filename, "r")) == NULL) continue; - memset(buffer, 0, sizeof(buffer)); + (void)memset(buffer, 0, sizeof(buffer)); while (fgets(buffer, sizeof(buffer), file) != NULL) { if (strstr(buffer, "present:") && strstr(buffer, "no")) @@ -1551,7 +1554,7 @@ * the design_voltage field, so work around this. */ if (FLOAT_CMP(voltage, 0.0)) { - sprintf(filename, "/proc/acpi/battery/%s/info", dirent->d_name); + (void)sprintf(filename, "/proc/acpi/battery/%s/info", dirent->d_name); if ((file = fopen(filename, "r")) != NULL) { while (fgets(buffer, sizeof(buffer), file) != NULL) { ptr = strchr(buffer, ':'); @@ -1577,7 +1580,7 @@ *discharging = true; /* Lie */ return 0; } - printf("Device is indicating it is not discharging and hence " + (void)printf("Device is indicating it is not discharging and hence " "we cannot measure power usage.\n"); return -1; } @@ -1636,7 +1639,7 @@ if (rapl->is_package) { static char buf[128]; - snprintf(buf, sizeof(buf), "pkg-%s", rapl->domain_name + 8); + (void)snprintf(buf, sizeof(buf), "pkg-%s", rapl->domain_name + 8); return buf; } return rapl->domain_name; @@ -1655,7 +1658,7 @@ dir = opendir("/sys/class/powercap"); if (dir == NULL) { - printf("Device does not have RAPL, cannot measure power usage.\n"); + (void)printf("Device does not have RAPL, cannot measure power usage.\n"); return -1; } @@ -1669,17 +1672,17 @@ continue; if ((rapl = calloc(1, sizeof(*rapl))) == NULL) { - fprintf(stderr, "Cannot allocate RAPL information.\n"); - closedir(dir); + (void)fprintf(stderr, "Cannot allocate RAPL information.\n"); + (void)closedir(dir); return -1; } if ((rapl->name = strdup(entry->d_name)) == NULL) { - fprintf(stderr, "Cannot allocate RAPL name information.\n"); - closedir(dir); + (void)fprintf(stderr, "Cannot allocate RAPL name information.\n"); + (void)closedir(dir); free(rapl); return -1; } - snprintf(path, sizeof(path), + (void)snprintf(path, sizeof(path), "/sys/class/powercap/%s/max_energy_range_uj", entry->d_name); @@ -1689,7 +1692,7 @@ rapl->max_energy_uj = 0.0; (void)fclose(fp); } - snprintf(path, sizeof(path), + (void)snprintf(path, sizeof(path), "/sys/class/powercap/%s/name", entry->d_name); @@ -1718,7 +1721,7 @@ power_domains = MIN(n, MAX_POWER_DOMAINS); if (!n) - printf("Device does not have any RAPL domains, cannot power measure power usage.\n"); + (void)printf("Device does not have any RAPL domains, cannot power measure power usage.\n"); return n; } @@ -1737,18 +1740,18 @@ char *tmp; size_t new_len; - snprintf(new_name, sizeof(new_name), "%s%s", + (void)snprintf(new_name, sizeof(new_name), "%s%s", len == 0 ? "" : ", ", rapl->domain_name); new_len = strlen(new_name); tmp = realloc(names, new_len + len + 1); if (!tmp) { - fprintf(stderr, "Out of memory allocating RAPL domain names.\n"); + (void)fprintf(stderr, "Out of memory allocating RAPL domain names.\n"); free(names); names = NULL; break; } names = tmp; - strncpy(names + len, new_name, new_len + 1); + (void)strncpy(names + len, new_name, new_len + 1); len += new_len; } @@ -1780,7 +1783,7 @@ FILE *fp; double ujoules; - snprintf(path, sizeof(path), + (void)snprintf(path, sizeof(path), "/sys/class/powercap/%s/energy_uj", rapl->name); @@ -1814,7 +1817,7 @@ n++; *discharging = true; } - fclose(fp); + (void)fclose(fp); } if (first) { @@ -1827,7 +1830,7 @@ *discharging = true; /* Lie */ return 0; } - printf("Device does not have any RAPL domains, cannot power measure power usage.\n"); + (void)printf("Device does not have any RAPL domains, cannot power measure power usage.\n"); return -1; } return 0; @@ -1935,7 +1938,7 @@ dir = opendir("/sys/class/thermal"); if (dir == NULL) { - printf("Device does not have thermal zones.\n"); + (void)printf("Device does not have thermal zones.\n"); return -1; } @@ -1949,17 +1952,17 @@ continue; if ((tz = calloc(1, sizeof(*tz))) == NULL) { - fprintf(stderr, "Cannot allocate thermal information.\n"); - closedir(dir); + (void)fprintf(stderr, "Cannot allocate thermal information.\n"); + (void)closedir(dir); return -1; } if ((tz->name = strdup(entry->d_name)) == NULL) { - fprintf(stderr, "Cannot allocate thermal zone name information.\n"); - closedir(dir); + (void)fprintf(stderr, "Cannot allocate thermal zone name information.\n"); + (void)closedir(dir); free(tz); return -1; } - snprintf(path, sizeof(path), + (void)snprintf(path, sizeof(path), "/sys/class/thermal/%s/type", entry->d_name); @@ -2002,7 +2005,7 @@ char path[PATH_MAX]; uint64_t temp; - snprintf(path, sizeof(path), + (void)snprintf(path, sizeof(path), "/sys/class/thermal/%s/temp", tz->name); if (file_get_uint64(path, &temp) == 0) { @@ -2046,7 +2049,7 @@ S_ISDIR(buf.st_mode)) return power_get_proc_acpi(stats, discharging); - fprintf(stderr, "Device does not seem to have a battery, cannot measure power.\n"); + (void)fprintf(stderr, "Device does not seem to have a battery, cannot measure power.\n"); return -1; } @@ -2083,7 +2086,7 @@ return s; s = s->hash_next; } - if ((s = calloc(1, sizeof(cpu_state_t))) == NULL) + if ((s = calloc(1, sizeof(*s))) == NULL) return NULL; if ((s->name = strdup(name)) == NULL) { free(s); @@ -2098,7 +2101,7 @@ free(s); return NULL; } - strncpy(s->name_short, name, len + 1); + (void)strncpy(s->name_short, name, len + 1); s->name_short[len] = '\0'; s->hash_next = cpu_states[h]; cpu_states[h] = s; @@ -2127,7 +2130,7 @@ ci = ci->hash_next; } - if ((ci = calloc(1, sizeof(cpu_info_t))) == NULL) + if ((ci = calloc(1, sizeof(*ci))) == NULL) return NULL; ci->cpu_id = cpu_id; if ((ci->state = strdup(state)) == NULL) { @@ -2135,16 +2138,16 @@ return NULL; } - snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/name", + (void)snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/name", cpu_path, cpu_id, state); - memset(buffer, 0, sizeof(buffer)); + (void)memset(buffer, 0, sizeof(buffer)); if ((fp = fopen(path, "r")) != NULL) { if (fscanf(fp, "%63s", buffer) != 1) - strncpy(buffer, "unknown", sizeof(buffer) - 1); - fclose(fp); + (void)strncpy(buffer, "unknown", sizeof(buffer) - 1); + (void)fclose(fp); } else { - strncpy(buffer, state, sizeof(buffer) - 1); + (void)strncpy(buffer, state, sizeof(buffer) - 1); } if ((ci->cpu_state = cpu_state_get(buffer)) == NULL) { free(ci->state); @@ -2153,12 +2156,12 @@ } if (!ci->cpu_state->latency) { uint64_t val; - snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/latency", + (void)snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/latency", cpu_path, cpu_id, state); if ((fp = fopen(path, "r")) != NULL) { if (fscanf(fp, "%" SCNu64, &val) == 1) ci->cpu_state->latency = val; - fclose(fp); + (void)fclose(fp); } } @@ -2183,25 +2186,25 @@ FILE *fp; uint64_t val; - snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/time", + (void)snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/time", cpu_path, ci->cpu_id, ci->state); ci->prev_time = ci->time; ci->time = 0; if ((fp = fopen(path, "r")) != NULL) { if (fscanf(fp, "%" SCNu64, &val) == 1) ci->time = val; - fclose(fp); + (void)fclose(fp); } ci->time_diff = ci->time - ci->prev_time; - snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/usage", + (void)snprintf(path, sizeof(path), "%s/cpu%" PRIu32 "/cpuidle/%s/usage", cpu_path, ci->cpu_id, ci->state); ci->prev_usage = ci->usage; ci->usage = 0; if ((fp = fopen(path, "r")) != NULL) { if (fscanf(fp, "%" SCNu64, &val) == 1) ci->usage = val; - fclose(fp); + (void)fclose(fp); } ci->usage_diff = ci->usage - ci->prev_usage; @@ -2237,7 +2240,7 @@ if (max_cpu_id < cpu_id) max_cpu_id = cpu_id; - snprintf(path, sizeof(path), "%s/%s/cpuidle", cpu_path, name); + (void)snprintf(path, sizeof(path), "%s/%s/cpuidle", cpu_path, name); n_states = scandir(path, &states_list, NULL, alphasort); for (j = 0; j < n_states; j++) { @@ -2320,15 +2323,15 @@ } if (c0_percent >= 0.0) { - printf("\n%-10s %7s %10s %-8s\n", + (void)printf("\n%-10s %7s %10s %-8s\n", "C-State", "Resident", "Count", "Latency"); for (s = cpu_states_list; s; s = s->list_next) - printf("%-10s %7.3f%% %10" PRIu64 "%8" PRIu64 "\n", + (void)printf("%-10s %7.3f%% %10" PRIu64 "%8" PRIu64 "\n", s->name, s->resident, s->usage_total, s->latency); if (!c0) - printf("%-10s %7.3f%%\n", "C0", c0_percent); + (void)printf("%-10s %7.3f%%\n", "C0", c0_percent); } else { - printf("\nUntrustworthy C-State states, ignoring.\n"); + (void)printf("\nUntrustworthy C-State states, ignoring.\n"); } } @@ -2377,7 +2380,7 @@ } if (n < 1) { - strncpy(cmdline, "<unknown>", size); + (void)strncpy(cmdline, "<unknown>", size); n = 9; } @@ -2457,10 +2460,10 @@ if (!free_slot) return -1; - memset(cmdline, 0, sizeof(cmdline)); /* keep valgrind happy */ + (void)memset(cmdline, 0, sizeof(cmdline)); /* keep valgrind happy */ - if ((info = calloc(1, sizeof(proc_info_t))) == NULL) { - fprintf(stderr, "Cannot allocate all proc info.\n"); + if ((info = calloc(1, sizeof(*info))) == NULL) { + (void)fprintf(stderr, "Cannot allocate all proc info.\n"); return -1; } info->pid = pid; @@ -2469,11 +2472,11 @@ (void)proc_cmdline(pid, cmdline, sizeof(cmdline)); if ((info->cmdline = malloc(strlen(cmdline)+1)) == NULL) { - fprintf(stderr, "Cannot allocate all proc info.\n"); + (void)fprintf(stderr, "Cannot allocate all proc info.\n"); free(info); return -1; } - strcpy(info->cmdline, cmdline); + (void)strcpy(info->cmdline, cmdline); proc_info[i] = info; return -1; @@ -2518,8 +2521,8 @@ struct nlmsghdr *nlmsghdr; double time_start; - if ((stats = calloc((size_t)max_readings, sizeof(stats_t))) == NULL) { - fprintf(stderr, "Cannot allocate statistics table.\n"); + if ((stats = calloc((size_t)max_readings, sizeof(*stats))) == NULL) { + (void)fprintf(stderr, "Cannot allocate statistics table.\n"); return -1; } @@ -2574,7 +2577,7 @@ if (ret < 0) { if (errno == EINTR) break; - fprintf(stderr,"select failed: errno=%d (%s).\n", + (void)fprintf(stderr,"select failed: errno=%d (%s).\n", errno, strerror(errno)); free(stats); return -1; @@ -2597,7 +2600,7 @@ (redone & OPTS_REDO_NETLINK_BUSY) ? "fork/exec/exit activity" : ""); indent = (80 - strlen(buffer)) / 2; row_increment(&row); - printf("%*.*s%s\n", indent, indent, "", buffer); + (void)printf("%*.*s%s\n", indent, indent, "", buffer); redone = 0; } @@ -2668,7 +2671,7 @@ if (errno == EINTR) { continue; } else { - fprintf(stderr,"recv failed: errno=%d (%s).\n", + (void)fprintf(stderr,"recv failed: errno=%d (%s).\n", errno, strerror(errno)); free(stats); return -1; @@ -2768,19 +2771,19 @@ stats_ruler(); } - printf("Summary:\n"); + (void)printf("Summary:\n"); #if defined(POWERSTAT_X86) if (opts & OPTS_RAPL) { - printf("CPU: %6.2f Watts on average with standard deviation %-6.2f\n", + (void)printf("CPU: %6.2f Watts on average with standard deviation %-6.2f\n", average.value[POWER_TOTAL], stddev.value[POWER_TOTAL]); } else #endif { - printf("System: %6.2f Watts on average with standard deviation %-6.2f\n", + (void)printf("System: %6.2f Watts on average with standard deviation %-6.2f\n", average.value[POWER_TOTAL], stddev.value[POWER_TOTAL]); } if (opts & OPTS_GPU) { - printf("GPU: %6.2f Watts on average with standard deviation %-6.2f\n", + (void)printf("GPU: %6.2f Watts on average with standard deviation %-6.2f\n", average.value[POWER_GPU], stddev.value[POWER_GPU]); } @@ -2788,23 +2791,23 @@ if (opts & OPTS_RAPL) { char *names = power_get_rapl_domain_names(); - printf("Note: power read from RAPL domains: %s.\n", + (void)printf("Note: power read from RAPL domains: %s.\n", names ? names : "unknown"); - printf("These readings do not cover all the hardware in this device.\n"); + (void)printf("These readings do not cover all the hardware in this device.\n"); free(names); } else #endif { if (power_calc_from_capacity) { - printf("Note: Power calculated from battery capacity drain, may not be accurate.\n"); + (void)printf("Note: Power calculated from battery capacity drain, may not be accurate.\n"); } else { if (opts & OPTS_STANDARD_AVERAGE) - printf("Note: The battery supplied suitable power data, -S option not required.\n"); + (void)printf("Note: The battery supplied suitable power data, -S option not required.\n"); } } /* Just in case user wondered why no thermal zone info was displayed */ if ((opts & OPTS_THERMAL_ZONE) && (!thermal_zones)) - printf("Note: No thermal zones on this device.\n"); + (void)printf("Note: No thermal zones on this device.\n"); if (opts & OPTS_CSTATES) cpu_states_dump(); @@ -2830,8 +2833,8 @@ char buf1[80], buf2[80]; const char *type = tz_get_type(tz); - snprintf(buf1, sizeof(buf1), "thermal zone %s", type); - snprintf(buf2, sizeof(buf2), "Histogram (of %%d thermal zone %s readings)\n\n", type); + (void)snprintf(buf1, sizeof(buf1), "thermal zone %s", type); + (void)snprintf(buf2, sizeof(buf2), "Histogram (of %%d thermal zone %s readings)\n\n", type); stats_histogram(stats, readings, THERMAL_ZONE_0 + tz, buf1, buf2, "Range (°C)", 1.0); } @@ -2848,30 +2851,30 @@ */ static void show_help(char *const argv[]) { - printf("%s, version %s\n\n", app_name, VERSION); - printf("usage: %s [options] [delay [count]]\n", argv[0]); - printf("\t-a enable all sampling collection options (-c, -f, -t and -H)\n"); - printf("\t-b redo a sample if a system is busy, considered less than %d%% CPU idle\n", IDLE_THRESHOLD); - printf("\t-c show C-State statistics at end of the run\n"); - printf("\t-d specify delay before starting, default is %" PRId32 " seconds\n", start_delay); - printf("\t-D show RAPL domain power measurements (enables -R option)\n"); - printf("\t-f show average CPU frequency\n"); - printf("\t-g show GPU power (currently just i915)\n"); - printf("\t-h show help\n"); - printf("\t-H show spread of measurements with power histogram\n"); - printf("\t-i specify CPU idle threshold, used in conjunction with -b\n"); - printf("\t-n no printing of table heading when screen scrolls\n"); - printf("\t-p redo a sample if we see process fork/exec/exit activity\n"); - printf("\t-r redo a sample if busy and we see process activity (same as -b -p)\n"); + (void)printf("%s, version %s\n\n", app_name, VERSION); + (void)printf("usage: %s [options] [delay [count]]\n", argv[0]); + (void)printf("\t-a enable all sampling collection options (-c, -f, -t and -H)\n"); + (void)printf("\t-b redo a sample if a system is busy, considered less than %d%% CPU idle\n", IDLE_THRESHOLD); + (void)printf("\t-c show C-State statistics at end of the run\n"); + (void)printf("\t-d specify delay before starting, default is %" PRId32 " seconds\n", start_delay); + (void)printf("\t-D show RAPL domain power measurements (enables -R option)\n"); + (void)printf("\t-f show average CPU frequency\n"); + (void)printf("\t-g show GPU power (currently just i915)\n"); + (void)printf("\t-h show help\n"); + (void)printf("\t-H show spread of measurements with power histogram\n"); + (void)printf("\t-i specify CPU idle threshold, used in conjunction with -b\n"); + (void)printf("\t-n no printing of table heading when screen scrolls\n"); + (void)printf("\t-p redo a sample if we see process fork/exec/exit activity\n"); + (void)printf("\t-r redo a sample if busy and we see process activity (same as -b -p)\n"); #if defined(POWERSTAT_X86) - printf("\t-R gather stats from Intel RAPL interface\n"); + (void)printf("\t-R gather stats from Intel RAPL interface\n"); #endif - printf("\t-s show process fork/exec/exit activity log\n"); - printf("\t-S calculate power from capacity drain using standard average\n"); - printf("\t-t show Thermal Zone temperatures (in degrees C)\n"); - printf("\t-z forcibly ignore zero power rate stats from the battery\n"); - printf("\tdelay: delay between each sample, default is %.1f seconds\n", SAMPLE_DELAY); - printf("\tcount: number of samples to take\n"); + (void)printf("\t-s show process fork/exec/exit activity log\n"); + (void)printf("\t-S calculate power from capacity drain using standard average\n"); + (void)printf("\t-t show Thermal Zone temperatures (in degrees C)\n"); + (void)printf("\t-z forcibly ignore zero power rate stats from the battery\n"); + (void)printf("\tdelay: delay between each sample, default is %.1f seconds\n", SAMPLE_DELAY); + (void)printf("\tcount: number of samples to take\n"); } int main(int argc, char * const argv[]) @@ -2910,11 +2913,11 @@ errno = 0; start_delay = strtol(optarg, NULL, 10); if (errno) { - fprintf(stderr, "Invalid value for start delay.\n"); + (void)fprintf(stderr, "Invalid value for start delay.\n"); exit(EXIT_FAILURE); } if (start_delay < 0) { - fprintf(stderr, "Start delay must be 0 or more seconds.\n"); + (void)fprintf(stderr, "Start delay must be 0 or more seconds.\n"); exit(EXIT_FAILURE); } break; @@ -2940,7 +2943,7 @@ opts |= OPTS_REDO_WHEN_NOT_IDLE; idle_threshold = atof(optarg); if ((idle_threshold < 0.0) || (idle_threshold > 99.99)) { - fprintf(stderr, "Idle threshold must be between 0..99.99.\n"); + (void)fprintf(stderr, "Idle threshold must be between 0..99.99.\n"); exit(EXIT_FAILURE); } break; @@ -2971,7 +2974,7 @@ opts |= OPTS_ZERO_RATE_ALLOW; break; case '?': - printf("Try '%s -h' for more information.\n", app_name); + (void)printf("Try '%s -h' for more information.\n", app_name); exit(EXIT_FAILURE); default: show_help(argv); @@ -2984,11 +2987,11 @@ errno = 0; sample_delay = atof(argv[optind++]); if (errno) { - fprintf(stderr, "Invalid value for start delay.\n"); + (void)fprintf(stderr, "Invalid value for start delay.\n"); exit(EXIT_FAILURE); } if (sample_delay < MIN_SAMPLE_DELAY) { - fprintf(stderr, "Sample delay must be greater or equal " + (void)fprintf(stderr, "Sample delay must be greater or equal " "to %.1f seconds.\n", MIN_SAMPLE_DELAY); exit(EXIT_FAILURE); } @@ -3017,11 +3020,11 @@ errno = 0; max_readings = strtol(argv[optind++], NULL, 10); if (errno) { - fprintf(stderr, "Invalid value for maximum readings.\n"); + (void)fprintf(stderr, "Invalid value for maximum readings.\n"); exit(EXIT_FAILURE); } if ((max_readings * sample_delay) < run_duration) { - fprintf(stderr, "Number of readings should be at least %ld.\n", + (void)fprintf(stderr, "Number of readings should be at least %ld.\n", (long int)(run_duration / sample_delay)); exit(EXIT_FAILURE); } @@ -3030,31 +3033,31 @@ } if (max_readings < 5) { - fprintf(stderr, "Number of readings too low.\n"); + (void)fprintf(stderr, "Number of readings too low.\n"); exit(EXIT_FAILURE); } if (max_readings < 10) - fprintf(stderr, "Number of readings low, results may be inaccurate.\n"); + (void)fprintf(stderr, "Number of readings low, results may be inaccurate.\n"); if (!(opts & OPTS_ROOT_PRIV) && (opts & (OPTS_USE_NETLINK | OPTS_GPU))) { - fprintf(stderr, "%s needs to be run with root privilege when using -g, -p, -r, -s options.\n", argv[0]); + (void)fprintf(stderr, "%s needs to be run with root privilege when using -g, -p, -r, -s options.\n", argv[0]); exit(ret); } if (power_get(&dummy_stats, &discharging) < 0) exit(ret); - printf("Running for %.1f seconds (%" PRIu32 " samples at %.1f second intervals).\n", + (void)printf("Running for %.1f seconds (%" PRIu32 " samples at %.1f second intervals).\n", sample_delay * max_readings, max_readings, sample_delay); - printf("Power measurements will start in %" PRId32 " seconds time.\n", + (void)printf("Power measurements will start in %" PRId32 " seconds time.\n", start_delay); - printf("\n"); + (void)printf("\n"); if (start_delay > 0) { /* Gather up initial data */ for (i = 0; i < start_delay; i++) { - printf("Waiting %" PRId32 " seconds before starting (gathering samples). \r", start_delay - i); - fflush(stdout); + (void)printf("Waiting %" PRId32 " seconds before starting (gathering samples). \r", start_delay - i); + (void)fflush(stdout); if (power_get(&dummy_stats, &discharging) < 0) exit(ret); if (sleep(1) || stop_recv) @@ -3062,17 +3065,17 @@ if (!discharging) exit(ret); } - printf("%79.79s\r", ""); + (void)printf("%79.79s\r", ""); } - memset(&new_action, 0, sizeof(new_action)); - for (i = 0; signals[i] != -1; i++) { + (void)memset(&new_action, 0, sizeof(new_action)); + for (i = 0; i < (int)SIZEOF_ARRAY(signals); i++) { new_action.sa_handler = handle_sig; sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; if (sigaction(signals[i], &new_action, NULL) < 0) { - fprintf(stderr, "sigaction failed: errno=%d (%s).\n", + (void)fprintf(stderr, "sigaction failed: errno=%d (%s).\n", errno, strerror(errno)); exit(EXIT_FAILURE); } @@ -3084,7 +3087,7 @@ sock = netlink_connect(); if (sock == -EPROTONOSUPPORT) { if (opts & OPTS_SHOW_PROC_ACTIVITY) - printf("Cannot show process activity with this kernel.\n"); + (void)printf("Cannot show process activity with this kernel.\n"); opts &= ~OPTS_USE_NETLINK; } else if (sock < 0) { goto abort;

1 0

commit eventstat for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package eventstat for openSUSE:Factory checked in at 2017-10-30 21:18:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eventstat (Old) and /work/SRC/openSUSE:Factory/.eventstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eventstat" Mon Oct 30 21:18:40 2017 rev:4 rq:537433 version:0.04.02 Changes: -------- --- /work/SRC/openSUSE:Factory/eventstat/eventstat.changes 2017-09-09 20:26:13.000780368 +0200 +++ /work/SRC/openSUSE:Factory/.eventstat.new/eventstat.changes 2017-10-30 21:19:00.798044294 +0100 @@ -1,0 +2,15 @@ +Thu Oct 19 17:49:55 UTC 2017 - mardnh(a)gmx.de + +- Update to version 4.04.02 + * Makefile: bump version + * Iterate over arrays using size of array rather than using + sentinels at end of array + * Remove empty lines + * Voidify returns from various functions + * Add some UNLIKELY/LIKELY branch hinting + * debian/control: update Standards-Version to 4.1.1 + * Prefix all globals with g_ to notify scope + * Use sizeof object rather than size of type + * Remove whitespace from source + +------------------------------------------------------------------- Old: ---- eventstat-0.04.01.tar.gz New: ---- eventstat-0.04.02.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eventstat.spec ++++++ --- /var/tmp/diff_new_pack.AvqflS/_old 2017-10-30 21:19:01.366023644 +0100 +++ /var/tmp/diff_new_pack.AvqflS/_new 2017-10-30 21:19:01.390022771 +0100 @@ -18,7 +18,7 @@ Name: eventstat -Version: 0.04.01 +Version: 0.04.02 Release: 0 Summary: Kernel event states monitoring tool License: GPL-2.0+ ++++++ eventstat-0.04.01.tar.gz -> eventstat-0.04.02.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eventstat-0.04.01/Makefile new/eventstat-0.04.02/Makefile --- old/eventstat-0.04.01/Makefile 2017-08-16 20:47:11.000000000 +0200 +++ new/eventstat-0.04.02/Makefile 2017-10-18 23:15:10.000000000 +0200 @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -VERSION=0.04.01 +VERSION=0.04.02 CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eventstat-0.04.01/eventstat.c new/eventstat-0.04.02/eventstat.c --- old/eventstat-0.04.01/eventstat.c 2017-08-16 20:47:11.000000000 +0200 +++ new/eventstat-0.04.02/eventstat.c 2017-10-18 23:15:10.000000000 +0200 @@ -43,6 +43,8 @@ #define TABLE_SIZE (1009) /* Should be a prime */ +#define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0])) + #define OPT_QUIET (0x00000001) #define OPT_CUMULATIVE (0x00000002) #define OPT_CMD_SHORT (0x00000004) @@ -95,6 +97,14 @@ #define OPTIMIZE3 #endif +#if defined(__GNUC__) +#define LIKELY(x) __builtin_expect((x),1) +#define UNLIKELY(x) __builtin_expect((x),0) +#else +#define LIKELY(x) (x) +#define UNLIKELY(x) (x) +#endif + #define FLOAT_TINY (0.0000001) #define FLOAT_CMP(a, b) (fabs(a - b) < FLOAT_TINY) @@ -150,47 +160,47 @@ #define KERN_TASK_INFO(str) { str, sizeof(str) - 1 } -static const char * const app_name = "eventstat"; -static const char * const sys_tracing_enable = +static const char * const g_app_name = "eventstat"; +static const char * const g_sys_tracing_enable = "/sys/kernel/debug/tracing/events/timer/hrtimer_start/enable"; -static const char * const sys_tracing_pipe = +static const char * const g_sys_tracing_pipe = "/sys/kernel/debug/tracing/trace_pipe"; -static const char * const sys_tracing_set_event = +static const char * const g_sys_tracing_set_event = "/sys/kernel/debug/tracing/set_event"; -static const char * const sys_tracing_filter = +static const char * const g_sys_tracing_filter = "/sys/kernel/debug/tracing/events/timer/filter"; static void es_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); -static timer_stat_t *timer_stat_free_list; /* free list of timer stats */ -static timer_info_t *timer_info_list; /* cache list of timer_info */ -static timer_info_t *timer_info_hash[TABLE_SIZE]; /* hash of timer_info */ +static timer_stat_t *g_timer_stat_free_list; /* free list of timer stats */ +static timer_info_t *g_timer_info_list; /* cache list of timer_info */ +static timer_info_t *g_timer_info_hash[TABLE_SIZE]; /* hash of timer_info */ /* head of list of samples, sorted in sample time order */ -static sample_delta_list_t *sample_delta_list_head; +static sample_delta_list_t *g_sample_delta_list_head; /* tail of list of samples, sorted in sample time order */ -static sample_delta_list_t *sample_delta_list_tail; +static sample_delta_list_t *g_sample_delta_list_tail; /* ignore samples with event delta less than this */ -static double opt_threshold; +static double g_opt_threshold; -static char *csv_results; /* results in comma separated values */ -static char *get_events_buf; /* buffer to glob events into */ -static uint32_t timer_info_list_length; /* length of timer_info_list */ -static uint32_t opt_flags; /* option flags */ -static volatile bool stop_eventstat = false; /* set by sighandler */ -static bool sane_procs; /* false if we are in a container */ -static bool resized; /* window resized */ -static bool curses_init; /* curses initialised */ -static int rows = 25; /* tty size, rows */ -static int cols = 80; /* tty size, columns */ +static char *g_csv_results; /* results in comma separated values */ +static char *g_get_events_buf; /* buffer to glob events into */ +static uint32_t g_timer_info_list_length; /* length of timer_info_list */ +static uint32_t g_opt_flags; /* option flags */ +static volatile bool g_stop_eventstat = false; /* set by sighandler */ +static bool g_sane_procs; /* false if we are in a container */ +static bool g_resized; /* window resized */ +static bool g_curses_init; /* curses initialised */ +static int g_rows = 25; /* tty size, rows */ +static int g_cols = 80; /* tty size, columns */ /* * Attempt to catch a range of signals so * we can clean */ -static const int signals[] = { +static const int g_signals[] = { /* POSIX.1-1990 */ #ifdef SIGHUP SIGHUP, @@ -236,7 +246,6 @@ #ifdef SIGVTALRM SIGVTALRM, #endif - -1, }; /* @@ -272,7 +281,6 @@ max_digits = min_digits; ret: return max_digits; - } /* @@ -301,8 +309,8 @@ struct winsize ws; if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1) { - rows = ws.ws_row; - cols = ws.ws_col; + g_rows = ws.ws_row; + g_cols = ws.ws_col; } } @@ -312,7 +320,7 @@ */ static inline void eventstat_clear(void) { - if (curses_init) + if (g_curses_init) clear(); } @@ -322,7 +330,7 @@ */ static inline void eventstat_refresh(void) { - if (curses_init) + if (g_curses_init) refresh(); } @@ -332,7 +340,7 @@ */ static inline void eventstat_move(const int y, const int x) { - if (curses_init) + if (g_curses_init) move(y, x); } @@ -342,7 +350,7 @@ */ static void eventstat_endwin(void) { - if (curses_init) { + if (g_curses_init) { clear(); endwin(); } @@ -359,7 +367,7 @@ va_start(ap, fmt); eventstat_endwin(); - vfprintf(stderr,fmt, ap); + (void)vfprintf(stderr,fmt, ap); va_end(ap); exit(EXIT_FAILURE); @@ -398,21 +406,21 @@ */ static inline void set_tracing_enable(const char *str, const bool carp) { - set_tracing(sys_tracing_enable, str, carp); + set_tracing(g_sys_tracing_enable, str, carp); } static void set_tracing_event(void) { char buffer[64]; - set_tracing(sys_tracing_set_event, "\n", true); - set_tracing(sys_tracing_set_event, "hrtimer_start", true); - set_tracing(sys_tracing_filter, "0", true); + set_tracing(g_sys_tracing_set_event, "\n", true); + set_tracing(g_sys_tracing_set_event, "hrtimer_start", true); + set_tracing(g_sys_tracing_filter, "0", true); /* Ignore event stat and idle events */ - snprintf(buffer, sizeof(buffer), + (void)snprintf(buffer, sizeof(buffer), "common_pid != %d && common_pid != 0", getpid()); - set_tracing(sys_tracing_filter, buffer, true); + set_tracing(g_sys_tracing_filter, buffer, true); } @@ -457,7 +465,7 @@ { struct timeval tv; - if (gettimeofday(&tv, NULL) < 0) + if (UNLIKELY(gettimeofday(&tv, NULL) < 0)) err_abort("gettimeofday failed: errno=%d (%s)\n", errno, strerror(errno)); return timeval_to_double(&tv); @@ -498,7 +506,6 @@ ptr = pattern; } } - (void)fclose(fp); return ret; @@ -512,7 +519,7 @@ { (void)dummy; /* Stop unused parameter warning with -Wextra */ - stop_eventstat = true; + g_stop_eventstat = true; set_tracing_enable("0\n", false); } @@ -522,7 +529,7 @@ */ static inline void samples_free(void) { - sample_delta_list_t *sdl = sample_delta_list_head; + sample_delta_list_t *sdl = g_sample_delta_list_head; while (sdl) { sample_delta_list_t *sdl_next = sdl->next; @@ -548,10 +555,10 @@ sample_delta_list_t *sdl; sample_delta_item_t *sdi; - if (csv_results == NULL) /* No need if not enabled */ + if (g_csv_results == NULL) /* No need if not enabled */ return; - for (sdl = sample_delta_list_head; sdl; sdl = sdl->next) { + for (sdl = g_sample_delta_list_head; sdl; sdl = sdl->next) { if (FLOAT_CMP(sdl->whence, whence)) { found = true; break; @@ -563,21 +570,21 @@ * list since time is assumed to be increasing */ if (!found) { - if ((sdl = calloc(1, sizeof(sample_delta_list_t))) == NULL) + if ((sdl = calloc(1, sizeof(*sdl))) == NULL) err_abort("Cannot allocate sample delta list\n"); sdl->whence = whence; - if (sample_delta_list_tail) { - sample_delta_list_tail->next = sdl; - sample_delta_list_tail = sdl; + if (g_sample_delta_list_tail) { + g_sample_delta_list_tail->next = sdl; + g_sample_delta_list_tail = sdl; } else { - sample_delta_list_head = sdl; - sample_delta_list_tail = sdl; + g_sample_delta_list_head = sdl; + g_sample_delta_list_tail = sdl; } } /* Now append the sdi onto the list */ - if ((sdi = calloc(1, sizeof(sample_delta_item_t))) == NULL) + if (UNLIKELY(((sdi = calloc(1, sizeof(*sdi))) == NULL))) err_abort("Cannot allocate sample delta item\n"); sdi->delta_events = timer_stat->info->delta_events; sdi->time_delta = timer_stat->info->last_used - @@ -656,7 +663,7 @@ size_t i; - for (i = 0; kernel_tasks[i].task != NULL; i++) { + for (i = 0; i < SIZEOF_ARRAY(kernel_tasks); i++) { if (!strncmp(task, kernel_tasks[i].task, kernel_tasks[i].len)) return true; } @@ -672,7 +679,7 @@ const pid_t pgid = id == 0 ? 0 : getpgid(id); /* We are either in a container, or with a task with a NULL cmdline */ - if (sane_procs || (id >= 0)) + if (g_sane_procs || (id >= 0)) return (pgid == 0); /* Can't get pgid on that pid, so make a guess */ @@ -690,7 +697,7 @@ int fd; ssize_t ret; - snprintf(buffer, sizeof(buffer), "/proc/%d/cmdline", id); + (void)snprintf(buffer, sizeof(buffer), "/proc/%d/cmdline", id); if ((fd = open(buffer, O_RDONLY)) < 0) return NULL; @@ -707,7 +714,7 @@ /* * OPT_CMD_LONG option we get the full cmdline args */ - if (opt_flags & OPT_CMD_LONG) { + if (g_opt_flags & OPT_CMD_LONG) { for (ptr = buffer; ptr < buffer + ret - 1; ptr++) { if (*ptr == '\0') *ptr = ' '; @@ -717,14 +724,14 @@ /* * OPT_CMD_SHORT option we discard anything after a space */ - if (opt_flags & OPT_CMD_SHORT) { + if (g_opt_flags & OPT_CMD_SHORT) { for (ptr = buffer; *ptr && (ptr < buffer + ret); ptr++) { if (*ptr == ' ') *ptr = '\0'; } } - if (opt_flags & OPT_DIRNAME_STRIP) + if (g_opt_flags & OPT_DIRNAME_STRIP) return strdup(basename(buffer)); return strdup(buffer); @@ -753,17 +760,17 @@ return; if ((fp = fopen(filename, "w")) == NULL) { - fprintf(stderr, "Cannot write to file %s\n", filename); + (void)fprintf(stderr, "Cannot write to file %s\n", filename); return; } - sorted_timer_infos = calloc(timer_info_list_length, - sizeof(timer_info_t *)); + sorted_timer_infos = calloc(g_timer_info_list_length, + sizeof(*sorted_timer_infos)); if (!sorted_timer_infos) err_abort("Cannot allocate buffer for sorting timer_infos\n"); /* Just want the timers with some non-zero total */ - for (n = 0, info = timer_info_list; info; info = info->next) { + for (n = 0, info = g_timer_info_list; info; info = info->next) { if (info->total_events > 0) sorted_timer_infos[n++] = info; } @@ -775,37 +782,37 @@ for (i = 0; i < n; i++) { char *task; - if (opt_flags & OPT_CMD) + if (g_opt_flags & OPT_CMD) task = sorted_timer_infos[i]->cmdline; else task = sorted_timer_infos[i]->task_mangled; - fprintf(fp, ",%s", task); + (void)fprintf(fp, ",%s", task); } - fprintf(fp, "\n"); + (void)fprintf(fp, "\n"); - fprintf(fp, ",Init Function:"); + (void)fprintf(fp, ",Init Function:"); for (i = 0; i < n; i++) - fprintf(fp, ",%s", sorted_timer_infos[i]->func); - fprintf(fp, "\n"); + (void)fprintf(fp, ",%s", sorted_timer_infos[i]->func); + (void)fprintf(fp, "\n"); - fprintf(fp, ",Total:"); + (void)fprintf(fp, ",Total:"); for (i = 0; i < n; i++) - fprintf(fp, ",%" PRIu64, sorted_timer_infos[i]->total_events); - fprintf(fp, "\n"); + (void)fprintf(fp, ",%" PRIu64, sorted_timer_infos[i]->total_events); + (void)fprintf(fp, "\n"); - for (sdl = sample_delta_list_head; sdl; sdl = sdl->next) { + for (sdl = g_sample_delta_list_head; sdl; sdl = sdl->next) { time_t t = (time_t)sdl->whence; struct tm *tm; count++; tm = localtime(&t); - fprintf(fp, "%2.2d:%2.2d:%2.2d", + (void)fprintf(fp, "%2.2d:%2.2d:%2.2d", tm->tm_hour, tm->tm_min, tm->tm_sec); if (first_time < 0) first_time = sdl->whence; - fprintf(fp, ",%f", duration_round(sdl->whence - first_time)); + (void)fprintf(fp, ",%f", duration_round(sdl->whence - first_time)); /* * Scan in timer info order to be consistent for all sdl rows @@ -819,80 +826,80 @@ * raw sample count by scaling by 1.0 (i.e. no scaling) */ if (sdi) { - double duration = duration_round((opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); - fprintf(fp, ",%f", + double duration = duration_round((g_opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); + (void)fprintf(fp, ",%f", FLOAT_CMP(duration, 0.0) ? -99.99 : (double)sdi->delta_events / duration); } else - fprintf(fp, ",%f", 0.0); + (void)fprintf(fp, ",%f", 0.0); } - fprintf(fp, "\n"); + (void)fprintf(fp, "\n"); } /* * -S option - some statistics, min, max, average, std.dev. */ - if (opt_flags & OPT_RESULT_STATS) { - fprintf(fp, ",Min:"); + if (g_opt_flags & OPT_RESULT_STATS) { + (void)fprintf(fp, ",Min:"); for (i = 0; i < n; i++) { double min = DBL_MAX; - for (sdl = sample_delta_list_head; sdl; sdl = sdl->next) { + for (sdl = g_sample_delta_list_head; sdl; sdl = sdl->next) { sample_delta_item_t *sdi = sample_find(sdl, sorted_timer_infos[i]); if (sdi) { - double duration = duration_round((opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); + double duration = duration_round((g_opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); double val = FLOAT_CMP(duration, 0.0) ? 0.0 : sdi->delta_events / duration; if (min > val) min = val; } } - fprintf(fp, ",%f", min); + (void)fprintf(fp, ",%f", min); } - fprintf(fp, "\n"); + (void)fprintf(fp, "\n"); - fprintf(fp, ",Max:"); + (void)fprintf(fp, ",Max:"); for (i = 0; i < n; i++) { double max = DBL_MIN; - for (sdl = sample_delta_list_head; sdl; sdl = sdl->next) { + for (sdl = g_sample_delta_list_head; sdl; sdl = sdl->next) { sample_delta_item_t *sdi = sample_find(sdl, sorted_timer_infos[i]); if (sdi) { - double duration = duration_round((opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); + double duration = duration_round((g_opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); double val = FLOAT_CMP(duration, 0.0) ? 0.0 : sdi->delta_events / duration; if (max < val) max = val; } } - fprintf(fp, ",%f", max); + (void)fprintf(fp, ",%f", max); } - fprintf(fp, "\n"); + (void)fprintf(fp, "\n"); - fprintf(fp, ",Average:"); + (void)fprintf(fp, ",Average:"); for (i = 0; i < n; i++) - fprintf(fp, ",%f", count == 0 ? 0.0 : + (void)fprintf(fp, ",%f", count == 0 ? 0.0 : (double)sorted_timer_infos[i]->total_events / count); - fprintf(fp, "\n"); + (void)fprintf(fp, "\n"); /* * population standard deviation */ - fprintf(fp, ",Std.Dev.:"); + (void)fprintf(fp, ",Std.Dev.:"); for (i = 0; i < n; i++) { double average = (double) sorted_timer_infos[i]->total_events / (double)count; double sum = 0.0; - for (sdl = sample_delta_list_head; sdl; sdl = sdl->next) { + for (sdl = g_sample_delta_list_head; sdl; sdl = sdl->next) { sample_delta_item_t *sdi = sample_find(sdl, sorted_timer_infos[i]); if (sdi) { - double duration = duration_round((opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); + double duration = duration_round((g_opt_flags & OPT_SAMPLE_COUNT) ? 1.0 : sdi->time_delta); double diff = FLOAT_CMP(duration, 0.0) ? 0.0 : ((double)sdi->delta_events - average) / duration; diff = diff * diff; @@ -900,9 +907,9 @@ } } sum = sum / (double)count; - fprintf(fp, ",%f", sqrt(sum)); + (void)fprintf(fp, ",%f", sqrt(sum)); } - fprintf(fp, "\n"); + (void)fprintf(fp, "\n"); } free(sorted_timer_infos); (void)fclose(fp); @@ -922,15 +929,15 @@ timer_info_t *info; const uint32_t h = hash_djb2a(ident); - for (info = timer_info_hash[h]; info; info = info->hash_next) { - if (strcmp(ident, info->ident) == 0) { + for (info = g_timer_info_hash[h]; info; info = info->hash_next) { + if (UNLIKELY(strcmp(ident, info->ident) == 0)) { info->prev_used = info->last_used; info->last_used = time_now; return info; } } - info = calloc(1, sizeof(timer_info_t)); - if (!info) + info = calloc(1, sizeof(*info)); + if (UNLIKELY(!info)) err_abort("Cannot allocate timer info\n"); info->pid = new_info->pid; @@ -950,20 +957,20 @@ info->total_events = 1; info->delta_events = 1; - if (info->task == NULL || - info->task_mangled == NULL || - info->cmdline == NULL || - info->func == NULL || - info->ident == NULL) { + if (UNLIKELY(info->task == NULL || + info->task_mangled == NULL || + info->cmdline == NULL || + info->func == NULL || + info->ident == NULL)) { err_abort("Out of memory allocating a timer stat fields\n"); } /* Does not exist in list, append it */ - info->next = timer_info_list; - timer_info_list = info; - timer_info_list_length++; - info->hash_next = timer_info_hash[h]; - timer_info_hash[h] = info; + info->next = g_timer_info_list; + g_timer_info_list = info; + g_timer_info_list_length++; + info->hash_next = g_timer_info_hash[h]; + g_timer_info_hash[h] = info; return info; } @@ -1008,7 +1015,7 @@ *list = next; else prev->next = next; - timer_info_list_length--; + g_timer_info_list_length--; } else { prev = info; } @@ -1048,7 +1055,6 @@ } } - /* * timer_info_purge_old() * clean out old timer infos @@ -1062,9 +1068,9 @@ size_t i; count = 0; - timer_info_purge_old_from_timer_list(&timer_info_list, time_now); + timer_info_purge_old_from_timer_list(&g_timer_info_list, time_now); for (i = 0; i < TABLE_SIZE; i++) - timer_info_purge_old_from_hash_list(&timer_info_hash[i], time_now); + timer_info_purge_old_from_hash_list(&g_timer_info_hash[i], time_now); } } @@ -1074,7 +1080,7 @@ */ static inline void timer_info_list_free(void) { - timer_info_t *info = timer_info_list; + timer_info_t *info = g_timer_info_list; /* Free list and timers on list */ while (info) { @@ -1092,11 +1098,11 @@ { static char ident[128]; - if (opt_flags & OPT_TIMER_ID) { - snprintf(ident, sizeof(ident), "%x%s%8.8s%" PRIx64, + if (g_opt_flags & OPT_TIMER_ID) { + (void)snprintf(ident, sizeof(ident), "%x%s%8.8s%" PRIx64, info->pid, info->task, info->func, info->timer); } else { - snprintf(ident, sizeof(ident), "%x%s%8.8s", + (void)snprintf(ident, sizeof(ident), "%x%s%8.8s", info->pid, info->task, info->func); } return ident; @@ -1108,7 +1114,7 @@ */ static void timer_stat_free_list_free(void) { - timer_stat_t *ts = timer_stat_free_list; + timer_stat_t *ts = g_timer_stat_free_list; while (ts) { timer_stat_t *next = ts->next; @@ -1116,7 +1122,7 @@ free(ts); ts = next; } - timer_stat_free_list = NULL; + g_timer_stat_free_list = NULL; } /* @@ -1136,8 +1142,8 @@ /* Decrement info ref count */ ts->info->ref_count--; /* Add it onto the timer stat free list */ - ts->next = timer_stat_free_list; - timer_stat_free_list = ts; + ts->next = g_timer_stat_free_list; + g_timer_stat_free_list = ts; ts = next; } @@ -1161,7 +1167,7 @@ timer_stat_t *ts, *ts_new; for (ts = timer_stats[h]; ts; ts = ts->next) { - if (strcmp(ts->info->ident, ident) == 0) { + if (UNLIKELY(strcmp(ts->info->ident, ident) == 0)) { ts->info->total_events++; ts->info->delta_events++; sample_add(ts, time_now); @@ -1169,13 +1175,13 @@ } } /* Not found, it is new */ - if (timer_stat_free_list) { + if (g_timer_stat_free_list) { /* Get new one from free list */ - ts_new = timer_stat_free_list; - timer_stat_free_list = timer_stat_free_list->next; + ts_new = g_timer_stat_free_list; + g_timer_stat_free_list = g_timer_stat_free_list->next; } else { /* Get one from heap */ - if ((ts_new = malloc(sizeof(timer_stat_t))) == NULL) + if ((ts_new = malloc(sizeof(*ts_new))) == NULL) err_abort("Out of memory allocating a timer stat\n"); } @@ -1197,7 +1203,7 @@ timer_stat_t *new) /* timer stat to add */ { while (*sorted) { - if (opt_flags & OPT_CUMULATIVE) { + if (g_opt_flags & OPT_CUMULATIVE) { if ((*sorted)->info->total_events < new->info->total_events) { new->sorted_freq_next = *(sorted); break; @@ -1223,13 +1229,13 @@ va_list ap; va_start(ap, fmt); - if (curses_init) { + if (g_curses_init) { char buf[256]; - vsnprintf(buf, sizeof(buf), fmt, ap); - printw("%s", buf); + (void)vsnprintf(buf, sizeof(buf), fmt, ap); + (void)printw("%s", buf); } else { - vprintf(fmt, ap); + (void)vprintf(fmt, ap); } va_end(ap); } @@ -1254,7 +1260,7 @@ timer_stat_sort_freq_add(&sorted, ts); } - if (!(opt_flags & OPT_QUIET)) { + if (!(g_opt_flags & OPT_QUIET)) { uint64_t total = 0UL, kt_total = 0UL; int32_t j = 0; const int pid_size = pid_max_digits(); @@ -1262,23 +1268,23 @@ int min_width; eventstat_winsize(); - if (resized && curses_init) { - resizeterm(rows, cols); + if (g_resized && g_curses_init) { + resizeterm(g_rows, g_cols); refresh(); - resized = false; + g_resized = false; } /* Minimum width w/o task or func info */ min_width = EVENTS_WIDTH + 1 + \ 1 + \ pid_size + 1; - if (!(opt_flags & OPT_BRIEF)) { - if (opt_flags & OPT_TIMER_ID) + if (!(g_opt_flags & OPT_BRIEF)) { + if (g_opt_flags & OPT_TIMER_ID) min_width += TIMER_ID_WIDTH + 1; fn_size = FUNC_WIDTH; } - sz = cols - min_width; + sz = g_cols - min_width; sz = (sz < 0) ? 0 : sz; if (fn_size) { @@ -1287,21 +1293,21 @@ fn_size = FUNC_WIDTH_MAX; min_width += fn_size; - sz = cols - min_width; + sz = g_cols - min_width; sz = (sz < 0) ? 0 : sz; } ta_size = sz; if (ta_size < TASK_WIDTH) ta_size = TASK_WIDTH; - + es_printf("%*.*s %-*.*s %-*.*s", EVENTS_WIDTH, EVENTS_WIDTH, - (opt_flags & OPT_CUMULATIVE) ? + (g_opt_flags & OPT_CUMULATIVE) ? "Events" : "Event/s", pid_size, pid_size, "PID", ta_size, ta_size, "Task"); - if (!(opt_flags & OPT_BRIEF)) { - if (opt_flags & OPT_TIMER_ID) { + if (!(g_opt_flags & OPT_BRIEF)) { + if (g_opt_flags & OPT_TIMER_ID) { es_printf(" %-16.16s", "Timer ID"); } es_printf("%-*.*s\n", fn_size, fn_size, @@ -1313,14 +1319,14 @@ while (sorted) { if (((n_lines == -1) || (j < n_lines)) && (sorted->info->delta_events != 0)) { - char *task = (opt_flags & OPT_CMD) ? + char *task = (g_opt_flags & OPT_CMD) ? sorted->info->cmdline : sorted->info->task_mangled; if (!*task) task = sorted->info->task_mangled; j++; - if (opt_flags & OPT_CUMULATIVE) + if (g_opt_flags & OPT_CUMULATIVE) es_printf("%*" PRIu64 " ", EVENTS_WIDTH, sorted->info->total_events); @@ -1329,7 +1335,7 @@ EVENTS_WIDTH, (double)sorted->info->delta_events / duration); - if (opt_flags & OPT_BRIEF) { + if (g_opt_flags & OPT_BRIEF) { es_printf("%*d %s\n", pid_size, sorted->info->pid, @@ -1338,7 +1344,7 @@ es_printf("%*d %-*.*s", pid_size, sorted->info->pid, ta_size, ta_size, task); - if (opt_flags & OPT_TIMER_ID) { + if (g_opt_flags & OPT_TIMER_ID) { es_printf(" %16" PRIx64, sorted->info->timer); } @@ -1359,7 +1365,7 @@ total, (double)total / duration, (double)kt_total / duration, (double)(total - kt_total) / duration); - if ((opt_flags & OPT_SHOW_WHENCE) && !curses_init) { + if ((g_opt_flags & OPT_SHOW_WHENCE) && !g_curses_init) { time_t t = (time_t)whence; char *timestr = ctime(&t); char *pos = strchr(timestr, '\n'); @@ -1370,7 +1376,7 @@ "%.1f secs\n", timestr, time_delta); } - if (!sane_procs) + if (!g_sane_procs) es_printf("Note: this was run inside a container, " "kernel tasks were guessed.\n"); es_printf("\n"); @@ -1390,19 +1396,19 @@ static size_t get_events_size; size_t size; - if (get_events_buf == NULL) { - if ((get_events_buf = malloc(EVENT_BUF_SIZE << 1)) == NULL) + if (UNLIKELY(g_get_events_buf == NULL)) { + if ((g_get_events_buf = malloc(EVENT_BUF_SIZE << 1)) == NULL) err_abort("Cannot read %s, out of memory\n", - sys_tracing_pipe); + g_sys_tracing_pipe); get_events_size = (EVENT_BUF_SIZE << 1); } - if ((fd = open(sys_tracing_pipe, O_RDONLY)) < 0) - err_abort("Cannot open %s\n", sys_tracing_pipe); + if ((fd = open(g_sys_tracing_pipe, O_RDONLY)) < 0) + err_abort("Cannot open %s\n", g_sys_tracing_pipe); size = 0; - while (!stop_eventstat) { + while (!g_stop_eventstat) { ssize_t ret; int rc; static char buffer[EVENT_BUF_SIZE]; @@ -1427,7 +1433,7 @@ if (ret == 0) continue; if (ret < 0) { - if (!stop_eventstat && + if (!g_stop_eventstat && ((errno == EINTR) || (errno != EAGAIN))) { continue; @@ -1439,21 +1445,21 @@ char *tmpptr; get_events_size += (EVENT_BUF_SIZE << 1); - tmpptr = realloc(get_events_buf, get_events_size + 1); + tmpptr = realloc(g_get_events_buf, get_events_size + 1); if (!tmpptr) { (void)close(fd); err_abort("Cannot read %s, out of memory\n", - sys_tracing_pipe); + g_sys_tracing_pipe); } - get_events_buf = tmpptr; + g_get_events_buf = tmpptr; } - memcpy(get_events_buf + size, buffer, ret); + (void)memcpy(g_get_events_buf + size, buffer, ret); size += ret; - *(get_events_buf + size) = '\0'; + *(g_get_events_buf + size) = '\0'; } (void)close(fd); - return get_events_buf; + return g_get_events_buf; } /* @@ -1466,7 +1472,7 @@ const double time_now, const double duration) { - const size_t app_name_len = strlen(app_name); + const size_t app_name_len = strlen(g_app_name); const double time_end = time_now + duration - 0.05; char *tmpptr = read_events(time_end); @@ -1484,7 +1490,7 @@ /* Find the end of a line */ while (*eol) { - if (*eol == '\n') { + if (UNLIKELY(*eol == '\n')) { *eol = '\0'; eol++; break; @@ -1492,9 +1498,9 @@ eol++; } if (strstr(tmpptr, "hrtimer_start")) { - memset(&info, 0, sizeof(info)); - memset(task, 0, sizeof(task)); - memset(func, 0, sizeof(func)); + (void)memset(&info, 0, sizeof(info)); + (void)memset(task, 0, sizeof(task)); + (void)memset(func, 0, sizeof(func)); /* * Parse something like the following: @@ -1522,7 +1528,7 @@ if (sscanf(ptr, "%10d\n", &info.pid) != 1) goto next; - if (info.pid == 0) + if (UNLIKELY(info.pid == 0)) goto next; /* Processes without a command line are kernel threads */ @@ -1534,21 +1540,21 @@ info.kernel_thread = true; mask = info.kernel_thread ? OPT_KERNEL : OPT_USER; - if (!(opt_flags & mask)) + if (!(g_opt_flags & mask)) goto free_next; if (info.kernel_thread) { char tmp[sizeof(task)]; - strcpy(tmp, task); + (void)strcpy(tmp, task); tmp[13] = '\0'; - snprintf(task_mangled, sizeof(task_mangled), + (void)snprintf(task_mangled, sizeof(task_mangled), "[%s]", tmp); } else { - strcpy(task_mangled, task); + (void)strcpy(task_mangled, task); } - if (strncmp(task, app_name, app_name_len)) { + if (strncmp(task, g_app_name, app_name_len)) { info.task = task; info.cmdline = cmdline ? cmdline : task_mangled; info.task_mangled = task_mangled; @@ -1571,9 +1577,9 @@ */ static void show_usage(void) { - printf("%s, version %s\n\n", app_name, VERSION); - printf("Usage: %s [options] [duration] [count]\n", app_name); - printf("Options are:\n" + (void)printf("%s, version %s\n\n", g_app_name, VERSION); + (void)printf("Usage: %s [options] [duration] [count]\n", g_app_name); + (void)printf("Options are:\n" " -c\t\treport cumulative events rather than events per second.\n" " -C\t\treport event count rather than event per second in CSV output.\n" " -d\t\tremove pathname from long process name in CSV output.\n" @@ -1601,7 +1607,7 @@ eventstat_winsize(); - resized = true; + g_resized = true; } int main(int argc, char **argv) @@ -1613,7 +1619,7 @@ bool forever = true; bool redo = false; struct sigaction new_action; - int i; + size_t i; for (;;) { int c = getopt(argc, argv, "bcCdksSlhin:qr:t:Tuw"); @@ -1621,22 +1627,22 @@ break; switch (c) { case 'b': - opt_flags |= OPT_BRIEF; + g_opt_flags |= OPT_BRIEF; break; case 'c': - opt_flags |= OPT_CUMULATIVE; + g_opt_flags |= OPT_CUMULATIVE; break; case 'C': - opt_flags |= OPT_SAMPLE_COUNT; + g_opt_flags |= OPT_SAMPLE_COUNT; break; case 'd': - opt_flags |= OPT_DIRNAME_STRIP; + g_opt_flags |= OPT_DIRNAME_STRIP; break; case 'h': show_usage(); eventstat_exit(EXIT_SUCCESS); case 'i': - opt_flags |= OPT_TIMER_ID; + g_opt_flags |= OPT_TIMER_ID; break; case 'n': errno = 0; @@ -1648,36 +1654,36 @@ err_abort("-n option must be greater than 0\n"); break; case 'S': - opt_flags |= OPT_RESULT_STATS; + g_opt_flags |= OPT_RESULT_STATS; break; case 't': - opt_threshold = strtoull(optarg, NULL, 10); - if (opt_threshold < 1) + g_opt_threshold = strtoull(optarg, NULL, 10); + if (g_opt_threshold < 1) err_abort("-t threshold must be 1 or more.\n"); break; case 'T': - opt_flags |= OPT_TOP; + g_opt_flags |= OPT_TOP; break; case 'q': - opt_flags |= OPT_QUIET; + g_opt_flags |= OPT_QUIET; break; case 'r': - csv_results = optarg; + g_csv_results = optarg; break; case 's': - opt_flags |= OPT_CMD_SHORT; + g_opt_flags |= OPT_CMD_SHORT; break; case 'l': - opt_flags |= OPT_CMD_LONG; + g_opt_flags |= OPT_CMD_LONG; break; case 'k': - opt_flags |= OPT_KERNEL; + g_opt_flags |= OPT_KERNEL; break; case 'u': - opt_flags |= OPT_USER; + g_opt_flags |= OPT_USER; break; case 'w': - opt_flags |= OPT_SHOW_WHENCE; + g_opt_flags |= OPT_SHOW_WHENCE; break; default: show_usage(); @@ -1685,8 +1691,8 @@ } } - if (!(opt_flags & (OPT_KERNEL | OPT_USER))) - opt_flags |= (OPT_KERNEL | OPT_USER); + if (!(g_opt_flags & (OPT_KERNEL | OPT_USER))) + g_opt_flags |= (OPT_KERNEL | OPT_USER); if (optind < argc) { duration_secs = atof(argv[optind++]); @@ -1704,28 +1710,28 @@ err_abort("Count must be > 0\n"); } - opt_threshold *= duration_secs; + g_opt_threshold *= duration_secs; if (geteuid() != 0) err_abort("%s requires root privileges to gather " - "trace event data\n", app_name); + "trace event data\n", g_app_name); - sane_procs = sane_proc_pid_info(); - if (!sane_procs) - opt_flags &= ~(OPT_CMD_SHORT | OPT_CMD_LONG); + g_sane_procs = sane_proc_pid_info(); + if (!g_sane_procs) + g_opt_flags &= ~(OPT_CMD_SHORT | OPT_CMD_LONG); - memset(&new_action, 0, sizeof(new_action)); - for (i = 0; signals[i] != -1; i++) { + (void)memset(&new_action, 0, sizeof(new_action)); + for (i = 0; i < SIZEOF_ARRAY(g_signals); i++) { new_action.sa_handler = handle_sig; - sigemptyset(&new_action.sa_mask); + (void)sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; - if (sigaction(signals[i], &new_action, NULL) < 0) + if (sigaction(g_signals[i], &new_action, NULL) < 0) err_abort("sigaction failed: errno=%d (%s)\n", errno, strerror(errno)); } - if ((timer_stats = calloc(TABLE_SIZE, sizeof(timer_stat_t*))) == NULL) + if ((timer_stats = calloc(TABLE_SIZE, sizeof(*timer_stats))) == NULL) err_abort("Cannot allocate timer stats table\n"); /* Should really catch signals and set back to zero before we die */ @@ -1734,10 +1740,10 @@ time_now = time_start = gettime_to_double(); - if (opt_flags & OPT_TOP) { + if (g_opt_flags & OPT_TOP) { struct sigaction sa; - memset(&sa, 0, sizeof(sa)); + (void)memset(&sa, 0, sizeof(sa)); sa.sa_handler = handle_sigwinch; if (sigaction(SIGWINCH, &sa, NULL) < 0) err_abort("sigaction failed: errno=%d (%s)\n", @@ -1748,10 +1754,10 @@ nodelay(stdscr, 1); keypad(stdscr, 1); curs_set(0); - curses_init = true; + g_curses_init = true; } - while (!stop_eventstat && (forever || count--)) { + while (!g_stop_eventstat && (forever || count--)) { double secs, duration, time_delta; /* Timeout to wait for in the future for this sample */ @@ -1770,12 +1776,12 @@ redo = false; - if (curses_init) { + if (g_curses_init) { fd_set rfds; int ch, ret; struct timeval tv; - memset(&tv, 0, sizeof(tv)); + (void)memset(&tv, 0, sizeof(tv)); FD_ZERO(&rfds); FD_SET(fileno(stdin), &rfds); @@ -1790,7 +1796,7 @@ if (errno != EINTR) { eventstat_endwin(); - fprintf(stderr, "select() failed: " + (void)fprintf(stderr, "select() failed: " "errno=%d (%s)\n", errno, strerror(errno)); goto abort; @@ -1814,14 +1820,14 @@ } eventstat_endwin(); abort: - samples_dump(csv_results); + samples_dump(g_csv_results); timer_stat_free_contents(timer_stats); free(timer_stats); samples_free(); timer_info_list_free(); timer_stat_free_list_free(); - free(get_events_buf); + free(g_get_events_buf); eventstat_exit(EXIT_SUCCESS); }

1 0

commit slick-greeter for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package slick-greeter for openSUSE:Factory checked in at 2017-10-30 21:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slick-greeter (Old) and /work/SRC/openSUSE:Factory/.slick-greeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "slick-greeter" Mon Oct 30 21:18:37 2017 rev:5 rq:537413 version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/slick-greeter/slick-greeter.changes 2017-06-22 10:41:07.163477795 +0200 +++ /work/SRC/openSUSE:Factory/.slick-greeter.new/slick-greeter.changes 2017-10-30 21:18:58.090142749 +0100 @@ -1,0 +2,17 @@ +Sat Oct 28 19:57:36 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 1.0.9: + * Remove a broken symlink. + * Session detection: Add support for more DE/WM. + * Add tooltips to applets. + * Add support for numlockx. + * Rename background-logo -> other-monitors-logo. + * Other monitors logo: Use full opacity. + * Make panel indicators optional. + * Fix compilation warnings. + * Remove idle_timeout. + * Add a GNOME 3.26 X.org session and an Ubuntu X.org equivalent + session. + * Update translations. + +------------------------------------------------------------------- Old: ---- slick-greeter-1.0.8.tar.gz New: ---- slick-greeter-1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slick-greeter.spec ++++++ --- /var/tmp/diff_new_pack.JlDvr5/_old 2017-10-30 21:18:58.886113809 +0100 +++ /var/tmp/diff_new_pack.JlDvr5/_new 2017-10-30 21:18:58.890113663 +0100 @@ -18,10 +18,10 @@ %define _name lightdm-slick-greeter Name: slick-greeter -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: The slick-looking login screen application -License: GPL-3.0 and CC-BY-SA-3.0 +License: GPL-3.0 AND CC-BY-SA-3.0 Group: System/X11/Displaymanagers Url: https://github.com/linuxmint/slick-greeter Source: https://github.com/linuxmint/slick-greeter/archive/%{version}.tar.gz#/%{nam… @@ -49,6 +49,7 @@ Summary: The slick-looking login screen application Group: System/X11/Displaymanagers Requires: lightdm +Requires: numlockx Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: %{_name}-lang @@ -103,23 +104,26 @@ %endif %post -n %{_name} -%glib2_gsettings_schema_post update-alternatives --install \ %{_datadir}/xgreeters/lightdm-default-greeter.desktop \ lightdm-default-greeter.desktop \ %{_datadir}/xgreeters/%{name}.desktop \ 10 +%if 0%{?suse_version} <= 1320 +%glib2_gsettings_schema_post +%endif %postun -n %{_name} -%glib2_gsettings_schema_postun if [ "$1" = 0 ]; then update-alternatives --remove \ lightdm-default-greeter.desktop \ %{_datadir}/xgreeters/%{name}.desktop fi +%if 0%{?suse_version} <= 1320 +%glib2_gsettings_schema_postun +%endif %files -n %{_name} -%defattr(-,root,root) %doc COPYING README.md %{_sbindir}/%{name} %{_bindir}/%{name}-set-keyboard-layout @@ -138,10 +142,8 @@ %{_mandir}/man1/%{name}-check-hidpi.1%{?ext_man} %files -n %{_name}-lang -f %{name}.lang -%defattr(-,root,root) %files -n %{_name}-branding-upstream -%defattr(-,root,root) %doc README.GSettings-overrides %changelog ++++++ slick-greeter-1.0.8.tar.gz -> slick-greeter-1.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/.github/ISSUE_TEMPLATE.md new/slick-greeter-1.0.9/.github/ISSUE_TEMPLATE.md --- old/slick-greeter-1.0.8/.github/ISSUE_TEMPLATE.md 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/.github/ISSUE_TEMPLATE.md 2017-10-27 14:33:23.000000000 +0200 @@ -0,0 +1,21 @@ + +``` + * slick-greeter version (slick-greeter --version) + * Distribution - (Mint 17.2, Arch, Fedora 25, etc...) + * Graphics hardware *and* driver used + * 32 or 64 bit + ``` + +**Issue** + + + +**Steps to reproduce** + + + +**Expected behaviour** + + + +**Other information** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/README.md new/slick-greeter-1.0.9/README.md --- old/slick-greeter-1.0.8/README.md 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/README.md 2017-10-27 14:33:23.000000000 +0200 @@ -36,8 +36,13 @@ # draw-user-backgrounds=Whether to draw user backgrounds (true or false) # draw-grid=Whether to draw an overlay grid (true or false) # show-hostname=Whether to show the hostname in the menubar (true or false) + # show-power=Whether to show the power indicator in the menubar (true or false) + # show-a11y=Whether to show the accessibility options in the menubar (true or false) + # show-keyboard=Whether to show the keyboard indicator in the menubar (true or false) + # show-clock=Whether to show the clock in the menubar (true or false) + # show-quit=Whether to show the quit menu in the menubar (true or false) # logo=Logo file to use - # background-logo=Background logo file to use + # other-monitors-logo=Logo file to use for other monitors # theme-name=GTK+ theme to use # icon-theme-name=Icon theme to use # font-name=Font to use @@ -51,6 +56,5 @@ # play-ready-sound=A sound file to play when the greeter is ready # hidden-users=List of usernames that are hidden until a special key combination is hit # group-filter=List of groups that users must be part of to be shown (empty list shows all users) - # idle-timeout=Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout # enable-hidpi=Whether to enable HiDPI support (on/off/auto) - [greeter] + [Greeter] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/configure.ac new/slick-greeter-1.0.9/configure.ac --- old/slick-greeter-1.0.8/configure.ac 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/configure.ac 2017-10-27 14:33:23.000000000 +0200 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(slick-greeter, 1.0.8) +AC_INIT(slick-greeter, 1.0.9) AC_CONFIG_MACRO_DIR(m4) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign subdir-objects]) AM_PROG_CC_C_O diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/data/slick-greeter.1 new/slick-greeter-1.0.9/data/slick-greeter.1 --- old/slick-greeter-1.0.8/data/slick-greeter.1 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/data/slick-greeter.1 2017-10-27 14:33:23.000000000 +0200 @@ -45,11 +45,26 @@ .B show-hostname= Whether to show the hostname in the menubar (true or false) .TP +.B show-keyboard= +Whether to show the keyboard indicator in the menubar (true or false) +.TP +.B show-a11y= +Whether to show the accessibility options in the menubar (true or false) +.TP +.B show-power= +Whether to show the power indicator in the menubar (true or false) +.TP +.B show-clock= +Whether to show the clock in the menubar (true or false) +.TP +.B show-quit= +Whether to show the quit menu in the menubar (true or false) +.TP .B logo= Logo file to use .TP -.B background-logo= -Background logo file to use +.B other-monitors-logo= +Logo file to use for other monitors .TP .B theme-name= GTK+ theme to use @@ -90,9 +105,6 @@ .B group-filter= List of groups that users must be part of to be shown (empty list shows all users) .TP -.B idle-timeout= -Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout -.TP .B enable-hidpi= Whether to enable HiDPI support (on/off/auto) .SH SEE ALSO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/data/x.dm.slick-greeter.gschema.xml new/slick-greeter-1.0.9/data/x.dm.slick-greeter.gschema.xml --- old/slick-greeter-1.0.8/data/x.dm.slick-greeter.gschema.xml 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/data/x.dm.slick-greeter.gschema.xml 2017-10-27 14:33:23.000000000 +0200 @@ -21,13 +21,33 @@ <default>true</default> <summary>Whether to show the hostname in the menubar</summary> </key> + <key name="show-keyboard" type="b"> + <default>true</default> + <summary>Whether to show the keyboard indicator in the menubar</summary> + </key> + <key name="show-a11y" type="b"> + <default>true</default> + <summary>Whether to show the accessibility menu in the menubar</summary> + </key> + <key name="show-power" type="b"> + <default>true</default> + <summary>Whether to show the power indicator in the menubar</summary> + </key> + <key name="show-clock" type="b"> + <default>true</default> + <summary>Whether to show the clock in the menubar</summary> + </key> + <key name="show-quit" type="b"> + <default>true</default> + <summary>Whether to show the quit menu in the menubar</summary> + </key> <key name="logo" type="s"> <default>''</default> <summary>Logo file to use</summary> </key> - <key name="background-logo" type="s"> + <key name="other-monitors-logo" type="s"> <default>''</default> - <summary>Background logo file to use</summary> + <summary>Logo file to use for other monitors</summary> </key> <key name="theme-name" type="s"> <default>'Adwaita'</default> @@ -94,10 +114,6 @@ <default>[]</default> <summary>List of groups that users must be part of to be shown (empty list shows all users)</summary> </key> - <key name="idle-timeout" type="i"> - <default>300</default> - <summary>Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout.</summary> - </key> <key name="enable-hidpi" type="s"> <choices> <choice value='on'/> @@ -107,5 +123,9 @@ <default>'auto'</default> <summary>Whether to enable HiDPI support</summary> </key> + <key name="activate-numlock" type="b"> + <default>false</default> + <summary>Whether to activate numlock. This features requires the installation of numlockx.</summary> + </key> </schema> </schemalist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/debian/changelog new/slick-greeter-1.0.9/debian/changelog --- old/slick-greeter-1.0.8/debian/changelog 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/debian/changelog 2017-10-27 14:33:23.000000000 +0200 @@ -1,3 +1,40 @@ +slick-greeter (1.0.9) sylvia; urgency=medium + + [ Seth Barberee ] + * Fix typo in README.md (#56) + + [ NikoKrause ] + * update German l10n (#58) + + [ Michael Webster ] + * add an issue template + + [ Clement Lefebvre ] + * Remove broken symlink + + [ Stefano Capitani ] + * Session detection: Add support for more DE/WM (#61) + + [ Clement Lefebvre ] + * Add tooltips to applets + * Add support for numlockx + * Rename background-logo -> other-monitors-logo + * Other monitors logo: Use full opacity + * Make panel indicators optional + * Fix compilation warnings + * Remove idle_timeout + + [ NikoKrause ] + * add makepot and .pot file (#57) + + [ Clement Lefebvre ] + * l10n: Update POT file + + [ David Mohammed ] + * add GNOME 3.26 xorg session and ubuntu xorg equivalent session (#73) + + -- Clement Lefebvre <root(a)linuxmint.com> Fri, 27 Oct 2017 13:32:33 +0100 + slick-greeter (1.0.8) sonya; urgency=medium [ leigh123linux ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/gnome-xorg.svg new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/gnome-xorg.svg --- old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/gnome-xorg.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/gnome-xorg.svg 2017-10-30 21:18:59.570088941 +0100 @@ -0,0 +1 @@ +symbolic link to gnome.svg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-2d.png new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-2d.png --- old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-2d.png 2017-10-30 21:18:59.226101447 +0100 +++ new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-2d.png 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to ubuntu.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg --- old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg 2017-10-30 21:18:59.462092867 +0100 @@ -0,0 +1 @@ +symbolic link to ubuntu.svg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/makepot new/slick-greeter-1.0.9/makepot --- old/slick-greeter-1.0.8/makepot 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/makepot 2017-10-27 14:33:23.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/bash +xgettext --language=Vala --keyword=_ --output=slick-greeter.pot src/*.vala diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/po/de.po new/slick-greeter-1.0.9/po/de.po --- old/slick-greeter-1.0.8/po/de.po 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/po/de.po 2017-10-27 14:33:23.000000000 +0200 @@ -7,86 +7,99 @@ msgstr "" "Project-Id-Version: slick-greeter\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-22 05:42+0000\n" -"PO-Revision-Date: 2014-12-27 16:04+0000\n" +"POT-Creation-Date: 2017-06-20 21:40+0200\n" +"PO-Revision-Date: 2017-06-20 21:44+0200\n" "Last-Translator: Tobias Bannert <Unknown>\n" "Language-Team: German <de(a)li.org>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2016-03-23 05:32+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Generator: Poedit 1.8.7.1\n" -#: ../src/greeter-list.vala:300 +#: src/greeter-list.vala:302 #, c-format msgid "Enter password for %s" msgstr "Passwort für %s eingeben" -#: ../src/greeter-list.vala:805 ../src/user-list.vala:701 +#: src/greeter-list.vala:811 src/user-list.vala:703 msgid "Password:" msgstr "Passwort:" -#: ../src/greeter-list.vala:807 ../src/user-list.vala:695 +#: src/greeter-list.vala:813 src/user-list.vala:697 msgid "Username:" msgstr "Benutzername:" -#: ../src/greeter-list.vala:859 +#: src/greeter-list.vala:868 msgid "Invalid password, please try again" msgstr "Passwort ungültig, bitte wiederholen" -#: ../src/greeter-list.vala:870 +#: src/greeter-list.vala:879 msgid "Failed to authenticate" msgstr "Legitimierung gescheitert" -#: ../src/greeter-list.vala:916 +#: src/greeter-list.vala:925 msgid "Failed to start session" msgstr "Starten der Sitzung fehlgeschlagen" -#: ../src/greeter-list.vala:931 +#: src/greeter-list.vala:940 msgid "Logging in…" msgstr "Anmeldevorgang …" -#: ../src/main-window.vala:49 +#: src/main-window.vala:49 msgid "Login Screen" msgstr "Anmeldebildschirm" -#: ../src/main-window.vala:116 +#: src/main-window.vala:113 msgid "Back" msgstr "Zurück" -#: ../src/menubar.vala:220 +#: src/menubar.vala:362 msgid "Onscreen keyboard" msgstr "Bildschirmtastatur" -#: ../src/menubar.vala:225 +#: src/menubar.vala:367 msgid "High Contrast" msgstr "Starker Kontrast" -#: ../src/menubar.vala:231 +#: src/menubar.vala:373 msgid "Screen Reader" msgstr "Bildschirmleser" -#: ../src/prompt-box.vala:212 +#: src/menubar.vala:397 src/shutdown-dialog.vala:155 +msgid "Suspend" +msgstr "Bereitschaft" + +#: src/menubar.vala:415 src/shutdown-dialog.vala:172 +msgid "Hibernate" +msgstr "Ruhezustand" + +#: src/menubar.vala:431 +msgid "Quit..." +msgstr "Beenden …" + +#: src/prompt-box.vala:215 msgid "Session Options" msgstr "Sitzungsoptionen" -#: ../src/session-list.vala:34 +#: src/session-list.vala:34 msgid "Select desktop environment" msgstr "Arbeitsumgebung wählen" -#: ../src/shutdown-dialog.vala:101 +#: src/shutdown-dialog.vala:101 msgid "Goodbye. Would you like to…" msgstr "Auf Wiedersehen. Würden Sie gerne …" -#: ../src/shutdown-dialog.vala:105 ../src/shutdown-dialog.vala:207 +#: src/shutdown-dialog.vala:105 src/shutdown-dialog.vala:207 msgid "Shut Down" msgstr "Herunterfahren" -#: ../src/shutdown-dialog.vala:112 +#: src/shutdown-dialog.vala:112 msgid "Are you sure you want to shut down the computer?" msgstr "Wollen Sie den Rechner wirklich herunterfahren?" -#: ../src/shutdown-dialog.vala:137 +#: src/shutdown-dialog.vala:137 msgid "" "Other users are currently logged in to this computer, shutting down now will " "also close these other sessions." @@ -94,60 +107,47 @@ "Zur Zeit sind noch andere Benutzer an diesem Rechner angemeldet. Wenn Sie " "jetzt den Rechner herunterfahren, werden diese Benutzer abgemeldet." -#: ../src/shutdown-dialog.vala:155 -msgid "Suspend" -msgstr "Bereitschaft" - -#: ../src/shutdown-dialog.vala:172 -msgid "Hibernate" -msgstr "Ruhezustand" - -#: ../src/shutdown-dialog.vala:190 +#: src/shutdown-dialog.vala:190 msgid "Restart" msgstr "Neustarten" -#. Translators: %s is a session name like KDE or Ubuntu -#: ../src/toggle-box.vala:98 -#, c-format -msgid "%s (Default)" -msgstr "%s (Standard)" - -#. Help string for command line --version flag -#: ../src/slick-greeter.vala:512 +#: src/slick-greeter.vala:634 msgid "Show release version" msgstr "Veröffentlichungsversion anzeigen" -#. Help string for command line --test-mode flag -#: ../src/slick-greeter.vala:515 +#: src/slick-greeter.vala:637 msgid "Run in test mode" msgstr "Im Testmodus starten" -#. Arguments and description for --help text -#: ../src/slick-greeter.vala:521 +#: src/slick-greeter.vala:643 msgid "- Slick Greeter" msgstr "- Slick Greeter" -#. Text printed out when an unknown command-line argument provided -#: ../src/slick-greeter.vala:532 +#: src/slick-greeter.vala:654 #, c-format msgid "Run '%s --help' to see a full list of available command line options." msgstr "" "Bitte »%s --help« eingeben, um eine vollständige Liste der verfügbaren " "Befehlszeilenoptionen einzusehen." -#: ../src/user-list.vala:45 +#: src/toggle-box.vala:98 +#, c-format +msgid "%s (Default)" +msgstr "%s (Standard)" + +#: src/user-list.vala:45 msgid "Guest Session" msgstr "Gastzugang" -#: ../src/user-list.vala:438 +#: src/user-list.vala:438 msgid "Please enter a complete e-mail address" msgstr "Bitte eine vollständige E-Mail-Adresse eingeben" -#: ../src/user-list.vala:518 +#: src/user-list.vala:518 msgid "Incorrect e-mail address or password" msgstr "Ungültige(s) E-Mail-Adresse oder Passwort" -#: ../src/user-list.vala:549 +#: src/user-list.vala:549 msgid "" "If you have an account on an RDP or Citrix server, Remote Login lets you run " "applications from that server." @@ -155,8 +155,7 @@ "Wenn Sie über ein Konto auf einem RDP- oder Citrix-Server verfügen, können " "Sie mit dem Fernzugriff von diesem Server aus Anwendungen ausführen." -#. For 12.10 we still don't support Citrix -#: ../src/user-list.vala:551 +#: src/user-list.vala:551 msgid "" "If you have an account on an RDP server, Remote Login lets you run " "applications from that server." @@ -164,15 +163,15 @@ "Falls Sie ein Konto auf einem RDP-Server besitzen, können Sie über den " "Fernzugriff Anwendungen von diesem Server ausführen." -#: ../src/user-list.vala:554 +#: src/user-list.vala:554 msgid "Cancel" msgstr "Abbrechen" -#: ../src/user-list.vala:555 +#: src/user-list.vala:555 msgid "Set Up…" msgstr "Einrichten …" -#: ../src/user-list.vala:557 +#: src/user-list.vala:557 msgid "" "You need an Ubuntu Remote Login account to use this service. Would you like " "to set up an account now?" @@ -180,50 +179,49 @@ "Sie benötigen ein Ubuntu-Fernzugriffskonto, um diesen Dienst zu nutzen. " "Möchten Sie jetzt ein Fernzugriffskonto einrichten?" -#: ../src/user-list.vala:561 +#: src/user-list.vala:561 msgid "OK" msgstr "OK" -#: ../src/user-list.vala:562 +#: src/user-list.vala:562 msgid "" -"You need an Ubuntu Remote Login account to use this service. Visit " -"uccs.canonical.com to set up an account." +"You need an Ubuntu Remote Login account to use this service. Visit uccs." +"canonical.com to set up an account." msgstr "" "Sie benötigen ein Ubuntu Fernzugriffskonto, um diesen Dienst zu nutzen. " "Besuchen Sie uccs.canonical.com, um ein Konto einzurichten." -#: ../src/user-list.vala:679 +#: src/user-list.vala:681 msgid "Server type not supported." msgstr "Server-Typ nicht unterstützt." -#: ../src/user-list.vala:720 +#: src/user-list.vala:722 msgid "Domain:" msgstr "Domäne:" -#: ../src/user-list.vala:781 +#: src/user-list.vala:783 msgid "Email address:" msgstr "E-Mail-Adresse:" -#. 'Log In' here is the button for logging in. -#: ../src/user-list.vala:825 +#: src/user-list.vala:827 msgid "Log In" msgstr "Anmelden" -#: ../src/user-list.vala:826 +#: src/user-list.vala:828 #, c-format msgid "Login as %s" msgstr "Als %s anmelden" -#: ../src/user-list.vala:830 +#: src/user-list.vala:832 msgid "Retry" msgstr "Erneut versuchen" -#: ../src/user-list.vala:831 +#: src/user-list.vala:833 #, c-format msgid "Retry as %s" msgstr "Erneut versuchen als %s" -#: ../src/user-list.vala:869 +#: src/user-list.vala:871 msgid "Login" msgstr "Anmelden" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/slick-greeter.pot new/slick-greeter-1.0.9/slick-greeter.pot --- old/slick-greeter-1.0.8/slick-greeter.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/slick-greeter.pot 2017-10-27 14:33:23.000000000 +0200 @@ -0,0 +1,221 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-14 16:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/greeter-list.vala:302 +#, c-format +msgid "Enter password for %s" +msgstr "" + +#: src/greeter-list.vala:811 src/user-list.vala:703 +msgid "Password:" +msgstr "" + +#: src/greeter-list.vala:813 src/user-list.vala:697 +msgid "Username:" +msgstr "" + +#: src/greeter-list.vala:868 +msgid "Invalid password, please try again" +msgstr "" + +#: src/greeter-list.vala:879 +msgid "Failed to authenticate" +msgstr "" + +#: src/greeter-list.vala:925 +msgid "Failed to start session" +msgstr "" + +#: src/greeter-list.vala:940 +msgid "Logging in..." +msgstr "" + +#: src/main-window.vala:49 +msgid "Login Screen" +msgstr "" + +#: src/main-window.vala:110 +msgid "Back" +msgstr "" + +#: src/menubar.vala:322 +msgid "Power:" +msgstr "" + +#: src/menubar.vala:372 +msgid "Accessibility" +msgstr "" + +#: src/menubar.vala:381 +msgid "Onscreen keyboard" +msgstr "" + +#: src/menubar.vala:386 +msgid "High Contrast" +msgstr "" + +#: src/menubar.vala:392 +msgid "Screen Reader" +msgstr "" + +#: src/menubar.vala:404 src/menubar.vala:451 +msgid "Quit..." +msgstr "" + +#: src/menubar.vala:417 src/shutdown-dialog.vala:155 +msgid "Suspend" +msgstr "" + +#: src/menubar.vala:435 src/shutdown-dialog.vala:172 +msgid "Hibernate" +msgstr "" + +#: src/menubar.vala:474 +msgid "Keyboard layout:" +msgstr "" + +#: src/prompt-box.vala:215 +msgid "Session Options" +msgstr "" + +#: src/session-list.vala:34 +msgid "Select desktop environment" +msgstr "" + +#: src/shutdown-dialog.vala:101 +msgid "Goodbye. Would you like to..." +msgstr "" + +#: src/shutdown-dialog.vala:105 src/shutdown-dialog.vala:207 +msgid "Shut Down" +msgstr "" + +#: src/shutdown-dialog.vala:112 +msgid "Are you sure you want to shut down the computer?" +msgstr "" + +#: src/shutdown-dialog.vala:137 +msgid "" +"Other users are currently logged in to this computer, shutting down now will " +"also close these other sessions." +msgstr "" + +#: src/shutdown-dialog.vala:190 +msgid "Restart" +msgstr "" + +#: src/slick-greeter.vala:616 +msgid "Show release version" +msgstr "" + +#: src/slick-greeter.vala:619 +msgid "Run in test mode" +msgstr "" + +#: src/slick-greeter.vala:635 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options." +msgstr "" + +#: src/toggle-box.vala:98 +#, c-format +msgid "%s (Default)" +msgstr "" + +#: src/user-list.vala:45 +msgid "Guest Session" +msgstr "" + +#: src/user-list.vala:438 +msgid "Please enter a complete e-mail address" +msgstr "" + +#: src/user-list.vala:518 +msgid "Incorrect e-mail address or password" +msgstr "" + +#: src/user-list.vala:549 +msgid "" +"If you have an account on an RDP or Citrix server, Remote Login lets you run " +"applications from that server." +msgstr "" + +#: src/user-list.vala:551 +msgid "" +"If you have an account on an RDP server, Remote Login lets you run " +"applications from that server." +msgstr "" + +#: src/user-list.vala:554 +msgid "Cancel" +msgstr "" + +#: src/user-list.vala:555 +msgid "Set Up..." +msgstr "" + +#: src/user-list.vala:557 +msgid "" +"You need an Ubuntu Remote Login account to use this service. Would you like " +"to set up an account now?" +msgstr "" + +#: src/user-list.vala:561 +msgid "OK" +msgstr "" + +#: src/user-list.vala:562 +msgid "" +"You need an Ubuntu Remote Login account to use this service. Visit uccs." +"canonical.com to set up an account." +msgstr "" + +#: src/user-list.vala:681 +msgid "Server type not supported." +msgstr "" + +#: src/user-list.vala:722 +msgid "Domain:" +msgstr "" + +#: src/user-list.vala:783 +msgid "Email address:" +msgstr "" + +#: src/user-list.vala:827 +msgid "Log In" +msgstr "" + +#: src/user-list.vala:828 +#, c-format +msgid "Login as %s" +msgstr "" + +#: src/user-list.vala:832 +msgid "Retry" +msgstr "" + +#: src/user-list.vala:833 +#, c-format +msgid "Retry as %s" +msgstr "" + +#: src/user-list.vala:871 +msgid "Login" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/background.vala new/slick-greeter-1.0.9/src/background.vala --- old/slick-greeter-1.0.8/src/background.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/background.vala 2017-10-27 14:33:23.000000000 +0200 @@ -207,7 +207,7 @@ var y = (int) (image.height / grid_size - 2) * grid_size + grid_y_offset; bc.translate (grid_x_offset, y); bc.set_source_surface (logo, 0, 0); - bc.paint_with_alpha (0.5); + bc.paint_with_alpha (1.0); bc.restore (); } @@ -397,8 +397,6 @@ /* Fallback color - shown upon first startup, until an async background loader finishes, * or until a user background or default background is loaded. */ - private bool draw_user_backgrounds = UGSettings.get_boolean (UGSettings.KEY_DRAW_USER_BACKGROUNDS); - private string _fallback_color = null; public string fallback_color { get { @@ -481,9 +479,9 @@ private Cairo.Surface? version_logo_surface = null; private int version_logo_width; private int version_logo_height; - private Cairo.Surface? background_logo_surface = null; - private int background_logo_width; - private int background_logo_height; + private Cairo.Surface? other_monitors_logo_surface = null; + private int other_monitors_logo_width; + private int other_monitors_logo_height; public Background () { @@ -503,14 +501,14 @@ timer = new AnimateTimer (AnimateTimer.ease_in_out, 700); - set_logo (UGSettings.get_string (UGSettings.KEY_LOGO), UGSettings.get_string (UGSettings.KEY_BACKGROUND_LOGO)); + set_logo (UGSettings.get_string (UGSettings.KEY_LOGO), UGSettings.get_string (UGSettings.KEY_OTHER_MONITORS_LOGO)); timer.animate.connect (animate_cb); } - public void set_logo (string version_logo, string background_logo) + public void set_logo (string version_logo, string other_monitors_logo) { version_logo_surface = load_image (version_logo, out version_logo_width, out version_logo_height); - background_logo_surface = load_image (background_logo, out background_logo_width, out background_logo_height); + other_monitors_logo_surface = load_image (other_monitors_logo, out other_monitors_logo_width, out other_monitors_logo_height); } private Cairo.Surface? load_image (string filename, out int width, out int height) @@ -645,13 +643,13 @@ c.paint_with_alpha (alpha); c.restore (); - if (monitor != active_monitor && background_logo_surface != null) + if (monitor != active_monitor && other_monitors_logo_surface != null) { - var width = background_logo_width; - var height = background_logo_height; + var width = other_monitors_logo_width; + var height = other_monitors_logo_height; c.save (); - pattern = new Cairo.Pattern.for_surface (background_logo_surface); + pattern = new Cairo.Pattern.for_surface (other_monitors_logo_surface); matrix = Cairo.Matrix.identity (); var x = monitor.x + (monitor.width - width) / 2; var y = monitor.y + (monitor.height - height) / 2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/dash-button.vala new/slick-greeter-1.0.9/src/dash-button.vala --- old/slick-greeter-1.0.8/src/dash-button.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/dash-button.vala 2017-10-27 14:33:23.000000000 +0200 @@ -67,8 +67,7 @@ try { var style = new Gtk.CssProvider (); - style.load_from_data ("* {padding: 6px 8px 6px 8px; - }", -1); + style.load_from_data ("* {padding: 6px 8px 6px 8px;}", -1); this.get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); } catch (Error e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/greeter-list.vala new/slick-greeter-1.0.9/src/greeter-list.vala --- old/slick-greeter-1.0.8/src/greeter-list.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/greeter-list.vala 2017-10-27 14:33:23.000000000 +0200 @@ -937,7 +937,7 @@ sensitive = false; selected_entry.clear (); - selected_entry.add_message (_("Logging in…"), false); + selected_entry.add_message (_("Logging in..."), false); redraw_greeter_box (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/main-window.vala new/slick-greeter-1.0.9/src/main-window.vala --- old/slick-greeter-1.0.8/src/main-window.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/main-window.vala 2017-10-27 14:33:23.000000000 +0200 @@ -66,15 +66,12 @@ var shadow_style = ""; if (FileUtils.test (shadow_path, FileTest.EXISTS)) { - shadow_style = "background-image: url('%s'); - background-repeat: repeat;".printf(shadow_path); + shadow_style = "background-image: url('%s');background-repeat: repeat;".printf(shadow_path); } try { var style = new Gtk.CssProvider (); - style.load_from_data ("* {background-color: transparent; - %s - }".printf(shadow_style), -1); + style.load_from_data ("* {background-color: transparent;%s}".printf(shadow_style), -1); var context = menubox.get_style_context (); context.add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/menubar.vala new/slick-greeter-1.0.9/src/menubar.vala --- old/slick-greeter-1.0.8/src/menubar.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/menubar.vala 2017-10-27 14:33:23.000000000 +0200 @@ -139,65 +139,80 @@ pack_direction = Gtk.PackDirection.RTL; - var session_menu = make_session_item (); - session_menu.right_justified = true; - append (session_menu); - - clock_label = new Gtk.Label (""); - var fg = clock_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - clock_label.override_color (Gtk.StateFlags.INSENSITIVE, fg); - clock_label.show (); - var item = new Gtk.MenuItem (); - item.add (clock_label); - item.sensitive = false; - item.show (); - append (item); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_QUIT)) + { + var session_menu = make_session_item (); + append (session_menu); + } - update_clock (); - Timeout.add (1000, update_clock); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_CLOCK)) + { + clock_label = new Gtk.Label (""); + var clock_fg = clock_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + clock_label.override_color (Gtk.StateFlags.INSENSITIVE, clock_fg); + clock_label.show (); + var item = new Gtk.MenuItem (); + item.add (clock_label); + item.sensitive = false; + item.show (); + append (item); + update_clock (); + Timeout.add (1000, update_clock); + } - power_menu_item = new Gtk.MenuItem (); - var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); - hbox.show (); - power_icon = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "battery.svg")); - power_icon.show (); - hbox.add (power_icon); - hbox.set_spacing (6); - power_label = new Gtk.Label (""); - power_label.sensitive = false; - fg = power_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - power_label.override_color (Gtk.StateFlags.INSENSITIVE, fg); - power_label.show (); - hbox.add (power_label); - power_menu_item.add (hbox); - power_menu_item.hide (); - append (power_menu_item); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_POWER)) + { + power_menu_item = new Gtk.MenuItem (); + var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); + hbox.show (); + power_icon = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "battery.svg")); + power_icon.show (); + hbox.add (power_icon); + hbox.set_spacing (6); + power_label = new Gtk.Label (""); + power_label.sensitive = false; + var power_fg = power_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + power_label.override_color (Gtk.StateFlags.INSENSITIVE, power_fg); + power_label.show (); + hbox.add (power_label); + power_menu_item.add (hbox); + power_menu_item.hide (); + append (power_menu_item); - var keyboard_menu = make_keyboard_item (); - append (keyboard_menu); + try + { + upowerd = Bus.get_proxy_sync(BusType.SYSTEM, "org.freedesktop.UPower", "/org/freedesktop/UPower"); + upowerd.device_added.connect(on_power_device_added); + upowerd.device_removed.connect(on_power_device_removed); + upowerd.device_changed.connect(on_power_device_changed); + upowerd.changed.connect(on_changed); + upowerd.sleeping.connect(on_sleeping); + upowerd.resuming.connect(on_resuming); + query_upower_daemon (); + Timeout.add (60000, query_upower_daemon); + } catch (IOError e) + { + warning("Could not connect to Upower: %s", e.message); + } + } - try { - upowerd = Bus.get_proxy_sync(BusType.SYSTEM, "org.freedesktop.UPower", "/org/freedesktop/UPower"); - upowerd.device_added.connect(on_power_device_added); - upowerd.device_removed.connect(on_power_device_removed); - upowerd.device_changed.connect(on_power_device_changed); - upowerd.changed.connect(on_changed); - upowerd.sleeping.connect(on_sleeping); - upowerd.resuming.connect(on_resuming); - query_upower_daemon (); - Timeout.add (60000, query_upower_daemon); - } catch (IOError e) { - warning("Could not connect to Upower: %s", e.message); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_KEYBOARD)) + { + var keyboard_menu = make_keyboard_item (); + append (keyboard_menu); } - var a11y_item = make_a11y_item (); - append (a11y_item); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_A11Y)) + { + var a11y_item = make_a11y_item (); + append (a11y_item); + } if (UGSettings.get_boolean (UGSettings.KEY_SHOW_HOSTNAME)) { var label = new Gtk.Label (Posix.utsname ().nodename); - fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - label.override_color (Gtk.StateFlags.INSENSITIVE, fg); + var hostname_fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + label.override_color (Gtk.StateFlags.INSENSITIVE, hostname_fg); label.show (); var hostname_item = new Gtk.MenuItem (); hostname_item.add (label); @@ -302,7 +317,9 @@ else { char[] buffer = new char[double.DTOSTR_BUF_SIZE]; unowned string str = device.percentage.to_str (buffer); - power_label.set_label(str.concat("%")); + var percentage_string = str.concat("%"); + power_label.set_label(percentage_string); + power_menu_item.set_tooltip_text (_("Power:").concat(" ").concat(percentage_string)); var icon = "battery.svg"; if (device.percentage <= 50.0) { icon = "battery_50.svg"; @@ -322,6 +339,7 @@ { var current_time = new DateTime.now_local (); clock_label.set_label(current_time.format ("%H:%M")); + clock_label.set_tooltip_text (current_time.format ("%x")); return true; } @@ -351,6 +369,7 @@ private Gtk.MenuItem make_a11y_item () { var a11y_item = new Gtk.MenuItem (); + a11y_item.set_tooltip_text(_("Accessibility")); var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); hbox.show (); a11y_item.add (hbox); @@ -382,6 +401,7 @@ private Gtk.MenuItem make_session_item () { var item = new Gtk.MenuItem (); + item.set_tooltip_text(_("Quit...")); var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); hbox.show (); item.add (hbox); @@ -451,9 +471,10 @@ var current_layout = LightDM.get_layout (); if (current_layout != null) { label.set_label (current_layout.name); + item.set_tooltip_text(_("Keyboard layout:").concat(" ").concat(current_layout.description)); } - var fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - label.override_color (Gtk.StateFlags.INSENSITIVE, fg); + var keyboard_fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + label.override_color (Gtk.StateFlags.INSENSITIVE, keyboard_fg); label.show (); hbox.add (label); item.show (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/settings.vala new/slick-greeter-1.0.9/src/settings.vala --- old/slick-greeter-1.0.8/src/settings.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/settings.vala 2017-10-27 14:33:23.000000000 +0200 @@ -25,8 +25,13 @@ public const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds"; public const string KEY_DRAW_GRID = "draw-grid"; public const string KEY_SHOW_HOSTNAME = "show-hostname"; + public const string KEY_SHOW_POWER = "show-power"; + public const string KEY_SHOW_A11Y = "show-a11y"; + public const string KEY_SHOW_CLOCK = "show-clock"; + public const string KEY_SHOW_KEYBOARD = "show-keyboard"; + public const string KEY_SHOW_QUIT = "show-quit"; public const string KEY_LOGO = "logo"; - public const string KEY_BACKGROUND_LOGO = "background-logo"; + public const string KEY_OTHER_MONITORS_LOGO = "other-monitors-logo"; public const string KEY_THEME_NAME = "theme-name"; public const string KEY_ICON_THEME_NAME = "icon-theme-name"; public const string KEY_FONT_NAME = "font-name"; @@ -40,8 +45,8 @@ public const string KEY_PLAY_READY_SOUND = "play-ready-sound"; public const string KEY_HIDDEN_USERS = "hidden-users"; public const string KEY_GROUP_FILTER = "group-filter"; - public const string KEY_IDLE_TIMEOUT = "idle-timeout"; public const string KEY_ENABLE_HIDPI = "enable-hidpi"; + public const string KEY_ACTIVATE_NUMLOCK = "activate-numlock"; public static bool get_boolean (string key) { @@ -114,7 +119,7 @@ string_keys.append (KEY_BACKGROUND); string_keys.append (KEY_BACKGROUND_COLOR); string_keys.append (KEY_LOGO); - string_keys.append (KEY_BACKGROUND_LOGO); + string_keys.append (KEY_OTHER_MONITORS_LOGO); string_keys.append (KEY_THEME_NAME); string_keys.append (KEY_ICON_THEME_NAME); string_keys.append (KEY_FONT_NAME); @@ -127,10 +132,15 @@ bool_keys.append (KEY_DRAW_USER_BACKGROUNDS); bool_keys.append (KEY_DRAW_GRID); bool_keys.append (KEY_SHOW_HOSTNAME); + bool_keys.append (KEY_SHOW_POWER); + bool_keys.append (KEY_SHOW_A11Y); + bool_keys.append (KEY_SHOW_CLOCK); + bool_keys.append (KEY_SHOW_KEYBOARD); + bool_keys.append (KEY_SHOW_QUIT); bool_keys.append (KEY_XFT_ANTIALIAS); + bool_keys.append (KEY_ACTIVATE_NUMLOCK); var int_keys = new List<string> (); - int_keys.append (KEY_IDLE_TIMEOUT); int_keys.append (KEY_XFT_DPI); var strv_keys = new List<string> (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/shutdown-dialog.vala new/slick-greeter-1.0.9/src/shutdown-dialog.vala --- old/slick-greeter-1.0.8/src/shutdown-dialog.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/shutdown-dialog.vala 2017-10-27 14:33:23.000000000 +0200 @@ -98,7 +98,7 @@ if (type == ShutdownDialogType.SHUTDOWN) { - text = _("Goodbye. Would you like to…"); + text = _("Goodbye. Would you like to..."); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/slick-greeter.vala new/slick-greeter-1.0.9/src/slick-greeter.vala --- old/slick-greeter-1.0.8/src/slick-greeter.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/slick-greeter.vala 2017-10-27 14:33:23.000000000 +0200 @@ -58,16 +58,7 @@ greeter = new LightDM.Greeter (); greeter.show_message.connect ((text, type) => { show_message (text, type); }); greeter.show_prompt.connect ((text, type) => { show_prompt (text, type); }); - greeter.autologin_timer_expired.connect (() => { - try - { - greeter.authenticate_autologin (); - } - catch (Error e) - { - warning ("Failed to autologin authenticate: %s", e.message); - } - }); + greeter.autologin_timer_expired.connect (() => { greeter.authenticate_autologin (); }); greeter.authentication_complete.connect (() => { authentication_complete (); }); var connected = false; try @@ -183,7 +174,19 @@ sessions.append ("plasma"); sessions.append ("kde-plasma"); sessions.append ("kde"); + sessions.append ("budgie-desktop"); sessions.append ("gnome"); + sessions.append ("LXDE"); + sessions.append ("lxqt"); + sessions.append ("pekwm"); + sessions.append ("pantheon"); + sessions.append ("i3"); + sessions.append ("enlightenment"); + sessions.append ("deepin"); + sessions.append ("openbox"); + sessions.append ("awesome"); + sessions.append ("gnome-xorg"); + sessions.append ("ubuntu-xorg"); foreach (string session in sessions) { var path = Path.build_filename ("/usr/share/xsessions/", session.concat(".desktop"), null); @@ -229,7 +232,7 @@ // bg.draw_full (c, Background.DrawFlags.NONE); // c = null; // refresh_background (screen, background_surface); - + main_window.before_session_start(); if (test_mode) @@ -300,62 +303,27 @@ public void authenticate (string? userid = null) { - try - { - greeter.authenticate (userid); - } - catch (Error e) - { - warning ("Failed to authenticate: %s", e.message); - } + greeter.authenticate (userid); } public void authenticate_as_guest () { - try - { - greeter.authenticate_as_guest (); - } - catch (Error e) - { - warning ("Failed to authenticate as guest: %s", e.message); - } + greeter.authenticate_as_guest (); } public void authenticate_remote (string session, string? userid) { - try - { - SlickGreeter.singleton.greeter.authenticate_remote (session, userid); - } - catch (Error e) - { - warning ("Failed to remote authenticate: %s", e.message); - } + SlickGreeter.singleton.greeter.authenticate_remote (session, userid); } public void cancel_authentication () { - try - { - greeter.cancel_authentication (); - } - catch (Error e) - { - warning ("Failed to cancel authentication: %s", e.message); - } + greeter.cancel_authentication (); } public void respond (string response) { - try - { - greeter.respond (response); - } - catch (Error e) - { - warning ("Failed to respond: %s", e.message); - } + greeter.respond (response); } public string authentication_user () @@ -556,6 +524,16 @@ } } + private static void activate_numlock () + { + try { + Process.spawn_command_line_sync("/usr/bin/numlockx on", null, null, null); + } + catch (Error e){ + warning ("Error while activating numlock: %s", e.message); + } + } + public static int main (string[] args) { /* Protect memory from being paged to disk, as we deal with passwords */ @@ -597,6 +575,12 @@ /* Set the keyboard layout */ set_keyboard_layout (); + /* Set the numlock state */ + if (UGSettings.get_boolean (UGSettings.KEY_ACTIVATE_NUMLOCK)) { + debug ("Activating numlock"); + activate_numlock (); + } + Pid atspi_pid = 0; try @@ -639,8 +623,7 @@ OptionEntry[] options = { versionOption, testOption, nullOption }; debug ("Loading command line options"); - var c = new OptionContext (/* Arguments and description for --help text */ - _("- Slick Greeter")); + var c = new OptionContext ("- Slick Greeter"); c.add_main_entries (options, Config.GETTEXT_PACKAGE); c.add_group (Gtk.get_option_group (true)); try diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/user-list.vala new/slick-greeter-1.0.9/src/user-list.vala --- old/slick-greeter-1.0.8/src/user-list.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/user-list.vala 2017-10-27 14:33:23.000000000 +0200 @@ -552,7 +552,7 @@ if (offer_guest) { dialog.add_button (_("Cancel"), 0); - var b = dialog.add_button (_("Set Up…"), 1); + var b = dialog.add_button (_("Set Up..."), 1); b.grab_focus (); dialog.text = _("You need an Ubuntu Remote Login account to use this service. Would you like to set up an account now?"); }

1 0

commit audacious-plugins for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package audacious-plugins for openSUSE:Factory checked in at 2017-10-30 21:18:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacious-plugins (Old) and /work/SRC/openSUSE:Factory/.audacious-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacious-plugins" Mon Oct 30 21:18:36 2017 rev:4 rq:537412 version:3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/audacious-plugins/audacious-plugins.changes 2017-08-28 15:32:50.848472908 +0200 +++ /work/SRC/openSUSE:Factory/.audacious-plugins.new/audacious-plugins.changes 2017-10-30 21:18:57.186175615 +0100 @@ -1,0 +2,6 @@ +Sun Oct 29 11:49:17 UTC 2017 - olaf(a)aepfle.de + +- Remove GTK conditional, it is always enabled and the name is too generic +- Remove stale Qt conditional + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacious-plugins.spec ++++++ --- /var/tmp/diff_new_pack.0jmUcZ/_old 2017-10-30 21:18:57.934148421 +0100 +++ /var/tmp/diff_new_pack.0jmUcZ/_new 2017-10-30 21:18:57.934148421 +0100 @@ -19,10 +19,8 @@ %define __provides_exclude_from ^%{_libdir}/audacious/*/.*.so$ %define aud_ver_min 3.9 %define aud_ver_max 3.9.99 -%bcond_without qt %bcond_with faad %bcond_with restricted -%bcond_without gtk Name: audacious-plugins Version: 3.9 Release: 0 @@ -78,12 +76,10 @@ Requires: libaudcore%{?_isa} >= %{aud_ver_min} Recommends: %{name}-extra Recommends: %{name}-lang -%if %{with gtk} BuildRequires: pkgconfig(gdk-x11-3.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.4 BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xrender) -%endif BuildRequires: pkgconfig(Qt5Core) >= 5.2 BuildRequires: pkgconfig(Qt5Gui) >= 5.2 BuildRequires: pkgconfig(Qt5Multimedia) >= 5.2 @@ -116,11 +112,7 @@ NOCONFIGURE=1 ./autogen.sh %configure \ --enable-qt \ -%if %{with gtk} --enable-gtk \ -%else - --disable-gtk \ -%endif %if %{with faad} --enable-aac \ %else

1 0

commit audacious for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package audacious for openSUSE:Factory checked in at 2017-10-30 21:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacious (Old) and /work/SRC/openSUSE:Factory/.audacious.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacious" Mon Oct 30 21:18:33 2017 rev:3 rq:537411 version:3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/audacious/audacious.changes 2017-08-24 18:56:41.881100043 +0200 +++ /work/SRC/openSUSE:Factory/.audacious.new/audacious.changes 2017-10-30 21:18:52.790335441 +0100 @@ -1,0 +2,10 @@ +Sun Oct 29 11:49:17 UTC 2017 - olaf(a)aepfle.de + +- Remove the versioned conditional for Qt build. + It builds fine in PackageHub, and audacious-plugins expects the + Qt variant. +- Remove Qt and GTK conditionals, they are always enabled and the + name is too generic +- Remove conditional for appdata for obsolete Leap 42.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacious.spec ++++++ --- /var/tmp/diff_new_pack.js2H7o/_old 2017-10-30 21:18:54.270281633 +0100 +++ /var/tmp/diff_new_pack.js2H7o/_new 2017-10-30 21:18:54.274281487 +0100 @@ -22,12 +22,6 @@ %define qt_soname 2 %define gui_soname 5 %define tag_soname 3 -%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) -%bcond_without qt -%else -%bcond_with qt -%endif -%bcond_without gtk Name: audacious Version: 3.9 Release: 0 @@ -55,14 +49,10 @@ Requires: %{name}-plugins%{?_isa} >= %{aud_plugin_ver_min} Recommends: %{name}-lang Recommends: %{name}-plugins-extra >= %{aud_plugin_ver_min} -%if %{with gtk} BuildRequires: pkgconfig(gtk+-3.0) >= 3.4 -%endif -%if %{with qt} BuildRequires: pkgconfig(Qt5Core) >= 5.2 BuildRequires: pkgconfig(Qt5Gui) >= 5.2 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 -%endif %description Audacious is an audio player. It is based on GTK+ and supports a wide @@ -80,7 +70,6 @@ %description -n libaudcore%{core_soname} Library from the Audacious audio player. -%if %{with qt} %package -n libaudqt%{qt_soname} Summary: QT GUI implementation of Audacious Group: System/Libraries @@ -88,9 +77,7 @@ %description -n libaudqt%{qt_soname} Library from the Audacious audio player. -%endif -%if %{with gtk} %package -n libaudgui%{gui_soname} Summary: GTK GUI implementation of Audacious Group: System/Libraries @@ -98,7 +85,6 @@ %description -n libaudgui%{gui_soname} Library from the Audacious audio player. -%endif %package -n libaudtag%{tag_soname} Summary: ID3 and APE metadata support for Audacious @@ -113,12 +99,8 @@ Group: Development/Libraries/C and C++ Requires: libaudcore%{core_soname} = %{version} Requires: libaudtag%{tag_soname} = %{version} -%if %{with qt} Requires: libaudqt%{qt_soname} = %{version} -%endif -%if %{with gtk} Requires: libaudgui%{gui_soname} = %{version} -%endif %description devel Development files for Audacious audio player. @@ -130,26 +112,14 @@ %build NOCONFIGURE=1 ./autogen.sh %configure \ -%if %{with qt} --enable-qt \ -%else - --disable-qt \ -%endif -%if %{with gtk} --enable-gtk \ -%else - --disable-gtk \ -%endif --disable-rpath make %{?_smp_mflags} V=1 %install %make_install -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 install -Dpm 0644 contrib/%{name}.appdata.xml %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml -%else -install -Dpm 0644 contrib/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -%endif %find_lang %{name} %fdupes %{buildroot}%{_datadir}/ @@ -165,17 +135,13 @@ %postun -n libaudcore%{core_soname} -p /sbin/ldconfig -%if %{with qt} %post -n libaudqt%{qt_soname} -p /sbin/ldconfig %postun -n libaudqt%{qt_soname} -p /sbin/ldconfig -%endif -%if %{with gtk} %post -n libaudgui%{gui_soname} -p /sbin/ldconfig %postun -n libaudgui%{gui_soname} -p /sbin/ldconfig -%endif %post -n libaudtag%{tag_soname} -p /sbin/ldconfig @@ -189,13 +155,8 @@ %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}* -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/%{name}.appdata.xml -%else -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml -%endif %{_mandir}/man?/%{name}.?%{?ext_man} %{_mandir}/man?/audtool.?%{?ext_man} @@ -206,17 +167,13 @@ %defattr(-,root,root) %{_libdir}/libaudcore.so.%{core_soname}* -%if %{with qt} %files -n libaudqt%{qt_soname} %defattr(-,root,root) %{_libdir}/libaudqt.so.%{qt_soname}* -%endif -%if %{with gtk} %files -n libaudgui%{gui_soname} %defattr(-,root,root) %{_libdir}/libaudgui.so.%{gui_soname}* -%endif %files -n libaudtag%{tag_soname} %defattr(-,root,root) @@ -227,14 +184,10 @@ %{_includedir}/%{name}/ %{_includedir}/libaudcore/ %{_libdir}/libaudcore.so -%if %{with qt} %{_includedir}/libaudqt/ %{_libdir}/libaudqt.so -%endif -%if %{with gtk} %{_includedir}/libaudgui/ %{_libdir}/libaudgui.so -%endif %{_libdir}/libaudtag.so %{_libdir}/pkgconfig/%{name}.pc

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2017-10-30 21:18:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Mon Oct 30 21:18:31 2017 rev:168 rq:537391 version:62.0.3202.75 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2017-10-28 14:23:00.400651550 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2017-10-30 21:18:31.367114356 +0100 @@ -1,0 +2,6 @@ +Sun Oct 29 08:18:37 UTC 2017 - tchvatal(a)suse.com + +- Add patch to fix sandbox crashes wrt bsc#1064298 + * chromium-sandbox.patch + +------------------------------------------------------------------- New: ---- chromium-sandbox.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.y6wkte/_old 2017-10-30 21:18:44.554634877 +0100 +++ /var/tmp/diff_new_pack.y6wkte/_new 2017-10-30 21:18:44.562634587 +0100 @@ -71,6 +71,7 @@ Patch15: chromium-gcc5.patch Patch16: chromium-60.0.3112.113-breakpad-ucontext.patch Patch17: chromium-62.0.3202.62-correct-cplusplus-check.patch +Patch18: chromium-sandbox.patch # GN buildsystem related patches Patch200: chromium-last-commit-position-r0.patch Patch201: fix-gn-bootstrap.diff @@ -259,6 +260,7 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 # Copy the toolchain settings mkdir toolchain ++++++ chromium-sandbox.patch ++++++ diff --git a/sandbox/linux/services/namespace_sandbox.cc b/sandbox/linux/services/namespace_sandbox.cc index 3e5bba3bd43c..53d530ca0af5 100644 --- a/sandbox/linux/services/namespace_sandbox.cc +++ b/sandbox/linux/services/namespace_sandbox.cc @@ -105,8 +105,7 @@ struct glibc_pthread { }; pid_t GetGlibcCachedTid() { - pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; - CHECK_EQ(0, pthread_mutex_init(&lock, nullptr)); + pthread_mutex_t lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; CHECK_EQ(0, pthread_mutex_lock(&lock)); pid_t tid = lock.__data.__owner; CHECK_EQ(0, pthread_mutex_unlock(&lock));

1 0

commit transactional-update for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package transactional-update for openSUSE:Factory checked in at 2017-10-30 21:18:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/transactional-update (Old) and /work/SRC/openSUSE:Factory/.transactional-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "transactional-update" Mon Oct 30 21:18:26 2017 rev:14 rq:537066 version:1.21 Changes: -------- --- /work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes 2017-09-13 22:38:05.026153774 +0200 +++ /work/SRC/openSUSE:Factory/.transactional-update.new/transactional-update.changes 2017-10-30 21:18:24.755354750 +0100 @@ -1,0 +2,6 @@ +Fri Oct 27 13:52:56 CEST 2017 - kukuk(a)suse.de + +- Update to version 1.21 + - Reset salt grains even if no update was found + +------------------------------------------------------------------- Old: ---- transactional-update-1.20.tar.bz2 New: ---- transactional-update-1.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ transactional-update.spec ++++++ --- /var/tmp/diff_new_pack.U8zpDY/_old 2017-10-30 21:18:25.551325809 +0100 +++ /var/tmp/diff_new_pack.U8zpDY/_new 2017-10-30 21:18:25.555325664 +0100 @@ -17,7 +17,7 @@ Name: transactional-update -Version: 1.20 +Version: 1.21 Release: 0 Summary: Transactional Updates with btrfs and snapshots License: GPL-2.0+ ++++++ transactional-update-1.20.tar.bz2 -> transactional-update-1.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/NEWS new/transactional-update-1.21/NEWS --- old/transactional-update-1.20/NEWS 2017-09-13 11:21:31.000000000 +0200 +++ new/transactional-update-1.21/NEWS 2017-10-27 13:51:13.000000000 +0200 @@ -2,6 +2,9 @@ Copyright (C) 2016, 2017 Thorsten Kukuk +Version 1.21 +* Reset salt grains if no updates are available + Version 1.20 * Document more options * Add pkg update option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/configure new/transactional-update-1.21/configure --- old/transactional-update-1.20/configure 2017-09-13 11:20:46.000000000 +0200 +++ new/transactional-update-1.21/configure 2017-10-27 13:51:19.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for transactional-update 1.20. +# Generated by GNU Autoconf 2.69 for transactional-update 1.21. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ # Identity of this package. PACKAGE_NAME='transactional-update' PACKAGE_TARNAME='transactional-update' -PACKAGE_VERSION='1.20' -PACKAGE_STRING='transactional-update 1.20' +PACKAGE_VERSION='1.21' +PACKAGE_STRING='transactional-update 1.21' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1211,7 +1211,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures transactional-update 1.20 to adapt to many kinds of systems. +\`configure' configures transactional-update 1.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1278,7 +1278,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of transactional-update 1.20:";; + short | recursive ) echo "Configuration of transactional-update 1.21:";; esac cat <<\_ACEOF @@ -1358,7 +1358,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -transactional-update configure 1.20 +transactional-update configure 1.21 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1375,7 +1375,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by transactional-update $as_me 1.20, which was +It was created by transactional-update $as_me 1.21, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2238,7 +2238,7 @@ # Define the identity of the package. PACKAGE='transactional-update' - VERSION='1.20' + VERSION='1.21' cat >>confdefs.h <<_ACEOF @@ -3097,7 +3097,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by transactional-update $as_me 1.20, which was +This file was extended by transactional-update $as_me 1.21, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3150,7 +3150,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -transactional-update config.status 1.20 +transactional-update config.status 1.21 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/configure.ac new/transactional-update-1.21/configure.ac --- old/transactional-update-1.20/configure.ac 2017-09-13 11:20:38.000000000 +0200 +++ new/transactional-update-1.21/configure.ac 2017-10-27 13:50:14.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(transactional-update, 1.20) +AC_INIT(transactional-update, 1.21) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([sbin/transactional-update.in]) AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/logrotate/Makefile.in new/transactional-update-1.21/logrotate/Makefile.in --- old/transactional-update-1.20/logrotate/Makefile.in 2017-09-13 11:20:44.000000000 +0200 +++ new/transactional-update-1.21/logrotate/Makefile.in 2017-10-27 13:51:19.000000000 +0200 @@ -238,9 +238,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu logrotate/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign logrotate/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu logrotate/Makefile + $(AUTOMAKE) --foreign logrotate/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/man/Makefile.in new/transactional-update-1.21/man/Makefile.in --- old/transactional-update-1.20/man/Makefile.in 2017-09-13 11:20:44.000000000 +0200 +++ new/transactional-update-1.21/man/Makefile.in 2017-10-27 13:51:19.000000000 +0200 @@ -261,9 +261,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/sbin/Makefile.in new/transactional-update-1.21/sbin/Makefile.in --- old/transactional-update-1.20/sbin/Makefile.in 2017-09-13 11:20:44.000000000 +0200 +++ new/transactional-update-1.21/sbin/Makefile.in 2017-10-27 13:51:19.000000000 +0200 @@ -238,9 +238,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sbin/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign sbin/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu sbin/Makefile + $(AUTOMAKE) --foreign sbin/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/sbin/transactional-update.in new/transactional-update-1.21/sbin/transactional-update.in --- old/transactional-update-1.20/sbin/transactional-update.in 2017-09-01 10:24:09.000000000 +0200 +++ new/transactional-update-1.21/sbin/transactional-update.in 2017-10-27 13:41:59.000000000 +0200 @@ -394,6 +394,14 @@ if [ ${PACKAGE_UPDATES} -eq 0 -a ${SIZE_OF_UPDATES} -eq 0 ]; then log_info "zypper: nothing to update" log_info "transactional-update finished" + if [ $USE_SALT_GRAINS -eq 1 ]; then + log_info "Update salt grains" + if [ -f /etc/salt/grains ]; then + # Reset tx_update_failed if exist. Could have been set due to wrong + # repository configuration or other temporary error before. + sed -i -e 's|tx_update_failed:.*|tx_update_failed: false|g' /etc/salt/grains + fi + fi exit 0 fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transactional-update-1.20/systemd/Makefile.in new/transactional-update-1.21/systemd/Makefile.in --- old/transactional-update-1.20/systemd/Makefile.in 2017-09-13 11:20:44.000000000 +0200 +++ new/transactional-update-1.21/systemd/Makefile.in 2017-10-27 13:51:19.000000000 +0200 @@ -238,9 +238,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemd/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign systemd/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu systemd/Makefile + $(AUTOMAKE) --foreign systemd/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \

1 0

commit chrony for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package chrony for openSUSE:Factory checked in at 2017-10-30 21:18:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chrony (Old) and /work/SRC/openSUSE:Factory/.chrony.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chrony" Mon Oct 30 21:18:20 2017 rev:8 rq:536990 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/chrony/chrony.changes 2017-10-02 16:54:57.903979788 +0200 +++ /work/SRC/openSUSE:Factory/.chrony.new/chrony.changes 2017-10-30 21:18:23.419403323 +0100 @@ -1,0 +2,13 @@ +Thu Oct 26 10:39:11 UTC 2017 - mpluskal(a)suse.com + +- Cleanup spec file: + * Drop pre systemd support + * Run spec-cleaner + +------------------------------------------------------------------- +Tue Oct 24 18:23:56 UTC 2017 - mpost(a)suse.com + +- Modified the spec file to comment out the pool statement + in chrony.conf if _not_ building for openSUSE. (bsc#1063704). + +------------------------------------------------------------------- Old: ---- chrony.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chrony.spec ++++++ --- /var/tmp/diff_new_pack.6CoA53/_old 2017-10-30 21:18:24.307371038 +0100 +++ /var/tmp/diff_new_pack.6CoA53/_new 2017-10-30 21:18:24.311370892 +0100 @@ -18,13 +18,6 @@ %define vendorzone opensuse. %global clknetsim_ver 71dbbc5 -%if 0%{?suse_version} > 1230 -%bcond_without systemd -%bcond_without syscallfilter -%else -%bcond_with systemd -%bcond_with syscallfilter -%endif Name: chrony Version: 3.2 Release: 0 @@ -33,7 +26,6 @@ Group: Productivity/Networking/Other Url: http://chrony.tuxfamily.org/ Source: http://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz -Source1: chrony.init Source2: chrony.sysconfig Source3: chrony.dhclient Source4: chrony.helper @@ -47,7 +39,6 @@ Patch1: chrony-service-helper.patch Patch2: chrony-logrotate.patch Patch5: chrony-fix-open.patch -# BuildRequires: NetworkManager-devel BuildRequires: bison BuildRequires: gcc-c++ @@ -58,25 +49,17 @@ # The timezone package is needed for the "make check" tests. It can be # removed if the call to make check is ever deleted. BuildRequires: timezone +BuildRequires: pkgconfig(systemd) Requires: logrotate Requires(pre): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd Provides: ntp-daemon -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with syscallfilter} %ifarch s390 s390x ppc64le BuildRequires: libseccomp-devel >= 2.2.0 %else BuildRequires: libseccomp-devel %endif -%endif -%if %{with systemd} -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%else -Requires(pre): %insserv_prereq -%endif %description Chrony is an implementation of the Network Time Protocol (NTP). It can @@ -107,9 +90,16 @@ %patch2 -p1 %patch5 -p1 -# use our vendor zone (2.*pool.ntp.org names include IPv6 addresses) +# If this is an openSUSE build, use our vendor zone +# (2.*pool.ntp.org names include IPv6 addresses). If not +# an openSUSE build, comment out the pool statement +%if 0%{?is_opensuse} sed -e 's|^$pool $$pool.ntp.org$|\12.%{vendorzone}\2|' \ < examples/chrony.conf.example2 > chrony.conf +%else +sed -e 's|^\pool|! pool|' \ + < examples/chrony.conf.example2 > chrony.conf +%endif touch -r examples/chrony.conf.example2 chrony.conf @@ -130,90 +120,67 @@ --with-user=chrony \ --with-hwclockfile=%{_sysconfdir}/adjtime \ --with-sendmail=%{_sbindir}/sendmail - make %{?_smp_mflags} all docs %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install - -mkdir -p %{buildroot}%{_sysconfdir}/{sysconfig,logrotate.d} -mkdir -p %{buildroot}%{_localstatedir}/{lib,log}/chrony -mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d -mkdir -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d -mkdir -p %{buildroot}%{_datadir} -mkdir -p %{buildroot}{%{_unitdir},%{_prefix}/lib/systemd/ntp-units.d} - -install -m 644 -p chrony.conf %{buildroot}%{_sysconfdir}/chrony.conf - -install -m 640 -p examples/chrony.keys.example \ +%make_install +install -Dpm 0644 chrony.conf \ + %{buildroot}%{_sysconfdir}/chrony.conf +install -Dpm 0640 examples/chrony.keys.example \ %{buildroot}%{_sysconfdir}/chrony.keys -install -m 755 -p examples/chrony.nm-dispatcher \ +install -Dpm 0755 examples/chrony.nm-dispatcher \ %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/20-chrony -install -m 755 -p %{SOURCE3} \ +install -Dpm 0755 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/dhcp/dhclient.d/chrony.sh -install -m 644 -p examples/chrony.logrotate \ +install -Dpm 0644 examples/chrony.logrotate \ %{buildroot}%{_sysconfdir}/logrotate.d/chrony - -%if %{with systemd} -install -m 644 -p examples/chronyd.service \ +install -Dpm 0644 examples/chronyd.service \ %{buildroot}%{_unitdir}/chronyd.service -install -m 644 -p examples/chrony-wait.service \ +install -Dpm 0644 examples/chrony-wait.service \ %{buildroot}%{_unitdir}/chrony-wait.service -install -m 644 -p %{SOURCE5} %{buildroot}%{_unitdir}/chrony-dnssrv@.service -install -m 644 -p %{SOURCE6} %{buildroot}%{_unitdir}/chrony-dnssrv@.timer -ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchronyd" -ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchrony-wait" +install -Dpm 0644 %{SOURCE5} \ + %{buildroot}%{_unitdir}/chrony-dnssrv@.service +install -Dpm 0644 %{SOURCE6} \ + %{buildroot}%{_unitdir}/chrony-dnssrv@.timer + +install -d %{buildroot}%{sbindir} +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchrony-wait +install -d %{buildroot}%{_prefix}/lib/systemd/ntp-units.d echo 'chronyd.service' > \ %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list -%else -install -D -m0755 "%{SOURCE1}" "%{buildroot}%{_initddir}/chronyd" -ln -s ../..%{_initddir}/chronyd "%{buildroot}%{_sbindir}/rcchronyd" -%endif -install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd" -install -m 755 -p %{SOURCE4} %{buildroot}%{_datadir}/chrony-helper +install -Dpm 0644 %{SOURCE2} \ + %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd +install -Dpm 755 %{SOURCE4} \ + %{buildroot}%{_datadir}/chrony-helper +install -d %{buildroot}%{_localstatedir}/log/chrony touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc} %check # Set random seed to get deterministic results export CLKNETSIM_RANDOM_SEED=24501 make %{?_smp_mflags} -C test/simulation/clknetsim - -make check +make %{?_smp_mflags} check %pre -%{_sbindir}/groupadd -r chrony >/dev/null 2>&1 || : -%{_sbindir}/useradd -g chrony -s /bin/false -r -c "Chrony Daemon" -d "%{_localstatedir}/lib/chrony" chrony >/dev/null 2>&1 || : -# START BIG SYSTEMD -%if %{with systemd} +getent group %{name} >/dev/null || groupadd -r %{name} +getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/lib/chrony" -s /bin/false -c "Chrony Daemon" %{name} %service_add_pre chronyd.service chrony-wait.service -%endif %preun -%if %{with systemd} %service_del_preun chronyd.service chrony-wait.service -%else -%stop_on_removal chronyd -%endif %post %fillup_only %{name} -%if %{with systemd} %service_add_post chronyd.service chrony-wait.service -%endif %postun -%if %{with systemd} %service_del_postun chronyd.service chrony-wait.service -%else -%restart_on_update chronyd -%insserv_cleanup -%endif %files -%defattr(-,root,root) %doc FAQ NEWS README COPYING %doc examples %config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/chrony.conf @@ -229,13 +196,9 @@ %{_mandir}/man1/chronyc.1%{ext_man} %{_mandir}/man5/chrony.conf.5%{ext_man} %{_mandir}/man8/chronyd.8%{ext_man} -%if %{with systemd} %{_prefix}/lib/systemd/ntp-units.d/*.list %{_unitdir}/chrony*.service %{_unitdir}/chrony*.timer -%else -%config %{_sysconfdir}/init.d/chronyd -%endif %{_sbindir}/rcchrony* %{_localstatedir}/adm/fillup-templates/sysconfig.chronyd %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2017-10-30 21:18:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Mon Oct 30 21:18:03 2017 rev:386 rq:537041 version:4.13.10 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2017-10-24 22:20:47.767655014 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2017-10-30 21:18:03.892113310 +0100 @@ -1,0 +2,170 @@ +Fri Oct 27 11:03:09 CEST 2017 - jslaby(a)suse.cz + +- Linux 4.13.10 final +- commit db36cf8 + +------------------------------------------------------------------- +Fri Oct 27 09:37:37 CEST 2017 - jslaby(a)suse.cz + +- scripts/stableids: revert unwanted change +- commit d6206ec + +------------------------------------------------------------------- +Fri Oct 27 09:26:52 CEST 2017 - jslaby(a)suse.cz + +- futex: futex_wake_op, fix sign_extend32 sign bits (bnc#1064590). +- commit 0d29474 + +------------------------------------------------------------------- +Wed Oct 25 14:47:02 CEST 2017 - jslaby(a)suse.cz + +- Linux 4.13.10 (bnc#1012628). +- staging: bcm2835-audio: Fix memory corruption (bnc#1012628). +- USB: devio: Revert "USB: devio: Don't corrupt user memory" + (bnc#1012628). +- USB: core: fix out-of-bounds access bug in + usb_get_bos_descriptor() (bnc#1012628). +- USB: serial: metro-usb: add MS7820 device id (bnc#1012628). +- usb: cdc_acm: Add quirk for Elatec TWN3 (bnc#1012628). +- usb: quirks: add quirk for WORLDE MINI MIDI keyboard + (bnc#1012628). +- usb: hub: Allow reset retry for USB2 devices on connect bounce + (bnc#1012628). +- ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box + S2 Digital (bnc#1012628). +- can: gs_usb: fix busy loop if no more TX context is available + (bnc#1012628). +- scsi: qla2xxx: Fix uninitialized work element (bnc#1012628). +- nbd: don't set the device size until we're connected + (bnc#1012628). +- s390/cputime: fix guest/irq/softirq times after CPU hotplug + (bnc#1012628). +- parisc: Fix double-word compare and exchange in LWS code on + 32-bit kernels (bnc#1012628). +- parisc: Fix detection of nonsynchronous cr16 cycle counters + (bnc#1012628). +- iio: dummy: events: Add missing break (bnc#1012628). +- usb: musb: sunxi: Explicitly release USB PHY on exit + (bnc#1012628). +- USB: musb: fix session-bit runtime-PM quirk (bnc#1012628). +- USB: musb: fix late external abort on suspend (bnc#1012628). +- usb: musb: musb_cppi41: Fix the address of teardown and autoreq + registers (bnc#1012628). +- usb: musb: musb_cppi41: Fix cppi41_set_dma_mode() for DA8xx + (bnc#1012628). +- usb: musb: musb_cppi41: Configure the number of channels for + DA8xx (bnc#1012628). +- usb: musb: Check for host-mode using is_host_active() on reset + interrupt (bnc#1012628). +- xhci: Identify USB 3.1 capable hosts by their port protocol + capability (bnc#1012628). +- xhci: Cleanup current_cmd in xhci_cleanup_command_queue() + (bnc#1012628). +- usb: xhci: Reset halted endpoint if trb is noop (bnc#1012628). +- usb: xhci: Handle error condition in xhci_stop_device() + (bnc#1012628). +- can: esd_usb2: Fix can_dlc value for received RTR, frames + (bnc#1012628). +- can: af_can: can_pernet_init(): add missing error handling + for kzalloc returning NULL (bnc#1012628). +- can: flexcan: fix state transition regression (bnc#1012628). +- can: flexcan: rename legacy error state quirk (bnc#1012628). +- can: flexcan: implement error passive state quirk (bnc#1012628). +- can: flexcan: fix i.MX6 state transition issue (bnc#1012628). +- can: flexcan: fix i.MX28 state transition issue (bnc#1012628). +- can: flexcan: fix p1010 state transition issue (bnc#1012628). +- KEYS: encrypted: fix dereference of NULL user_key_payload + (bnc#1012628). +- mmc: sdhci-pci: Fix default d3_retune for Intel host controllers + (bnc#1012628). +- drm/i915: Use bdw_ddi_translations_fdi for Broadwell + (bnc#1012628). +- drm/nouveau/kms/nv50: fix oops during DP IRQ handling on + non-MST boards (bnc#1012628). +- drm/nouveau/bsp/g92: disable by default (bnc#1012628). +- drm/nouveau/mmu: flush tlbs before deleting page tables + (bnc#1012628). +- media: s5p-cec: add NACK detection support (bnc#1012628). +- media: cec: Respond to unregistered initiators, when applicable + (bnc#1012628). +- media: dvb: i2c transfers over usb cannot be done from stack + (bnc#1012628). +- tracing/samples: Fix creation and deletion of simple_thread_fn + creation (bnc#1012628). +- ALSA: seq: Enable 'use' locking in all configurations + (bnc#1012628). +- ALSA: hda: Remove superfluous '-' added by printk conversion + (bnc#1012628). +- i2c: ismt: Separate I2C block read from SMBus block read + (bnc#1012628). +- i2c: piix4: Fix SMBus port selection for AMD Family 17h chips + (bnc#1012628). +- Revert "tools/power turbostat: stop migrating, unless '-m'" + (bnc#1012628). +- Input: stmfts - fix setting ABS_MT_POSITION_* maximum size + (bnc#1012628). +- brcmfmac: Add check for short event packets (bnc#1012628). +- brcmsmac: make some local variables 'static const' to reduce + stack size (bnc#1012628). +- ARM: dts: sun6i: Fix endpoint IDs in second display pipeline + (bnc#1012628). +- bus: mbus: fix window size calculation for 4GB windows + (bnc#1012628). +- clockevents/drivers/cs5535: Improve resilience to spurious + interrupts (bnc#1012628). +- rtlwifi: rtl8821ae: Fix connection lost problem (bnc#1012628). +- x86/microcode/intel: Disable late loading on model 79 + (bnc#1012628). +- lib/digsig: fix dereference of NULL user_key_payload + (bnc#1012628). +- fscrypt: fix dereference of NULL user_key_payload (bnc#1012628). +- ecryptfs: fix dereference of NULL user_key_payload + (bnc#1012628). +- KEYS: Fix race between updating and finding a negative key + (bnc#1012628). +- FS-Cache: fix dereference of NULL user_key_payload + (bnc#1012628). +- KEYS: don't let add_key() update an uninstantiated key + (bnc#1012628). +- pkcs7: Prevent NULL pointer dereference, since sinfo is not + always set (bnc#1012628). +- arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms + (bnc#1012628). +- ALSA: hda - Fix incorrect TLV callback check introduced during + set_fs() removal (bnc#1012628). +- iomap_dio_rw: Allocate AIO completion queue before submitting + dio (bnc#1012628). +- xfs: don't unconditionally clear the reflink flag on zero-block + files (bnc#1012628). +- xfs: evict CoW fork extents when performing finsert/fcollapse + (bnc#1012628). +- fs/xfs: Use %pS printk format for direct addresses + (bnc#1012628). +- xfs: report zeroed or not correctly in xfs_zero_range() + (bnc#1012628). +- xfs: update i_size after unwritten conversion in dio completion + (bnc#1012628). +- xfs: perag initialization should only touch m_ag_max_usable + for AG 0 (bnc#1012628). +- xfs: Capture state of the right inode in xfs_iflush_done + (bnc#1012628). +- xfs: always swap the cow forks when swapping extents + (bnc#1012628). +- xfs: handle racy AIO in xfs_reflink_end_cow (bnc#1012628). +- xfs: Don't log uninitialised fields in inode structures + (bnc#1012628). +- xfs: move more RT specific code under CONFIG_XFS_RT + (bnc#1012628). +- xfs: don't change inode mode if ACL update fails (bnc#1012628). +- xfs: reinit btree pointer on attr tree inactivation walk + (bnc#1012628). +- xfs: handle error if xfs_btree_get_bufs fails (bnc#1012628 + bsc#1059863). +- xfs: cancel dirty pages on invalidation (bnc#1012628). +- xfs: trim writepage mapping to within eof (bnc#1012628). +- xfs: move two more RT specific functions into CONFIG_XFS_RT + (bnc#1012628). +- scripts/stableids: +- commit e760ea6 + +------------------------------------------------------------------- dtb-armv6l.changes: same change dtb-armv7l.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-syzkaller.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.423694036 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.431693745 +0100 @@ -17,7 +17,7 @@ %define srcversion 4.13 -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb}) Name: dtb-aarch64 -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.555689237 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.567688801 +0100 @@ -18,7 +18,7 @@ %define srcversion 4.13 -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.699684001 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.703683856 +0100 @@ -17,7 +17,7 @@ %define srcversion 4.13 -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.743682402 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.747682256 +0100 @@ -18,7 +18,7 @@ %define srcversion 4.13 -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0 Group: System/Kernel -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.791680657 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.799680366 +0100 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %define vanilla_only 0 @@ -57,9 +57,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.859678184 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.867677893 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.915676148 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.919676003 +0100 @@ -18,7 +18,7 @@ %define srcversion 4.13 -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.955674694 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.959674548 +0100 @@ -18,7 +18,7 @@ %define srcversion 4.13 -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:15.995673239 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:15.999673094 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.13.9 +Version: 4.13.10 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif ++++++ kernel-syzkaller.spec ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:16.055671058 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:16.059670913 +0100 @@ -18,7 +18,7 @@ %define srcversion 4.13 -%define patchversion 4.13.9 +%define patchversion 4.13.10 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel used for fuzzing by syzkaller License: GPL-2.0 Group: System/Kernel -Version: 4.13.9 +Version: 4.13.10 %if 0%{?is_kotd} -Release: <RELEASE>.ge7d7106 +Release: <RELEASE>.gdb36cf8 %else Release: 0 %endif kernel-vanilla.spec: same change kernel-zfcpdump.spec: same change ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Abort-capability-probe-at-invalid-register- new/patches.drivers/ALSA-hda-Abort-capability-probe-at-invalid-register- --- old/patches.drivers/ALSA-hda-Abort-capability-probe-at-invalid-register- 2017-10-18 12:43:48.000000000 +0200 +++ new/patches.drivers/ALSA-hda-Abort-capability-probe-at-invalid-register- 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -From 098a0a62c1554f5a3813ef1b8539563214ada8f6 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai(a)suse.de> -Date: Tue, 17 Oct 2017 16:38:55 +0200 -Subject: [PATCH] ALSA: hda: Abort capability probe at invalid register read -Patch-mainline: Queued in subsystem maintainer repository -Git-commit: 098a0a62c1554f5a3813ef1b8539563214ada8f6 -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git -References: bsc#1064017 - -The loop in snd_hdac_bus_parse_capabilities() may go to nirvana when -it hits an invalid register value read: - - BUG: unable to handle kernel paging request at ffffad5dc41f3fff - IP: pci_azx_readl+0x5/0x10 [snd_hda_intel] - Call Trace: - snd_hdac_bus_parse_capabilities+0x3c/0x1f0 [snd_hda_core] - azx_probe_continue+0x7d5/0x940 [snd_hda_intel] - ..... - -This happened on a new Intel machine, and we need to check the value -and abort the loop accordingly. - -[note: the fixes tag below indicates only the commit where this patch - can be applied; the original problem was introduced even before that - commit] - -Fixes: 6720b38420a0 ("ALSA: hda - move bus_parse_capabilities to core") -Cc: <stable(a)vger.kernel.org> -Acked-by: Vinod Koul <vinod.koul(a)intel.com> -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - sound/hda/hdac_controller.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/sound/hda/hdac_controller.c -+++ b/sound/hda/hdac_controller.c -@@ -284,6 +284,11 @@ int snd_hdac_bus_parse_capabilities(stru - dev_dbg(bus->dev, "HDA capability ID: 0x%x\n", - (cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF); - -+ if (cur_cap == -1) { -+ dev_dbg(bus->dev, "Invalid capability reg read\n"); -+ break; -+ } -+ - switch ((cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF) { - case AZX_ML_CAP_ID: - dev_dbg(bus->dev, "Found ML capability\n"); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/xfs-handle-error-if-xfs_btree_get_bufs-fails.patch new/patches.fixes/xfs-handle-error-if-xfs_btree_get_bufs-fails.patch --- old/patches.fixes/xfs-handle-error-if-xfs_btree_get_bufs-fails.patch 2017-10-18 22:21:40.000000000 +0200 +++ new/patches.fixes/xfs-handle-error-if-xfs_btree_get_bufs-fails.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -From: Eric Sandeen <sandeen(a)sandeen.net> -Date: Tue, 17 Oct 2017 17:15:03 -0700 -Subject: [PATCH] xfs: handle error if xfs_btree_get_bufs fails -Patch-mainline: Not yet, it slipped through the rocks I pushed it again -References: bsc#1059863 - -Jason reported that a corrupted filesystem failed to replay -the log with a metadata block out of bounds warning: - -XFS (dm-2): _xfs_buf_find: Block out of range: block 0x80270fff8, EOFS 0x9c40000 - -_xfs_buf_find() and xfs_btree_get_bufs() return NULL if -that happens, and then when xfs_alloc_fix_freelist() calls -xfs_trans_binval() on that NULL bp, we oops with: - -BUG: unable to handle kernel NULL pointer dereference at 00000000000000f8 - -We don't handle _xfs_buf_find errors very well, every -caller higher up the stack gets to guess at why it failed. -But we should at least handle it somehow, so return -EFSCORRUPTED here. - -Reported-by: Jason L Tibbitts III <tibbs(a)math.uh.edu> -Signed-off-by: Eric Sandeen <sandeen(a)redhat.com> -Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> -Signed-off-by: Luis R. Rodriguez <mcgrof(a)suse.com> ---- - fs/xfs/libxfs/xfs_alloc.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c -index 744dcaec34cc..f965ce832bc0 100644 ---- a/fs/xfs/libxfs/xfs_alloc.c -+++ b/fs/xfs/libxfs/xfs_alloc.c -@@ -1584,6 +1584,10 @@ xfs_alloc_ag_vextent_small( - - bp = xfs_btree_get_bufs(args->mp, args->tp, - args->agno, fbno, 0); -+ if (!bp) { -+ error = -EFSCORRUPTED; -+ goto error0; -+ } - xfs_trans_binval(args->tp, bp); - } - args->len = 1; -@@ -2141,6 +2145,10 @@ xfs_alloc_fix_freelist( - if (error) - goto out_agbp_relse; - bp = xfs_btree_get_bufs(mp, tp, args->agno, bno, 0); -+ if (!bp) { -+ error = -EFSCORRUPTED; -+ goto out_agbp_relse; -+ } - xfs_trans_binval(tp, bp); - } - --- -2.14.2 - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 7409 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-futex-futex_wake_op-do-not-fail-on-invalid-op.patch new/patches.suse/0001-futex-futex_wake_op-do-not-fail-on-invalid-op.patch --- old/patches.suse/0001-futex-futex_wake_op-do-not-fail-on-invalid-op.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/0001-futex-futex_wake_op-do-not-fail-on-invalid-op.patch 2017-10-27 09:27:49.000000000 +0200 @@ -0,0 +1,81 @@ +From: Jiri Slaby <jslaby(a)suse.cz> +Date: Mon, 23 Oct 2017 09:53:49 +0200 +Subject: futex: futex_wake_op, do not fail on invalid op +Patch-mainline: submitted on 2017/10/23 +References: bnc#1064590 + +In 30d6e0a4190d ("futex: Remove duplicated code and fix undefined +behaviour"), I let FUTEX_WAKE_OP to fail on invalid op. Namely when +op should be considered as shift and the shift is out of range (< 0 or +> 31). + +But strace's test suite does this madness: +futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xa0caffee); +futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xbadfaced); +futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xffffffff); + +When I pick the first 0xa0caffee, it decodes as: +0x80000000 & 0xa0caffee: oparg is shift +0x70000000 & 0xa0caffee: op is FUTEX_OP_OR +0x0f000000 & 0xa0caffee: cmp is FUTEX_OP_CMP_EQ +0x00fff000 & 0xa0caffee: oparg is sign-extended 0xcaf = -849 +0x00000fff & 0xa0caffee: cmparg is sign-extended 0xfee = -18 + +That means the op tries to do this: + (futex |= (1 << (-849))) == -18 +which is completely bogus. The new check of op in the code is: + if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) { + if (oparg < 0 || oparg > 31) + return -EINVAL; + oparg = 1 << oparg; + } + +which results obviously in the "Invalid argument" errno: +----8<--------8<--------8<--------8<--------8<---- +FAIL: futex +=========== + +futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xa0caffee) = -1: Invalid argument +futex.test: failed test: ../futex failed with code 1 +----8<--------8<--------8<--------8<--------8<---- + +So let us soften the failure to print only a (ratelimited) message, +crop the value and continue as if it were right. When userspace keeps +up, we can switch this to return -EINVAL again. + +[v2] +Do not return 0 immediatelly, proceed with the cropped value. + +Fixes: 30d6e0a4190d ("futex: Remove duplicated code and fix undefined behaviour") +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +Cc: Ingo Molnar <mingo(a)redhat.com> +Cc: Peter Zijlstra <peterz(a)infradead.org> +Cc: Darren Hart <dvhart(a)infradead.org> +Cc: Linus Torvalds <torvalds(a)linux-foundation.org> + +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +--- + kernel/futex.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/kernel/futex.c ++++ b/kernel/futex.c +@@ -1566,8 +1566,16 @@ static int futex_atomic_op_inuser(unsign + int oldval, ret; + + if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) { +- if (oparg < 0 || oparg > 31) +- return -EINVAL; ++ if (oparg < 0 || oparg > 31) { ++ char comm[sizeof(current->comm)]; ++ /* ++ * kill this print and return -EINVAL when userspace ++ * is sane again ++ */ ++ pr_info_ratelimited("futex_wake_op: %s tries to shift op by %d; fix this program\n", ++ get_task_comm(comm, current), oparg); ++ oparg &= 31; ++ } + oparg = 1 << oparg; + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch new/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch --- old/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch 2017-10-27 09:27:49.000000000 +0200 @@ -0,0 +1,36 @@ +From: Jiri Slaby <jslaby(a)suse.cz> +Date: Mon, 23 Oct 2017 13:13:24 +0200 +Subject: futex: futex_wake_op, fix sign_extend32 sign bits +Patch-mainline: submitted on 2017/10/23 +References: bnc#1064590 + +sign_extend32 counts the sign bit parameter from 0, not from 1. So we +have to use "11" for 12th bit, not "12". + +This mistake means we have not allowed negative op and cmp args since +commit 30d6e0a4190d ("futex: Remove duplicated code and fix undefined +behaviour") till now. + +Fixes: 30d6e0a4190d ("futex: Remove duplicated code and fix undefined behaviour") +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +Cc: Ingo Molnar <mingo(a)redhat.com> +Cc: Peter Zijlstra <peterz(a)infradead.org> +Cc: Darren Hart <dvhart(a)infradead.org> +Cc: Linus Torvalds <torvalds(a)linux-foundation.org> +--- + kernel/futex.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/kernel/futex.c ++++ b/kernel/futex.c +@@ -1561,8 +1561,8 @@ static int futex_atomic_op_inuser(unsign + { + unsigned int op = (encoded_op & 0x70000000) >> 28; + unsigned int cmp = (encoded_op & 0x0f000000) >> 24; +- int oparg = sign_extend32((encoded_op & 0x00fff000) >> 12, 12); +- int cmparg = sign_extend32(encoded_op & 0x00000fff, 12); ++ int oparg = sign_extend32((encoded_op & 0x00fff000) >> 12, 11); ++ int cmparg = sign_extend32(encoded_op & 0x00000fff, 11); + int oldval, ret; + + if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/futex-do-not-fail-on-invalid-op.patch new/patches.suse/futex-do-not-fail-on-invalid-op.patch --- old/patches.suse/futex-do-not-fail-on-invalid-op.patch 2017-10-23 11:44:25.000000000 +0200 +++ new/patches.suse/futex-do-not-fail-on-invalid-op.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -From: Jiri Slaby <jslaby(a)suse.cz> -Date: Mon, 23 Oct 2017 09:53:49 +0200 -Subject: futex: do not fail on invalid op -Patch-mainline: submitted on 2017/10/23 -References: bnc#1064590 - -In 30d6e0a4190d ("futex: Remove duplicated code and fix undefined -behaviour"), I let FUTEX_WAKE_OP to fail on invalid op. Namely when -op should be considered as shift and the shift is out of range (< 0 or -> 31). - -But strace's test suite does this madness: -futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xa0caffee); -futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xbadfaced); -futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xffffffff); - -When I pick the first 0xa0caffee, it decodes as: -0x80000000 & 0xa0caffee: oparg is shift -0x70000000 & 0xa0caffee: op is FUTEX_OP_OR -0x0f000000 & 0xa0caffee: cmp is FUTEX_OP_CMP_EQ -0x00fff000 & 0xa0caffee: oparg is sign-extended 0xcaf = -849 -0x00000fff & 0xa0caffee: cmparg is sign-extended 0xfee = -18 - -That means the op tries to do this: - (futex |= (1 << (-849))) == -18 -which is completely bogus. The new check of op in the code is: - if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) { - if (oparg < 0 || oparg > 31) - return -EINVAL; - oparg = 1 << oparg; - } - -which results obviously in the "Invalid argument" errno: -----8<--------8<--------8<--------8<--------8<---- -FAIL: futex -=========== - -futex(0x7fabd78bcffc, 0x5, 0xfacefeed, 0xb, 0x7fabd78bcffc, 0xa0caffee) = -1: Invalid argument -futex.test: failed test: ../futex failed with code 1 -----8<--------8<--------8<--------8<--------8<---- - -So let us soften the failure to print only a (ratelimited) message and -return 0 silently in these cases until userspace keeps up. - -Fixes: 30d6e0a4190d ("futex: Remove duplicated code and fix undefined behaviour") -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> -Cc: Ingo Molnar <mingo(a)redhat.com> -Cc: Peter Zijlstra <peterz(a)infradead.org> -Cc: Darren Hart <dvhart(a)infradead.org> -Cc: Linus Torvalds <torvalds(a)linux-foundation.org> - -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> ---- - kernel/futex.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - ---- a/kernel/futex.c -+++ b/kernel/futex.c -@@ -1570,8 +1570,16 @@ static int futex_atomic_op_inuser(unsign - int oldval, ret; - - if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) { -- if (oparg < 0 || oparg > 31) -- return -EINVAL; -+ if (oparg < 0 || oparg > 31) { -+ char comm[sizeof(current->comm)]; -+ /* -+ * kill this print and return -EINVAL when userspace -+ * is sane again -+ */ -+ pr_info_ratelimited("futex_wake_op: %s tries to shift op by %d, ignoring this request; fix this program\n", -+ get_task_comm(comm, current), oparg); -+ return 0; -+ } - oparg = 1 << oparg; - } - ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:18.031599216 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:18.031599216 +0100 @@ -602,6 +602,92 @@ patches.kernel.org/4.13.9-010-vmbus-eliminate-duplicate-cached-index.patch patches.kernel.org/4.13.9-011-vmbus-more-host-signalling-avoidance.patch patches.kernel.org/4.13.9-012-Linux-4.13.9.patch + patches.kernel.org/4.13.10-001-staging-bcm2835-audio-Fix-memory-corruption.… + patches.kernel.org/4.13.10-002-USB-devio-Revert-USB-devio-Don-t-corrupt-use… + patches.kernel.org/4.13.10-003-USB-core-fix-out-of-bounds-access-bug-in-usb… + patches.kernel.org/4.13.10-004-USB-serial-metro-usb-add-MS7820-device-id.pa… + patches.kernel.org/4.13.10-005-usb-cdc_acm-Add-quirk-for-Elatec-TWN3.patch + patches.kernel.org/4.13.10-006-usb-quirks-add-quirk-for-WORLDE-MINI-MIDI-ke… + patches.kernel.org/4.13.10-007-usb-hub-Allow-reset-retry-for-USB2-devices-o… + patches.kernel.org/4.13.10-008-ALSA-usb-audio-Add-native-DSD-support-for-Pr… + patches.kernel.org/4.13.10-009-can-gs_usb-fix-busy-loop-if-no-more-TX-conte… + patches.kernel.org/4.13.10-010-scsi-qla2xxx-Fix-uninitialized-work-element.… + patches.kernel.org/4.13.10-011-nbd-don-t-set-the-device-size-until-we-re-co… + patches.kernel.org/4.13.10-012-s390-cputime-fix-guest-irq-softirq-times-aft… + patches.kernel.org/4.13.10-013-parisc-Fix-double-word-compare-and-exchange-… + patches.kernel.org/4.13.10-014-parisc-Fix-detection-of-nonsynchronous-cr16-… + patches.kernel.org/4.13.10-015-iio-dummy-events-Add-missing-break.patch + patches.kernel.org/4.13.10-016-usb-musb-sunxi-Explicitly-release-USB-PHY-on… + patches.kernel.org/4.13.10-017-USB-musb-fix-session-bit-runtime-PM-quirk.pa… + patches.kernel.org/4.13.10-018-USB-musb-fix-late-external-abort-on-suspend.… + patches.kernel.org/4.13.10-019-usb-musb-musb_cppi41-Fix-the-address-of-tear… + patches.kernel.org/4.13.10-020-usb-musb-musb_cppi41-Fix-cppi41_set_dma_mode… + patches.kernel.org/4.13.10-021-usb-musb-musb_cppi41-Configure-the-number-of… + patches.kernel.org/4.13.10-022-usb-musb-Check-for-host-mode-using-is_host_a… + patches.kernel.org/4.13.10-023-xhci-Identify-USB-3.1-capable-hosts-by-their… + patches.kernel.org/4.13.10-024-xhci-Cleanup-current_cmd-in-xhci_cleanup_com… + patches.kernel.org/4.13.10-025-usb-xhci-Reset-halted-endpoint-if-trb-is-noo… + patches.kernel.org/4.13.10-026-usb-xhci-Handle-error-condition-in-xhci_stop… + patches.kernel.org/4.13.10-027-can-esd_usb2-Fix-can_dlc-value-for-received-… + patches.kernel.org/4.13.10-028-can-af_can-can_pernet_init-add-missing-error… + patches.kernel.org/4.13.10-029-can-flexcan-fix-state-transition-regression.… + patches.kernel.org/4.13.10-030-can-flexcan-rename-legacy-error-state-quirk.… + patches.kernel.org/4.13.10-031-can-flexcan-implement-error-passive-state-qu… + patches.kernel.org/4.13.10-032-can-flexcan-fix-i.MX6-state-transition-issue… + patches.kernel.org/4.13.10-033-can-flexcan-fix-i.MX28-state-transition-issu… + patches.kernel.org/4.13.10-034-can-flexcan-fix-p1010-state-transition-issue… + patches.kernel.org/4.13.10-035-KEYS-encrypted-fix-dereference-of-NULL-user_… + patches.kernel.org/4.13.10-036-mmc-sdhci-pci-Fix-default-d3_retune-for-Inte… + patches.kernel.org/4.13.10-037-drm-i915-Use-bdw_ddi_translations_fdi-for-Br… + patches.kernel.org/4.13.10-038-drm-nouveau-kms-nv50-fix-oops-during-DP-IRQ-… + patches.kernel.org/4.13.10-039-drm-nouveau-bsp-g92-disable-by-default.patch + patches.kernel.org/4.13.10-040-drm-nouveau-mmu-flush-tlbs-before-deleting-p… + patches.kernel.org/4.13.10-041-media-s5p-cec-add-NACK-detection-support.pat… + patches.kernel.org/4.13.10-042-media-cec-Respond-to-unregistered-initiators… + patches.kernel.org/4.13.10-043-media-dvb-i2c-transfers-over-usb-cannot-be-d… + patches.kernel.org/4.13.10-044-tracing-samples-Fix-creation-and-deletion-of… + patches.kernel.org/4.13.10-045-ALSA-seq-Enable-use-locking-in-all-configura… + patches.kernel.org/4.13.10-046-ALSA-hda-Remove-superfluous-added-by-printk-… + patches.kernel.org/4.13.10-047-ALSA-hda-Abort-capability-probe-at-invalid-r… + patches.kernel.org/4.13.10-048-i2c-ismt-Separate-I2C-block-read-from-SMBus-… + patches.kernel.org/4.13.10-049-i2c-piix4-Fix-SMBus-port-selection-for-AMD-F… + patches.kernel.org/4.13.10-050-Revert-tools-power-turbostat-stop-migrating-… + patches.kernel.org/4.13.10-051-Input-stmfts-fix-setting-ABS_MT_POSITION_-ma… + patches.kernel.org/4.13.10-052-brcmfmac-Add-check-for-short-event-packets.p… + patches.kernel.org/4.13.10-053-brcmsmac-make-some-local-variables-static-co… + patches.kernel.org/4.13.10-054-ARM-dts-sun6i-Fix-endpoint-IDs-in-second-dis… + patches.kernel.org/4.13.10-055-bus-mbus-fix-window-size-calculation-for-4GB… + patches.kernel.org/4.13.10-056-clockevents-drivers-cs5535-Improve-resilienc… + patches.kernel.org/4.13.10-057-rtlwifi-rtl8821ae-Fix-connection-lost-proble… + patches.kernel.org/4.13.10-058-x86-microcode-intel-Disable-late-loading-on-… + patches.kernel.org/4.13.10-059-lib-digsig-fix-dereference-of-NULL-user_key_… + patches.kernel.org/4.13.10-060-fscrypt-fix-dereference-of-NULL-user_key_pay… + patches.kernel.org/4.13.10-061-ecryptfs-fix-dereference-of-NULL-user_key_pa… + patches.kernel.org/4.13.10-062-KEYS-Fix-race-between-updating-and-finding-a… + patches.kernel.org/4.13.10-063-FS-Cache-fix-dereference-of-NULL-user_key_pa… + patches.kernel.org/4.13.10-064-KEYS-don-t-let-add_key-update-an-uninstantia… + patches.kernel.org/4.13.10-065-pkcs7-Prevent-NULL-pointer-dereference-since… + patches.kernel.org/4.13.10-066-arm64-dts-rockchip-correct-vqmmc-voltage-for… + patches.kernel.org/4.13.10-067-ALSA-hda-Fix-incorrect-TLV-callback-check-in… + patches.kernel.org/4.13.10-068-iomap_dio_rw-Allocate-AIO-completion-queue-b… + patches.kernel.org/4.13.10-069-xfs-don-t-unconditionally-clear-the-reflink-… + patches.kernel.org/4.13.10-070-xfs-evict-CoW-fork-extents-when-performing-f… + patches.kernel.org/4.13.10-071-fs-xfs-Use-pS-printk-format-for-direct-addre… + patches.kernel.org/4.13.10-072-xfs-report-zeroed-or-not-correctly-in-xfs_ze… + patches.kernel.org/4.13.10-073-xfs-update-i_size-after-unwritten-conversion… + patches.kernel.org/4.13.10-074-xfs-perag-initialization-should-only-touch-m… + patches.kernel.org/4.13.10-075-xfs-Capture-state-of-the-right-inode-in-xfs_… + patches.kernel.org/4.13.10-076-xfs-always-swap-the-cow-forks-when-swapping-… + patches.kernel.org/4.13.10-077-xfs-handle-racy-AIO-in-xfs_reflink_end_cow.p… + patches.kernel.org/4.13.10-078-xfs-Don-t-log-uninitialised-fields-in-inode-… + patches.kernel.org/4.13.10-079-xfs-move-more-RT-specific-code-under-CONFIG_… + patches.kernel.org/4.13.10-080-xfs-don-t-change-inode-mode-if-ACL-update-fa… + patches.kernel.org/4.13.10-081-xfs-reinit-btree-pointer-on-attr-tree-inacti… + patches.kernel.org/4.13.10-082-xfs-handle-error-if-xfs_btree_get_bufs-fails… + patches.kernel.org/4.13.10-083-xfs-cancel-dirty-pages-on-invalidation.patch + patches.kernel.org/4.13.10-084-xfs-trim-writepage-mapping-to-within-eof.pat… + patches.kernel.org/4.13.10-085-xfs-move-two-more-RT-specific-functions-into… + patches.kernel.org/4.13.10-086-Linux-4.13.10.patch ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -651,7 +737,8 @@ ######################################################## patches.suse/setuid-dumpable-wrongdir patches.fixes/futex-Remove-duplicated-code-and-fix-undefined-behav.patch - patches.suse/futex-do-not-fail-on-invalid-op.patch + patches.suse/0001-futex-futex_wake_op-do-not-fail-on-invalid-op.patch + patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch ######################################################## # Architecture-specific patches. These used to be all @@ -943,7 +1030,6 @@ ########################################################## patches.drivers/ALSA-hda-Implement-mic-mute-LED-mode-enum patches.drivers/ALSA-ice1712-Add-support-for-STAudio-ADCIII - patches.drivers/ALSA-hda-Abort-capability-probe-at-invalid-register- ######################################################## # Char / serial @@ -1074,7 +1160,6 @@ # submitted patches.suse/0001-orc-mark-it-as-reliable.patch - patches.fixes/xfs-handle-error-if-xfs_btree_get_bufs-fails.patch ######################################################## # Kdump ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.f39aXw/_old 2017-10-30 21:18:18.087597180 +0100 +++ /var/tmp/diff_new_pack.f39aXw/_new 2017-10-30 21:18:18.087597180 +0100 @@ -1,3 +1,3 @@ -2017-10-23 11:44:25 +0200 -GIT Revision: e7d71063ecf68f95aca8efd745790e08a8f93e30 +2017-10-27 11:03:09 +0200 +GIT Revision: db36cf83181a996bfdb86b3c32dc376d7b6922f0 GIT Branch: stable

1 0

commit gnome-builder for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '17

30 Oct '17

Hello community, here is the log from the commit of package gnome-builder for openSUSE:Factory checked in at 2017-10-30 21:17:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-builder (Old) and /work/SRC/openSUSE:Factory/.gnome-builder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-builder" Mon Oct 30 21:17:45 2017 rev:25 rq:537405 version:3.26.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-builder/gnome-builder.changes 2017-10-27 13:47:48.806181180 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-builder.new/gnome-builder.changes 2017-10-30 21:17:46.492745931 +0100 @@ -1,0 +2,6 @@ +Fri Oct 27 20:30:57 UTC 2017 - luc14n0(a)linuxmail.org + +- Add gnome-builder-plugin-fpaste Obsoletes: missing tag since + plugin has been removed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-builder.spec ++++++ --- /var/tmp/diff_new_pack.3ToLKj/_old 2017-10-30 21:17:47.400712918 +0100 +++ /var/tmp/diff_new_pack.3ToLKj/_new 2017-10-30 21:17:47.404712772 +0100 @@ -83,6 +83,7 @@ %if 0%{?suse_version} > 1320 Requires: python3-gobject-Gdk %endif +Obsoletes: gnome-builder-plugin-fpaste <= %{version} %description Builder is an IDE for GNOME and a tool to help writing GNOME-based

1 0