August 2016 - openSUSE Commits - openSUSE Mailing Lists

commit pacemaker for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2016-08-31 14:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pacemaker (Old) and /work/SRC/openSUSE:Factory/.pacemaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pacemaker" Changes: -------- --- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2016-07-21 07:53:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2016-08-31 14:28:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 26 16:20:25 UTC 2016 - ygao(a)suse.com + +- cts: Restart systemd-journald with "systemctl restart systemd-journald.socket" (bsc#995365) + * bug-995365_pacemaker-cts-restart-systemd-journald.patch + +------------------------------------------------------------------- New: ---- bug-995365_pacemaker-cts-restart-systemd-journald.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.lxQjDB/_old 2016-08-31 14:28:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lxQjDB/_new 2016-08-31 14:28:39.000000000 +0200 @@ -55,6 +55,7 @@ Patch7: pacemaker-Wno-format-signedness.patch Patch8: bug-943295_pacemaker-lrmd-log-notice.patch Patch9: bug-977201_pacemaker-controld-self-fencing.patch +Patch10: bug-995365_pacemaker-cts-restart-systemd-journald.patch # Required for core functionality (python-devel depends on python) BuildRequires: autoconf BuildRequires: automake @@ -262,6 +263,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build autoreconf -fvi ++++++ bug-995365_pacemaker-cts-restart-systemd-journald.patch ++++++ Index: pacemaker/cts/CTSaudits.py =================================================================== --- pacemaker.orig/cts/CTSaudits.py +++ pacemaker/cts/CTSaudits.py @@ -67,10 +67,8 @@ class LogAudit(ClusterAudit): for node in nodes: if self.CM.Env["have_systemd"]: - if self.CM.rsh(node, "systemctl stop systemd-journald.socket") != 0: - self.CM.log ("ERROR: Cannot stop 'systemd-journald' on %s" % node) - if self.CM.rsh(node, "systemctl start systemd-journald.service") != 0: - self.CM.log ("ERROR: Cannot start 'systemd-journald' on %s" % node) + if self.CM.rsh(node, "systemctl restart systemd-journald.socket") != 0: + self.CM.log ("ERROR: Cannot restart 'systemd-journald' on %s" % node) if self.CM.rsh(node, "service %s restart" % self.CM.Env["syslogd"]) != 0: self.CM.log ("ERROR: Cannot restart '%s' on %s" % (self.CM.Env["syslogd"], node))

1 0

commit ffmpeg for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2016-08-31 14:28:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ffmpeg" Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2016-08-26 23:15:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2016-08-31 14:28:24.000000000 +0200 @@ -1,0 +2,29 @@ +Sat Aug 27 06:18:31 UTC 2016 - aloisio(a)gmx.com + +- Update to version 3.1.3 + * examples/demuxing_decoding: convert to codecpar + * avcodec/exr: Check tile positions + * avcodec/aacenc: Tighter input checks + * avformat/wtvdec: Check pointer before use + * libavcodec/wmalosslessdec: Check the remaining bits + * avcodec/adpcm: Fix adpcm_ima_wav padding + * avcodec/svq3: fix slice size check + * avcodec/diracdec: Check numx/y + * avcodec/h2645_parse: fix nal size + * avcodec/h2645_parse: Use get_nalsize() in + ff_h2645_packet_split() + * h2645_parse: only read avc length code at the correct + position + * h2645_parse: don't overread AnnexB NALs within an avc + stream + * avcodec/h264_parser: Factor get_avc_nalsize() out + * avcodec/cfhd: Increase minimum band dimension to 3 + * avcodec/indeo2: check ctab + * avformat/swfdec: Fix inflate() error code check + * avcodec/rawdec: Fix bits_per_coded_sample checks + * vcodec/h2645_parse: Clear buffer padding + * avcodec/h2645: Fix NAL unit padding + * avfilter/drawutils: Fix single plane with alpha + * cmdutils: check for SetDllDirectory() availability + +------------------------------------------------------------------- Old: ---- ffmpeg-3.1.2.tar.xz ffmpeg-3.1.2.tar.xz.asc New: ---- ffmpeg-3.1.3.tar.xz ffmpeg-3.1.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.LdbhRj/_old 2016-08-31 14:28:25.000000000 +0200 +++ /var/tmp/diff_new_pack.LdbhRj/_new 2016-08-31 14:28:25.000000000 +0200 @@ -32,7 +32,7 @@ %bcond_without webp Name: ffmpeg -Version: 3.1.2 +Version: 3.1.3 Release: 0 Summary: Library for working with various multimedia formats License: LGPL-2.1+ and GPL-2.0+ ++++++ ffmpeg-3.1.2.tar.xz -> ffmpeg-3.1.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg-3.1.2.tar.xz /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg-3.1.3.tar.xz differ: char 26, line 1

1 0

commit xdm for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2016-08-31 14:27:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdm" Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2016-06-29 15:03:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-08-31 14:27:56.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 23 11:51:55 UTC 2016 - eich(a)suse.com + +- spec-file: + Move '%fillup_only -n displaymanager' into %else + clause of test for initV/systemd as this is only + required for systemd. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.spec ++++++ --- /var/tmp/diff_new_pack.a2D3ns/_old 2016-08-31 14:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.a2D3ns/_new 2016-08-31 14:27:57.000000000 +0200 @@ -177,8 +177,8 @@ %{fillup_and_insserv -Y xdm} %else %service_add_post display-manager.service -%endif %{fillup_only -n displaymanager} +%endif %pre %if !0%{?suse_version} < 1315

1 0

commit hplip for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2016-08-31 14:27:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hplip" Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2016-07-01 09:50:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2016-08-31 14:27:44.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 15:13:30 UTC 2016 - martin.wilck(a)suse.com + +- Fixed device communication/detection problems with mdns/Bonjour + * added hplip-mdns.patch (MDNS send/receive on every iterface) + * added hplip-mdns-retry-query.patch (MDNS retry) + See https://bugs.launchpad.net/hplip/+bug/1616861 + +------------------------------------------------------------------- New: ---- hplip-mdns-retry-query.patch hplip-mdns.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.yhrzBK/_old 2016-08-31 14:27:45.000000000 +0200 +++ /var/tmp/diff_new_pack.yhrzBK/_new 2016-08-31 14:27:45.000000000 +0200 @@ -56,6 +56,10 @@ # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 Patch108: add_missing_includes_and_define_GNU_SOURCE.patch +# Patch200 fixes device communication and detection via MDNS in some network setups: +Patch200: hplip-mdns.patch +# Patch201 makes MDNS lookups more robust by retrying queries: +Patch201: hplip-mdns-retry-query.patch # HPLIP's Python module cupsext.so has a build-time dependancy on the CUPS version: # It needs symbols (like ippFirstAttribute, ippNextAttribute, ippSetOperation etc) # that are defined only in libcups.so version > 1.5. For backward compatibility @@ -350,6 +354,8 @@ # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig +%patch200 -p1 -b .mdns +%patch201 -p1 -b .mdns-retry %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -407,7 +413,8 @@ --with-drvdir=%{_libexecdir}/cups/driver \ --with-mimedir=%{_sysconfdir}/cups \ --with-docdir=%{_defaultdocdir}/%{name} \ - --with-htmldir==%{_defaultdocdir}/%{name} + --with-htmldir==%{_defaultdocdir}/%{name} \ + CFLAGS='%{optflags}' make %install ++++++ hplip-mdns-retry-query.patch ++++++ diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c index 92e153a..75ef0ea 100644 --- a/protocol/discovery/mdns.c +++ b/protocol/discovery/mdns.c @@ -436,7 +436,7 @@ static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvb FD_SET(udp_socket, &master); maxfd = udp_socket; tmo.tv_sec = 0; - tmo.tv_usec = 300000; + tmo.tv_usec = 10000; readfd = master; ret = select(maxfd + 1, &readfd, NULL, NULL, &tmo); @@ -549,6 +549,34 @@ static void mdns_rr_cleanup(DNS_RECORD *rr) } } +static DNS_RECORD* send_and_receive(struct mdns_socket *mdns_sock, + const char *name, + int query_type, int read_mode) +{ + /* wait up to ~1s */ + const useconds_t DELTA_T = 251000; + const int RETRIES = 8; + int retry = RETRIES; + DNS_RECORD *rr_list; + + while (retry) { + if (mdns_send_query(mdns_sock, name, query_type) == MDNS_STATUS_OK) { + rr_list = mdns_read_responses(mdns_sock->socket, read_mode, name); + if (rr_list != NULL) { + DBG("send_and_receive: got response after %d retries\n", + RETRIES - retry); + return rr_list; + } + } + /* MDNS servers delay responses. If the server just responded + * to some query (maybe an earlier one we sent), we may need to wait. */ + --retry; + usleep(DELTA_T); + } + BUG("send_and_receive: no response after %d retries\n", RETRIES); + return NULL; +} + int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count) { int n = 0, bytes_read = 0; @@ -562,11 +590,7 @@ int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count) if (mdns_open_socket(&mdns_sock) != MDNS_STATUS_OK) goto bugout; - /* Send dns query */ - mdns_send_query(&mdns_sock, scanner_name, QTYPE_PTR); - - /* Read Responses */ - rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_ALL, scanner_name); + rr_list = send_and_receive(&mdns_sock, scanner_name, QTYPE_PTR, MODE_READ_ALL); /* Update URIs buffer */ bytes_read = mdns_update_uris(rr_list, uris_buf, buf_size, count); @@ -598,10 +622,8 @@ int mdns_lookup(char* hostname, unsigned char* ip) /* Send dns query */ sprintf(fqdn, "%s.local", hostname); - mdns_send_query(&mdns_sock, fqdn, QTYPE_A); - /* Read Responses */ - rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_SINGLE, fqdn); + rr_list = send_and_receive(&mdns_sock, fqdn, QTYPE_A, MODE_READ_SINGLE); /* Update IP Address buffer */ if(rr_list) diff --git a/protocol/discovery/mdns.h b/protocol/discovery/mdns.h index 34066fb..56d8847 100644 --- a/protocol/discovery/mdns.h +++ b/protocol/discovery/mdns.h @@ -102,5 +102,8 @@ static int mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr); static void mdns_rr_cleanup(DNS_RECORD *rr); static DNS_RECORD *mdns_read_responses(int udp_socket, int mode, const char *question); static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len); +static DNS_RECORD* send_and_receive(struct mdns_socket *mdns_sock, const char *name, + int query_type, int read_mode); +static int get_ipv4_address(const char *iface, struct in_addr *addr); #endif // _DISCOVERY_MDNS_H ++++++ hplip-mdns.patch ++++++ diff --git a/base/mdns.py b/base/mdns.py index 03bdb92..11d08b8 100644 --- a/base/mdns.py +++ b/base/mdns.py @@ -35,6 +35,17 @@ from .g import * from . import utils from .sixext import BytesIO, to_bytes_utf8, to_bytes_latin, to_string_latin +if hasattr(socket, "if_nameindex"): + if_nameindex = socket.if_nameindex +else: + def _if_nameindex(): + """"Poor man's if_nameindex for Python 2.""" + import os + sysdir = "/sys/class/net" + return sorted([ (int(open("%s/%s/ifindex" % (sysdir, iface), "r").read(), 0), iface) + for iface in os.listdir(sysdir) ]) + if_nameindex = _if_nameindex + MAX_ANSWERS_PER_PACKET = 24 QTYPE_A = 1 @@ -45,6 +56,8 @@ QTYPE_PTR = 12 QCLASS_IN = 1 +MCAST_ADDR='224.0.0.251' + # Caller needs to ensure, data should be in string format. def read_utf8(offset, data, l): return offset+l, data[offset:offset+l] @@ -188,11 +201,6 @@ def createSocketsWithsetOption(ttl=4): s=None try: s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) - x = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - x.connect(('1.2.3.4', 56)) - intf = x.getsockname()[0] - x.close() - s.setblocking(0) ttl = struct.pack('B', ttl) except socket.error: @@ -209,14 +217,42 @@ def createSocketsWithsetOption(ttl=4): try: s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_TTL, ttl) - s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_IF, socket.inet_aton(intf) + socket.inet_aton('0.0.0.0')) s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP ,1) except Exception as e: log.error("Unable to setup multicast socket for mDNS: %s" % e) if s: s.close() return None - return s + + ifaces = [] + for idx, name in if_nameindex(): + mreqn = struct.pack("=4sii", socket.inet_aton(MCAST_ADDR), + socket.ntohl(socket.INADDR_ANY), idx) + try: + s.setsockopt(socket.SOL_IP, socket.IP_ADD_MEMBERSHIP, mreqn) + except Exception as e: + log.debug("Failed to join multicast group on interface %s: %s" % + (name, e)) + else: + log.debug("Joined multicast group on interface %s" % name) + ifaces.append((idx, name)) + + if len(ifaces) == 0: + log.error("failed to join multicast group on any interface") + s.close() + return None + + return (s, ifaces) + +def closeSocket(s): + for idx, name in if_nameindex(): + mreqn = struct.pack("=4sii", socket.inet_aton(MCAST_ADDR), + socket.ntohl(socket.INADDR_ANY), idx) + try: + s.setsockopt(socket.SOL_IP, socket.IP_DROP_MEMBERSHIP, mreqn) + except Exception: + pass + s.close() def updateReceivedData(data, answers): update_spinner() @@ -299,13 +335,22 @@ def updateReceivedData(data, answers): break return y, answers +def send_packets(s, answers, name, mcast_addr, mcast_port): + for p in create_outgoing_packets(answers): + log.debug("Outgoing on %s: (%d)" % (name, len(p))) + log.log_data(p, width=16) + try: + s.sendto(p, 0, (mcast_addr, mcast_port)) + except socket.error as e: + log.debug("Unable to send broadcast DNS packet on %s: %s" % (name, e)) + raise def detectNetworkDevices(ttl=4, timeout=10): - mcast_addr, mcast_port ='224.0.0.251', 5353 + mcast_addr, mcast_port =MCAST_ADDR, 5353 found_devices = {} answers = [] - s = createSocketsWithsetOption(ttl) + s, ifaces = createSocketsWithsetOption(ttl) if not s: return {} @@ -321,14 +366,24 @@ def detectNetworkDevices(ttl=4, timeout=10): break if now >= next: - try: - for p in create_outgoing_packets(answers): - log.debug("Outgoing: (%d)" % len(p)) - log.log_data(p, width=16) - s.sendto(p, 0, (mcast_addr, mcast_port)) + good = [] + for idx, name in ifaces: + mreqn = struct.pack("=4sii", socket.inet_aton(mcast_addr), + socket.ntohl(socket.INADDR_ANY), idx) + try: + s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_IF, mreqn) + except socket.error as e: + log.debug("failed to set IP_MULTICAST_IF on %s" % name) + continue + try: + send_packets(s, answers, name, mcast_addr, mcast_port) + except socket.error: + continue + else: + good.append((idx, name)) - except socket.error as e: - log.error("Unable to send broadcast DNS packet: %s" % e) + if len(good) == 0: + log.error("Failed to send MDNS packet on any interface") next += delay delay *= 2 @@ -347,7 +402,5 @@ def detectNetworkDevices(ttl=4, timeout=10): found_devices[y['ip']] = y log.debug("Found %d devices" % len(found_devices)) - s.close() + closeSocket(s) return found_devices - - diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c index 3324d2a..92e153a 100644 --- a/protocol/discovery/mdns.c +++ b/protocol/discovery/mdns.c @@ -1,3 +1,4 @@ + /***************************************************************************** mdns.c - mDNS related calls @@ -29,14 +30,17 @@ #endif #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <syslog.h> #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> #include <arpa/inet.h> +#include <net/if.h> #include "mdns.h" #include <unistd.h> +#include <sys/ioctl.h> /* Convert "www.google.com" to "3www6google3com". */ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name) @@ -71,14 +75,50 @@ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_n return x; /* return length DOES include null termination */ } +#define MREQN_INIT(_mr, index) do { \ + (&(_mr))->imr_multiaddr.s_addr = inet_addr("224.0.0.251"); \ + (&(_mr))->imr_address.s_addr = htonl(INADDR_ANY); \ + (&(_mr))->imr_ifindex = (index); \ + } while(0) + +struct mdns_socket { + int socket; + struct if_nameindex *idx; + struct if_nameindex **good; +}; +#define MDNS_SOCKET_INIT { .socket = -1, .idx = NULL, .good = NULL, } + +static int get_ipv4_address(const char *iface, struct in_addr *addr) +{ + int s, r; + struct ifreq ifr; + + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_name, iface, IFNAMSIZ-1); + + s = socket(AF_INET, SOCK_DGRAM, 0); + r = ioctl(s, SIOCGIFADDR, &ifr); + close(s); + + if (r == -1) { + DBG("error in SIOCGIFADDR for %s: %m\n", iface); + return MDNS_STATUS_ERROR; + } + + if (addr != NULL) + memcpy(addr, &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr, + sizeof(*addr)); + return MDNS_STATUS_OK; +} -static int mdns_open_socket(int *psocket) +static int mdns_open_socket(struct mdns_socket *mdns_sock) { int stat = MDNS_STATUS_ERROR; - int udp_socket = -1, yes = 1; + int udp_socket = -1, yes = 1, ifaces; char loop = 0, ttl = 255; struct sockaddr_in recv_addr , addr; - struct ip_mreq mreq; + struct ip_mreqn mreqn; + struct if_nameindex *idx; DBG("mdns_open_socket entry.\n"); @@ -120,24 +160,86 @@ static int mdns_open_socket(int *psocket) goto bugout; } - /* Join the .local multicast group */ - mreq.imr_multiaddr.s_addr = inet_addr("224.0.0.251"); - mreq.imr_interface.s_addr = htonl(INADDR_ANY); - if (setsockopt(udp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(struct ip_mreq)) == -1) { - BUG("unable to add to multicast group: %m\n"); - close(udp_socket); + mdns_sock->idx = if_nameindex(); + if (mdns_sock->idx == NULL) { + BUG("if_nameindex failed: %m\n"); + goto bugout; + } + + for (idx = mdns_sock->idx, ifaces = 0; + idx && (idx->if_index != 0 || idx->if_name != NULL); idx++) { + ifaces ++; + } + + mdns_sock->good = calloc(ifaces, sizeof(struct if_nameindex*)); + if (mdns_sock->good == NULL) + goto bugout; + + for (idx = mdns_sock->idx, ifaces = 0; + idx && (idx->if_index != 0 || idx->if_name != NULL); idx++) { + + /* Skip lo and interfaces without IPv4 address */ + if (!strcmp(idx->if_name, "lo")) + continue; + if (get_ipv4_address(idx->if_name, NULL) == MDNS_STATUS_ERROR) + continue; + + /* Join the multicast group on each local interface */ + MREQN_INIT(mreqn, idx->if_index); + if (setsockopt(udp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreqn, + sizeof(struct ip_mreqn)) == -1) { + BUG("unable to add to multicast group for %s: %m\n", idx->if_name); + } else { + mdns_sock->good[ifaces++] = idx; + DBG("added multicast group on interface %s\n", idx->if_name); + } + } + + if (ifaces == 0) { + BUG("no interfaces for multicast found\n"); goto bugout; } - *psocket = udp_socket; - DBG("pSocket = [%d]: %m\n", *psocket); + mdns_sock->socket = udp_socket; + DBG("Socket = [%d]: %m\n", mdns_sock->socket); stat = MDNS_STATUS_OK; bugout: + if (stat != MDNS_STATUS_OK) + mdns_close_socket(mdns_sock); return stat; } -static void mdns_create_query_packet(char* fqdn, int query_type, char* querybuf, int *length) +static void mdns_close_socket(struct mdns_socket *mdns_sock) +{ + int i; + struct if_nameindex *idx; + struct ip_mreqn mreqn; + if (mdns_sock->socket != -1) { + for (i = 0; mdns_sock->good[i]; i++) { + idx = mdns_sock->good[i]; + MREQN_INIT(mreqn, idx->if_index); + if (setsockopt(mdns_sock->socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, + &mreqn, sizeof(struct ip_mreqn)) == -1) { + BUG("unable to drop multicast group for %s: %m\n", idx->if_name); + }; + } + close(mdns_sock->socket); + mdns_sock->socket = -1; + } + + if (mdns_sock->idx != NULL) { + if_freenameindex(mdns_sock->idx); + mdns_sock->idx = NULL; + } + + if (mdns_sock->good != NULL) { + free(mdns_sock->good); + mdns_sock->good = NULL; + } +} + +static void mdns_create_query_packet(const char* fqdn, int query_type, char* querybuf, int *length) { int n = 0; char header[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -157,14 +259,14 @@ static void mdns_create_query_packet(char* fqdn, int query_type, char* querybuf, *length = n; } -static int mdns_send_query(int udp_socket, char *fqdn, int query_type) +static int mdns_send_query(struct mdns_socket *mdns_sock, const char *fqdn, int query_type) { char querybuf[256] = {0,}; - int length = 0; + int length = 0, i, success; int stat = MDNS_STATUS_OK; struct sockaddr_in send_addr; - DBG("mdns_send_query entry. send socket=%d len=%d\n", udp_socket, length); + DBG("mdns_send_query entry. send socket=%d len=%d\n", mdns_sock->socket, length); mdns_create_query_packet(fqdn, query_type, querybuf, &length); @@ -172,8 +274,26 @@ static int mdns_send_query(int udp_socket, char *fqdn, int query_type) send_addr.sin_family = AF_INET; send_addr.sin_addr.s_addr = inet_addr("224.0.0.251"); send_addr.sin_port = htons(5353); - if (sendto(udp_socket, querybuf, length, 0, (struct sockaddr *) &send_addr, sizeof(send_addr)) < 0) - stat = MDNS_STATUS_ERROR; + + for (i = 0, success = 0; mdns_sock->good[i]; i++) { + struct if_nameindex *idx; + struct ip_mreqn mreqn; + idx = mdns_sock->good[i]; + MREQN_INIT(mreqn, idx->if_index); + if (setsockopt(mdns_sock->socket, IPPROTO_IP, IP_MULTICAST_IF, &mreqn, sizeof(mreqn)) + == -1) { + DBG("failed to set IP_MULTICAST_IF to %s\n", idx->if_name); + continue; + } + if (sendto(mdns_sock->socket, querybuf, length, 0, + (struct sockaddr *) &send_addr, sizeof(send_addr))< 0) { + DBG("failed to send on %s\n", idx->if_name); + } else + success++; + } + + if (success == 0) + stat = MDNS_STATUS_ERROR; DBG("mdns_send_query returning with status(%d)...\n", stat); return stat; @@ -252,7 +372,7 @@ static void mdns_read_header(char *Response, DNS_PKT_HEADER *h) } -static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) +static int mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) { unsigned char *p = Response; unsigned short type = 0, data_len = 0; @@ -263,6 +383,11 @@ static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) mdns_read_header(Response, &h); p += MDNS_HEADER_SIZE; + if (h.answers + h.additionals <= 0) { + DBG("mdns_parse_respponse: no answers"); + return MDNS_STATUS_ERROR; + } + for (i = 0; i < h.questions; i++) { p += mdns_readName(Response, p, rr->name); @@ -295,6 +420,7 @@ static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) } DBG("mdns_parse_respponse returning MDL = %s, IP = %s\n",rr->mdl, rr->ip); + return MDNS_STATUS_OK; } static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvbufsize) @@ -328,7 +454,7 @@ static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvb return ret; } -static DNS_RECORD *mdns_read_responses(int udp_socket, int mode) +static DNS_RECORD *mdns_read_responses(int udp_socket, int mode, const char *question) { int retries = 3, ret = 0; char recvbuffer[MAX_MDNS_RESPONSE_LEN] = { 0, }; @@ -351,17 +477,22 @@ static DNS_RECORD *mdns_read_responses(int udp_socket, int mode) temp = (DNS_RECORD *)malloc(sizeof(DNS_RECORD)); if(temp) { - temp->next = NULL; - if(head == NULL) - rr = head = temp; - else - { - rr->next = temp; - rr = rr->next; - } - - memset(rr, 0, sizeof(DNS_RECORD)); - mdns_parse_respponse(recvbuffer, rr); + memset(temp, 0, sizeof(DNS_RECORD)); + if (mdns_parse_respponse(recvbuffer, temp) == MDNS_STATUS_OK && + (mode == MODE_READ_ALL || question == NULL || + !strncmp(question, temp->name, sizeof(temp->name)-1))) { + if(head == NULL) + rr = head = temp; + else + { + rr->next = temp; + rr = rr->next; + } + } else { + DBG("Parse error or wrong MDNS name"); + free(temp); + continue; + } if(mode == MODE_READ_SINGLE) break; @@ -421,28 +552,28 @@ static void mdns_rr_cleanup(DNS_RECORD *rr) int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count) { int n = 0, bytes_read = 0; - int udp_socket = 0; + struct mdns_socket mdns_sock = MDNS_SOCKET_INIT; int stat = MDNS_STATUS_ERROR; DNS_RECORD *rr_list = NULL; + const char scanner_name[] = "_scanner._tcp.local"; DBG("mdns_probe_nw_scanners entry.\n"); /* Open UDP socket */ - if (mdns_open_socket(&udp_socket) != MDNS_STATUS_OK) + if (mdns_open_socket(&mdns_sock) != MDNS_STATUS_OK) goto bugout; /* Send dns query */ - mdns_send_query(udp_socket, "_scanner._tcp.local", QTYPE_PTR); + mdns_send_query(&mdns_sock, scanner_name, QTYPE_PTR); /* Read Responses */ - rr_list = mdns_read_responses(udp_socket, MODE_READ_ALL); + rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_ALL, scanner_name); /* Update URIs buffer */ bytes_read = mdns_update_uris(rr_list, uris_buf, buf_size, count); DBG("mdns_probe_nw_scanners returned with bytes_read = [%d].\n",bytes_read); bugout: - if (udp_socket >= 0) - close(udp_socket); + mdns_close_socket(&mdns_sock); mdns_rr_cleanup(rr_list); @@ -455,22 +586,22 @@ bugout: */ int mdns_lookup(char* hostname, unsigned char* ip) { - int udp_socket = 0; + struct mdns_socket mdns_sock = MDNS_SOCKET_INIT; int stat = MDNS_STATUS_ERROR; char fqdn[MAX_NAME_LENGTH] = {0}; DNS_RECORD *rr_list = NULL; DBG("mdns_probe_nw_scanners entry.\n"); /* Open UDP socket */ - if (mdns_open_socket(&udp_socket) != MDNS_STATUS_OK) + if (mdns_open_socket(&mdns_sock) != MDNS_STATUS_OK) goto bugout; /* Send dns query */ sprintf(fqdn, "%s.local", hostname); - mdns_send_query(udp_socket, fqdn, QTYPE_A); + mdns_send_query(&mdns_sock, fqdn, QTYPE_A); /* Read Responses */ - rr_list = mdns_read_responses(udp_socket, MODE_READ_SINGLE); + rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_SINGLE, fqdn); /* Update IP Address buffer */ if(rr_list) @@ -481,8 +612,7 @@ int mdns_lookup(char* hostname, unsigned char* ip) } bugout: - if (udp_socket >= 0) - close(udp_socket); + mdns_close_socket(&mdns_sock); mdns_rr_cleanup(rr_list); return stat; diff --git a/protocol/discovery/mdns.h b/protocol/discovery/mdns.h index 8fccc82..34066fb 100644 --- a/protocol/discovery/mdns.h +++ b/protocol/discovery/mdns.h @@ -86,19 +86,21 @@ typedef struct _DNS_PKT_HEADER int mdns_probe_nw_scanners(char* buf, int buf_size, int *count); int mdns_lookup(char* hostname, unsigned char* ip); +struct mdns_socket; /*Helper Function Prototypes*/ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name); static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvbufsize); -static int mdns_open_socket(int *psocket); -static int mdns_send_query(int udp_socket, char *fqdn, int query_type); +static int mdns_open_socket(struct mdns_socket *mdns_sock); +static void mdns_close_socket(struct mdns_socket *mdns_sock); +static int mdns_send_query(struct mdns_socket *mdns_sock, const char *fqdn, int query_type); static int mdns_readName(unsigned char* start, unsigned char *p, char *buf); static int mdns_update_uris(DNS_RECORD *rr, char* uris_buf, int buf_size, int *count); -static void mdns_create_query_packet(char* fqdn, int query_type, char* dnsquery, int *length); +static void mdns_create_query_packet(const char* fqdn, int query_type, char* dnsquery, int *length); static void mdns_read_header(char *Response, DNS_PKT_HEADER *h); -static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr); +static int mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr); static void mdns_rr_cleanup(DNS_RECORD *rr); -static DNS_RECORD *mdns_read_responses(int udp_socket, int mode); +static DNS_RECORD *mdns_read_responses(int udp_socket, int mode, const char *question); static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len); #endif // _DISCOVERY_MDNS_H

1 0

commit yast2-users for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2016-08-31 14:27:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2016-08-18 10:19:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2016-08-31 14:27:28.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 30 10:37:18 CEST 2016 - schubi(a)suse.de + +- AutoYaST: Checking users entries for duplicate username/UIDs. + (bnc#995397) +- 3.1.56 + +------------------------------------------------------------------- Old: ---- yast2-users-3.1.55.tar.bz2 New: ---- yast2-users-3.1.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.kVJbrV/_old 2016-08-31 14:27:29.000000000 +0200 +++ /var/tmp/diff_new_pack.kVJbrV/_new 2016-08-31 14:27:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.55 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.1.55.tar.bz2 -> yast2-users-3.1.56.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/CONTRIBUTING.md new/yast2-users-3.1.56/CONTRIBUTING.md --- old/yast2-users-3.1.55/CONTRIBUTING.md 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/CONTRIBUTING.md 2016-08-30 11:12:17.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/package/yast2-users.changes new/yast2-users-3.1.56/package/yast2-users.changes --- old/yast2-users-3.1.55/package/yast2-users.changes 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/package/yast2-users.changes 2016-08-30 11:12:17.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 30 10:37:18 CEST 2016 - schubi(a)suse.de + +- AutoYaST: Checking users entries for duplicate username/UIDs. + (bnc#995397) +- 3.1.56 + +------------------------------------------------------------------- Fri Aug 12 14:37:40 UTC 2016 - ancor(a)suse.com - The YaST client using the user creation dialog can now know diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/package/yast2-users.spec new/yast2-users-3.1.56/package/yast2-users.spec --- old/yast2-users-3.1.55/package/yast2-users.spec 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/package/yast2-users.spec 2016-08-30 11:12:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.55 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/src/clients/users_auto.rb new/yast2-users-3.1.56/src/clients/users_auto.rb --- old/yast2-users-3.1.55/src/clients/users_auto.rb 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/src/clients/users_auto.rb 2016-08-30 11:12:17.000000000 +0200 @@ -36,8 +36,12 @@ # This is a client for autoinstallation. It takes its arguments, # goes through the configuration and return the setting. # Does not do any changes to the configuration. + +Yast.import "Report" + module Yast class UsersAutoClient < Client + def main Yast.import "UI" textdomain "users" @@ -89,6 +93,7 @@ # param = $["users": users]; if @func == "Import" + check_users(@param["users"] || []) @ret = Users.Import(@param) # create a summary elsif @func == "Summary" @@ -156,6 +161,21 @@ deep_copy(@ret) end + + private + + # Checking double user entries + # (double username or UID) + # @param [Array] users to check + def check_users(users) + if users.size > users.uniq { |u| u["username"]}.size + Report.Error(_("Found users in profile with equal <username>.")) + end + if users.size > users.uniq { |u| u["uid"]}.size + Report.Error(_("Found users in profile with equal <uid>.")) + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/test/fixtures/users_error.yml new/yast2-users-3.1.56/test/fixtures/users_error.yml --- old/yast2-users-3.1.55/test/fixtures/users_error.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-3.1.56/test/fixtures/users_error.yml 2016-08-30 11:12:17.000000000 +0200 @@ -0,0 +1,23 @@ +users: + - username: root + user_password: yast.password + fullname: Superuser + encrypted: true + - username: yast + user_password: suse + fullname: YaST team user + gid: 100 + uid: 1000 + shell: /usr/bin/zsh + encrypted: true + - username: saprouter + user_password: suse + fullname: SAP User + gid: 100 + uid: 1000 + shell: /usr/bin/zsh + encrypted: true + - username: root + user_password: yast.password + fullname: Superuser + encrypted: true \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/test/test_helper.rb new/yast2-users-3.1.56/test/test_helper.rb --- old/yast2-users-3.1.55/test/test_helper.rb 2016-08-12 16:59:08.000000000 +0200 +++ new/yast2-users-3.1.56/test/test_helper.rb 2016-08-30 11:12:17.000000000 +0200 @@ -48,6 +48,9 @@ config.mock_with :rspec do |c| # https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partia… c.verify_partial_doubles = true + + config.extend Yast::I18n # available in context/describe + config.include Yast::I18n # available in it/let/before/... end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/test/users_auto_test.rb new/yast2-users-3.1.56/test/users_auto_test.rb --- old/yast2-users-3.1.55/test/users_auto_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-3.1.56/test/users_auto_test.rb 2016-08-30 11:12:17.000000000 +0200 @@ -0,0 +1,41 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" +require "yaml" +require_relative "../src/clients/users_auto" + +describe Yast::UsersAutoClient do + Yast.import "WFM" + Yast.import "Users" + Yast.import "Users" + Yast.import "Report" + + let(:mode) { "autoinstallation" } + + before do + allow(Yast::Mode).to receive(:mode).and_return(mode) + end + + describe "#AutoYaST" do + + context "Import" do + let(:func) { "Import" } + + context "when double users have been given in the profile" do + let(:users) { YAML.load_file(FIXTURES_PATH.join("users_error.yml")) } + + before do + allow(Yast::WFM).to receive(:Args).with(no_args).and_return([func,users]) + allow(Yast::WFM).to receive(:Args).with(0).and_return(func) + allow(Yast::WFM).to receive(:Args).with(1).and_return(users) + end + + it "report error" do + expect(Yast::Report).to receive(:Error).with(_("Found users in profile with equal <username>.")) + expect(Yast::Report).to receive(:Error).with(_("Found users in profile with equal <uid>.")) + expect(subject.main).to eq(true) + end + end + end + end +end

1 0

commit syncthing-gtk for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package syncthing-gtk for openSUSE:Factory checked in at 2016-08-31 00:11:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syncthing-gtk (Old) and /work/SRC/openSUSE:Factory/.syncthing-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syncthing-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/syncthing-gtk/syncthing-gtk.changes 2016-07-27 16:12:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.syncthing-gtk.new/syncthing-gtk.changes 2016-08-31 00:12:27.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Aug 30 13:16:24 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 0.9.2.1 (changes since 0.9.1): + * Add black and white icons theme, selectable in UI settings. + * New directory ID is pre-filled with auto-generated ID. + * Add a man page. + * Add Spanish translation. + * Fix error message about incompatible nodes being repeated + infinitely. + * Fix File Pull Order defaulting to nothing. + * Fix "Override remote changes" option not doing anything. + * 'tcp://' is prepended to dynamic address in directory editor. + * Add more error details when '404/Not Found' error is generated. + +------------------------------------------------------------------- Old: ---- syncthing-gtk-0.9.1.tar.gz New: ---- syncthing-gtk-0.9.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syncthing-gtk.spec ++++++ --- /var/tmp/diff_new_pack.AJzR15/_old 2016-08-31 00:12:28.000000000 +0200 +++ /var/tmp/diff_new_pack.AJzR15/_new 2016-08-31 00:12:28.000000000 +0200 @@ -19,7 +19,7 @@ %global __requires_exclude typelib\$(Caja|Nautilus|Nemo)\$ %define _name syncthing_gtk Name: syncthing-gtk -Version: 0.9.1 +Version: 0.9.2.1 Release: 0 Summary: Syncthing Gtk-based graphical interface License: GPL-2.0+ @@ -119,9 +119,10 @@ %{python_sitelib}/%{_name}-* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}*.png -%{_datadir}/icons/hicolor/*/apps/si-*.png %{_datadir}/icons/hicolor/*/emblems/emblem-*.png +%{_datadir}/icons/hicolor/*/status/si-*.png %{_datadir}/pixmaps/*.png +%{_mandir}/man1/%{name}.1%{?ext_man} %files lang -f %{name}.lang %defattr(-,root,root) ++++++ syncthing-gtk-0.9.1.tar.gz -> syncthing-gtk-0.9.2.1.tar.gz ++++++ ++++ 5483 lines of diff (skipped)

1 0

commit kalzium for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kalzium for openSUSE:Factory checked in at 2016-08-31 00:11:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalzium (Old) and /work/SRC/openSUSE:Factory/.kalzium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kalzium" Changes: -------- --- /work/SRC/openSUSE:Factory/kalzium/kalzium.changes 2016-07-24 19:44:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kalzium.new/kalzium.changes 2016-08-31 00:12:25.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Aug 30 10:29:24 UTC 2016 - fabian(a)ritter-vogt.de + +- Remove unnecessary Requires: libkdeedu4-devel + +------------------------------------------------------------------- +Fri Aug 12 10:08:34 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:45:28 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kalzium-16.04.3.tar.xz New: ---- kalzium-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalzium.spec ++++++ --- /var/tmp/diff_new_pack.NWLeAX/_old 2016-08-31 00:12:26.000000000 +0200 +++ /var/tmp/diff_new_pack.NWLeAX/_new 2016-08-31 00:12:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: kalzium -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Periodic Table of Elements License: GPL-2.0+ @@ -32,7 +32,6 @@ BuildRequires: glew-devel BuildRequires: libeigen2-devel BuildRequires: libkde4-devel -BuildRequires: libkdeedu4-devel BuildRequires: libopenbabel-devel BuildRequires: python-devel BuildRequires: xz @@ -54,7 +53,6 @@ Summary: Periodic Table of Elements Group: Development/Libraries/KDE Requires: kalzium = %{version} -Requires: libkdeedu4-devel %description devel Kalzium shows a periodic table of the elements. ++++++ kalzium-16.04.3.tar.xz -> kalzium-16.08.0.tar.xz ++++++

1 0

commit gnu_parallel for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2016-08-31 00:11:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2016-08-09 22:15:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/gnu_parallel.changes 2016-08-31 00:12:23.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Aug 30 08:47:57 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 20160822 +* --tmuxpane opens jobs in panes in tmux. Useful if you want to + monitor progress of less than 100 simultaneous jobs. +* --linebuffer now treats \r as line ending, too. +* Perl changes forces use of floats to be given with leading + zero, so 0.1 and not .1 +* --xapply renamed to --link. + +------------------------------------------------------------------- Old: ---- parallel-20160722.tar.bz2 parallel-20160722.tar.bz2.sig New: ---- parallel-20160822.tar.bz2 parallel-20160822.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.0mphDh/_old 2016-08-31 00:12:24.000000000 +0200 +++ /var/tmp/diff_new_pack.0mphDh/_new 2016-08-31 00:12:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20160722 +Version: 20160822 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0+ ++++++ parallel-20160722.tar.bz2 -> parallel-20160822.tar.bz2 ++++++ ++++ 5877 lines of diff (skipped) ++++++ parallel-20160722.tar.bz2.sig -> parallel-20160822.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20160722.tar.bz2.sig 2016-08-09 22:15:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/parallel-20160822.tar.bz2.sig 2016-08-31 00:12:23.000000000 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160722.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160822.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -11,32 +11,32 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQTwBAABCgAGBQJXkpsYAAoJENGrRRaIiIiIU+AmoKgD9iN69S1RCcqteYyPGU9X -As5yKuaLZSeuJVA9BaGoE+XOsMfzqVGSjeimh4CGYs/FoE6rnoXb0XOL1Rsv1anM -ueR0ZwfCSoGC9CTPCiUjjswba2qgav/UqCs8dmczs0hRTNOs3TX4IYfslc6x7dFI -G0VcxD9ZbCdNcJ2C1s1bAfgbWchrM38zEsMcbaeLzA5av6i+gumUNsE30o/j2bKx -Hof7spYB1HrUVazhzjENorhHSD3TiJbOYAiaVOHXN4wDyL6PqzhSjMSMiKiRTAJ9 -eQojArkU5hn9mPrQYgKZLRm0M2G67hnqYShDtlT4HHdfpiLyz+t1etJDEmoUwcTp -32vvuDOmvwehRDN+8Z9Tdzhd9cQkw7di+kBWEV3HunhfW/P49lSeX56Z+1K8tOGM -jPO9izcuR8qj+eIDz9N6C6IY0u8/l3BVMxJHBuk8oRd7t4Zp3xVTS/PI6VrsZCdk -r4NcU6C4rNYEmn1KadHG2BlnjemGRcI3fmgUUfgzY+tHj8XQuj4RmAel1qbfCUIt -AbalMJbC84k0j1atjCRha0ivktbb5lWXQ2Ie1oc8AhUHpK120WwWB46ti8Wsd8IC -ZhDkrHrQ6ajxEe0TFtQKn9G0WuZkwVnQ7YNikbFocBwa3N/pulBDokVKIpJVCIew -Gyw3RXMD+VehFjiggHXztJerx5v5HOt/botPK4XuKK0ZEieQxcd6fGm4L6r7hpsc -2lY6KDUbyBDyz7V/C7nM8e0O/++sIo3FvdDaja4Pm0s+fyivfAeh7bDP0D9Cef/8 -UpDtrC7HGh9NSZJ3siN2oJ1jVN9wLbVcl2G92zts78FshgkyA0tVbLDa3sd0SAPq -DePy05U9a8YB2AhvNbItkrd/RYtGeEEHAGyt//5tcuEOHTbULbUbUR+bo89unmq5 -gEOvVJLPJ7/4aSN+jUFr2Z1zfgObcnRRtPVTcT99n0dxkSnFBScCQ8A/DyEA87hP -7mjpAMAIJgiKIHhCFgd6tybYwLwIJ1obC0d+U/UxBx8mMlHVsjPfAU0UgjQHN2OF -5YJVNHtXARBUbn9g5yHGCCnFUhHDpJmCfZ/wx8uBRkeEinOt3JDnzEimPkvVQcJ7 -FM1Y7dnVQPb37fAW8zkS9pNzOlBX8trqyWxdQn2zyKqmPXEsT9dRCyUIZeUxq5oN -BYUvlaCl8Jw+94Qtogk5HQazEgjZzOTqx8xBLKwm4UN1uGMtCRpVoAWHNa2bCdtH -Id2WqNjUabJSsqmLDg/+hhPg2dGrDlNGhwQYY3ZrTNIgsS0CAxrBBOHVpGjQ7ntO -OTft6Bl1CoI8HULcwyMLtqz+en29N5zY/QtwBd50svtX1lhs21SJRMAqWkLDYgtt -nkNRPVNvf5HwcrO8bbX4k+sDGpGgdJnUEEYdhhrwpdpWhYq1x0ORW6b83DvDLgH9 -+XXh9BtCJz8fsWE3/z7OsdrdMtO62GOJ6nmZN5ZAyBs5jjGINzlg2uEuoaoAWyVC -kHrxTG/+1NqOJswp7hY6I0DecQ2mmLfCuhiWHEOVzWBq24hgsd312BZvGIMABc4u -RB6cVlqFCYMS/xcsydDTmGc+kVM3ZwTiQIVn9WgewOt2BOu33I3C+2O/ZFmH6vq/ -DjUvPohRYkJ63nYH35HndvF4eg== -=822U +iQTwBAABCgAGBQJXugw/AAoJENGrRRaIiIiItdMmn2Vnnv8djUdw75c0sbbfuS6d +znF03fepp+tlDcalbvG77kMhWebxP0413WE9drIg7Q+JDa8/DqmhQ7e1AUbnqJO4 +P0QbAATR8Bz8AlqXv3wdJf6ly71g9S5cmvOb1d8Ou0RMgnoQbPWXipZel6mr/QFn +jOk9Ze/bDCcy/wcoMkd4RXlJnPJei1oR+uhv4lzls8Vz8iWg2Kem/cj8M0K0Lame +XEU7bebr9MhhtVx/kQqlYW37Cw9uIl50r/PCWpmaz8fCrBBK/AIcU2M1ITpck55W +/sbRzLcUX6E74jexDXWtH7AKcdMl4NbSfigJv2iiemZiSAx1t9AEG98fplk9F/7A +6xyn1Tv3mOzNfAw84JOqvhzoyo/4d7A6uzVq6AyzD6vO/ZfW6mUVnRA7m/2CIDnM +uhnlnw3pMT5Nezyt1lnGAnbZMpwoWnLnMEMhM6/A+q9gNMpUEpDjCYHQTerKKUXv +M6fY6QVT4xZu76rPP0K4O+kJqP2LGHR7GM7UDgrIJS4OAWEFlGPg2TLAvDGQRoo8 +tgQqemqe+PGkZGAKreG8CL7LfcStF/4srua1HsiEdIkqQsAQG2CVHNa2BiAtsoAR +OaEyAweF2ZQ/Qur4PMdKAiTXYe9issyPbqCDAaqmcFnXcly0UFC0iOsHnK6fho3h +dsymX4pO4WGbujlyCsHm1bHgXhBfpTu2eHcH7zZEoTdNbaHzhw1TnqPCrTL5AVyw +dEdPnZXVFKWIg5cm7e1/r5pJUuRkZpfNO0n2mGs1qujfYz0fzipRnpcEMUJmcyle +RiKUOYXhishZSzHiFEy3BcYbgY/OCjaIR4ZGSecgsZa/Ew+nsq+rm1cZB3fqqMAf +bFu15Zneixr6L3vCAAn7P1EM39FOhKAav2qW+LRA1jGyfLfika+Ejqq6piWnpdBT +w/H4optQ+zwEGLp2Sfc8oYO0n0LQmfoJXw2QfzIjOSmk9tKKr/L4yS8Ar9jdxbqc +DMsxH8ieaWNVpNSUfQlxXzfNYMMWf+zjlcOP2XgwyU0mBhR0vNr7AmPRywyGaA5I +gVfPJCqvU3nLPIPPMk8aFatX3XffSrS63DnT649NPAGyrbezcJbTd1s2ms8layGz +vLY0I+B+HBZSt4xawyR+ZDx2muJzZT8NWlm6YYec3VR9qMJbhvVyKewpjm7+Fb7r +ybLompreQT4DEwduiL8K0EXOgayDokQ9wmRvrJQ1Ny0JrCBXAEt+k/jz0Czthqts +yXIStpiE/hJhdUyL+SRvTpWVlsp2lcfKV9GHsBA7nJtt5Vf6UIzj9eqjwP8LMBin +390mt8uUZaApINjNys5zq1CiXAYv7hMeJoLWSnHwQkURaVl+iAqtPg5HpdavxXP5 +Q2QIl5VR9onIoj+pwyj/LraB796CKq39nSWSegYuGp/4jZPwDMntHI3e/GkAJ/eI +mG25NCHz6o2uBaJDkx+sGys69T6+140X5QhxbnsgHjsaQG1puHsbgGz7H1MZU1c8 +Ynb02mqs0ab8/AyfaUEpxQzgiwoXdxpocIIdpFdlgVKIh8HeAJ3CUq08GW2izNCc +eoQNs8kzmTRAvPzIITHbz2LRq5LoGp1mGME5vPDKluvMYl2bjjbw6xIs0mEfuNOT +XOW7Y+aFvzb2UdY9KM3eUYhEcw== +=2slJ -----END PGP SIGNATURE-----

1 0

commit kde-print-manager for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kde-print-manager for openSUSE:Factory checked in at 2016-08-31 00:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-print-manager (Old) and /work/SRC/openSUSE:Factory/.kde-print-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde-print-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-print-manager/kde-print-manager.changes 2016-07-24 19:45:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde-print-manager.new/kde-print-manager.changes 2016-08-31 00:12:22.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Aug 30 08:56:28 UTC 2016 - wbauer(a)tmo.at + +- Adjust filelist for the plasmoid appdata, installed with KF >= 5.25.0 + +------------------------------------------------------------------- +Fri Aug 12 10:12:57 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:51:32 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- print-manager-16.04.3.tar.xz New: ---- print-manager-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-print-manager.spec ++++++ --- /var/tmp/diff_new_pack.2T4VtP/_old 2016-08-31 00:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.2T4VtP/_new 2016-08-31 00:12:23.000000000 +0200 @@ -21,7 +21,7 @@ Summary: A new print manager for KDE License: GPL-2.0+ Group: System/GUI/KDE -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source: print-manager-%{version}.tar.xz BuildRequires: cups @@ -107,5 +107,6 @@ %{_kf5_applicationsdir}/org.kde.PrintQueue.desktop %{_kf5_qmldir}/org/kde/plasma/printmanager/ %{_kf5_notifydir}/printmanager.notifyrc +%{_kf5_appstreamdir}/org.kde.plasma.printmanager.appdata.xml %changelog ++++++ print-manager-16.04.3.tar.xz -> print-manager-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/CMakeLists.txt new/print-manager-16.08.0/CMakeLists.txt --- old/print-manager-16.04.3/CMakeLists.txt 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/CMakeLists.txt 2016-06-25 11:57:29.000000000 +0200 @@ -35,7 +35,9 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + +remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) # Generate config.h configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseSamba.cpp new/print-manager-16.08.0/add-printer/ChooseSamba.cpp --- old/print-manager-16.04.3/add-printer/ChooseSamba.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseSamba.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -60,19 +60,19 @@ QString address = ui->addressLE->text().trimmed(); QUrl url; if (address.startsWith(QLatin1String("//"))) { - url = QLatin1String("smb:") % address; + url = QUrl(QLatin1String("smb:") % address); } else if (address.startsWith(QLatin1String("/"))) { - url = QLatin1String("smb:/") % address; + url = QUrl(QLatin1String("smb:/") % address); } else if (address.startsWith(QLatin1String("://"))) { - url = QLatin1String("smb") % address; + url = QUrl(QLatin1String("smb") % address); } else if (address.startsWith(QLatin1String("smb://"))) { - url = address; + url = QUrl(address); } else if (!QUrl::fromUserInput(address).scheme().isEmpty() && QUrl::fromUserInput(address).scheme() != QStringLiteral("smb")) { url = QUrl::fromUserInput(address); url.setScheme(QStringLiteral("smb")); } else { - url = QStringLiteral("smb://") % address; + url = QUrl(QStringLiteral("smb://") % address); } qDebug() << 1 << url; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseSocket.cpp new/print-manager-16.08.0/add-printer/ChooseSocket.cpp --- old/print-manager-16.04.3/add-printer/ChooseSocket.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseSocket.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -53,7 +53,7 @@ ui->addressLE->clear(); ui->portISB->setValue(9100); QString deviceUri = args[KCUPS_DEVICE_URI].toString(); - QUrl url = deviceUri; + QUrl url(deviceUri); if (url.scheme() == QStringLiteral("socket")) { ui->addressLE->setText(url.host()); ui->portISB->setValue(url.port(9100)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseUri.cpp new/print-manager-16.08.0/add-printer/ChooseUri.cpp --- old/print-manager-16.04.3/add-printer/ChooseUri.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseUri.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -51,7 +51,7 @@ { m_args = args; bool visible = false; - QUrl url = args[KCUPS_DEVICE_URI].toString(); + QUrl url(args[KCUPS_DEVICE_URI].toString()); if (url.url() == QLatin1String("other")) { ui->addressLE->clear(); visible = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/PageChoosePPD.cpp new/print-manager-16.08.0/add-printer/PageChoosePPD.cpp --- old/print-manager-16.04.3/add-printer/PageChoosePPD.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/PageChoosePPD.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -93,7 +93,7 @@ } qDebug() << deviceURI << url; KJob *job = KIO::file_copy(url, - tempFile->fileName(), + QUrl::fromLocalFile(tempFile->fileName()), -1, KIO::Overwrite | KIO::HideProgressInfo); job->setProperty("URI", deviceURI); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/PageDestinations.cpp new/print-manager-16.08.0/add-printer/PageDestinations.cpp --- old/print-manager-16.04.3/add-printer/PageDestinations.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/PageDestinations.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -301,7 +301,7 @@ } else { QVariant aux = ui->connectionsCB->itemData(ui->connectionsCB->currentIndex()); KCupsPrinter printer = aux.value<KCupsPrinter>(); - QUrl url = uri.toString(); + QUrl url(uri.toString()); url.setPath(QLatin1String("printers/") % printer.name()); ret[KCUPS_DEVICE_URI] = url.url(); ret[KCUPS_DEVICE_ID] = index.data(DevicesModel::DeviceId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/configure-printer/PrinterOptions.cpp new/print-manager-16.08.0/configure-printer/PrinterOptions.cpp --- old/print-manager-16.04.3/configure-printer/PrinterOptions.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/configure-printer/PrinterOptions.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -78,7 +78,7 @@ void PrinterOptions::reloadPPD() { // The caller "owns" the file that is created and must unlink the returned filename. - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { unlink(m_filename.toUtf8()); } @@ -393,7 +393,7 @@ ppdClose(m_ppd); } - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { unlink(m_filename.toUtf8()); } @@ -706,7 +706,7 @@ *keyptr; /* Pointer into keyword... */ // copy cups-1.4.2/cgi-bin line 3779 - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { out = cupsTempFile2(tempfile, sizeof(tempfile)); in = cupsFileOpen(m_filename.toUtf8(), "r"); @@ -764,6 +764,12 @@ cupsFileClose(in); cupsFileClose(out); } + else { + // TODO add a KMessageBox::error + qCWarning(PM_CONFIGURE_PRINTER) << "No printer PPD file set, can't save options."; + + return; + } QVariantHash values; // we need null values QPointer<KCupsRequest> request = new KCupsRequest;

1 0

commit neovim for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package neovim for openSUSE:Factory checked in at 2016-08-31 00:11:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/neovim (Old) and /work/SRC/openSUSE:Factory/.neovim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "neovim" Changes: -------- --- /work/SRC/openSUSE:Factory/neovim/neovim.changes 2016-05-10 09:27:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.neovim.new/neovim.changes 2016-08-31 00:12:20.000000000 +0200 @@ -1,0 +2,55 @@ +Mon Aug 29 22:45:13 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 0.1.5: + * Breaking changes: + + 'termguicolors' option enables "true color". + NVIM_TUI_ENABLE_TRUE_COLOR is now ignored. + + Remove ":oldfiles!", replaced by Vim's ":browse oldfiles". + * Features: + + Full :ruby support! + + timers: timer_start(), timer_stop(). + + :CheckHealth command. + + file: Add buffered reading and writing. + Much faster shada file reading (important for startup time). + + jobstart() learned 'rpc': + - jobs and RPC channel IDs share the same "namespace". + - jobstart() can start RPC channels, which allows scripts to + handle 'stderr' on a RPC channel, like a typical non-RPC + job. + - jobpid()/jobstop() works on RPC jobs. + - Deprecates rpcstart(). + + man.vim rewrite: + - :Man command is enabled by default. + - New features: completion, window handling, better parsing, + and more. + + capture() function (renamed to execute()) + - Supports nesting, including nested :redir. + + rplugin manifest: default to XDG dir. + + Better handling of mouse-clicks on concealed chars. + + terminal: Ensure b:term_title always has a value. + + tui: Assume 256 colours in most cases. + + Always resize the :terminal. + + api_info(). + + allow setting cwd in jobstart(), termopen(). + + support "special" highlight (undercurl). + + mouse: Implement horizontal scroll. + * Fixes: + + Prevent data loss for process output streams. + + 'process.c: Fix block in teardown'. + + Prevent endless loop in printdigraph() (gh#neovim/neovim#5215). + + timers: Avoid crash after processing events. + + Set the default value for 'packpath'. + + Restore double click. + + readfile(): Less-disruptive readonly check. + Fixes an issue where nvim unnecessarily "touched" open files. + + Handle very long $XDG_DATA_DIRS. + + option: Do not expand options in XDG vars. + + server_init: Handle server_address_new() failure. + + Fix v:register for clipboard=unnamed,unnamedplus. + + 'Trigger TabNewEntered with T'. + + synIDattr(): Return RRGGBB value for fg#. +- Correct group: Productivity/Text/Editors. +- Separate locales into neovim-lang. +- Some spec cleanup. + +------------------------------------------------------------------- @@ -132 +186,0 @@ - Old: ---- neovim-0.1.4.tar.gz New: ---- neovim-0.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ neovim.spec ++++++ --- /var/tmp/diff_new_pack.uzLTnj/_old 2016-08-31 00:12:21.000000000 +0200 +++ /var/tmp/diff_new_pack.uzLTnj/_new 2016-08-31 00:12:21.000000000 +0200 @@ -17,80 +17,80 @@ Name: neovim -Version: 0.1.4 +Version: 0.1.5 Release: 0 Summary: Vim-fork focused on extensibility and agility License: Apache-2.0 -Group: Productivity/Editors/Vi +Group: Productivity/Text/Editors Url: https://neovim.io/ Source: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar… -Source1: neovim.svg -Source2: neovim.desktop +Source1: neovim.desktop +Source2: neovim.svg BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libmsgpack-devel >= 1.2.0 BuildRequires: libmsgpackc-devel >= 1.2.0 -BuildRequires: libuv-devel BuildRequires: lua51-BitOp BuildRequires: lua51-LPeg BuildRequires: lua51-mpack BuildRequires: luajit-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(jemalloc) +BuildRequires: pkgconfig(libuv) BuildRequires: pkgconfig(termkey) BuildRequires: pkgconfig(unibilium) BuildRequires: pkgconfig(vterm) +Recommends: %{name}-lang Recommends: python-neovim Recommends: python3-neovim Recommends: xsel %description -Neovim is a refactor - and sometimes redactor - in the tradition of Vim, which -itself derives from Stevie. It is not a rewrite, but a continuation and -extension of Vim. Many rewrites, clones, emulators and imitators exist; some are -very clever, but none are Vim. Neovim strives to be a superset of Vim, -notwithstanding some intentionally removed misfeatures; excepting those few and -carefully-considered excisions, Neovim is Vim. It is built for users who want -the good parts of Vim, without compromise, and more. +Neovim is a refactor - and sometimes redactor - in the tradition of +Vim, which itself derives from Stevie. It is not a rewrite, but a +continuation and extension of Vim. Many rewrites, clones, emulators +and imitators exist; some are very clever, but none are Vim. Neovim +strives to be a superset of Vim, notwithstanding some intentionally +removed misfeatures; excepting those few and carefully-considered +excisions, Neovim is Vim. It is built for users who want the good +parts of Vim, without compromise, and more. + +%lang_package %prep %setup -q +cp -f %{SOURCE1} neovim.desktop +cp -f %{SOURCE2} neovim.svg -# Remove __DATE__ and __TIME__ -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" -DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" -TIME="\"$(date -d "${modified}" "+%%R")\"" -find . -name '*.[ch]' | xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" +# Remove __DATE__ and __TIME__. +BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}') +BUILD_DATE=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{b} %{d} %{Y}') +sed -i "s/__TIME__/\"$BUILD_TIME\"/" $(grep -rl '__TIME__') +sed -i "s/__DATE__/\"$BUILD_DATE\"/" $(grep -rl '__DATE__') %build -%cmake -DLUA_PRG=%{_bindir}/lua \ +%cmake \ + -DLUA_PRG=%{_bindir}/lua \ -DUSE_BUNDLED=OFF \ -DLUAJIT_USE_BUNDLED=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DENABLE_JEMALLOC=ON - make %{?_smp_mflags} %install -pushd build -make %{?_smp_mflags} DESTDIR=%{buildroot} install -popd - -# Install icon. -install -D -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%cmake_install # Install desktop file. -install -D -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.desktop +install -Dpm 0644 neovim.desktop %{buildroot}/%{_datadir}/applications/neovim.desktop -# Create hardlinks for duplicate files. -%fdupes %{buildroot}%{_datadir}/nvim/runtime/ftplugin/ +# Install the icon. +install -Dpm 0644 neovim.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/neovim.svg %suse_update_desktop_file -r neovim ConsoleOnly Application Utility TextEditor +%fdupes %{buildroot}%{_datadir}/ %find_lang nvim %post @@ -101,13 +101,16 @@ %desktop_database_postun %icon_theme_cache_postun -%files -f nvim.lang +%files %defattr(-,root,root) %doc BACKERS.md CONTRIBUTING.md LICENSE README.md %{_bindir}/nvim -%{_datadir}/applications/%{name}.desktop %{_datadir}/nvim/ -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_mandir}/man1/nvim.1%{ext_man} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.svg +%{_mandir}/man1/nvim.1%{?ext_man} + +%files lang -f nvim.lang +%defattr(-,root,root) %changelog ++++++ neovim-0.1.4.tar.gz -> neovim-0.1.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/neovim/neovim-0.1.4.tar.gz /work/SRC/openSUSE:Factory/.neovim.new/neovim-0.1.5.tar.gz differ: char 12, line 1

1 0