May 2015 - openSUSE Commits - openSUSE Mailing Lists

commit phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2015-05-29 10:46:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2015-05-16 19:01:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2015-05-29 10:46:15.000000000 +0200 @@ -1,0 +2,19 @@ +Thu May 28 16:13:56 UTC 2015 - ecsos(a)opensuse.org + +- update to 4.4.8 (2015-05-28) + - fix bug Allow accessing visual query builder when pmadb is not + configured + - sf#4893 Nav tree line alignment issue + - sf#4911 Lock page icon is not shown after fresh reload + - sf#4912 "Highlight pointer" and "Row marker" doesn't work + properly + - fix bug Browse foreigners window goes out of the window + - sf#4918 Date field popup dialog position bug + - fix bug In /setup, PMA_messages is not defined + - sf#4924 Recaptcha failure + - sf#4930 Database copy doesn't work for tables with more than + one FULLTEXT index + - sf#4929 Edit view structure doesn't load the algorithm + - sf#4923 Do not limit table comments to 60 characters + +------------------------------------------------------------------- Old: ---- phpMyAdmin-4.4.7-all-languages.tar.bz2 New: ---- phpMyAdmin-4.4.8-all-languages.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.3L1TFu/_old 2015-05-29 10:46:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3L1TFu/_new 2015-05-29 10:46:16.000000000 +0200 @@ -34,7 +34,7 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 4.4.7 +Version: 4.4.8 Release: 0 Url: http://www.phpMyAdmin.net Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-lan… ++++++ phpMyAdmin-4.4.7-all-languages.tar.bz2 -> phpMyAdmin-4.4.8-all-languages.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.4.7-all-languages.tar.bz2 /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.4.8-all-languages.tar.bz2 differ: char 11, line 1

1 0

commit virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2015-05-29 10:45:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2015-05-06 07:49:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2015-05-29 10:45:59.000000000 +0200 @@ -1,0 +2,26 @@ +Wed May 20 13:14:27 MDT 2015 - carnold(a)suse.com + +- Upstream bug fixes + 776c1d97-fix-changing-USB-device-model.patch + bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch + f8af2e6b-verify-HYPER-V-support-after-customization.patch + +------------------------------------------------------------------- +Fri May 15 13:10:49 MDT 2015 - carnold(a)suse.com + +- Upstream bug fixes + fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch + 2c1e482b-fix--show-host-summary-error-windows-flooding.patch + 4b5c836a-read-start-mode-from-inactive-conf-XML.patch + +------------------------------------------------------------------- +Fri May 8 11:08:49 MDT 2015 - carnold(a)suse.com + +- Upstream bug fixes + 848123e6-fix-memory-stats-for-shutoff-VM.patch + ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch + c4d26d16-fix-VM-polling-on-old-libvirt.patch + ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch + 88e18c86-fix-sending-net-removed-signal.patch + +------------------------------------------------------------------- New: ---- 2c1e482b-fix--show-host-summary-error-windows-flooding.patch 4b5c836a-read-start-mode-from-inactive-conf-XML.patch 776c1d97-fix-changing-USB-device-model.patch 848123e6-fix-memory-stats-for-shutoff-VM.patch 88e18c86-fix-sending-net-removed-signal.patch ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch c4d26d16-fix-VM-polling-on-old-libvirt.patch ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch f8af2e6b-verify-HYPER-V-support-after-customization.patch fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.bxUFPO/_old 2015-05-29 10:46:01.000000000 +0200 +++ /var/tmp/diff_new_pack.bxUFPO/_new 2015-05-29 10:46:01.000000000 +0200 @@ -37,6 +37,17 @@ Source1: virt-install.rb Source2: virt-install.desktop # Upstream Patches +Patch1: 848123e6-fix-memory-stats-for-shutoff-VM.patch +Patch2: ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch +Patch3: c4d26d16-fix-VM-polling-on-old-libvirt.patch +Patch4: ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch +Patch5: 88e18c86-fix-sending-net-removed-signal.patch +Patch6: fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch +Patch7: 2c1e482b-fix--show-host-summary-error-windows-flooding.patch +Patch8: 4b5c836a-read-start-mode-from-inactive-conf-XML.patch +Patch9: 776c1d97-fix-changing-USB-device-model.patch +Patch10: bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch +Patch11: f8af2e6b-verify-HYPER-V-support-after-customization.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -155,6 +166,17 @@ %prep %setup -q # Upstream Patches +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 ++++++ 2c1e482b-fix--show-host-summary-error-windows-flooding.patch ++++++ Subject: virt-manager: fix --show-host-summary error windows flooding From: Giuseppe Scrivano gscrivan(a)redhat.com Mon May 11 15:05:57 2015 +0200 Date: Mon May 11 20:20:10 2015 +0200: Git: 2c1e482b2df58e76624cb30625ce4bed0c663275 Break an endless loop vmmHost.overview_name_changed -> vmmHost.conn_state_changed -> vmmHost._overview_name_changed. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1220322 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> Index: virt-manager-1.2.0/virtManager/connection.py =================================================================== --- virt-manager-1.2.0.orig/virtManager/connection.py +++ virt-manager-1.2.0/virtManager/connection.py @@ -1346,7 +1346,8 @@ class vmmConnection(vmmGObject): self.config.set_conn_autoconnect(self.get_uri(), val) def set_config_pretty_name(self, value): - self.config.set_perconn(self.get_uri(), "/pretty-name", value) + if value != self._get_config_pretty_name(): + self.config.set_perconn(self.get_uri(), "/pretty-name", value) def _get_config_pretty_name(self): return self.config.get_perconn(self.get_uri(), "/pretty-name") def _on_config_pretty_name_changed(self, *args, **kwargs): ++++++ 4b5c836a-read-start-mode-from-inactive-conf-XML.patch ++++++ Subject: interface: read the start mode from the inactive conf XML From: Giuseppe Scrivano gscrivan(a)redhat.com Thu May 14 16:27:55 2015 +0200 Date: Fri May 15 09:14:09 2015 +0200: Git: 4b5c836a16da18e58e013a0fa6c3ca4caba00b94 Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1154480 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> diff --git a/virtManager/interface.py b/virtManager/interface.py index bd1e2ba..dc6f4da 100644 --- a/virtManager/interface.py +++ b/virtManager/interface.py @@ -101,7 +101,7 @@ class vmmInterface(vmmLibvirtObject): return "Interface" def get_startmode(self): - return self.get_xmlobj().start_mode or "none" + return self.get_xmlobj(inactive=True).start_mode or "none" def set_startmode(self, newmode): xmlobj = self._make_xmlobj_to_define() ++++++ 776c1d97-fix-changing-USB-device-model.patch ++++++ Subject: domain: Fix changing USB device model From: Cole Robinson crobinso(a)redhat.com Tue May 19 13:21:36 2015 -0400 Date: Tue May 19 18:29:45 2015 -0400: Git: 776c1d97c667628b03ad79d4e89457675f475dfb Broken before v1.2.0 Index: virt-manager-1.2.0/virtManager/domain.py =================================================================== --- virt-manager-1.2.0.orig/virtManager/domain.py +++ virt-manager-1.2.0/virtManager/domain.py @@ -953,23 +953,22 @@ class vmmDomain(vmmLibvirtObject): def _change_model(): if editdev.type == "usb": - guest = self._make_xmlobj_to_define() - ctrls = guest.get_devices("controller") + ctrls = xmlobj.get_devices("controller") ctrls = [x for x in ctrls if (x.type == VirtualController.TYPE_USB)] for dev in ctrls: - guest.remove_device(dev) + xmlobj.remove_device(dev) if model == "ich9-ehci1": for dev in VirtualController.get_usb2_controllers( - guest.conn): - guest.add_device(dev) + xmlobj.conn): + xmlobj.add_device(dev) else: - dev = VirtualController(guest.conn) + dev = VirtualController(xmlobj.conn) dev.type = "usb" if model != "default": dev.model = model - guest.add_device(dev) + xmlobj.add_device(dev) elif editdev.type == "scsi": if model == "default": ++++++ 848123e6-fix-memory-stats-for-shutoff-VM.patch ++++++ Subject: domain: Fix memory stats for shutoff VM (bz 1215453) From: Cole Robinson crobinso(a)redhat.com Mon May 4 15:50:01 2015 -0400 Date: Mon May 4 15:50:01 2015 -0400: Git: 848123e6c8850bafad28767a165bbbf8dc746a09 memory doesn't have a separate input/output stats, so we shouldn't use the in_out_vector_helper. This resulted in shutoff VMs appearing to still use memory in the manager window. diff --git a/virtManager/domain.py b/virtManager/domain.py index cdb8cd5..e96b80f 100644 --- a/virtManager/domain.py +++ b/virtManager/domain.py @@ -1699,8 +1699,10 @@ class vmmDomain(vmmLibvirtObject): cpudata = cpudata[0:limit] return cpudata def memory_usage_vector_limit(self, limit): - return self.in_out_vector_limit(self.stats_memory_vector(), - limit) + data = self.stats_memory_vector() + if len(data) > limit: + data = data[0:limit] + return data def network_traffic_vector_limit(self, limit, ceil=None): return self.in_out_vector_limit(self.network_traffic_vector(ceil), limit) ++++++ 88e18c86-fix-sending-net-removed-signal.patch ++++++ Subject: connection: Fix sending net-removed signal From: Cole Robinson crobinso(a)redhat.com Thu May 7 12:30:28 2015 -0400 Date: Thu May 7 12:30:28 2015 -0400: Git: 88e18c86d36406b3dab032b2bb21b46767871b4b Index: virt-manager-1.2.0/virtManager/connection.py =================================================================== --- virt-manager-1.2.0.orig/virtManager/connection.py +++ virt-manager-1.2.0/virtManager/connection.py @@ -961,13 +961,17 @@ class vmmConnection(vmmGObject): for obj in gone_objects: class_name = obj.class_name() + try: + name = obj.get_name() + except: + name = str(obj) if not self._objects.remove(obj): logging.debug("Requested removal of %s=%s, but it's " - "not in our object list.", class_name, obj.get_name()) + "not in our object list.", class_name, name) continue - logging.debug("%s=%s removed", class_name, obj.get_name()) + logging.debug("%s=%s removed", class_name, name) if class_name == "domain": self.emit("vm-removed", obj.get_connkey()) elif class_name == "network": ++++++ ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch ++++++ Subject: storage: do not throw exception if the volume or the pool don't exist From: Giuseppe Scrivano gscrivan(a)redhat.com Thu May 7 13:42:00 2015 +0200 Date: Thu May 7 17:42:58 2015 +0200: Git: ac2be79658ec5673d00ca9603db63b9b0de4fbd3 commit 5357b91402fb7a8a73921216926908c08f6ad99d changed the semantic of conn.get_(vm|pool|interface|nodedev|net), to return None instead of raising KeyError. Leave the exception handling code in case the semantic is going to be reverted. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1219427 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> Index: virt-manager-1.2.0/virtManager/delete.py =================================================================== --- virt-manager-1.2.0.orig/virtManager/delete.py +++ virt-manager-1.2.0/virtManager/delete.py @@ -236,7 +236,11 @@ def populate_storage_list(storage_list, if disk.source_pool: try: pool = conn.get_pool(disk.source_pool) + if pool is None: + return disk.path vol = pool.get_volume(disk.path) + if vol is None: + return disk.path return vol.get_target_path() except KeyError: return disk.path Index: virt-manager-1.2.0/virtManager/details.py =================================================================== --- virt-manager-1.2.0.orig/virtManager/details.py +++ virt-manager-1.2.0/virtManager/details.py @@ -2698,12 +2698,14 @@ class vmmDetails(vmmGObjectUI): if not path: size = "-" else: + vol = None if source_pool: try: pool = self.conn.get_pool(source_pool) - vol = pool.get_volume(path) + if pool is not None: + vol = pool.get_volume(path) except KeyError: - vol = None + pass else: vol = self.conn.get_vol_by_path(path) ++++++ bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch ++++++ Subject: virtinst: enable qemu_ga for sles-11-sp4 and newer From: Lin Ma lma(a)suse.com Wed May 20 09:26:44 2015 +0800 Date: Wed May 20 14:01:50 2015 -0400: Git: bbc4f83bd3233617122ce89504f8cda8ddf88512 Qemu guest agent becomes available since sles 11 sp4 distro, So enable qemu_ga while installing sles11sp4 and newer sles. Signed-off-by: Lin Ma <lma(a)suse.com> diff --git a/virtinst/osdict.py b/virtinst/osdict.py index 57039b0..76c2260 100644 --- a/virtinst/osdict.py +++ b/virtinst/osdict.py @@ -514,7 +514,7 @@ class _OsVariant(object): return False def supports_qemu_ga(self): - return self._is_related_to(["fedora18", "rhel6.0"]) + return self._is_related_to(["fedora18", "rhel6.0", "sles11sp4"]) def default_videomodel(self, guest): if guest.os.is_pseries(): ++++++ c4d26d16-fix-VM-polling-on-old-libvirt.patch ++++++ Subject: pollhelpers: Fix VM polling on old libvirt From: Michał Kępień michal.kepien(a)nask.pl Thu May 7 11:10:20 2015 -0400 Date: Thu May 7 11:10:20 2015 -0400: Git: c4d26d16a65e0ce6b88323e13669c7c388397d7f https://bugzilla.redhat.com/show_bug.cgi?id=1219443 diff --git a/virtinst/pollhelpers.py b/virtinst/pollhelpers.py index 3eeada4..dafd079 100644 --- a/virtinst/pollhelpers.py +++ b/virtinst/pollhelpers.py @@ -268,7 +268,7 @@ def _old_fetch_vms(backend, origmap, build_func): except: logging.exception("Couldn't fetch domain '%s'", name) - return (origmap, new, current) + return (origmap.values(), new.values(), current.values()) def fetch_vms(backend, origmap, build_func): ++++++ ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch ++++++ Subject: sshtunnels: fix exception when the address is not an IP From: Giuseppe Scrivano gscrivan(a)redhat.com Wed May 6 12:52:40 2015 +0200 Date: Wed May 6 21:27:50 2015 +0200: Git: ebcb7c064ca5a3afd2ec3a0c8f59328a7f71b009 bug introduced with commit a2d453f3e20d103a4767394300c5183fde9a6bb4 Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1218958 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> diff --git a/virtManager/sshtunnels.py b/virtManager/sshtunnels.py index 53f43be..03e1738 100644 --- a/virtManager/sshtunnels.py +++ b/virtManager/sshtunnels.py @@ -48,10 +48,16 @@ class ConnectionInfo(object): self._connhost = "127.0.0.1" def _is_listen_localhost(self, host=None): - return ipaddr.IPNetwork(host or self.gaddr).is_loopback + try: + return ipaddr.IPNetwork(host or self.gaddr).is_loopback + except: + return False def _is_listen_any(self): - return ipaddr.IPNetwork(self.gaddr).is_unspecified + try: + return ipaddr.IPNetwork(self.gaddr).is_unspecified + except: + return False def need_tunnel(self): if not self._is_listen_localhost(): ++++++ f8af2e6b-verify-HYPER-V-support-after-customization.patch ++++++ Subject: create: verify HYPER-V support after customization From: Giuseppe Scrivano gscrivan(a)redhat.com Wed May 20 18:27:13 2015 +0200 Date: Wed May 20 22:48:33 2015 +0200: Git: f8af2e6b1083ec38ffa143ce4d04751f6d543362 commit 938060ae5340f6e28dc9669ba1ab79a1aa3d615e moved default devices setup to happen before UEFI is set invalidating what the commit 5acfccf6032abb9e8be89130d05b661e8b3f42c7 does. Add another check to happen before installing the guest to disable HYPER-V when not supported. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1185253 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> Index: virt-manager-1.2.0/virtManager/create.py =================================================================== --- virt-manager-1.2.0.orig/virtManager/create.py +++ virt-manager-1.2.0/virtManager/create.py @@ -1790,6 +1790,7 @@ class vmmCreate(vmmGObjectUI): if not self.is_visible(): return logging.debug("User finished customize dialog, starting install") + guest.check_defaults() self.start_install(guest) def config_canceled(ignore): Index: virt-manager-1.2.0/virtinst/guest.py =================================================================== --- virt-manager-1.2.0.orig/virtinst/guest.py +++ virt-manager-1.2.0/virtinst/guest.py @@ -814,6 +814,18 @@ class Guest(XMLBuilder): return False return True + def check_defaults(self): + # This is used only by virt-manager to reset any defaults that may have + # changed through manual intervention via the customize wizard. + if not self._hv_supported(): + self.features.hyperv_relaxed = None + self.features.hyperv_vapic = None + self.features.hyperv_spinlocks = None + self.features.hyperv_spinlocks_retries = None + for i in self.clock.timers: + if i.name == "hypervclock": + self.clock.remove_timer(i) + def _set_feature_defaults(self): if self.os.is_container(): self.features.acpi = None ++++++ fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch ++++++ Subject: add-hardware: fix shortcut key for USB redir dev type From: Giuseppe Scrivano gscrivan(a)redhat.com Mon May 11 10:02:54 2015 +0200 Date: Mon May 11 10:17:11 2015 +0200: Git: fbdf574c53fc0138d4f346b0dbfebff28117605a Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1172108 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> diff --git a/ui/addhardware.ui b/ui/addhardware.ui index 54dc695..32beb4f 100644 --- a/ui/addhardware.ui +++ b/ui/addhardware.ui @@ -1373,9 +1373,10 @@ <object class="GtkLabel" id="label3213"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">1</property> <property name="label" translatable="yes">_Type:</property> <property name="use_underline">True</property> - <property name="xalign">1</property> + <property name="mnemonic_widget">usbredir-list</property> </object> <packing> <property name="left_attach">0</property> ++++++ virtman-add-s390x-arch-support.patch ++++++ --- /var/tmp/diff_new_pack.bxUFPO/_old 2015-05-29 10:46:01.000000000 +0200 +++ /var/tmp/diff_new_pack.bxUFPO/_new 2015-05-29 10:46:01.000000000 +0200 @@ -75,7 +75,7 @@ return self.add_device(VirtualGraphics(self.conn)) -@@ -948,7 +953,7 @@ class Guest(XMLBuilder): +@@ -960,7 +965,7 @@ class Guest(XMLBuilder): if self._hv_only_supports_virtio(): return True ++++++ virtman-autoyast-support.patch ++++++ --- /var/tmp/diff_new_pack.bxUFPO/_old 2015-05-29 10:46:01.000000000 +0200 +++ /var/tmp/diff_new_pack.bxUFPO/_new 2015-05-29 10:46:01.000000000 +0200 @@ -1,9 +1,9 @@ Enhancement to switch the label from 'Kickstart' to 'Autoyast' when a suse distro is selected. -Index: virt-manager-1.1.0/virtManager/create.py +Index: virt-manager-1.2.0/virtManager/create.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/create.py -+++ virt-manager-1.1.0/virtManager/create.py +--- virt-manager-1.2.0.orig/virtManager/create.py ++++ virt-manager-1.2.0/virtManager/create.py @@ -1242,11 +1242,34 @@ class vmmCreate(vmmGObjectUI): self.populate_os_type_model() return @@ -51,7 +51,7 @@ if extraargs: self.guest.installer.extraargs = extraargs -@@ -2053,6 +2079,7 @@ class vmmCreate(vmmGObjectUI): +@@ -2054,6 +2080,7 @@ class vmmCreate(vmmGObjectUI): dl = self.set_os_val(self.widget("install-os-type"), distro_type) vl = self.set_os_val(self.widget("install-os-version"), distro_var) self.set_distro_labels(dl, vl) @@ -59,10 +59,10 @@ def check_detection(self, idx, forward): results = None -Index: virt-manager-1.1.0/ui/create.ui +Index: virt-manager-1.2.0/ui/create.ui =================================================================== ---- virt-manager-1.1.0.orig/ui/create.ui -+++ virt-manager-1.1.0/ui/create.ui +--- virt-manager-1.2.0.orig/ui/create.ui ++++ virt-manager-1.2.0/ui/create.ui @@ -843,7 +843,7 @@ bar</property> <property name="column_spacing">6</property> <property name="row_spacing">4</property> ++++++ virtman-dont-allow-grub.xen-to-be-deleted.patch ++++++ --- /var/tmp/diff_new_pack.bxUFPO/_old 2015-05-29 10:46:01.000000000 +0200 +++ /var/tmp/diff_new_pack.bxUFPO/_new 2015-05-29 10:46:01.000000000 +0200 @@ -1,11 +1,11 @@ Reference: bnc#885094 grub.xen is required to boot Xen PV VMs using BTRFS. It belongs to the grub2-x86_64-xen RPM and should never be deleted. -Index: virt-manager-1.1.0/virtManager/delete.py +Index: virt-manager-1.2.0/virtManager/delete.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/delete.py -+++ virt-manager-1.1.0/virtManager/delete.py -@@ -250,7 +250,7 @@ def populate_storage_list(storage_list, +--- virt-manager-1.2.0.orig/virtManager/delete.py ++++ virt-manager-1.2.0/virtManager/delete.py +@@ -254,7 +254,7 @@ def populate_storage_list(storage_list, diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False)) for target, path, ro, shared in diskdata:

1 0

commit u-boot for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2015-05-29 10:43:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "u-boot" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 2015-04-25 11:26:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2015-05-29 10:43:33.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 27 10:07:49 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.07-rc1: +- Update drop-marvell.patch +- Remove no more needed add_snow_usb_boot.patch + +------------------------------------------------------------------- +Wed Apr 29 07:51:25 UTC 2015 - dmueller(a)suse.com + +- adjust copyright headers + +------------------------------------------------------------------- u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xevm.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change u-boot-colibrit20.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-highbank.changes: same change u-boot-melea1000.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-snow.changes: same change --- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes 2015-04-30 11:51:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot.changes 2015-05-29 10:43:34.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 27 10:07:49 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.07-rc1: +- Update drop-marvell.patch +- Remove no more needed add_snow_usb_boot.patch + +------------------------------------------------------------------- Old: ---- add_snow_usb_boot.patch u-boot-2015.04.tar.bz2 New: ---- u-boot-2015.07-rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.Twv8LG/_old 2015-05-29 10:43:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Twv8LG/_new 2015-05-29 10:43:37.000000000 +0200 @@ -25,20 +25,19 @@ %define cuboxi_spl 0 Name: u-boot-a10-olinuxino-lime -Version: 2015.04 +Version: 2015.07~rc1 Release: 0 Summary: The u-boot firmware for the a10-olinuxino-lime arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: u-boot-2015.07-rc1.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch Patch3: mx53loco-bootscr.patch -# Apply add_snow_usb_boot.patch only for snow, otherwise may break other boards -Patch20: add_snow_usb_boot.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,17 +65,14 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2015.07-rc1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 %patch3 -%if "%{name}" == "u-boot-snow" -# Apply some patches only for u-boot-snow to avoid to break other boards -%patch20 -p1 -%endif %patch99 -p1 %build u-boot-a13-olinuxino.spec: same change u-boot-a13-olinuxinom.spec: same change u-boot-a20-olinuxino-lime.spec: same change u-boot-a20-olinuxino-lime2.spec: same change u-boot-a20-olinuxinomicro.spec: same change u-boot-am335xevm.spec: same change u-boot-arndale.spec: same change u-boot-bananapi.spec: same change u-boot-colibrit20.spec: same change u-boot-cubieboard.spec: same change u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change u-boot-highbank.spec: same change u-boot-melea1000.spec: same change u-boot-mx53loco.spec: same change u-boot-mx6qsabrelite.spec: same change u-boot-omap3beagle.spec: same change u-boot-omap4panda.spec: same change u-boot-paz00.spec: same change u-boot-pcm051rev3.spec: same change u-boot-rpi.spec: same change u-boot-rpi2.spec: same change ++++++ u-boot-snow.spec ++++++ --- /var/tmp/diff_new_pack.Twv8LG/_old 2015-05-29 10:43:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Twv8LG/_new 2015-05-29 10:43:38.000000000 +0200 @@ -25,20 +25,19 @@ %define cuboxi_spl 0 Name: u-boot-snow -Version: 2015.04 +Version: 2015.07~rc1 Release: 0 Summary: The u-boot firmware for the snow arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: u-boot-2015.07-rc1.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch Patch3: mx53loco-bootscr.patch -# Apply add_snow_usb_boot.patch only for snow, otherwise may break other boards -Patch20: add_snow_usb_boot.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,17 +65,14 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2015.07-rc1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 %patch3 -%if "%{name}" == "u-boot-snow" -# Apply some patches only for u-boot-snow to avoid to break other boards -%patch20 -p1 -%endif %patch99 -p1 %build ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.Twv8LG/_old 2015-05-29 10:43:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Twv8LG/_new 2015-05-29 10:43:38.000000000 +0200 @@ -19,13 +19,14 @@ Name: u-boot -Version: 2015.04 +Version: 2015.07~rc1 Release: 0 Summary: Tools for the u-boot Firmware License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: u-boot-2015.07-rc1.tar.bz2 BuildRequires: libopenssl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,7 +46,8 @@ mkimage- a tool that creates kernel bootable images for u-boot. %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2015.07-rc1 %build # needed for include/config/auto.conf ++++++ drop-marvell.patch ++++++ --- /var/tmp/diff_new_pack.Twv8LG/_old 2015-05-29 10:43:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Twv8LG/_new 2015-05-29 10:43:38.000000000 +0200 @@ -1,17 +1,18 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index bc55e5b..cec4ad2 100644 +index 49bcad1..f2015d6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -739,9 +739,6 @@ source "board/aristainetos/Kconfig" +@@ -859,10 +859,6 @@ source "board/aristainetos/Kconfig" source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" source "board/CarMediaLab/flea3/Kconfig" -source "board/Marvell/aspenite/Kconfig" +-source "board/Marvell/db-88f6820-gp/Kconfig" -source "board/Marvell/db-mv784mp-gp/Kconfig" -source "board/Marvell/gplugd/Kconfig" source "board/altera/socfpga/Kconfig" source "board/armadeus/apf27/Kconfig" - source "board/armltd/integrator/Kconfig" + source "board/armltd/vexpress/Kconfig" diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 45c6687..7f39776 100644 --- a/arch/arm/mach-kirkwood/Kconfig ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.Twv8LG/_old 2015-05-29 10:43:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Twv8LG/_new 2015-05-29 10:43:38.000000000 +0200 @@ -25,20 +25,19 @@ %define cuboxi_spl CUBOXI_SPL Name: u-boot-BOARDNAME -Version: 2015.04 +Version: 2015.07~rc1 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: u-boot-2015.07-rc1.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Patch1: enable_spl_ext_support_for_ti_armv7.patch Patch2: fix_beagle_spl_build.patch Patch3: mx53loco-bootscr.patch -# Apply add_snow_usb_boot.patch only for snow, otherwise may break other boards -Patch20: add_snow_usb_boot.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,17 +65,14 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2015.07-rc1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch1 %patch2 -p1 %patch3 -%if "%{name}" == "u-boot-snow" -# Apply some patches only for u-boot-snow to avoid to break other boards -%patch20 -p1 -%endif %patch99 -p1 %build

1 0

commit terminology-theme-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package terminology-theme-openSUSE for openSUSE:Factory checked in at 2015-05-29 10:43:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terminology-theme-openSUSE (Old) and /work/SRC/openSUSE:Factory/.terminology-theme-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "terminology-theme-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/terminology-theme-openSUSE/terminology-theme-openSUSE.changes 2014-10-14 13:25:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.terminology-theme-openSUSE.new/terminology-theme-openSUSE.changes 2015-05-29 10:43:16.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 27 09:36:08 UTC 2015 - aj(a)ajaissle.de + +- Uppercase rpm group + +------------------------------------------------------------------- @@ -8,2 +12,0 @@ - - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terminology-theme-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.nqiVxe/_old 2015-05-29 10:43:17.000000000 +0200 +++ /var/tmp/diff_new_pack.nqiVxe/_new 2015-05-29 10:43:17.000000000 +0200 @@ -21,7 +21,7 @@ Release: 0 Summary: openSUSE theme for Terminology License: BSD-2-Clause and LGPL-2.1 and CC-BY-SA-3.0 -Group: System/X11/terminals +Group: System/X11/Terminals Url: https://en.opensuse.org/Portal:Enlightenment Source: %{name}-%{version}.tar.xz BuildRequires: ImageMagick

1 0

commit nbd for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package nbd for openSUSE:Factory checked in at 2015-05-29 10:42:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nbd (Old) and /work/SRC/openSUSE:Factory/.nbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nbd" Changes: -------- --- /work/SRC/openSUSE:Factory/nbd/nbd.changes 2015-05-15 07:43:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nbd.new/nbd.changes 2015-05-29 10:43:00.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 28 11:32:18 UTC 2015 - mpluskal(a)suse.com + +- Update to 3.11 + * nbd-server: fix unsafe signal handling + * define error values as part of the protocol + * docs/proto: clarify NBD_CMD_FLUSH +- Drop nbd_signaling_CVE-2015-0847.patch as fix is included in + upstream + +------------------------------------------------------------------- Old: ---- nbd-3.10.tar.xz nbd_signaling_CVE-2015-0847.patch New: ---- nbd-3.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbd.spec ++++++ --- /var/tmp/diff_new_pack.xjx5An/_old 2015-05-29 10:43:01.000000000 +0200 +++ /var/tmp/diff_new_pack.xjx5An/_new 2015-05-29 10:43:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: nbd -Version: 3.10 +Version: 3.11 Release: 0 Summary: Network Block Device Server and Client Utilities License: GPL-2.0+ @@ -32,8 +32,6 @@ Patch3: nbd-2.9.25-doxyfile.diff # fix return value Patch4: no-return-nonvoid.patch -# fix for CVE-2015-0847 (incorrect signal handling DoD) -Patch5: nbd_signaling_CVE-2015-0847.patch BuildRequires: doxygen BuildRequires: glib2-devel >= 2.26.0 BuildRequires: xz @@ -91,7 +89,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing" ++++++ nbd-2.9.25-close.diff ++++++ --- /var/tmp/diff_new_pack.xjx5An/_old 2015-05-29 10:43:01.000000000 +0200 +++ /var/tmp/diff_new_pack.xjx5An/_new 2015-05-29 10:43:01.000000000 +0200 @@ -1,7 +1,7 @@ -Index: nbd-3.9/nbd-client.c +Index: nbd-3.11/nbd-client.c =================================================================== ---- nbd-3.9.orig/nbd-client.c -+++ nbd-3.9/nbd-client.c +--- nbd-3.11.orig/nbd-client.c ++++ nbd-3.11/nbd-client.c @@ -79,6 +79,7 @@ int check_conn(char* devname, int do_pri } buf[(len < 256) ? len : 255]='\0'; ++++++ nbd-2.9.25-doxyfile.diff ++++++ --- /var/tmp/diff_new_pack.xjx5An/_old 2015-05-29 10:43:01.000000000 +0200 +++ /var/tmp/diff_new_pack.xjx5An/_new 2015-05-29 10:43:01.000000000 +0200 @@ -1,6 +1,8 @@ ---- nbd-2.9.25/doc/Doxyfile.in 2011-10-01 06:28:58.000000000 -0400 -+++ nbd-2.9.20/Doxyfile.in 2009-01-03 07:59:46.000000000 -0500 -@@ -30,7 +30,7 @@ +Index: nbd-3.11/doc/Doxyfile.in +=================================================================== +--- nbd-3.11.orig/doc/Doxyfile.in ++++ nbd-3.11/doc/Doxyfile.in +@@ -30,7 +30,7 @@ PROJECT_NUMBER = @PACKAGE_VERSIO # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. @@ -9,7 +11,7 @@ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output -@@ -459,7 +459,7 @@ +@@ -459,7 +459,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. ++++++ nbd-3.10.tar.xz -> nbd-3.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.10/configure new/nbd-3.11/configure --- old/nbd-3.10/configure 2015-03-11 18:32:38.000000000 +0100 +++ new/nbd-3.11/configure 2015-05-25 12:28:35.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nbd 3.10. +# Generated by GNU Autoconf 2.69 for nbd 3.11. # # Report bugs to <wouter(a)debian.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='nbd' PACKAGE_TARNAME='nbd' -PACKAGE_VERSION='3.10' -PACKAGE_STRING='nbd 3.10' +PACKAGE_VERSION='3.11' +PACKAGE_STRING='nbd 3.11' PACKAGE_BUGREPORT='wouter(a)debian.org' PACKAGE_URL='' @@ -1335,7 +1335,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 nbd 3.10 to adapt to many kinds of systems. +\`configure' configures nbd 3.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nbd 3.10:";; + short | recursive ) echo "Configuration of nbd 3.11:";; esac cat <<\_ACEOF @@ -1529,7 +1529,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nbd configure 3.10 +nbd configure 3.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2238,7 +2238,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nbd $as_me 3.10, which was +It was created by nbd $as_me 3.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3101,7 +3101,7 @@ # Define the identity of the package. PACKAGE='nbd' - VERSION='3.10' + VERSION='3.11' cat >>confdefs.h <<_ACEOF @@ -14431,7 +14431,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nbd $as_me 3.10, which was +This file was extended by nbd $as_me 3.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14497,7 +14497,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nbd config.status 3.10 +nbd config.status 3.11 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/nbd-3.10/configure.ac new/nbd-3.11/configure.ac --- old/nbd-3.10/configure.ac 2015-03-11 18:31:55.000000000 +0100 +++ new/nbd-3.11/configure.ac 2015-05-25 12:28:03.000000000 +0200 @@ -1,7 +1,7 @@ dnl Configure script for NBD system dnl (c) 1998 Martin Mares <mj(a)ucw.cz>, (c) 2000 Pavel Machek <pavel(a)ucw.cz>, dnl (c) 2003-2006 Wouter Verhelst <wouter(a)debian.org> -AC_INIT([nbd],[3.10],[wouter(a)debian.org]) +AC_INIT([nbd],[3.11],[wouter(a)debian.org]) AM_INIT_AUTOMAKE(foreign dist-xz serial-tests) AM_MAINTAINER_MODE([enable]) LT_INIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.10/doc/proto.txt new/nbd-3.11/doc/proto.txt --- old/nbd-3.10/doc/proto.txt 2015-03-11 18:31:55.000000000 +0100 +++ new/nbd-3.11/doc/proto.txt 2015-05-25 12:27:56.000000000 +0200 @@ -43,7 +43,7 @@ The reply contains three fields: a 32 bit magic number ('magic'), a 32 bit error code ('error'; 0, unless an error occurred in which case it is -the errno of the error on the server side), and the same 64 bit handle +one of the error values documented below), and the same 64 bit handle that the corresponding request had in its 'handle' field. In case the reply is sent in response to a read request and the error field is 0 (zero), the reply header is immediately followed by request.len bytes of @@ -65,6 +65,30 @@ in a multifile environment). NBD_CMD_FLAG_FUA will not be set unless NBD_FLAG_SEND_FUA is set. +Error values +------------ + +The following error values are defined: + + Integer value Short name Description + ------------------------------------------------------------- + 1 EPERM Operation not permitted + 5 EIO Input/output error + 12 ENOMEM Cannot allocate memory + 22 EINVAL Invalid argument + 28 ENOSPC No space left on device + +The server should return ENOSPC if it receives a write request including +one or more sectors beyond the size of the device. It should return +EINVAL if it receives a read or trim request including one or more +sectors beyond the size of the device. It also should map the EDQUOT +and EFBIG errors to ENOSPC. Finally, it should return EPERM if it +receives a write or trim request on a read-only export. Which error to +return in any other case is not specified by the NBD protocol. + +Negotiation +=========== + There are two versions of the negotiation: the 'old' style (nbd <= 2.9.16) and the 'new' style (nbd >= 2.9.17, though due to a bug it does not work with anything below 2.9.18). What follows is a description of @@ -334,9 +358,9 @@ NBD_CMD_DISC command. * NBD_CMD_FLUSH (3) - A flush request; a write barrier. The server MUST NOT send the reply - header to this request before all outstanding write requests that were - sent before this command have hit the disk (using fsync() or similar). + A flush request; a write barrier. The server MUST NOT send a successful + reply header for this request before all write requests that were + completed before this command have hit the disk (using fsync() or similar). In this command, "len" and "offset" are reserved, and should be set to all-zero. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.10/nbd-server.c new/nbd-3.11/nbd-server.c --- old/nbd-3.10/nbd-server.c 2015-03-16 18:51:04.000000000 +0100 +++ new/nbd-3.11/nbd-server.c 2015-05-25 12:27:56.000000000 +0200 @@ -168,6 +168,16 @@ #include <nbdsrv.h> +static volatile sig_atomic_t is_sigchld_caught; /**< Flag set by + SIGCHLD handler + to mark a child + exit */ + +static volatile sig_atomic_t is_sigterm_caught; /**< Flag set by + SIGTERM handler + to mark a exit + request */ + static volatile sig_atomic_t is_sighup_caught; /**< Flag set by SIGHUP handler to mark a reconfiguration @@ -930,27 +940,16 @@ } /** - * Signal handler for SIGCHLD + * Handle SIGCHLD by setting atomically a flag which will be evaluated in the + * main loop of the root server process. This allows us to separate the signal + * catching from th actual task triggered by SIGCHLD and hence processing in the + * interrupt context is kept as minimial as possible. + * * @param s the signal we're handling (must be SIGCHLD, or something * is severely wrong) **/ -void sigchld_handler(int s) { - int status; - int* i; - pid_t pid; - - while((pid=waitpid(-1, &status, WNOHANG)) > 0) { - if(WIFEXITED(status)) { - msg(LOG_INFO, "Child exited with %d", WEXITSTATUS(status)); - } - i=g_hash_table_lookup(children, &pid); - if(!i) { - msg(LOG_INFO, "SIGCHLD received for an unknown child with PID %ld", (long)pid); - } else { - DEBUG("Removing %d from the list of children", pid); - g_hash_table_remove(children, &pid); - } - } +static void sigchld_handler(const int s G_GNUC_UNUSED) { + is_sigchld_caught = 1; } /** @@ -968,15 +967,16 @@ } /** - * Handle SIGTERM and dispatch it to our children + * Handle SIGTERM by setting atomically a flag which will be evaluated in the + * main loop of the root server process. This allows us to separate the signal + * catching from th actual task triggered by SIGTERM and hence processing in the + * interrupt context is kept as minimial as possible. + * * @param s the signal we're handling (must be SIGTERM, or something * is severely wrong). **/ -void sigterm_handler(int s) { - g_hash_table_foreach(children, killchild, NULL); - unlink(pidfname); - - exit(EXIT_SUCCESS); +static void sigterm_handler(const int s G_GNUC_UNUSED) { + is_sigterm_caught = 1; } /** @@ -1554,12 +1554,33 @@ } } +static int nbd_errno(int errcode) { + switch (errcode) { + case EPERM: + return htonl(1); + case EIO: + return htonl(5); + case ENOMEM: + return htonl(12); + case EINVAL: + return htonl(22); + case EFBIG: + case ENOSPC: +#ifdef EDQUOT + case EDQUOT: +#endif + return htonl(28); // ENOSPC + default: + return htonl(22); // EINVAL + } +} + /** sending macro. */ #define SEND(net,reply) { writeit( net, &reply, sizeof( reply )); \ if (client->transactionlogfd != -1) \ writeit(client->transactionlogfd, &reply, sizeof(reply)); } /** error macro. */ -#define ERROR(client,reply,errcode) { reply.error = htonl(errcode); SEND(client->net,reply); reply.error = 0; } +#define ERROR(client,reply,errcode) { reply.error = nbd_errno(errcode); SEND(client->net,reply); reply.error = 0; } /** * Serve a file to a single client. * @@ -1609,7 +1630,8 @@ memcpy(reply.handle, request.handle, sizeof(reply.handle)); - if ((command==NBD_CMD_WRITE) || (command==NBD_CMD_READ)) { + if ((command==NBD_CMD_WRITE) || (command==NBD_CMD_READ) || + (command==NBD_CMD_TRIM)) { if (request.from + len < request.from) { // 64 bit overflow!! DEBUG("[Number too large!]"); ERROR(client, reply, EINVAL); @@ -1618,7 +1640,7 @@ if (((off_t)request.from + len) > client->exportsize) { DEBUG("[RANGE!]"); - ERROR(client, reply, EINVAL); + ERROR(client, reply, (command==NBD_CMD_WRITE) ? ENOSPC : EINVAL); continue; } @@ -1711,6 +1733,12 @@ case NBD_CMD_TRIM: /* The kernel module sets discard_zeroes_data == 0, * so it is okay to do nothing. */ + if ((client->server->flags & F_READONLY) || + (client->server->flags & F_AUTOREADONLY)) { + DEBUG("[TRIM to READONLY!]"); + ERROR(client, reply, EPERM); + continue; + } if (exptrim(&request, client)) { DEBUG("Trim failed: %m"); ERROR(client, reply, errno); @@ -2065,9 +2093,12 @@ goto out; } /* Child */ + + /* Child's signal disposition is reset to default. */ signal(SIGCHLD, SIG_DFL); signal(SIGTERM, SIG_DFL); signal(SIGHUP, SIG_DFL); + sigemptyset(&oldset); out: sigprocmask(SIG_SETMASK, &oldset, NULL); return pid; @@ -2261,9 +2292,12 @@ goto handle_connection_out; } /* child */ + + /* Child's signal disposition is reset to default. */ signal(SIGCHLD, SIG_DFL); signal(SIGTERM, SIG_DFL); signal(SIGHUP, SIG_DFL); + sigemptyset(&oldset); sigprocmask(SIG_SETMASK, &oldset, NULL); g_hash_table_destroy(children); @@ -2367,6 +2401,8 @@ int max; fd_set mset; fd_set rset; + sigset_t blocking_mask; + sigset_t original_mask; /* * Set up the master fd_set. The set of descriptors we need @@ -2389,7 +2425,56 @@ FD_SET(sock, &mset); max=sock>max?sock:max; } + + /* Construct a signal mask which is used to make signal testing and + * receiving an atomic operation to ensure no signal is received between + * tests and blocking pselect(). */ + if (sigemptyset(&blocking_mask) == -1) + err("failed to initialize blocking_mask: %m"); + + if (sigaddset(&blocking_mask, SIGCHLD) == -1) + err("failed to add SIGCHLD to blocking_mask: %m"); + + if (sigaddset(&blocking_mask, SIGHUP) == -1) + err("failed to add SIGHUP to blocking_mask: %m"); + + if (sigaddset(&blocking_mask, SIGTERM) == -1) + err("failed to add SIGTERM to blocking_mask: %m"); + + if (sigprocmask(SIG_BLOCK, &blocking_mask, &original_mask) == -1) + err("failed to block signals: %m"); + for(;;) { + if (is_sigterm_caught) { + is_sigterm_caught = 0; + + g_hash_table_foreach(children, killchild, NULL); + unlink(pidfname); + + exit(EXIT_SUCCESS); + } + + if (is_sigchld_caught) { + int status; + int* i; + pid_t pid; + + is_sigchld_caught = 0; + + while ((pid=waitpid(-1, &status, WNOHANG)) > 0) { + if (WIFEXITED(status)) { + msg(LOG_INFO, "Child exited with %d", WEXITSTATUS(status)); + } + i = g_hash_table_lookup(children, &pid); + if (!i) { + msg(LOG_INFO, "SIGCHLD received for an unknown child with PID %ld", (long)pid); + } else { + DEBUG("Removing %d from the list of children", pid); + g_hash_table_remove(children, &pid); + } + } + } + /* SIGHUP causes the root server process to reconfigure * itself and add new export servers for each newly * found export configuration group, i.e. spawn new @@ -2424,8 +2509,7 @@ } memcpy(&rset, &mset, sizeof(fd_set)); - if(select(max+1, &rset, NULL, NULL, NULL)>0) { - + if (pselect(max + 1, &rset, NULL, NULL, NULL, &original_mask) > 0) { DEBUG("accept, "); for(i=0; i < modernsocks->len; i++) { int sock = g_array_index(modernsocks, int, i); ++++++ no-return-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.xjx5An/_old 2015-05-29 10:43:01.000000000 +0200 +++ /var/tmp/diff_new_pack.xjx5An/_new 2015-05-29 10:43:01.000000000 +0200 @@ -1,7 +1,7 @@ -Index: nbd-3.10/nbd-server.c +Index: nbd-3.11/nbd-server.c =================================================================== ---- nbd-3.10.orig/nbd-server.c -+++ nbd-3.10/nbd-server.c +--- nbd-3.11.orig/nbd-server.c ++++ nbd-3.11/nbd-server.c @@ -1525,6 +1525,7 @@ CLIENT* negotiate(int net, GArray* serve err_nonfatal("Session terminated by client"); return NULL;

1 0

commit rdate for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package rdate for openSUSE:Factory checked in at 2015-05-29 10:42:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdate (Old) and /work/SRC/openSUSE:Factory/.rdate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rdate" Changes: -------- --- /work/SRC/openSUSE:Factory/rdate/rdate.changes 2011-09-23 12:44:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rdate.new/rdate.changes 2015-05-29 10:42:43.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 27 18:56:54 UTC 2015 - mpluskal(a)suse.com + +- Do not use url for source as no mirror is available +- Use wikipedia article about rdate as url +- Cleanup spec-file with spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdate.spec ++++++ --- /var/tmp/diff_new_pack.YD1Ae8/_old 2015-05-29 10:42:43.000000000 +0200 +++ /var/tmp/diff_new_pack.YD1Ae8/_new 2015-05-29 10:42:43.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package rdate (Version 1.4) +# spec file for package rdate # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: rdate -Summary: rdate retrieves the time from an RFC 868 server Version: 1.4 -Release: 117 +Release: 0 +Summary: Tool to retrieve the time from an RFC 868 server License: GPL-2.0+ Group: Productivity/Networking/Other -Source: ftp://people.redhat.com/sopwith/rdate-%{version}.tar.gz +Url: http://en.wikipedia.org/wiki/Rdate +Source: rdate-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -32,28 +31,18 @@ It is a simple, significantly less complex (and less functional) replacement for NTP. - - -Authors: --------- - Elliot Lee <sopwith(a)redhat.com> - %prep %setup -q %build -make CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CFLAGS="%{optflags}" %install -rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_bindir} -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 -cp rdate ${RPM_BUILD_ROOT}%{_bindir} -cp rdate.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 -gzip -9 ${RPM_BUILD_ROOT}%{_mandir}/man1/rdate.1 - -%clean -rm -rf ${RPM_BUILD_ROOT} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/man1 +cp rdate %{buildroot}%{_bindir} +cp rdate.1 %{buildroot}%{_mandir}/man1 +gzip -9 %{buildroot}%{_mandir}/man1/rdate.1 %files %defattr(-,root,root)

1 0

commit eaglemode for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package eaglemode for openSUSE:Factory checked in at 2015-05-29 10:42:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eaglemode (Old) and /work/SRC/openSUSE:Factory/.eaglemode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eaglemode" Changes: -------- --- /work/SRC/openSUSE:Factory/eaglemode/eaglemode.changes 2015-01-08 23:02:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.eaglemode.new/eaglemode.changes 2015-05-29 10:42:27.000000000 +0200 @@ -1,0 +2,33 @@ +Thu May 28 07:57:55 UTC 2015 - nemysis(a)gmx.ch + +- Use GenericName[en]=Eagle Mode instead of GenericName[en]=Eagle Modee + +------------------------------------------------------------------- +Wed May 27 14:12:58 UTC 2015 - nemysis(a)gmx.ch + +- Update to 0.89.0, announce message: + +- Changes fromVersion 0.89.0 + • Added new API classes: emListBox, emFileSelectionBox, emFileDialog, + and emAnything. + • Removed method emPanel::EnableAutoExpansion() + (it's always "enabled" now). + • Minor fixes and improvements. + +- Changes from Version 0.88.0 + • Replaced API class emTiling by more specialized classes: + emLinearLayout, emRasterLayout, and emPackLayout. + • Accordingly replaced emGroup by emLinearGroup, emRasterGroup, + and emPackGroup. + • Fixed cropping of video frames. + • Fixed launch feedback. + • Minor fixes. + +- Change Source0 to use Web URL +- Change Desktop entry +- Change icons, use eaglemode-icons.tar +- Add BuildRequires for hicolor-icon-theme +- Change Description +- Simplify installation handling + +------------------------------------------------------------------- Old: ---- eaglemode-0.87.0.tar.bz2 eaglemode_16x16.png eaglemode_24x24.png eaglemode_32x32.png eaglemode_48x48.png New: ---- eaglemode-0.89.0.tar.bz2 eaglemode-icons.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eaglemode.spec ++++++ --- /var/tmp/diff_new_pack.Y6zQjY/_old 2015-05-29 10:42:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6zQjY/_new 2015-05-29 10:42:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package eaglemode # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,16 @@ Name: eaglemode -Version: 0.87.0 +Version: 0.89.0 Release: 0 Summary: Eagle Mode the deep application Cosmos License: GPL-3.0 Group: Development/Tools/Other Url: http://eaglemode.sourceforge.net/ -Source: %{name}-%{version}.tar.bz2 -Source1: %{name}.desktop -Source2: %{name}_16x16.png -Source3: %{name}_24x24.png -Source4: %{name}_32x32.png -Source5: %{name}_48x48.png -Source6: %{name}-rpmlintrc +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}/%{name}-%{versi… +Source1: %{name}-icons.tar +Source2: %{name}.desktop +Source3: %{name}-rpmlintrc Patch0: 01-eaglemode.patch BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -43,6 +40,8 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} +BuildRequires: fdupes +BuildRequires: hicolor-icon-theme BuildRequires: libpoppler-glib-devel BuildRequires: librsvg-devel BuildRequires: update-desktop-files @@ -60,9 +59,6 @@ BuildRequires: poppler-glib-devel BuildRequires: xine-lib-devel %endif -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes -%endif Requires: abiword Requires: xorg-x11 %if 0%{?suse_version} @@ -106,8 +102,14 @@ in a virtual cosmos. Besides, that cosmos also provides a Linux kernel configurator in form of a kernel patch. +By featuring a separate popup-zoomed control view, help texts in the things +they are describing, editable bookmarks, multiple input methods, fast +anti-aliased graphics, a virtually unlimited depth of panel tree, +and by its portable C++ API, Eagle Mode aims to be a cutting edge +of zoomable user interfaces. + %prep -%setup -q +%setup -q -a 1 %patch0 -p1 %build @@ -123,6 +125,13 @@ %install perl make.pl install dir=%{buildroot}/%{_libdir}/eaglemode + +# install icons +for i in 16 24 32 48 ; do + install -Dm 0644 icons/%{name}-${i}.png \ + %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png +done + cd %{buildroot}/%{_libdir}/eaglemode mkdir -p ../../../%{_docdir}/eaglemode cp -r doc ../../../%{_docdir}/eaglemode @@ -139,42 +148,25 @@ mkdir -p %{buildroot}%{_prefix}/include cd %{buildroot}%{_prefix}/include ln -s ../../%{_libdir}/eaglemode/include/* . -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps -mkdir -p %{buildroot}%{_datadir}/applications -cp -avL %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/eaglemode.png -cp -avL %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/eaglemode.png -cp -avL %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eaglemode.png -cp -avL %{SOURCE5} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/eaglemode.png -cp -avL %{SOURCE1} %{buildroot}%{_datadir}/applications/eaglemode.desktop + +# install Desktop file +install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop + %if 0%{?suse_version} -%suse_update_desktop_file %{name} -%endif -%if 0%{?suse_version} > 1020 -%fdupes -s %{buildroot} + %suse_update_desktop_file %{name} + %fdupes -s %{buildroot}%{_prefix} %endif %files -%defattr(-,root,root) -%{_bindir}/* +%defattr(-,root,root,-) +%{_bindir}/%{name} %doc %{_docdir}/%{name} %{_datadir}/%{name} %{_libdir}/*.so %{_libdir}/%{name} %{_sysconfdir}/%{name} %{_includedir}/* -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/16x16 -%dir %{_datadir}/icons/hicolor/16x16/apps -%dir %{_datadir}/icons/hicolor/24x24 -%dir %{_datadir}/icons/hicolor/24x24/apps -%dir %{_datadir}/icons/hicolor/32x32 -%dir %{_datadir}/icons/hicolor/32x32/apps -%dir %{_datadir}/icons/hicolor/48x48 -%dir %{_datadir}/icons/hicolor/48x48/apps -%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/applications/%{name}.desktop %changelog ++++++ eaglemode-0.87.0.tar.bz2 -> eaglemode-0.89.0.tar.bz2 ++++++ ++++ 17508 lines of diff (skipped) ++++++ eaglemode.desktop ++++++ --- /var/tmp/diff_new_pack.Y6zQjY/_old 2015-05-29 10:42:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6zQjY/_new 2015-05-29 10:42:30.000000000 +0200 @@ -1,12 +1,12 @@ [Desktop Entry] -Name=eaglemode -GenericName=eaglemode -GenericName[en]=eaglemode -GenericName[ru]=eaglemode -Comment=eaglemode file manager +Name=Eagle Mode +GenericName=Eagle Mode +GenericName[en]=Eagle Mode +GenericName[ru]=Eagle Mode +Comment=Eagle Mode file manager Icon=eaglemode -Categories=FileManager;Utility;Qt;KDE; Exec=eaglemode Type=Application +Categories=FileManager;Utility;Qt;KDE; StartupNotify=true Terminal=false

1 0

commit sparkleshare for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package sparkleshare for openSUSE:Factory checked in at 2015-05-29 10:42:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sparkleshare (Old) and /work/SRC/openSUSE:Factory/.sparkleshare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sparkleshare" Changes: -------- --- /work/SRC/openSUSE:Factory/sparkleshare/sparkleshare.changes 2015-04-10 09:53:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sparkleshare.new/sparkleshare.changes 2015-05-29 10:42:09.000000000 +0200 @@ -1,0 +2,41 @@ +Wed Apr 8 08:37:06 UTC 2015 - dimstar(a)opensuse.org + +- Update to version 1.4: + + Check user's local bin folders for git binary. + + Show a notification after trying to start the app multiple + times. + + Set default focus on password fields when setting up + encryption. + + Show disclosure triangly on Recent Changes window timestamps. + + Fix some conflict resolution issues by merging instead of + rebasing on the remote. + + Fix crash when copying to clipboard on Windows. + + Sync more quickly after the system wakes up from sleep. + + Fix conflict resolution when renaming folders. + +------------------------------------------------------------------- +Sat Oct 4 21:39:06 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 1.3: + + Port interface from GTK+2 to GTK+3, replace widget + implementations with new APIs. + + Use GTK+3 compatible bindings for libnotify, webkitgtk, and + appindicator. + + Many style usability and behaviour fixes in the setup dialog. + + Fix annoying flicker when changing projects on the Recent + Changes window. + + Improved window scalability of the Recent Changes window and + about dialog. + + Remove menu item that toggles notifications (this can now be + done in GNOME's system menu). + + Refocus on existing SparkleShare instance when starting + multiple times. + + Include an appdata XML file for the GNOME Software application. + + Show correct icon and application name on GNOME 3 and Ubuntu. +- Update BuildRequires for port to GTK3: + + Drop pkgconfig(gtk-sharp-2.0), pkgconfig(notify-sharp) and + pkgconfig(webkit-sharp-1.0) + + Add pkgconfig(gtk-sharp-3.0), pkgconfig(notify-sharp-3.0) and + pkgconfig(webkitgtk-sharp-3.0). + +------------------------------------------------------------------- Old: ---- 1.2.0.tar.gz New: ---- 1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sparkleshare.spec ++++++ --- /var/tmp/diff_new_pack.u598r2/_old 2015-05-29 10:42:10.000000000 +0200 +++ /var/tmp/diff_new_pack.u598r2/_new 2015-05-29 10:42:10.000000000 +0200 @@ -19,7 +19,7 @@ %define with_translations 0 Name: sparkleshare -Version: 1.2.0 +Version: 1.4 Release: 0 Summary: A file sharing and collaboration tool License: GPL-3.0+ @@ -36,9 +36,9 @@ BuildRequires: nant BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-sharp-2.0) >= 2.12.2 -BuildRequires: pkgconfig(gtk-sharp-2.0) >= 2.12.2 -BuildRequires: pkgconfig(notify-sharp) -BuildRequires: pkgconfig(webkit-sharp-1.0) +BuildRequires: pkgconfig(gtk-sharp-3.0) >= 2.99.1 +BuildRequires: pkgconfig(notify-sharp-3.0) +BuildRequires: pkgconfig(webkitgtk-sharp-3.0) Requires: git-core >= 1.7.1 Requires: gvfs Requires: mono-core @@ -71,7 +71,7 @@ %setup -q -n SparkleShare-%{version} # Fail when legal/License.txt, News.txt or legal/Authors.txt are no longer executable, so this can be dropped -test -x legal/License.txt -a -x News.txt -a -x legal/Authors.txt +test -x legal/License_for_SparkleShare.txt -a -x News.txt -a -x legal/Authors.txt chmod a-x legal/*.txt News.txt %build ++++++ 1.2.0.tar.gz -> 1.4.tar.gz ++++++ ++++ 5299 lines of diff (skipped)

1 0

commit rubygem-puppet for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package rubygem-puppet for openSUSE:Factory checked in at 2015-05-29 10:41:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-puppet (Old) and /work/SRC/openSUSE:Factory/.rubygem-puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-puppet" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-puppet/rubygem-puppet.changes 2015-01-22 21:49:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-puppet.new/rubygem-puppet.changes 2015-05-29 10:41:36.000000000 +0200 @@ -1,0 +2,30 @@ +Thu May 28 07:49:27 UTC 2015 - dgutu(a)suse.com + +- Updated the change file + +------------------------------------------------------------------- +Thu May 14 19:31:57 UTC 2015 - tampakrap(a)opensuse.org + +- Add puppet-ruby-2_2.patch that fixes the ruby 2.2 support + +------------------------------------------------------------------- +Tue May 12 10:51:13 UTC 2015 - tampakrap(a)opensuse.org + +- Re-run g2r +- Fix the systemd patch to actually apply +- Remove the ext/{debian,gentoo} dirs for all ruby versions + +------------------------------------------------------------------- +Mon May 11 12:51:28 UTC 2015 - tampakrap(a)opensuse.org + +- Update to 3.7.5 + * https://docs.puppetlabs.com/puppet/3.7/reference/release_notes.html#puppet-… + * https://docs.puppetlabs.com/puppet/3.7/reference/release_notes.html#puppet-… +- Add upstream patch puppet-zypper-lu.patch to cache the output of zypper list-updates + https://tickets.puppetlabs.com/browse/PUP-3968 +- Add upstream patch puppet-systemd-default.patch to make systemd default on SLE12 and openSUSE >12.x + https://tickets.puppetlabs.com/browse/PUP-3338 +- Add runtime dependency on tar, needed by the "puppet module" command to + unpack tarballs that it fetches from the forge + +------------------------------------------------------------------- Old: ---- puppet-3.7.3.gem New: ---- puppet-3.7.5.gem puppet-ruby-2_2.patch puppet-systemd-default.patch puppet-zypper-lu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-puppet.spec ++++++ --- /var/tmp/diff_new_pack.y8U6cK/_old 2015-05-29 10:41:37.000000000 +0200 +++ /var/tmp/diff_new_pack.y8U6cK/_new 2015-05-29 10:41:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-puppet # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ # Name: rubygem-puppet -Version: 3.7.3 +Version: 3.7.5 Release: 0 %define mod_name puppet %define mod_full_name %{mod_name}-%{version} @@ -43,6 +43,7 @@ BuildRequires: fdupes Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +Requires: tar %if 0%{?suse_version} >= 1210 BuildRequires: systemd %{?systemd_requires} @@ -62,6 +63,11 @@ Source1: puppetmaster.fw Source2: puppet.fw Source3: gem2rpm.yml +# MANUAL +Patch0: %{mod_name}-zypper-lu.patch +Patch1: %{mod_name}-systemd-default.patch +Patch2: %{mod_name}-ruby-2_2.patch +# /MANUAL Summary: A network tool for managing many disparate systems License: Apache-2.0 Group: Development/Languages/Ruby @@ -74,6 +80,11 @@ cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %prep +%gem_unpack +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%gem_build %build @@ -132,7 +143,10 @@ install -Dp -m0644 $gemdir/ext/emacs/puppet-mode-init.el $emacsdir/site-start.d/puppet-mode-init.el # Remove those dirs as they cause strange runtime dependencies -rm -rf $gemdir/ext/{debian,gentoo} +for gem in $(/usr/bin/ruby-find-versioned gem) ; do + gemdir="%{buildroot}$($gem env gemdir)/gems/%{mod_full_name}" + rm -rf $gemdir/ext/{debian,gentoo} +done # /MANUAL @@ -198,7 +212,7 @@ %{?systemd_requires} %endif -# Requires: rubygem-puppet = 3.7.3 +# Requires: rubygem-puppet = 3.7.5 %description master Puppet lets you centrally manage every important aspect of your system using a cross-platform specification language that manages all the @@ -282,7 +296,7 @@ Provides: puppet-vim = %{version}-%{release} Obsoletes: puppet-vim < %{version}-%{release} -# Requires: rubygem-puppet = 3.7.3 +# Requires: rubygem-puppet = 3.7.5 %description vim Vim ftdetect and syntax files for Puppet manifests @@ -305,7 +319,7 @@ Supplements: packageand(emacs:%{name}) Provides: puppet-emacs = %{version}-%{release} -# Requires: rubygem-puppet = 3.7.3 +# Requires: rubygem-puppet = 3.7.5 %description emacs Emacs syntax files for Puppet manifests ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.y8U6cK/_old 2015-05-29 10:41:37.000000000 +0200 +++ /var/tmp/diff_new_pack.y8U6cK/_new 2015-05-29 10:41:37.000000000 +0200 @@ -9,6 +9,10 @@ separate elements normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. +:patches: + '%{mod_name}-zypper-lu.patch': -p1 + '%{mod_name}-systemd-default.patch': -p1 + '%{mod_name}-ruby-2_2.patch': -p1 :main: :preamble: |- Provides: %{mod_name} = %{version}-%{release} @@ -34,6 +38,7 @@ BuildRequires: fdupes Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd + Requires: tar %if 0%{?suse_version} >= 1210 BuildRequires: systemd %{?systemd_requires} @@ -91,7 +96,10 @@ install -Dp -m0644 $gemdir/ext/emacs/puppet-mode-init.el $emacsdir/site-start.d/puppet-mode-init.el # Remove those dirs as they cause strange runtime dependencies - rm -rf $gemdir/ext/{debian,gentoo} + for gem in $(/usr/bin/ruby-find-versioned gem) ; do + gemdir="%{buildroot}$($gem env gemdir)/gems/%{mod_full_name}" + rm -rf $gemdir/ext/{debian,gentoo} + done :scripts: :pre: |- getent group puppet >/dev/null || /usr/sbin/groupadd -r puppet ++++++ puppet-3.7.3.gem -> puppet-3.7.5.gem ++++++ ++++ 16331 lines of diff (skipped) ++++++ puppet-ruby-2_2.patch ++++++ --- a/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_node_monkeypatch.rb 2015-05-12 20:28:38.540000000 +0200 +++ b/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_node_monkeypatch.rb 2015-05-12 20:28:54.708000000 +0200 @@ -39,5 +39,7 @@ if defined?(YAML::Syck::Node) YAML::Syck.module_eval monkeypatch else - Syck.module_eval monkeypatch + if defined?(Syck) + Syck.module_eval monkeypatch + end end ++++++ puppet-systemd-default.patch ++++++ >From bdd0dfdda47032a269b42a53c864fe91856eaedd Mon Sep 17 00:00:00 2001 From: Rob Braden <bradejr(a)puppetlabs.com> Date: Wed, 24 Sep 2014 11:41:51 -0700 Subject: [PATCH] (pup-3338) Make systemd the default service provider for SLES 12 OpenSuSE >= 12 and SLES 12 use systemd as the default service management framework. This updates puppet to use the systemd provider by default on OpenSuSE 12 and 13 and SLES 12 --- lib/puppet/provider/service/systemd.rb | 1 + spec/unit/provider/service/systemd_spec.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb index eb6df29..e717049 100644 --- a/lib/puppet/provider/service/systemd.rb +++ b/lib/puppet/provider/service/systemd.rb @@ -8,6 +8,7 @@ defaultfor :osfamily => [:archlinux] defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7" defaultfor :osfamily => :redhat, :operatingsystem => :fedora, :operatingsystemmajrelease => ["17", "18", "19", "20", "21"] + defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["12", "13"] def self.instances i = [] ++++++ puppet-zypper-lu.patch ++++++ >From 358cabca903e019b863d654a74711581bc14b331 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos <tampakrap(a)gmail.com> Date: Thu, 5 Feb 2015 22:06:08 +0100 Subject: [PATCH] (PUP-3968) Cache the `zypper list-updates` output The zypper provider calls `zypper list-updates` in order to get a list of the packages that have newer versions. Then it checks if the resource name matches any of the items in the list, and then applies the newer version. The problem with the above though is that it runs list-updates for every single package instance, while it should be run only once, as it provides all the packages that have newer versions available. This commit caches the list-updates output and puts its contents in a hash, so that each package resource will query this instead of zypper directly Signed-off-by: Adrien Thebo <adrienthebo(a)somethigsinistral.net> --- lib/puppet/provider/package/zypper.rb | 34 +++++++++++++++++++++++-------- spec/unit/provider/package/zypper_spec.rb | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/lib/puppet/provider/package/zypper.rb b/lib/puppet/provider/package/zypper.rb index 2fe6cdf..c74358c 100644 --- a/lib/puppet/provider/package/zypper.rb +++ b/lib/puppet/provider/package/zypper.rb @@ -12,6 +12,30 @@ confine :operatingsystem => [:suse, :sles, :sled, :opensuse] + def self.latest_package_version(package) + if @latest_versions.nil? + @latest_versions = list_updates + end + + @latest_versions[package] + end + + def self.list_updates + output = zypper 'list-updates' + + avail_updates = {} + + # split up columns + output.lines.each do |line| + pkg_ver = line.split(/\s*\|\s*/) + # ignore zypper headers + next unless pkg_ver[0] == 'v' + avail_updates[pkg_ver[2]] = pkg_ver[4] + end + + avail_updates + end + #on zypper versions <1.0, the version option returns 1 #some versions of zypper output on stderr def zypper_version @@ -72,16 +96,10 @@ def install # What's the latest package version available? def latest - #zypper can only get a list of *all* available packages? - output = zypper "list-updates" - - if output =~ /#{Regexp.escape @resource[:name]}\s*\|.*?\|\s*([^\s\|]+)/ - return $1 - else + return self.class.latest_package_version(@resource[:name]) || # zypper didn't find updates, pretend the current # version is the latest - return @property_hash[:ensure] - end + @property_hash[:ensure] end def update diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb index 3265858..73389fe 100755 --- a/spec/unit/provider/package/zypper_spec.rb +++ b/spec/unit/provider/package/zypper_spec.rb @@ -119,7 +119,7 @@ fake_data = File.read(my_fixture('zypper-list-updates-SLES11sp1.out')) @resource.stubs(:[]).with(:name).returns "at" - @provider.expects(:zypper).with("list-updates").returns fake_data + described_class.expects(:zypper).with("list-updates").returns fake_data @provider.latest.should == "3.1.8-1069.18.2" end end

1 0

commit proxychains-ng for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package proxychains-ng for openSUSE:Factory checked in at 2015-05-29 10:41:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proxychains-ng (Old) and /work/SRC/openSUSE:Factory/.proxychains-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "proxychains-ng" Changes: -------- --- /work/SRC/openSUSE:Factory/proxychains-ng/proxychains-ng.changes 2015-01-08 23:01:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.proxychains-ng.new/proxychains-ng.changes 2015-05-29 10:41:19.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 28 07:29:41 UTC 2015 - nemysis(a)gmx.ch + +- Update to 4.9, announce message: + + - fix a security issue CVE-2015-3887 + - add sendto hook to handle MSG_FASTOPEN flag + - replace problematic hostentdb with hostsreader + - fix compilation on OpenBSD (although doesn't work there) + +------------------------------------------------------------------- Old: ---- proxychains-4.8.1.tar.bz2 New: ---- proxychains-4.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proxychains-ng.spec ++++++ --- /var/tmp/diff_new_pack.pns8pm/_old 2015-05-29 10:41:20.000000000 +0200 +++ /var/tmp/diff_new_pack.pns8pm/_new 2015-05-29 10:41:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package proxychains-ng # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: proxychains-ng -Version: 4.8.1 +Version: 4.9 Release: 0 Summary: Redirect connection through proxy servers License: GPL-2.0 ++++++ proxychains-4.8.1.tar.bz2 -> proxychains-4.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/COPYING new/proxychains-4.9/COPYING --- old/proxychains-4.8.1/COPYING 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/COPYING 2015-05-28 08:36:44.000000000 +0200 @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/Makefile new/proxychains-4.9/Makefile --- old/proxychains-4.8.1/Makefile 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/Makefile 2015-05-28 08:36:44.000000000 +0200 @@ -18,14 +18,14 @@ LOBJS = src/nameinfo.o src/version.o \ src/core.o src/common.o src/libproxychains.o src/shm.o \ src/allocator_thread.o src/ip_type.o src/stringdump.o \ - src/hostentdb.o src/hash.o src/debug.o + src/hostsreader.o src/hash.o src/debug.o GENH = src/version.h CFLAGS += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe NO_AS_NEEDED = -Wl,--no-as-needed LIBDL = -ldl -LDFLAGS = -shared -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread +LDFLAGS = -fPIC $(NO_AS_NEEDED) INC = PIC = -fPIC AR = $(CROSS_COMPILE)ar @@ -46,6 +46,7 @@ -include config.mak CFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS) +LDFLAGS+=$(USER_LDFLAGS) CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\" @@ -81,10 +82,10 @@ $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $< $(LDSO_PATHNAME): $(LOBJS) - $(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS) + $(CC) -shared $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -lpthread $(LIBDL) -o $@ $(LOBJS) $(ALL_TOOLS): $(OBJS) - $(CC) src/main.o src/common.o -o $(PXCHAINS) + $(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS) .PHONY: all clean install install-config install-libs install-tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/README new/proxychains-4.9/README --- old/proxychains-4.8.1/README 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/README 2015-05-28 08:36:44.000000000 +0200 @@ -1,4 +1,4 @@ -ProxyChains-NG ver 4.8 README +ProxyChains-NG ver 4.9 README ============================= ProxyChains is a UNIX program, that hooks network-related libc functions @@ -52,6 +52,12 @@ Changelog: ---------- +Version 4.9 +- fix a security issue CVE-2015-3887 +- add sendto hook to handle MSG_FASTOPEN flag +- replace problematic hostentdb with hostsreader +- fix compilation on OpenBSD (although doesn't work there) + Version 4.8.1: - fix regression in 4.8 install-config Makefile target @@ -69,9 +75,11 @@ - return EBADF rather than EINTR in close hook. it's legal for a program to retry close() calls when they receive EINTR, which could cause an infinite loop, as seen in chromium. + Version 4.6: - some cosmetic fixes to Makefile, fix a bug when non-numeric ip was - user as proxy server address. + used as proxy server address. + Version 4.5: - hook close() to prevent OpenSSH from messing with internal infrastructure. this caused ssh client to segfault when proxified. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/VERSION new/proxychains-4.9/VERSION --- old/proxychains-4.8.1/VERSION 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/VERSION 2015-05-28 08:36:44.000000000 +0200 @@ -1 +1 @@ -4.8.1 +4.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/configure new/proxychains-4.9/configure --- old/proxychains-4.8.1/configure 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/configure 2015-05-28 08:36:44.000000000 +0200 @@ -14,6 +14,10 @@ uname -s | grep BSD >/dev/null } +isopenbsd() { + uname -s | grep OpenBSD >/dev/null +} + usage() { echo "supported arguments" echo "--prefix=/path default: $prefix" @@ -22,6 +26,9 @@ echo "--libdir=/path default: $prefix/lib" echo "--includedir=/path default: $prefix/include" echo "--sysconfdir=/path default: $prefix/etc" + echo "--ignore-cve default: no" + echo " if set to yes ignores CVE-2015-3887 and makes it possible" + echo " to preload from current dir (insecure)" ismac && isx86_64 && echo "--fat-binary : build for both i386 and x86_64 architectures on 64-bit Macs" echo "--help : show this text" exit 1 @@ -35,7 +42,7 @@ } fat_binary= - +ignore_cve=no parsearg() { case "$1" in --prefix=*) prefix=`spliteq $1`;; @@ -44,6 +51,8 @@ --libdir=*) libdir=`spliteq $1`;; --includedir=*) includedir=`spliteq $1`;; --sysconfdir=*) sysconfdir=`spliteq $1`;; + --ignore-cve) ignore_cve=1;; + --ignore-cve=*) ignore_cve=`spliteq $1`;; --fat-binary) fat_binary=1;; --help) usage;; esac @@ -83,12 +92,14 @@ echo CC?=$CC>config.mak [ -z "$CPPFLAGS" ] || echo CPPFLAGS?=$CPPFLAGS>>config.mak [ -z "$CFLAGS" ] || echo USER_CFLAGS?=$CFLAGS>>config.mak +[ -z "$LDFLAGS" ] || echo USER_LDFLAGS?=$LDFLAGS>>config.mak echo prefix=$prefix>>config.mak echo exec_prefix=$exec_prefix>>config.mak echo bindir=$bindir>>config.mak echo libdir=$libdir>>config.mak echo includedir=$includedir>>config.mak echo sysconfdir=$sysconfdir>>config.mak +[ "$ignore_cve" = "no" ] && echo CPPFLAGS+= -DSUPER_SECURE>>config.mak make_cmd=make if ismac ; then echo NO_AS_NEEDED=>>config.mak @@ -103,6 +114,7 @@ elif isbsd ; then echo LIBDL=>>config.mak echo "CFLAGS+=-DIS_BSD">>config.mak + isopenbsd && echo "CFLAGS+=-DIS_OPENBSD">>config.mak make_cmd=gmake fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/src/core.c new/proxychains-4.9/src/core.c --- old/proxychains-4.8.1/src/core.c 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/src/core.c 2015-05-28 08:36:44.000000000 +0200 @@ -719,11 +719,7 @@ return -1; } -#include "hostentdb.h" -struct hostent_list hl; - void core_initialize(void) { - hdb_init(&hl); } void core_unload(void) { @@ -734,6 +730,7 @@ data->hostent_space.h_name = data->addr_name; } +extern ip_type hostsreader_get_numeric_ip_for_name(const char* name); struct hostent *proxy_gethostbyname(const char *name, struct gethostbyname_data* data) { PFUNC(); char buff[256]; @@ -758,10 +755,8 @@ goto retname; } - memset(buff, 0, sizeof(buff)); - // this iterates over the "known hosts" db, usually /etc/hosts - ip_type hdb_res = hdb_get(&hl, (char*) name); + ip_type hdb_res = hostsreader_get_numeric_ip_for_name(name); if(hdb_res.as_int != ip_type_invalid.as_int) { data->resolved_addr = hdb_res.as_int; goto retname; @@ -790,8 +785,12 @@ free(res); } -#ifdef IS_MAC -/* getservbyname on mac is using thread local storage, so we dont need mutex */ +#if defined(IS_MAC) || defined(IS_OPENBSD) +#ifdef IS_OPENBSD /* OpenBSD has its own incompatible getservbyname_r */ +#define getservbyname_r mygetservbyname_r +#endif +/* getservbyname on mac is using thread local storage, so we dont need mutex + TODO: check if the same applies to OpenBSD */ static int getservbyname_r(const char* name, const char* proto, struct servent* result_buf, char* buf, size_t buflen, struct servent** result) { PFUNC(); @@ -858,6 +857,9 @@ p->ai_flags = hints->ai_flags; p->ai_protocol = hints->ai_protocol; } else { +#ifndef AI_V4MAPPED +#define AI_V4MAPPED 0 +#endif p->ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/src/core.h new/proxychains-4.9/src/core.h --- old/proxychains-4.8.1/src/core.h 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/src/core.h 2015-05-28 08:36:44.000000000 +0200 @@ -95,6 +95,10 @@ typedef int (*getnameinfo_t) (const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, int); +typedef ssize_t (*sendto_t) (int sockfd, const void *buf, size_t len, int flags, + const struct sockaddr *dest_addr, socklen_t addrlen); + + extern connect_t true_connect; extern gethostbyname_t true_gethostbyname; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/src/hostentdb.c new/proxychains-4.9/src/hostentdb.c --- old/proxychains-4.8.1/src/hostentdb.c 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/src/hostentdb.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -#include <stdint.h> -#include <string.h> -#include <netdb.h> -#include <stdlib.h> -#include <netinet/in.h> -#include <sys/socket.h> - -#include "ip_type.h" -#include "hash.h" -#include "stringdump.h" -#include "hostentdb.h" -#include "common.h" -#include "debug.h" - -#define STEP 16 -static void hdb_add(struct hostent_list* hl, char* host, ip_type ip) { - if(hl->count +1 > hl->capa) { - void * nu = realloc(hl->entries, (hl->capa + STEP) * sizeof(struct hostent_entry)); - if(!nu) return; - hl->entries = nu; - hl->capa += STEP; - } - struct hostent_entry *h = &hl->entries[hl->count]; - h->hash = dalias_hash(host); - h->ip.as_int = ip.as_int; - h->str = dumpstring(host, strlen(host) + 1); - if(h->str) hl->count++; -} - -static void hdb_fill(struct hostent_list *hl) { -#ifndef IS_BSD - struct hostent* hp; - while((hp = gethostent())) - if(hp->h_addrtype == AF_INET && hp->h_length == sizeof(in_addr_t)) { - hdb_add(hl, hp->h_name, (ip_type) { .as_int = *((in_addr_t*)(hp->h_addr_list[0])) }); - } -#else - /* FreeBSD hangs on gethostent(). since this feature is not crucial, we just do nothing */ - (void) hl; -#endif -} - -void hdb_init(struct hostent_list *hl) { - memset(hl, 0, sizeof *hl); - hdb_fill(hl); -} - -ip_type hdb_get(struct hostent_list *hl, char* host) { - size_t i; - PFUNC(); - uint32_t hash = dalias_hash(host); - for(i = 0; i < hl->count; i++) { - if(hl->entries[i].hash == hash && !strcmp(hl->entries[i].str, host)) { - #ifdef DEBUG - char ipbuf[16]; - pc_stringfromipv4(hl->entries[i].ip.octet, ipbuf); - PDEBUG("got ip %s for hostent entry %s\n", ipbuf, host); - #endif - return hl->entries[i].ip; - } - } - return ip_type_invalid; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/src/hostentdb.h new/proxychains-4.9/src/hostentdb.h --- old/proxychains-4.8.1/src/hostentdb.h 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/src/hostentdb.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -#ifndef HOSTENTDB_H -#define HOSTENTDB_H - -#include "ip_type.h" -#include <unistd.h> - -struct hostent_entry { - uint32_t hash; - ip_type ip; - char* str; -}; - -struct hostent_list { - size_t count; - size_t capa; - struct hostent_entry *entries; -}; - -void hdb_init(struct hostent_list *hl); -ip_type hdb_get(struct hostent_list *hl, char* host); - -//RcB: DEP "hostendb.c" -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/src/hostsreader.c new/proxychains-4.9/src/hostsreader.c --- old/proxychains-4.8.1/src/hostsreader.c 1970-01-01 01:00:00.000000000 +0100 +++ new/proxychains-4.9/src/hostsreader.c 2015-05-28 08:36:44.000000000 +0200 @@ -0,0 +1,121 @@ +#include <stdio.h> +#include <ctype.h> +#include <string.h> + +/* + simple reader for /etc/hosts + it only supports comments, blank lines and lines consisting of an ipv4 hostname pair. + this is required so we can return entries from the host db without messing up the + non-thread-safe state of libc's gethostent(). + +*/ + +struct hostsreader { + FILE *f; + char* ip, *name; +}; + +int hostsreader_open(struct hostsreader *ctx) { + if(!(ctx->f = fopen("/etc/hosts", "r"))) return 0; + return 1; +} + +void hostsreader_close(struct hostsreader *ctx) { + fclose(ctx->f); +} + +static int isnumericipv4(const char* ipstring); +int hostsreader_get(struct hostsreader *ctx, char* buf, size_t bufsize) { + while(1) { + if(!fgets(buf, bufsize, ctx->f)) return 0; + if(*buf == '#') continue; + char *p = buf; + size_t l = bufsize; + ctx->ip = p; + while(*p && !isspace(*p) && l) { + p++; + l--; + } + if(!l || !*p || p == ctx->ip) continue; + *p = 0; + p++; + while(*p && isspace(*p) && l) { + p++; + l--; + } + if(!l || !*p) continue; + ctx->name = buf; + while(*p && !isspace(*p) && l) { + p++; + l--; + } + if(!l || !*p) continue; + *p = 0; + if(isnumericipv4(ctx->ip)) return 1; + } +} + +char* hostsreader_get_ip_for_name(const char* name, char* buf, size_t bufsize) { + struct hostsreader ctx; + char *res = 0; + if(!hostsreader_open(&ctx)) return 0; + while(hostsreader_get(&ctx, buf, bufsize)) { + if(!strcmp(ctx.name, name)) { + res = ctx.ip; + break; + } + } + hostsreader_close(&ctx); + return res; +} + +#include "ip_type.h" +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +ip_type hostsreader_get_numeric_ip_for_name(const char* name) { + char *hres; + char buf[320]; + if((hres = hostsreader_get_ip_for_name(name, buf, sizeof buf))) { + struct in_addr c; + inet_aton(hres, &c); + ip_type res; + memcpy(res.octet, &c.s_addr, 4); + return res; + } else return ip_type_invalid; +} + +#ifdef HOSTSREADER_TEST +int main() { + char buf[256]; + char * ret = hostsreader_get_ip_for_name("goo", buf, sizeof buf); + printf("%s\n", ret ? ret : "null"); +} +#endif + +/* isnumericipv4() taken from libulz */ +static int isnumericipv4(const char* ipstring) { + size_t x = 0, n = 0, d = 0; + int wasdot = 0; + while(1) { + switch(ipstring[x]) { + case 0: goto done; + case '.': + if(!n || wasdot) return 0; + d++; + wasdot = 1; + break; + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + n++; + wasdot = 0; + break; + default: + return 0; + } + x++; + } + done: + if(d == 3 && n >= 4 && n <= 12) return 1; + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/src/libproxychains.c new/proxychains-4.9/src/libproxychains.c --- old/proxychains-4.8.1/src/libproxychains.c 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/src/libproxychains.c 2015-05-28 08:36:44.000000000 +0200 @@ -52,6 +52,7 @@ freeaddrinfo_t true_freeaddrinfo; getnameinfo_t true_getnameinfo; gethostbyaddr_t true_gethostbyaddr; +sendto_t true_sendto; int tcp_read_time_out; int tcp_connect_time_out; @@ -113,6 +114,7 @@ proxychains_write_log(LOG_PREFIX "DLL init: proxychains-ng %s\n", proxychains_get_version()); SETUP_SYM(connect); + SETUP_SYM(sendto); SETUP_SYM(gethostbyname); SETUP_SYM(getaddrinfo); SETUP_SYM(freeaddrinfo); @@ -479,3 +481,20 @@ } return NULL; } + +#ifndef MSG_FASTOPEN +# define MSG_FASTOPEN 0x20000000 +#endif + +ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, + const struct sockaddr *dest_addr, socklen_t addrlen) { + if (flags & MSG_FASTOPEN) { + if (!connect(sockfd, dest_addr, addrlen) && errno != EINPROGRESS) { + return -1; + } + dest_addr = NULL; + addrlen = 0; + flags &= ~MSG_FASTOPEN; + } + return true_sendto(sockfd, buf, len, flags, dest_addr, addrlen); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/src/main.c new/proxychains-4.9/src/main.c --- old/proxychains-4.8.1/src/main.c 2014-07-22 17:23:21.000000000 +0200 +++ new/proxychains-4.9/src/main.c 2015-05-28 08:36:44.000000000 +0200 @@ -33,7 +33,9 @@ static char own_dir[256]; static const char *dll_dirs[] = { +#ifndef SUPER_SECURE /* CVE-2015-3887 */ ".", +#endif own_dir, LIB_DIR, "/lib", @@ -48,7 +50,11 @@ while(l && argv0[l - 1] != '/') l--; if(l == 0) +#ifdef SUPER_SECURE + memcpy(own_dir, "/dev/null/", 11); +#else memcpy(own_dir, ".", 2); +#endif else { memcpy(own_dir, argv0, l - 1); own_dir[l] = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/proxychains-4.8.1/tests/test_sendto.c new/proxychains-4.9/tests/test_sendto.c --- old/proxychains-4.8.1/tests/test_sendto.c 1970-01-01 01:00:00.000000000 +0100 +++ new/proxychains-4.9/tests/test_sendto.c 2015-05-28 08:36:44.000000000 +0200 @@ -0,0 +1,66 @@ +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netdb.h> + +#ifndef MSG_FASTOPEN +# define MSG_FASTOPEN 0x20000000 +#endif + +void error(const char *msg) +{ + perror(msg); + exit(1); +} + +int main(int argc, char *argv[]) +{ + if (argc < 4) { + printf("Usage: %s host port method(connect or sendto)\n", argv[0]); + return 1; + } + const char *hostname = argv[1]; + const int portno = atoi(argv[2]); + const char *method = argv[3]; + char request[BUFSIZ]; + sprintf(request, "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", hostname); + int sockfd, n; + struct sockaddr_in serv_addr; + struct hostent *server; + + char buffer[BUFSIZ]; + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd < 0) error("ERROR opening socket"); + server = gethostbyname(hostname); + if (server == NULL) { + fprintf(stderr, "%s: no such host\n", hostname); + return 1; + } + memset(&serv_addr, 0, sizeof(serv_addr)); + serv_addr.sin_family = AF_INET; + memcpy(&serv_addr.sin_addr.s_addr, server->h_addr, server->h_length); + serv_addr.sin_port = htons(portno); + if (!strcmp(method, "connect")) { + if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) + error("connect"); + n = send(sockfd, request, strlen(request), 0); + } else if (!strcmp(method, "sendto")) { + n = sendto(sockfd, request, strlen(request), MSG_FASTOPEN, (struct sockaddr *)&serv_addr, sizeof(serv_addr)); + } else { + printf("Unknown method %s\n", method); + return 1; + } + if (n < 0) + error("send"); + memset(buffer, 0, BUFSIZ); + n = read(sockfd, buffer, BUFSIZ - 1); + if (n < 0) + error("ERROR reading from socket"); + printf("%s\n", buffer); + close(sockfd); + return 0; +}

1 0