March 2016 - openSUSE Commits - openSUSE Mailing Lists

commit wpa_supplicant for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package wpa_supplicant for openSUSE:Factory checked in at 2016-03-01 09:39:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wpa_supplicant (Old) and /work/SRC/openSUSE:Factory/.wpa_supplicant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wpa_supplicant" Changes: -------- --- /work/SRC/openSUSE:Factory/wpa_supplicant/wpa_supplicant.changes 2015-05-10 10:56:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wpa_supplicant.new/wpa_supplicant.changes 2016-03-01 09:39:21.000000000 +0100 @@ -1,0 +2,110 @@ +Fri Feb 26 21:10:55 UTC 2016 - crrodriguez(a)opensuse.org + +- Revert CONFIG_ELOOP_EPOLL=y, it is broken in combination + with CONFIG_DBUS=yes. + +------------------------------------------------------------------- +Sat Feb 20 16:56:01 UTC 2016 - crrodriguez(a)opensuse.org + +- spec: Compile the GUI against QT5 in 13.2 and later. + +------------------------------------------------------------------- +Thu Feb 18 15:36:23 UTC 2016 - crrodriguez(a)opensuse.org + +- Previous update did not include version 2.5 tarball + or changed the version number in spec, only the changelog + and removed patches. +- config: set CONFIG_NO_RANDOM_POOL=y, we have a reliable· + random number generator by using /dev/urandom, no need to + keep an internal random number pool which draws entropy from + /dev/random. +- config: prefer using epoll(7) instead of select(2) + by setting CONFIG_ELOOP_EPOLL=y +- wpa_supplicant-getrandom.patch: Prefer to use the getrandom(2) + system call to collect entropy. if it is not present disable + buffering when reading /dev/urandom, otherwise each os_get_random() + call will request BUFSIZ of entropy instead of the few needed bytes. + +------------------------------------------------------------------- +Wed Feb 17 13:47:43 UTC 2016 - lnussel(a)suse.de + +- add aliases for both provided dbus names to avoid systemd stopping the + service when switching runlevels (boo#966535) + +------------------------------------------------------------------- +Thu Feb 4 10:18:54 UTC 2016 - michael(a)stroeder.com + +- removed obsolete security patches: + * 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch + * 0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch + * 0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch + * 0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch + * wpa_s-D-Bus-Fix-operations-when-P2P-management-interface-is-used.patch + * 0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch + * 0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch + * 0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch + * 0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch +- Update to upstream release 2.5 + * fixed P2P validation of SSID element length before copying it + [http://w1.fi/security/2015-1/] (CVE-2015-1863) + * fixed WPS UPnP vulnerability with HTTP chunked transfer encoding + [http://w1.fi/security/2015-2/] (CVE-2015-4141) + * fixed WMM Action frame parser (AP mode) + [http://w1.fi/security/2015-3/] (CVE-2015-4142) + * fixed EAP-pwd peer missing payload length validation + [http://w1.fi/security/2015-4/] + (CVE-2015-4143, CVE-2015-4144, CVE-2015-4145, CVE-2015-4146) + * fixed validation of WPS and P2P NFC NDEF record payload length + [http://w1.fi/security/2015-5/] + * nl80211: + - added VHT configuration for IBSS + - fixed vendor command handling to check OUI properly + - allow driver-based roaming to change ESS + * added AVG_BEACON_RSSI to SIGNAL_POLL output + * wpa_cli: added tab completion for number of commands + * removed unmaintained and not yet completed SChannel/CryptoAPI support + * modified Extended Capabilities element use in Probe Request frames to + include all cases if any of the values are non-zero + * added support for dynamically creating/removing a virtual interface + with interface_add/interface_remove + * added support for hashed password (NtHash) in EAP-pwd peer + * added support for memory-only PSK/passphrase (mem_only_psk=1 and + CTRL-REQ/RSP-PSK_PASSPHRASE) + * P2P + - optimize scan frequencies list when re-joining a persistent group + - fixed number of sequences with nl80211 P2P Device interface + - added operating class 125 for P2P use cases (this allows 5 GHz + channels 161 and 169 to be used if they are enabled in the current + regulatory domain) + - number of fixes to P2PS functionality + - do not allow 40 MHz co-ex PRI/SEC switch to force MCC + - extended support for preferred channel listing + * D-Bus: + - fixed WPS property of fi.w1.wpa_supplicant1.BSS interface + - fixed PresenceRequest to use group interface + - added new signals: FindStopped, WPS pbc-overlap, + GroupFormationFailure, WPS timeout, InvitationReceived + - added new methods: WPS Cancel, P2P Cancel, Reconnect, RemoveClient + - added manufacturer info + * added EAP-EKE peer support for deriving Session-Id + * added wps_priority configuration parameter to set the default priority + for all network profiles added by WPS + * added support to request a scan with specific SSIDs with the SCAN + command (optional "ssid <hexdump>" arguments) + * removed support for WEP40/WEP104 as a group cipher with WPA/WPA2 + * fixed SAE group selection in an error case + * modified SAE routines to be more robust and PWE generation to be + stronger against timing attacks + * added support for Brainpool Elliptic Curves with SAE + * added support for CCMP-256 and GCMP-256 as group ciphers with FT + * fixed BSS selection based on estimated throughput + * added option to disable TLSv1.0 with OpenSSL + (phase1="tls_disable_tlsv1_0=1") + * added Fast Session Transfer (FST) module + * fixed OpenSSL PKCS#12 extra certificate handling + * fixed key derivation for Suite B 192-bit AKM (this breaks + compatibility with the earlier version) + * added RSN IE to Mesh Peering Open/Confirm frames + * number of small fixes + +------------------------------------------------------------------- Old: ---- 0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch 0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch 0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch 0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch 0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch 0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch 0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch wpa_s-D-Bus-Fix-operations-when-P2P-management-interface-is-used.patch wpa_supplicant-2.4.tar.gz New: ---- wpa_supplicant-2.5.tar.gz wpa_supplicant-getrandom.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wpa_supplicant.spec ++++++ --- /var/tmp/diff_new_pack.vqEcVk/_old 2016-03-01 09:39:23.000000000 +0100 +++ /var/tmp/diff_new_pack.vqEcVk/_new 2016-03-01 09:39:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package wpa_supplicant # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,24 +16,16 @@ # -Name: wpa_supplicant -BuildRequires: dbus-1-devel -BuildRequires: libqt4 -BuildRequires: libqt4-devel -BuildRequires: openssl-devel -BuildRequires: pkg-config -BuildRequires: readline-devel -%if 0%{?suse_version} > 1230 -BuildRequires: systemd-rpm-macros -%systemd_requires +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run %endif -BuildRequires: libnl3-devel -Url: http://hostap.epitest.fi/wpa_supplicant/ -Version: 2.4 +Name: wpa_supplicant +Version: 2.5 Release: 0 Summary: WPA supplicant implementation License: BSD-3-Clause and GPL-2.0+ Group: Productivity/Networking/Other +Url: http://hostap.epitest.fi/wpa_supplicant/ Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.gz Source1: config Source2: %{name}.conf @@ -47,29 +39,26 @@ # wpa_supplicant-sigusr1-changes-debuglevel.patch won't go upstream as it # is not portable Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch -Patch3: 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch -Patch4: wpa_supplicant-alloc_size.patch -# PATCH-FIX-UPSTREAM wpa_s-D-Bus-Fix-operations-when-P2P-management-interface-is-used.patch arch#44740 zaitor(a)opensuse.org -- Fix Segmentation fault in wpa_supplicant. Patch taken from upstream master git. -Patch5: wpa_s-D-Bus-Fix-operations-when-P2P-management-interface-is-used.patch -# PATCH-FIX-UPSTREAM 0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch bnc#930077 -Patch6: 0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch -# PATCH-FIX-UPSTREAM 0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch bnc#930078 -Patch7: 0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch -# PATCH-FIX-UPSTREAM 0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch bnc#930079 -Patch8: 0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch -# PATCH-FIX-UPSTREAM 0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch bnc#930079 -Patch9: 0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch -# PATCH-FIX-UPSTREAM 0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch bnc#930079 -Patch10: 0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch -# PATCH-FIX-UPSTREAM 0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch bnc#930079 -Patch11: 0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch -# PATCH-FIX-UPSTREAM 0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch bnc#930079 -Patch12: 0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch3: wpa_supplicant-alloc_size.patch +Patch4: wpa_supplicant-getrandom.patch +BuildRequires: dbus-1-devel +BuildRequires: libnl3-devel +%if 0%{?suse_version} < 1320 +BuildRequires: libqt4 +BuildRequires: libqt4-devel +%else +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +%endif +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: readline-devel Requires: logrotate -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1230 +BuildRequires: systemd-rpm-macros +%systemd_requires %endif %description @@ -78,11 +67,6 @@ negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver. - -Authors: --------- - Jouni Malinen <jkmaline(a)cc.hut.fi> - %package gui Summary: WPA supplicant graphical front-end Group: System/Monitoring @@ -92,33 +76,23 @@ This package contains a graphical front-end to wpa_supplicant, an implementation of the WPA Supplicant component. - -Authors: --------- - Jouni Malinen <jkmaline(a)cc.hut.fi> - %prep %setup -q -n wpa_supplicant-%{version} rm -rf wpa_supplicant-%{version}/patches cp %{SOURCE1} wpa_supplicant/.config -%patch1 -p0 +%patch1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 - %build cd wpa_supplicant -CFLAGS="$RPM_OPT_FLAGS" make V=1 %{?_smp_mflags} +CFLAGS="%{optflags}" make V=1 %{?_smp_mflags} cd wpa_gui-qt4 -qmake QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" QMAKE_CFLAGS="$RPM_OPT_FLAGS" +%if 0%{?suse_version} < 1320 +qmake QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}" +%else +qmake-qt5 QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}" +%endif make %{?_smp_mflags} %install @@ -149,6 +123,11 @@ %endif # avoid spurious dependency on /usr/bin/python chmod -x wpa_supplicant/examples/*.py +%if 0%{?suse_version} > 1230 +# dbus auto activation boo#966535 +ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service +ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service +%endif %if 0%{?suse_version} > 1230 %pre @@ -180,15 +159,17 @@ %endif %if 0%{?suse_version} > 1230 %{_unitdir}/wpa_supplicant.service +%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service +%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service %endif %dir %{_sysconfdir}/%{name} -%doc %{_mandir}/man8/* +%{_mandir}/man8/* %exclude %{_mandir}/man8/wpa_gui.* -%doc %{_mandir}/man5/* +%{_mandir}/man5/* %files gui %defattr(-,root,root) -/usr/sbin/wpa_gui -%doc %{_mandir}/man8/wpa_gui.* +%{_sbindir}/wpa_gui +%{_mandir}/man8/wpa_gui.* %changelog ++++++ config ++++++ --- /var/tmp/diff_new_pack.vqEcVk/_old 2016-03-01 09:39:23.000000000 +0100 +++ /var/tmp/diff_new_pack.vqEcVk/_new 2016-03-01 09:39:23.000000000 +0100 @@ -433,7 +433,7 @@ # disabled. This will save some in binary size and CPU use. However, this # should only be considered for builds that are known to be used on devices # that meet the requirements described above. -#CONFIG_NO_RANDOM_POOL=y +CONFIG_NO_RANDOM_POOL=y # IEEE 802.11n (High Throughput) support (mainly for AP mode) CONFIG_IEEE80211N=y ++++++ wpa_supplicant-2.4.tar.gz -> wpa_supplicant-2.5.tar.gz ++++++ ++++ 43861 lines of diff (skipped) ++++++ wpa_supplicant-getrandom.patch ++++++ --- wpa_supplicant-2.4.orig/src/utils/os_unix.c +++ wpa_supplicant-2.4/src/utils/os_unix.c @@ -6,11 +6,15 @@ * See README for more details. */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include "includes.h" #include <time.h> #include <sys/wait.h> - +#include <sys/syscall.h> +#include <unistd.h> #ifdef ANDROID #include <sys/capability.h> #include <sys/prctl.h> @@ -223,6 +227,10 @@ void os_daemonize_terminate(const char * int os_get_random(unsigned char *buf, size_t len) { +#ifdef SYS_getrandom + int gr = TEMP_FAILURE_RETRY(syscall(SYS_getrandom, buf, len, 0)); + return (gr != -1 && gr == len) ? 0 : -1; +#else FILE *f; size_t rc; @@ -232,10 +240,13 @@ int os_get_random(unsigned char *buf, si return -1; } + setbuf(f, NULL); + rc = fread(buf, 1, len, f); fclose(f); return rc != len ? -1 : 0; +#endif }

1 0

commit bind for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package bind for openSUSE:Factory checked in at 2016-03-01 09:38:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bind (Old) and /work/SRC/openSUSE:Factory/.bind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bind" Changes: -------- --- /work/SRC/openSUSE:Factory/bind/bind.changes 2016-01-28 17:19:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2016-03-01 09:39:00.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 25 16:10:45 UTC 2016 - bwiedemann(a)suse.com + +- drop a changing timestamp making build reproducible + +------------------------------------------------------------------- +Fri Feb 12 18:56:28 UTC 2016 - crrodriguez(a)opensuse.org + +- Build with --with-randomdev=/dev/urandom otherwise + libisc will use /dev/random to gather entropy and that might + block, short read etc.. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.9RMc2W/_old 2016-03-01 09:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.9RMc2W/_new 2016-03-01 09:39:02.000000000 +0100 @@ -377,6 +377,10 @@ %patch53 %patch101 -p1 %patch102 -p1 +# use the year from source gzip header instead of current one to make reproducible rpms +year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < %{S:0}) +sed -i "s/stdout, copyright, year/stdout, copyright, \"-$year\"/" lib/dns/gen.c + # modify settings of some files regarding to OS version and vendor function replaceStrings() { @@ -441,7 +445,8 @@ --with-libxml2 \ --with-dlz-mysql \ --with-dlz-ldap \ - --enable-rrl + --enable-rrl \ + --with-randomdev=/dev/urandom \ " cp -f -p config.guess config.sub contrib/idn/idnkit-1.0-src/ ./configure ${CONFIGURE_OPTIONS}

1 0

commit rpmlint-mini for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package rpmlint-mini for openSUSE:Factory checked in at 2016-03-01 09:38:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint-mini (Old) and /work/SRC/openSUSE:Factory/.rpmlint-mini.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint-mini" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint-mini/rpmlint-mini.changes 2015-04-30 11:49:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint-mini.new/rpmlint-mini.changes 2016-03-01 09:38:45.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 22 07:48:27 UTC 2016 - dmueller(a)suse.com + +- raise version to 1.8 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-mini.spec ++++++ --- /var/tmp/diff_new_pack.u8vwJm/_old 2016-03-01 09:38:45.000000000 +0100 +++ /var/tmp/diff_new_pack.u8vwJm/_new 2016-03-01 09:38:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpmlint-mini # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -34,7 +34,7 @@ Summary: Rpm correctness checker License: GPL-2.0+ Group: System/Packages -Version: 1.5 +Version: 1.8 Release: 0 Url: http://rpmlint.zarb.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build

1 0

commit imap for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package imap for openSUSE:Factory checked in at 2016-03-01 09:38:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imap (Old) and /work/SRC/openSUSE:Factory/.imap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "imap" Changes: -------- --- /work/SRC/openSUSE:Factory/imap/imap.changes 2014-01-15 19:35:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.imap.new/imap.changes 2016-03-01 09:38:34.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 13 13:06:16 UTC 2016 - crrodriguez(a)opensuse.org + +- imap-openssl.patch: Support TLS 1.2 and ECDH ciphersuites. + +------------------------------------------------------------------- New: ---- imap-openssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imap.spec ++++++ --- /var/tmp/diff_new_pack.BPW6kg/_old 2016-03-01 09:38:35.000000000 +0100 +++ /var/tmp/diff_new_pack.BPW6kg/_new 2016-03-01 09:38:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package imap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -43,6 +43,7 @@ Patch5: %{name}-2007e-c++.patch #Patch6: %{name}-2006c1.diff Patch6: %{name}-2007e.patch +Patch7: imap-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: bash /bin/echo /bin/mv BuildRequires: openssl-devel @@ -105,6 +106,7 @@ %patch4 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -DDISABLE_POP_PROXY=1 -fPIC -fno-strict-aliasing -fstack-protector" ++++++ imap-openssl.patch ++++++ --- imap-2007e.orig/src/osdep/unix/ssl_unix.c +++ imap-2007e/src/osdep/unix/ssl_unix.c @@ -38,7 +38,7 @@ #undef crypt #define SSLBUFLEN 8192 -#define SSLCIPHERLIST "ALL:!LOW" +#define SSLCIPHERLIST "DEFAULT" /* SSL I/O stream */ @@ -219,11 +219,13 @@ static char *ssl_start_work (SSLSTREAM * (sslclientkey_t) mail_parameters (NIL,GET_SSLCLIENTKEY,NIL); if (ssl_last_error) fs_give ((void **) &ssl_last_error); ssl_last_host = host; - if (!(stream->context = SSL_CTX_new ((flags & NET_TLSCLIENT) ? - TLSv1_client_method () : - SSLv23_client_method ()))) + if (!(stream->context = SSL_CTX_new (SSLv23_client_method ()))) return "SSL context failed"; - SSL_CTX_set_options (stream->context,0); +#ifdef SSL_CTX_set_min_proto_version + SSL_CTX_set_min_proto_version(stream->context, TLS1_VERSION); +#else + SSL_CTX_set_options (stream->context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); +#endif /* disable certificate validation? */ if (flags & NET_NOVALIDATECERT) SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL); @@ -702,13 +704,22 @@ void ssl_server_init (char *server) if (stat (key,&sbuf)) strcpy (key,cert); } /* create context */ - if (!(stream->context = SSL_CTX_new (start_tls ? - TLSv1_server_method () : - SSLv23_server_method ()))) + if (!(stream->context = SSL_CTX_new (SSLv23_server_method ()))) syslog (LOG_ALERT,"Unable to create SSL context, host=%.80s", tcp_clienthost ()); else { /* set context options */ - SSL_CTX_set_options (stream->context,SSL_OP_ALL); + SSL_CTX_set_options (stream->context, SSL_OP_ALL); +#if defined(SSL_CTX_set_min_proto_version) + SSL_CTX_set_min_proto_version(stream->context, TLS1_VERSION); +#else + SSL_CTX_set_options (stream->context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); +#endif +#if defined(SSL_CTX_set_dh_auto) + SSL_CTX_set_dh_auto(stream->context, 1); +#endif +#if defined(SSL_CTX_set_ecdh_auto) + SSL_CTX_set_ecdh_auto(stream->context, 1); +#endif /* set cipher list */ if (!SSL_CTX_set_cipher_list (stream->context,SSLCIPHERLIST)) syslog (LOG_ALERT,"Unable to set cipher list %.80s, host=%.80s",

1 0

commit boost for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package boost for openSUSE:Factory checked in at 2016-03-01 09:38:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/boost (Old) and /work/SRC/openSUSE:Factory/.boost.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "boost" Changes: -------- --- /work/SRC/openSUSE:Factory/boost/boost.changes 2016-02-03 10:18:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.boost.new/boost.changes 2016-03-01 09:38:23.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 14 14:28:50 UTC 2016 - egeorget(a)openmailbox.org + +- Added libboost_python3 to the dependency macro. + * boost-devel will now correctly requires libboost_python3. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ boost.spec ++++++ --- /var/tmp/diff_new_pack.0ZimSD/_old 2016-03-01 09:38:26.000000000 +0100 +++ /var/tmp/diff_new_pack.0ZimSD/_new 2016-03-01 09:38:26.000000000 +0100 @@ -28,7 +28,7 @@ %define build_quickbook 1 %define boost_l1 libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} %define boost_l2 libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} -%define boost_l3 libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} +%define boost_l3 libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_python3-%{lib_appendix} libboost_serialization%{lib_appendix} %define boost_l4 libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix} %define boost_l5 libboost_wave%{lib_appendix} libboost_regex%{lib_appendix} libboost_regex%{lib_appendix} %define boost_l6 libboost_random%{lib_appendix} libboost_chrono%{lib_appendix} libboost_locale%{lib_appendix}

1 0

commit doxygen for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at 2016-03-01 09:36:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doxygen (Old) and /work/SRC/openSUSE:Factory/.doxygen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "doxygen" Changes: -------- --- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes 2016-01-08 15:22:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new/doxygen.changes 2016-03-01 09:36:10.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 21 00:48:27 UTC 2016 - crrodriguez(a)opensuse.org + +- Do not link with -pie if we are not compiling with -fPIE + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/doxygen/doxywizard.changes 2016-01-08 15:22:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new/doxywizard.changes 2016-03-01 09:36:11.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 21 00:41:56 UTC 2016 - crrodriguez(a)opensuse.org + +- Build against QT5 in newer products +- Do not link with -pie as we are not compiling with -fPIE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.BVIcCX/_old 2016-03-01 09:36:12.000000000 +0100 +++ /var/tmp/diff_new_pack.BVIcCX/_new 2016-03-01 09:36:12.000000000 +0100 @@ -65,9 +65,9 @@ -Dbuild_xmlparser=ON \ -Dbuild_search=OFF \ -Dbuild_wizard=OFF \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" make %{?_smp_mflags} %install ++++++ doxywizard.spec ++++++ --- /var/tmp/diff_new_pack.BVIcCX/_old 2016-03-01 09:36:12.000000000 +0100 +++ /var/tmp/diff_new_pack.BVIcCX/_new 2016-03-01 09:36:12.000000000 +0100 @@ -32,7 +32,15 @@ BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: libjpeg-devel +BuildRequires: python-xml +%if 0%{?suse_version} < 1320 BuildRequires: libqt4-devel >= 4.3 +%else +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +%endif BuildRequires: update-desktop-files Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,9 +63,9 @@ export CXXFLAGS="%{optflags} -fPIC" %cmake \ -Dbuild_wizard=ON \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" make %{?_smp_mflags} %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315

1 0

commit miniupnpc for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package miniupnpc for openSUSE:Factory checked in at 2016-03-01 09:35:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/miniupnpc (Old) and /work/SRC/openSUSE:Factory/.miniupnpc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "miniupnpc" Changes: -------- --- /work/SRC/openSUSE:Factory/miniupnpc/miniupnpc.changes 2015-12-03 13:25:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.miniupnpc.new/miniupnpc.changes 2016-03-01 09:36:06.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Feb 20 13:47:40 UTC 2016 - mpluskal(a)suse.com + +- Update to 1.9.20160209 + * change miniwget to return HTTP status code + * increments API_VERSION to 16 + * Improve UPNPIGD_IsConnected() to check if WAN address is not + private. parse HTTP response status line in miniwget.c + +------------------------------------------------------------------- Old: ---- miniupnpc-1.9.20151026.tar.gz New: ---- miniupnpc-1.9.20160209.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ miniupnpc.spec ++++++ --- /var/tmp/diff_new_pack.lvoghk/_old 2016-03-01 09:36:07.000000000 +0100 +++ /var/tmp/diff_new_pack.lvoghk/_new 2016-03-01 09:36:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package miniupnpc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,9 +16,9 @@ # -%define soname 15 +%define soname 16 Name: miniupnpc -Version: 1.9.20151026 +Version: 1.9.20160209 Release: 0 Summary: Universal Plug'n'Play (UPnP) Client License: BSD-3-Clause ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.lvoghk/_old 2016-03-01 09:36:07.000000000 +0100 +++ /var/tmp/diff_new_pack.lvoghk/_new 2016-03-01 09:36:07.000000000 +0100 @@ -1 +1 @@ -libminiupnpc15 +libminiupnpc16 ++++++ miniupnpc-1.9.20151026.tar.gz -> miniupnpc-1.9.20160209.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/CMakeLists.txt new/miniupnpc-1.9.20160209/CMakeLists.txt --- old/miniupnpc-1.9.20151026/CMakeLists.txt 2015-10-08 18:16:03.000000000 +0200 +++ new/miniupnpc-1.9.20160209/CMakeLists.txt 2016-02-09 10:38:56.000000000 +0100 @@ -2,7 +2,7 @@ project (miniupnpc C) set (MINIUPNPC_VERSION 1.9) -set (MINIUPNPC_API_VERSION 15) +set (MINIUPNPC_API_VERSION 16) if (NOT CMAKE_BUILD_TYPE) if (WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/Changelog.txt new/miniupnpc-1.9.20160209/Changelog.txt --- old/miniupnpc-1.9.20151026/Changelog.txt 2015-10-26 18:05:52.000000000 +0100 +++ new/miniupnpc-1.9.20160209/Changelog.txt 2016-02-09 10:38:56.000000000 +0100 @@ -1,6 +1,14 @@ -$Id: Changelog.txt,v 1.219 2015/10/26 17:05:06 nanard Exp $ +$Id: Changelog.txt,v 1.222 2016/01/24 17:24:35 nanard Exp $ miniUPnP client Changelog. +2016/01/24: + change miniwget to return HTTP status code + increments API_VERSION to 16 + +2016/01/22: + Improve UPNPIGD_IsConnected() to check if WAN address is not private. + parse HTTP response status line in miniwget.c + 2015/10/26: snprintf() overflow check. check overflow in simpleUPnPcommand2() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/Makefile new/miniupnpc-1.9.20160209/Makefile --- old/miniupnpc-1.9.20151026/Makefile 2015-10-26 18:05:52.000000000 +0100 +++ new/miniupnpc-1.9.20160209/Makefile 2016-02-09 10:38:56.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.132 2015/10/26 16:59:54 nanard Exp $ +# $Id: Makefile,v 1.133 2016/01/24 17:24:35 nanard Exp $ # MiniUPnP Project # http://miniupnp.free.fr/ # http://miniupnp.tuxfamily.org/ @@ -66,7 +66,7 @@ endif # APIVERSION is used to build SONAME -APIVERSION = 15 +APIVERSION = 16 SRCS = igd_desc_parse.c miniupnpc.c minixml.c minisoap.c miniwget.c \ upnpc.c upnpcommands.c upnpreplyparse.c testminixml.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/Makefile.mingw new/miniupnpc-1.9.20160209/Makefile.mingw --- old/miniupnpc-1.9.20151026/Makefile.mingw 2015-10-26 18:05:52.000000000 +0100 +++ new/miniupnpc-1.9.20160209/Makefile.mingw 2016-01-19 11:26:58.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: Makefile.mingw,v 1.22 2015/10/26 16:59:54 nanard Exp $ +# $Id: Makefile.mingw,v 1.23 2016/01/19 09:56:03 nanard Exp $ # Miniupnp project. # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ # (c) 2005-2015 Thomas Bernard @@ -18,7 +18,8 @@ upnpdev.o OBJSDLL=$(addprefix dll/, $(OBJS)) -all: init upnpc-static upnpc-shared testminixml libminiupnpc.a miniupnpc.dll +all: init upnpc-static upnpc-shared testminixml libminiupnpc.a \ + miniupnpc.dll listdevices init: mkdir dll @@ -66,6 +67,9 @@ upnpc-shared: dll/upnpc.o miniupnpc.lib $(CC) -o $@ $^ $(LDLIBS) +listdevices: listdevices.o libminiupnpc.a + $(CC) -o $@ $^ $(LDLIBS) + wingenminiupnpcstrings: wingenminiupnpcstrings.o wingenminiupnpcstrings.o: wingenminiupnpcstrings.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/apiversions.txt new/miniupnpc-1.9.20160209/apiversions.txt --- old/miniupnpc-1.9.20151026/apiversions.txt 2015-10-08 18:16:03.000000000 +0200 +++ new/miniupnpc-1.9.20160209/apiversions.txt 2016-02-09 10:38:56.000000000 +0100 @@ -1,7 +1,12 @@ -$Id: apiversions.txt,v 1.8 2015/10/08 16:15:47 nanard Exp $ +$Id: apiversions.txt,v 1.9 2016/01/24 17:24:36 nanard Exp $ Differences in API between miniUPnPc versions +API version 16 + added "status_code" argument to getHTTPResponse(), miniwget() and miniwget_getaddr() + updated macro : + #define MINIUPNPC_API_VERSION 16 + API version 15 changed "sameport" argument of upnpDiscover() upnpDiscoverAll() upnpDiscoverDevice() to "localport". When 0 or 1, behaviour is not changed, but it can take diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/minihttptestserver.c new/miniupnpc-1.9.20160209/minihttptestserver.c --- old/miniupnpc-1.9.20151026/minihttptestserver.c 2015-07-15 18:14:01.000000000 +0200 +++ new/miniupnpc-1.9.20160209/minihttptestserver.c 2015-11-18 09:25:37.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: minihttptestserver.c,v 1.18 2015/07/15 12:41:15 nanard Exp $ */ +/* $Id: minihttptestserver.c,v 1.19 2015/11/17 09:07:17 nanard Exp $ */ /* Project : miniUPnP * Author : Thomas Bernard * Copyright (c) 2011-2015 Thomas Bernard @@ -18,6 +18,10 @@ #include <time.h> #include <errno.h> +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK 0x7f000001 +#endif + #define CRAP_LENGTH (2048) volatile sig_atomic_t quit = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/minissdpc.c new/miniupnpc-1.9.20160209/minissdpc.c --- old/miniupnpc-1.9.20151026/minissdpc.c 2015-10-26 18:05:52.000000000 +0100 +++ new/miniupnpc-1.9.20160209/minissdpc.c 2016-01-19 11:26:58.000000000 +0100 @@ -1,5 +1,6 @@ -/* $Id: minissdpc.c,v 1.30 2015/10/26 17:05:07 nanard Exp $ */ -/* Project : miniupnp +/* $Id: minissdpc.c,v 1.31 2016/01/19 09:56:46 nanard Exp $ */ +/* vim: tabstop=4 shiftwidth=4 noexpandtab + * Project : miniupnp * Web : http://miniupnp.free.fr/ * Author : Thomas BERNARD * copyright (c) 2005-2015 Thomas Bernard @@ -67,6 +68,10 @@ #define HAS_IP_MREQN #endif +#if !defined(HAS_IP_MREQN) && !defined(_WIN32) +#include <sys/ioctl.h> +#endif + #if defined(HAS_IP_MREQN) && defined(NEED_STRUCT_IP_MREQN) /* Several versions of glibc don't define this structure, * define it here and compile with CFLAGS NEED_STRUCT_IP_MREQN */ @@ -647,11 +652,25 @@ { PRINT_SOCKET_ERROR("setsockopt"); } -#else +#elif !defined(_WIN32) + struct ifreq ifr; + int ifrlen = sizeof(ifr); + strncpy(ifr.ifr_name, multicastif, IFNAMSIZ); + ifr.ifr_name[IFNAMSIZ-1] = '\0'; + if(ioctl(sudp, SIOCGIFADDR, &ifr, &ifrlen) < 0) + { + PRINT_SOCKET_ERROR("ioctl(...SIOCGIFADDR...)"); + } + mc_if.s_addr = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; + if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) + { + PRINT_SOCKET_ERROR("setsockopt"); + } +#else /* _WIN32 */ #ifdef DEBUG printf("Setting of multicast interface not supported with interface name.\n"); #endif -#endif +#endif /* #ifdef HAS_IP_MREQN / !defined(_WIN32) */ } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/miniupnpc.c new/miniupnpc-1.9.20160209/miniupnpc.c --- old/miniupnpc-1.9.20151026/miniupnpc.c 2015-10-26 18:05:52.000000000 +0100 +++ new/miniupnpc-1.9.20160209/miniupnpc.c 2016-02-09 10:38:56.000000000 +0100 @@ -1,9 +1,9 @@ -/* $Id: miniupnpc.c,v 1.141 2015/10/26 17:05:07 nanard Exp $ */ -/* vim: tabstop=4 shiftwidth=4 noexpandtab */ -/* Project : miniupnp +/* $Id: miniupnpc.c,v 1.148 2016/01/24 17:24:36 nanard Exp $ */ +/* vim: tabstop=4 shiftwidth=4 noexpandtab + * Project : miniupnp * Web : http://miniupnp.free.fr/ * Author : Thomas BERNARD - * copyright (c) 2005-2015 Thomas Bernard + * copyright (c) 2005-2016 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENSE file. */ #include <stdlib.h> @@ -72,6 +72,25 @@ #define SERVICEPREFIX "u" #define SERVICEPREFIX2 'u' +/* check if an ip address is a private (LAN) address + * see https://tools.ietf.org/html/rfc1918 */ +static int is_rfc1918addr(const char * addr) +{ + /* 192.168.0.0 - 192.168.255.255 (192.168/16 prefix) */ + if(COMPARE(addr, "192.168.")) + return 1; + /* 10.0.0.0 - 10.255.255.255 (10/8 prefix) */ + if(COMPARE(addr, "10.")) + return 1; + /* 172.16.0.0 - 172.31.255.255 (172.16/12 prefix) */ + if(COMPARE(addr, "172.")) { + int i = atoi(addr + 4); + if((16 <= i) && (i <= 31)) + return 1; + } + return 0; +} + /* root description parsing */ MINIUPNP_LIBSPEC void parserootdesc(const char * buffer, int bufsize, struct IGDdatas * data) { @@ -107,6 +126,7 @@ int soapbodylen; char * buf; int n; + int status_code; *bufsize = 0; snprintf(soapact, sizeof(soapact), "%s#%s", service, action); @@ -210,11 +230,15 @@ return NULL; } - buf = getHTTPResponse(s, bufsize); + buf = getHTTPResponse(s, bufsize, &status_code); #ifdef DEBUG if(*bufsize > 0 && buf) { - printf("SOAP Response :\n%.*s\n", *bufsize, buf); + printf("HTTP %d SOAP Response :\n%.*s\n", status_code, *bufsize, buf); + } + else + { + printf("HTTP %d, empty SOAP response. size=%d\n", status_code, *bufsize); } #endif closesocket(s); @@ -526,7 +550,7 @@ * 3 = an UPnP device has been found but was not recognized as an IGD * * In any positive non zero return case, the urls and data structures - * passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to + * passed as parameters are set. Dont forget to call FreeUPNPUrls(urls) to * free allocated memory. */ MINIUPNP_LIBSPEC int @@ -546,6 +570,9 @@ int state = -1; /* state 1 : IGD connected. State 2 : IGD. State 3 : anything */ int n_igd = 0; char extIpAddr[16]; + char myLanAddr[40]; + int status_code = -1; + if(!devlist) { #ifdef DEBUG @@ -568,8 +595,8 @@ /* we should choose an internet gateway device. * with st == urn:schemas-upnp-org:device:InternetGatewayDevice:1 */ desc[i].xml = miniwget_getaddr(dev->descURL, &(desc[i].size), - lanaddr, lanaddrlen, - dev->scope_id); + myLanAddr, sizeof(myLanAddr), + dev->scope_id, &status_code); #ifdef DEBUG if(!desc[i].xml) { @@ -586,6 +613,8 @@ { desc[i].is_igd = 1; n_igd++; + if(lanaddr) + strncpy(lanaddr, myLanAddr, lanaddrlen); } } } @@ -601,20 +630,25 @@ parserootdesc(desc[i].xml, desc[i].size, data); if(desc[i].is_igd || state >= 3 ) { + int is_connected; + GetUPNPUrls(urls, data, dev->descURL, dev->scope_id); /* in state 2 and 3 we dont test if device is connected ! */ if(state >= 2) goto free_and_return; + is_connected = UPNPIGD_IsConnected(urls, data); #ifdef DEBUG printf("UPNPIGD_IsConnected(%s) = %d\n", - urls->controlURL, - UPNPIGD_IsConnected(urls, data)); + urls->controlURL, is_connected); #endif /* checks that status is connected AND there is a external IP address assigned */ - if(UPNPIGD_IsConnected(urls, data) - && (UPNP_GetExternalIPAddress(urls->controlURL, data->first.servicetype, extIpAddr) == 0)) - goto free_and_return; + if(is_connected && + (UPNP_GetExternalIPAddress(urls->controlURL, data->first.servicetype, extIpAddr) == 0)) { + if(!is_rfc1918addr(extIpAddr) && (extIpAddr[0] != '\0') + && (0 != strcmp(extIpAddr, "0.0.0.0"))) + goto free_and_return; + } FreeUPNPUrls(urls); if(data->second.servicetype[0] != '\0') { #ifdef DEBUG @@ -626,14 +660,17 @@ memcpy(&data->first, &data->second, sizeof(struct IGDdatas_service)); memcpy(&data->second, &data->tmp, sizeof(struct IGDdatas_service)); GetUPNPUrls(urls, data, dev->descURL, dev->scope_id); + is_connected = UPNPIGD_IsConnected(urls, data); #ifdef DEBUG printf("UPNPIGD_IsConnected(%s) = %d\n", - urls->controlURL, - UPNPIGD_IsConnected(urls, data)); + urls->controlURL, is_connected); #endif - if(UPNPIGD_IsConnected(urls, data) - && (UPNP_GetExternalIPAddress(urls->controlURL, data->first.servicetype, extIpAddr) == 0)) - goto free_and_return; + if(is_connected && + (UPNP_GetExternalIPAddress(urls->controlURL, data->first.servicetype, extIpAddr) == 0)) { + if(!is_rfc1918addr(extIpAddr) && (extIpAddr[0] != '\0') + && (0 != strcmp(extIpAddr, "0.0.0.0"))) + goto free_and_return; + } FreeUPNPUrls(urls); } } @@ -667,8 +704,9 @@ { char * descXML; int descXMLsize = 0; + descXML = miniwget_getaddr(rootdescurl, &descXMLsize, - lanaddr, lanaddrlen, 0); + lanaddr, lanaddrlen, 0, NULL); if(descXML) { memset(data, 0, sizeof(struct IGDdatas)); memset(urls, 0, sizeof(struct UPNPUrls)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/miniupnpc.h new/miniupnpc-1.9.20160209/miniupnpc.h --- old/miniupnpc-1.9.20151026/miniupnpc.h 2015-10-26 18:07:21.000000000 +0100 +++ new/miniupnpc-1.9.20160209/miniupnpc.h 2016-02-09 10:44:39.000000000 +0100 @@ -1,8 +1,8 @@ -/* $Id: miniupnpc.h,v 1.48 2015/10/08 16:19:40 nanard Exp $ */ +/* $Id: miniupnpc.h,v 1.49 2016/01/24 17:24:36 nanard Exp $ */ /* Project: miniupnp * http://miniupnp.free.fr/ * Author: Thomas Bernard - * Copyright (c) 2005-2015 Thomas Bernard + * Copyright (c) 2005-2016 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ #ifndef MINIUPNPC_H_INCLUDED @@ -19,8 +19,8 @@ #define UPNPDISCOVER_MEMORY_ERROR (-102) /* versions : */ -#define MINIUPNPC_VERSION "1.9.20151026" -#define MINIUPNPC_API_VERSION 15 +#define MINIUPNPC_VERSION "1.9.20160209" +#define MINIUPNPC_API_VERSION 16 /* Source port: Using "1" as an alias for 1900 for backwards compatability diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/miniwget.c new/miniupnpc-1.9.20160209/miniwget.c --- old/miniupnpc-1.9.20151026/miniwget.c 2015-10-26 18:05:52.000000000 +0100 +++ new/miniupnpc-1.9.20160209/miniwget.c 2016-02-09 10:38:58.000000000 +0100 @@ -1,8 +1,8 @@ -/* $Id: miniwget.c,v 1.72 2015/10/26 17:05:08 nanard Exp $ */ +/* $Id: miniwget.c,v 1.75 2016/01/24 17:24:36 nanard Exp $ */ /* Project : miniupnp * Website : http://miniupnp.free.fr/ * Author : Thomas Bernard - * Copyright (c) 2005-2015 Thomas Bernard + * Copyright (c) 2005-2016 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. */ @@ -65,7 +65,7 @@ * to the length parameter. */ void * -getHTTPResponse(int s, int * size) +getHTTPResponse(int s, int * size, int * status_code) { char buf[2048]; int n; @@ -83,7 +83,10 @@ unsigned int content_buf_used = 0; char chunksize_buf[32]; unsigned int chunksize_buf_index; + char * reason_phrase = NULL; + int reason_phrase_len = 0; + if(status_code) *status_code = -1; header_buf = malloc(header_buf_len); if(header_buf == NULL) { @@ -155,7 +158,7 @@ continue; /* parse header lines */ for(i = 0; i < endofheaders - 1; i++) { - if(colon <= linestart && header_buf[i]==':') + if(linestart > 0 && colon <= linestart && header_buf[i]==':') { colon = i; while(i < (endofheaders-1) @@ -166,7 +169,29 @@ /* detecting end of line */ else if(header_buf[i]=='\r' || header_buf[i]=='\n') { - if(colon > linestart && valuestart > colon) + if(linestart == 0 && status_code) + { + /* Status line + * HTTP-Version SP Status-Code SP Reason-Phrase CRLF */ + int sp; + for(sp = 0; sp < i; sp++) + if(header_buf[sp] == ' ') + { + if(*status_code < 0) + *status_code = atoi(header_buf + sp + 1); + else + { + reason_phrase = header_buf + sp + 1; + reason_phrase_len = i - sp - 1; + break; + } + } +#ifdef DEBUG + printf("HTTP status code = %d, Reason phrase = %.*s\n", + *status_code, reason_phrase_len, reason_phrase); +#endif + } + else if(colon > linestart && valuestart > colon) { #ifdef DEBUG printf("header='%.*s', value='%.*s'\n", @@ -337,7 +362,8 @@ miniwget3(const char * host, unsigned short port, const char * path, int * size, char * addr_str, int addr_str_len, - const char * httpversion, unsigned int scope_id) + const char * httpversion, unsigned int scope_id, + int * status_code) { char buf[2048]; int s; @@ -435,7 +461,7 @@ sent += n; } } - content = getHTTPResponse(s, size); + content = getHTTPResponse(s, size, status_code); closesocket(s); return content; } @@ -444,18 +470,20 @@ * Call miniwget3(); retry with HTTP/1.1 if 1.0 fails. */ static void * miniwget2(const char * host, - unsigned short port, const char * path, - int * size, char * addr_str, int addr_str_len, - unsigned int scope_id) + unsigned short port, const char * path, + int * size, char * addr_str, int addr_str_len, + unsigned int scope_id, int * status_code) { char * respbuffer; #if 1 respbuffer = miniwget3(host, port, path, size, - addr_str, addr_str_len, "1.1", scope_id); + addr_str, addr_str_len, "1.1", + scope_id, status_code); #else respbuffer = miniwget3(host, port, path, size, - addr_str, addr_str_len, "1.0", scope_id); + addr_str, addr_str_len, "1.0", + scope_id, status_code); if (*size == 0) { #ifdef DEBUG @@ -463,7 +491,8 @@ #endif free(respbuffer); respbuffer = miniwget3(host, port, path, size, - addr_str, addr_str_len, "1.1", scope_id); + addr_str, addr_str_len, "1.1", + scope_id, status_code); } #endif return respbuffer; @@ -588,7 +617,8 @@ } void * -miniwget(const char * url, int * size, unsigned int scope_id) +miniwget(const char * url, int * size, + unsigned int scope_id, int * status_code) { unsigned short port; char * path; @@ -601,12 +631,13 @@ printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n", hostname, port, path, scope_id); #endif - return miniwget2(hostname, port, path, size, 0, 0, scope_id); + return miniwget2(hostname, port, path, size, 0, 0, scope_id, status_code); } void * miniwget_getaddr(const char * url, int * size, - char * addr, int addrlen, unsigned int scope_id) + char * addr, int addrlen, unsigned int scope_id, + int * status_code) { unsigned short port; char * path; @@ -621,6 +652,6 @@ printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n", hostname, port, path, scope_id); #endif - return miniwget2(hostname, port, path, size, addr, addrlen, scope_id); + return miniwget2(hostname, port, path, size, addr, addrlen, scope_id, status_code); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/miniwget.h new/miniupnpc-1.9.20160209/miniwget.h --- old/miniupnpc-1.9.20151026/miniwget.h 2015-07-21 15:24:16.000000000 +0200 +++ new/miniupnpc-1.9.20160209/miniwget.h 2016-02-09 10:38:58.000000000 +0100 @@ -1,7 +1,7 @@ -/* $Id: miniwget.h,v 1.10 2015/07/21 13:16:55 nanard Exp $ */ +/* $Id: miniwget.h,v 1.12 2016/01/24 17:24:36 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard - * Copyright (c) 2005-2015 Thomas Bernard + * Copyright (c) 2005-2016 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. * */ @@ -14,11 +14,11 @@ extern "C" { #endif -MINIUPNP_LIBSPEC void * getHTTPResponse(int s, int * size); +MINIUPNP_LIBSPEC void * getHTTPResponse(int s, int * size, int * status_code); -MINIUPNP_LIBSPEC void * miniwget(const char *, int *, unsigned int); +MINIUPNP_LIBSPEC void * miniwget(const char *, int *, unsigned int, int *); -MINIUPNP_LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int, unsigned int); +MINIUPNP_LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int, unsigned int, int *); int parseURL(const char *, char *, unsigned short *, char * *, unsigned int *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/receivedata.c new/miniupnpc-1.9.20160209/receivedata.c --- old/miniupnpc-1.9.20151026/receivedata.c 2014-11-17 10:42:42.000000000 +0100 +++ new/miniupnpc-1.9.20160209/receivedata.c 2015-11-16 20:20:49.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: receivedata.c,v 1.6 2014/11/13 13:51:52 nanard Exp $ */ +/* $Id: receivedata.c,v 1.7 2015/11/09 21:51:41 nanard Exp $ */ /* Project : miniupnp * Website : http://miniupnp.free.fr/ * Author : Thomas Bernard @@ -40,7 +40,7 @@ char * data, int length, int timeout, unsigned int * scope_id) { -#if MINIUPNPC_GET_SRC_ADDR +#ifdef MINIUPNPC_GET_SRC_ADDR struct sockaddr_storage src_addr; socklen_t src_addr_len = sizeof(src_addr); #endif /* MINIUPNPC_GET_SRC_ADDR */ @@ -80,7 +80,7 @@ return 0; } #endif /* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */ -#if MINIUPNPC_GET_SRC_ADDR +#ifdef MINIUPNPC_GET_SRC_ADDR memset(&src_addr, 0, sizeof(src_addr)); n = recvfrom(socket, data, length, 0, (struct sockaddr *)&src_addr, &src_addr_len); @@ -90,7 +90,7 @@ if(n<0) { PRINT_SOCKET_ERROR("recv"); } -#if MINIUPNPC_GET_SRC_ADDR +#ifdef MINIUPNPC_GET_SRC_ADDR if (src_addr.ss_family == AF_INET6) { const struct sockaddr_in6 * src_addr6 = (struct sockaddr_in6 *)&src_addr; #ifdef DEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/testminiwget.c new/miniupnpc-1.9.20160209/testminiwget.c --- old/miniupnpc-1.9.20151026/testminiwget.c 2012-06-26 01:48:58.000000000 +0200 +++ new/miniupnpc-1.9.20160209/testminiwget.c 2016-02-09 10:38:59.000000000 +0100 @@ -1,7 +1,7 @@ -/* $Id: testminiwget.c,v 1.4 2012/06/23 22:35:59 nanard Exp $ */ +/* $Id: testminiwget.c,v 1.5 2016/01/24 17:24:36 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard - * Copyright (c) 2005-2012 Thomas Bernard + * Copyright (c) 2005-2016 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. * */ @@ -20,15 +20,17 @@ int size, writtensize; FILE *f; char addr[64]; + int status_code = -1; if(argc < 3) { fprintf(stderr, "Usage:\t%s url file\n", argv[0]); fprintf(stderr, "Example:\t%s http://www.google.com/ out.html\n", argv[0]); return 1; } - data = miniwget_getaddr(argv[1], &size, addr, sizeof(addr), 0); - if(!data) { - fprintf(stderr, "Error fetching %s\n", argv[1]); + data = miniwget_getaddr(argv[1], &size, addr, sizeof(addr), 0, &status_code); + if(!data || (status_code != 200)) { + if(data) free(data); + fprintf(stderr, "Error %d fetching %s\n", status_code, argv[1]); return 1; } printf("local address : %s\n", addr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/miniupnpc-1.9.20151026/upnpc.c new/miniupnpc-1.9.20160209/upnpc.c --- old/miniupnpc-1.9.20151026/upnpc.c 2015-10-08 18:16:06.000000000 +0200 +++ new/miniupnpc-1.9.20160209/upnpc.c 2016-02-09 10:38:59.000000000 +0100 @@ -1,7 +1,7 @@ -/* $Id: upnpc.c,v 1.112 2015/10/08 16:15:48 nanard Exp $ */ +/* $Id: upnpc.c,v 1.114 2016/01/22 15:04:23 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard - * Copyright (c) 2005-2015 Thomas Bernard + * Copyright (c) 2005-2016 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. */ @@ -66,7 +66,7 @@ char connectionType[64]; char status[64]; char lastconnerr[64]; - unsigned int uptime; + unsigned int uptime = 0; unsigned int brUp, brDown; time_t timenow, timestarted; int r; @@ -82,9 +82,11 @@ else printf("Status : %s, uptime=%us, LastConnectionError : %s\n", status, uptime, lastconnerr); - timenow = time(NULL); - timestarted = timenow - uptime; - printf(" Time started : %s", ctime(&timestarted)); + if(uptime > 0) { + timenow = time(NULL); + timestarted = timenow - uptime; + printf(" Time started : %s", ctime(&timestarted)); + } if(UPNP_GetLinkLayerMaxBitRates(urls->controlURL_CIF, data->CIF.servicetype, &brDown, &brUp) != UPNPCOMMAND_SUCCESS) { printf("GetLinkLayerMaxBitRates failed.\n"); @@ -538,7 +540,7 @@ char ** commandargv = 0; int commandargc = 0; struct UPNPDev * devlist = 0; - char lanaddr[64]; /* my ip address on the LAN */ + char lanaddr[64] = "unset"; /* my ip address on the LAN */ int i; const char * rootdescurl = 0; const char * multicastif = 0; @@ -560,7 +562,7 @@ } #endif printf("upnpc : miniupnpc library test client, version %s.\n", MINIUPNPC_VERSION_STRING); - printf(" (c) 2005-2015 Thomas Bernard.\n"); + printf(" (c) 2005-2016 Thomas Bernard.\n"); printf("Go to http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/\n" "for more information.\n"); /* command line processing */

1 0

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2016-03-01 09:35:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2016-02-09 16:49:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2016-03-01 09:35:48.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Feb 21 09:49:35 UTC 2016 - tchvatal(a)suse.com + +- Try to enable libreofficekit integration by mimicking what RH does + bnc#965296 + +------------------------------------------------------------------- +Tue Feb 9 09:19:59 UTC 2016 - tchvatal(a)suse.com + +- Provide/obsolete the gtk3 subpackage in gnome to allow nice migration +- %dir the appdata folder to build on leap and older + +------------------------------------------------------------------- @@ -14,0 +27 @@ + * Fixes bnc#967015 CVE-2016-0795 bnc#967014 CVE-2016-0794 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.rCBaXr/_old 2016-03-01 09:36:02.000000000 +0100 +++ /var/tmp/diff_new_pack.rCBaXr/_new 2016-03-01 09:36:02.000000000 +0100 @@ -30,7 +30,7 @@ %bcond_without oldmake %endif # Applications datastore -%if 0%{?suse_version} > 1315 +%if 0%{?suse_version} > 1310 %bcond_without appdatastore %else %bcond_with appdatastore @@ -330,6 +330,7 @@ BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk3-devel BuildRequires: libgltf-devel +BuildRequires: pkgconfig(gobject-introspection-1.0) %else BuildRequires: gcc48-c++ BuildRequires: gstreamer010-plugins-base-devel @@ -628,6 +629,9 @@ License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} +# Merged back to gnome, was split on 5.0 series only +Provides: %{name}-gtk3 = %{version} +Obsoletes: %{name}-gtk3 < %{version} %description gnome This package contains some GNOME extensions for LibreOffice. @@ -763,6 +767,26 @@ - MediaWiki Publisher +%package -n libreofficekit +Summary: A library providing access to LibreOffice functionality +License: MPL-2.0 +Group: Productivity/Office/Suite +Requires: %{name} = %{version} + +%description -n libreofficekit +LibreOfficeKit can be used to access LibreOffice functionality +through C/C++, without any need to use UNO. + +%package -n libreofficekit-devel +Summary: Development files for libreofficekit +License: MPL-2.0 +Group: Productivity/Office/Suite +Requires: libreofficekit = %{version} + +%description -n libreofficekit-devel +The libreofficekit-devel package contains libraries and header files for +developing applications that use libreofficekit. + # Symlink autocorr files for various conversion items %define make_autocorr_aliases(l:) \ %{?-l: \ @@ -1133,6 +1157,7 @@ --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ --enable-gtk3 \ + --enable-introspection \ --with-doxygen \ --enable-gltf \ --enable-collada --with-system-opencollada \ @@ -1325,6 +1350,9 @@ sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \ sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml echo "%{_datadir}/appdata/${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt +%if 0%{?suse_version} < 1320 + echo "%dir %{_datadir}/appdata/" >>file-lists/${appdata}_list.txt +%endif rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml done %endif @@ -1377,6 +1405,11 @@ done rm pyfiles.txt +# Symlink libreofficekit to libdir +%if %{with newmedia} +ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so +%endif + # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose mkdir -p %{buildroot}%{python3_sitelib} @@ -1537,6 +1570,19 @@ %dir %{_datadir}/icons/hicolor/512x512/apps %dir %{_datadir}/icons/hicolor/512x512/mimetypes +%if %{with newmedia} +%files -n libreofficekit +%defattr(-,root,root) +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib +%{_libdir}/liblibreofficekitgtk.so + +%files -n libreofficekit-devel +%defattr(-,root,root) +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/LOKDocView-0.1.gir +%endif + %files -f file-lists/base_list.txt base %defattr(-,root,root)

1 0

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2016-03-01 09:35:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2016-02-11 12:36:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2016-03-01 09:35:24.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 18 09:00:40 UTC 2016 - olaf(a)aepfle.de + +- Remove cmake version from generated files + cmake-version-in-generated-files.patch + +------------------------------------------------------------------- cmake.changes: same change New: ---- cmake-version-in-generated-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.Z24yKR/_old 2016-03-01 09:35:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Z24yKR/_new 2016-03-01 09:35:26.000000000 +0100 @@ -31,6 +31,8 @@ Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs Patch5: system-libs.patch +# PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS +Patch6: cmake-version-in-generated-files.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -73,6 +75,7 @@ %setup -q -n cmake-%{version} %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build EXTRA_FLAGS="--qt-gui" ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.Z24yKR/_old 2016-03-01 09:35:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Z24yKR/_new 2016-03-01 09:35:26.000000000 +0100 @@ -35,6 +35,8 @@ Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs Patch5: system-libs.patch +# PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS +Patch6: cmake-version-in-generated-files.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -64,6 +66,7 @@ %patch2 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build export CXXFLAGS="%{optflags}" ++++++ cmake-version-in-generated-files.patch ++++++ Enclosing the cmake version will cause a republish of generated files --- Source/CPack/IFW/cmCPackIFWGenerator.cxx | 2 +- Source/cmExportFileGenerator.cxx | 2 +- Source/cmExportLibraryDependenciesCommand.cxx | 2 +- Source/cmGlobalGhsMultiGenerator.cxx | 4 ++-- Source/cmGlobalNinjaGenerator.cxx | 4 +--- Source/cmLocalUnixMakefileGenerator3.cxx | 4 +--- 6 files changed, 7 insertions(+), 11 deletions(-) Index: cmake-3.4.3/Source/CPack/IFW/cmCPackIFWGenerator.cxx =================================================================== --- cmake-3.4.3.orig/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ cmake-3.4.3/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -614,7 +614,7 @@ cmCPackIFWPackage* cmCPackIFWGenerator:: //---------------------------------------------------------------------------- void cmCPackIFWGenerator::WriteGeneratedByToStrim(cmGeneratedFileStream &xout) { - xout << "<!-- Generated by CPack " << CMake_VERSION << " IFW generator " + xout << "<!-- Generated by CPack IFW generator " << "for QtIFW "; if(IsVersionLess("2.0")) { Index: cmake-3.4.3/Source/cmExportFileGenerator.cxx =================================================================== --- cmake-3.4.3.orig/Source/cmExportFileGenerator.cxx +++ cmake-3.4.3/Source/cmExportFileGenerator.cxx @@ -107,7 +107,7 @@ bool cmExportFileGenerator::GenerateImpo std::ostream& os = *foutPtr; // Protect that file against use with older CMake versions. - os << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n"; + os << "# Generated by CMake\n\n"; os << "if(\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" LESS 2.5)\n" << " message(FATAL_ERROR \"CMake >= 2.6.0 required\")\n" << "endif()\n"; Index: cmake-3.4.3/Source/cmExportLibraryDependenciesCommand.cxx =================================================================== --- cmake-3.4.3.orig/Source/cmExportLibraryDependenciesCommand.cxx +++ cmake-3.4.3/Source/cmExportLibraryDependenciesCommand.cxx @@ -168,7 +168,7 @@ void cmExportLibraryDependenciesCommand: // versions. const char* vertest = "\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" GREATER 2.4"; - fout << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n"; + fout << "# Generated by CMake\n\n"; fout << "if(" << vertest << ")\n"; fout << " # Information for CMake 2.6 and above.\n"; for(std::map<std::string, std::string>::const_iterator Index: cmake-3.4.3/Source/cmGlobalGhsMultiGenerator.cxx =================================================================== --- cmake-3.4.3.orig/Source/cmGlobalGhsMultiGenerator.cxx +++ cmake-3.4.3/Source/cmGlobalGhsMultiGenerator.cxx @@ -365,8 +365,8 @@ void cmGlobalGhsMultiGenerator::WriteDis (*os) << "#" << std::endl << "# CMAKE generated file: DO NOT EDIT!" << std::endl << "# Generated by \"" << GetActualName() << "\"" - << " Generator, CMake Version " << cmVersion::GetMajorVersion() << "." - << cmVersion::GetMinorVersion() << std::endl + << " Generator, CMake" + << std::endl << "#" << std::endl; } Index: cmake-3.4.3/Source/cmGlobalNinjaGenerator.cxx =================================================================== --- cmake-3.4.3.orig/Source/cmGlobalNinjaGenerator.cxx +++ cmake-3.4.3/Source/cmGlobalNinjaGenerator.cxx @@ -883,9 +883,7 @@ void cmGlobalNinjaGenerator::WriteDiscla os << "# CMAKE generated file: DO NOT EDIT!\n" << "# Generated by \"" << this->GetName() << "\"" - << " Generator, CMake Version " - << cmVersion::GetMajorVersion() << "." - << cmVersion::GetMinorVersion() << "\n\n"; + << " Generator, CMake\n\n"; } void cmGlobalNinjaGenerator::AddDependencyToAll(cmTarget* target) Index: cmake-3.4.3/Source/cmLocalUnixMakefileGenerator3.cxx =================================================================== --- cmake-3.4.3.orig/Source/cmLocalUnixMakefileGenerator3.cxx +++ cmake-3.4.3/Source/cmLocalUnixMakefileGenerator3.cxx @@ -2111,9 +2111,7 @@ void cmLocalUnixMakefileGenerator3::Writ os << "# CMAKE generated file: DO NOT EDIT!\n" << "# Generated by \"" << this->GlobalGenerator->GetName() << "\"" - << " Generator, CMake Version " - << cmVersion::GetMajorVersion() << "." - << cmVersion::GetMinorVersion() << "\n\n"; + << " Generator, CMake\n\n"; } //----------------------------------------------------------------------------

1 0

commit bouncycastle for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '16

01 Mar '16

Hello community, here is the log from the commit of package bouncycastle for openSUSE:Factory checked in at 2016-03-01 09:34:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bouncycastle (Old) and /work/SRC/openSUSE:Factory/.bouncycastle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bouncycastle" Changes: -------- --- /work/SRC/openSUSE:Factory/bouncycastle/bouncycastle.changes 2015-10-28 17:16:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bouncycastle.new/bouncycastle.changes 2016-03-01 09:35:03.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 20 08:34:39 UTC 2016 - tchvatal(a)suse.com + +- Version update to 1.54: + * No obvious changelog to be found + * Fixes bnc#967521 CVE-2015-7575 + +------------------------------------------------------------------- Old: ---- bcprov-jdk15on-1.53.pom bcprov-jdk15on-153.tar.gz New: ---- bcprov-jdk15on-1.54.pom bcprov-jdk15on-154.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bouncycastle.spec ++++++ --- /var/tmp/diff_new_pack.3RNOlt/_old 2016-03-01 09:35:04.000000000 +0100 +++ /var/tmp/diff_new_pack.3RNOlt/_new 2016-03-01 09:35:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bouncycastle # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,8 +16,8 @@ # -%define ver 1.53 -%define shortver 153 +%define ver 1.54 +%define shortver 154 %define archivever jdk15on-%{shortver} %define classname org.bouncycastle.jce.provider.BouncyCastleProvider Name: bouncycastle ++++++ bcprov-jdk15on-153.tar.gz -> bcprov-jdk15on-154.tar.gz ++++++ /work/SRC/openSUSE:Factory/bouncycastle/bcprov-jdk15on-153.tar.gz /work/SRC/openSUSE:Factory/.bouncycastle.new/bcprov-jdk15on-154.tar.gz differ: char 5, line 1

1 0