March 2018 - openSUSE Commits - openSUSE Mailing Lists

commit totem-pl-parser for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package totem-pl-parser for openSUSE:Factory checked in at 2018-03-30 11:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/totem-pl-parser (Old) and /work/SRC/openSUSE:Factory/.totem-pl-parser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "totem-pl-parser" Fri Mar 30 11:56:32 2018 rev:75 rq:592261 version:3.26.0+20180301.0091a56 Changes: -------- --- /work/SRC/openSUSE:Factory/totem-pl-parser/totem-pl-parser.changes 2018-03-26 12:37:30.844682104 +0200 +++ /work/SRC/openSUSE:Factory/.totem-pl-parser.new/totem-pl-parser.changes 2018-03-30 11:56:37.141174217 +0200 @@ -1,0 +2,17 @@ +Thu Mar 22 23:22:40 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Update to version 3.26.0+20180301.0091a56: + + plparse: Don't consider MJPEG streams as JPEG images. + + build: Remove libsoup dependency. + + podcast: Add support for "medium" property. + + videosite: Fix leak in totem_pl_parser_add_videosite. + + Updated translations. +- Switch to git checkout via source service. +- Drop pkgconfig(libsoup-2.4) BuildRequires following upstreams + changes. +- Use autosetup macro. +- Pass explicit disable-gmime-i-know-what-im-doing=false, + enable-quvi=yes, enable-libarchive=yes and enable-libgcrypt=yes + to meson, make sure we build the features we want. + +------------------------------------------------------------------- Old: ---- totem-pl-parser-3.26.0.tar.xz New: ---- _service _servicedata totem-pl-parser-3.26.0+20180301.0091a56.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem-pl-parser.spec ++++++ --- /var/tmp/diff_new_pack.wofk0l/_old 2018-03-30 11:56:38.185136462 +0200 +++ /var/tmp/diff_new_pack.wofk0l/_new 2018-03-30 11:56:38.185136462 +0200 @@ -18,13 +18,14 @@ %define sover 18 Name: totem-pl-parser -Version: 3.26.0 +Version: 3.26.0+20180301.0091a56 Release: 0 Summary: A simple GObject-based library to parse playlist formats License: LGPL-2.0-or-later AND GPL-2.0-or-later Group: Productivity/Multimedia/Video/Players URL: http://www.gnome.org/projects/totem/ -Source0: http://download.gnome.org/sources/totem-pl-parser/3.26/%{name}-%{version}.t… +#Source0: http://download.gnome.org/sources/totem-pl-parser/3.26/%%{name}-%%{version}… +Source: %{name}-%{version}.tar.xz BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgcrypt-devel @@ -36,7 +37,6 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libarchive) >= 3.0 BuildRequires: pkgconfig(libquvi-0.9) >= 0.9.1 -BuildRequires: pkgconfig(libsoup-2.4) >= 2.43.0 BuildRequires: pkgconfig(libxml-2.0) Requires: libquvi-scripts Recommends: %{name}-lang @@ -92,12 +92,16 @@ %lang_package %prep -%setup -q +%autosetup translation-update-upstream %build %meson \ - -Denable-gtk-doc=true \ + -D disable-gmime-i-know-what-im-doing=false \ + -D enable-quvi=yes \ + -D enable-libarchive=yes \ + -D enable-libgcrypt=yes \ + -D enable-gtk-doc=true \ %{nil} %meson_build @@ -107,6 +111,7 @@ %post -n libtotem-plparser%{sover} -p /sbin/ldconfig %postun -n libtotem-plparser%{sover} -p /sbin/ldconfig + %post -n libtotem-plparser-mini%{sover} -p /sbin/ldconfig %postun -n libtotem-plparser-mini%{sover} -p /sbin/ldconfig ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://git.gnome.org/browse/totem-pl-parser</param> <param name="scm">git</param> <param name="versionformat">3.26.0+%cd.%h</param> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version" /> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://git.gnome.org/browse/totem-pl-parser</param> <param name="changesrevision">0091a562f2299fc61943bf5b44ecd7c472288693</param></service></servicedata>

1 0

commit gnome-dictionary for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package gnome-dictionary for openSUSE:Factory checked in at 2018-03-30 11:56:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-dictionary (Old) and /work/SRC/openSUSE:Factory/.gnome-dictionary.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-dictionary" Fri Mar 30 11:56:27 2018 rev:28 rq:592260 version:3.26.1+20180313.ac6d4c0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-dictionary/gnome-dictionary.changes 2018-03-26 12:47:31.330986143 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-dictionary.new/gnome-dictionary.changes 2018-03-30 11:56:28.841474378 +0200 @@ -1,0 +2,17 @@ +Thu Mar 22 22:36:25 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Update to version 3.26.1+20180313.ac6d4c0: + + Remove po/Makevars. + + Flatpak: use meson from flatpak build definition. + + Fix translations of the Name key. + + Drop build-api wrapper for Continuous. + + Updated translations. +- Switch to git-checkout via source services. +- Drop obsolete gnome-utils Conflicts and update-desktop-files + BuildRequires and stop passing glib2_gsettings_schema_requires + and suse_update_desktop_file macros. +- Use autosetup macro and pass explicit use_ipv6=true and + build_man=true to meson, ensure we build the features we want. +- Update URL to correct home. + +------------------------------------------------------------------- Old: ---- gnome-dictionary-3.26.1.tar.xz New: ---- _service _servicedata gnome-dictionary-3.26.1+20180313.ac6d4c0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-dictionary.spec ++++++ --- /var/tmp/diff_new_pack.fu6Eks/_old 2018-03-30 11:56:29.325456875 +0200 +++ /var/tmp/diff_new_pack.fu6Eks/_new 2018-03-30 11:56:29.325456875 +0200 @@ -17,13 +17,14 @@ Name: gnome-dictionary -Version: 3.26.1 +Version: 3.26.1+20180313.ac6d4c0 Release: 0 Summary: Utility to look up words in dictionary sources License: GPL-2.0-or-later Group: System/GUI/GNOME -URL: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-dictionary/3.26/%{name}-%{version}.… +URL: https://wiki.gnome.org/Apps/Dictionary +#Source0: https://download.gnome.org/sources/gnome-dictionary/3.26/%%{name}-%%{versio… +Source: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -39,7 +40,6 @@ # libgdict is no longer a public library, and thus no external tool can make use of the data # Merge the package back into the main package, obsoleting libgdict-data Obsoletes: libgdict-data < %{version} -%glib2_gsettings_schema_requires %description The Dictionary application enables you to search words and terms on a @@ -48,16 +48,18 @@ %lang_package %prep -%setup -q +%autosetup translation-update-upstream %build -%meson +%meson \ + -D use_ipv6=true \ + -D build_man=true \ + %{nil} %meson_build %install %meson_install -%suse_update_desktop_file org.gnome.Dictionary %fdupes %{buildroot}%{_datadir}/help %find_lang %{name} %{?no_lang_C} @@ -65,14 +67,14 @@ %license COPYING %doc NEWS %doc %{_datadir}/help/C/%{name}/ +%{_mandir}/man1/%{name}.1%{?ext_man} %{_bindir}/%{name} %dir %{_datadir}/appdata %{_datadir}/appdata/org.gnome.Dictionary.appdata.xml %{_datadir}/applications/org.gnome.Dictionary.desktop %{_datadir}/dbus-1/services/org.gnome.Dictionary.service -%{_datadir}/glib-2.0/schemas/org.gnome.dictionary.gschema.xml %{_datadir}/gdict-1.0 -%{_mandir}/man1/%{name}.1%{?ext_man} +%{_datadir}/glib-2.0/schemas/org.gnome.dictionary.gschema.xml %files lang -f %{name}.lang ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://git.gnome.org/browse/gnome-dictionary</param> <param name="scm">git</param> <param name="versionformat">3.26.1+%cd.%h</param> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version" /> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://git.gnome.org/browse/gnome-dictionary</param> <param name="changesrevision">ac6d4c091bd4f24c987dbdf7df3d626e08c13f12</param></service></servicedata>

1 0

commit gnutls for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package gnutls for openSUSE:Factory checked in at 2018-03-30 11:56:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnutls (Old) and /work/SRC/openSUSE:Factory/.gnutls.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnutls" Fri Mar 30 11:56:05 2018 rev:109 rq:591143 version:3.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnutls/gnutls.changes 2018-03-16 10:33:47.705113879 +0100 +++ /work/SRC/openSUSE:Factory/.gnutls.new/gnutls.changes 2018-03-30 11:56:10.186149056 +0200 @@ -1,0 +2,19 @@ +Fri Mar 23 11:20:59 UTC 2018 - vcizek(a)suse.com + +- build without DANE support on SLE-15, as it doesn't have unbound + (bsc#1086428) + +------------------------------------------------------------------- +Fri Mar 23 11:10:59 UTC 2018 - vcizek(a)suse.com + +- add back refreshed gnutls-3.6.0-disable-flaky-dtls_resume-test.patch + the dtls-resume test still keeps randomly failing on PPC + +------------------------------------------------------------------- +Fri Mar 23 01:42:49 CET 2018 - ro(a)suse.de + +- remove gnutls-3.6.0-disable-flaky-dtls_resume-test.patch + patch does not apply any more and apparently the build + suceeds even if the formerly flaky testcase is run (bsc#1086579) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnutls.spec ++++++ --- /var/tmp/diff_new_pack.qbLp60/_old 2018-03-30 11:56:11.694094520 +0200 +++ /var/tmp/diff_new_pack.qbLp60/_new 2018-03-30 11:56:11.694094520 +0200 @@ -19,14 +19,20 @@ %define gnutls_sover 30 %define gnutlsxx_sover 28 %define gnutls_dane_sover 0 + +# unbound isn't in SLE-15 (bsc#1086428) +%if 0%{?sle_version} == 150000 && !0%{?is_opensuse} +%bcond_with dane +%else %bcond_without dane +%endif %bcond_with tpm %bcond_without guile Name: gnutls Version: 3.6.2 Release: 0 Summary: The GNU Transport Layer Security Library -License: LGPL-2.1+ AND GPL-3.0+ +License: LGPL-2.1-or-later AND GPL-3.0-or-later Group: Productivity/Networking/Security Url: http://www.gnutls.org/ Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/%{name}-%{version}.tar.xz @@ -79,7 +85,7 @@ %package -n libgnutls%{gnutls_sover} Summary: The GNU Transport Layer Security Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n libgnutls%{gnutls_sover} @@ -90,7 +96,7 @@ %if %{with dane} %package -n libgnutls-dane%{gnutls_dane_sover} Summary: The GNU Transport Layer Security Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Networking/Security %description -n libgnutls-dane%{gnutls_dane_sover} @@ -101,7 +107,7 @@ %package -n libgnutlsxx%{gnutlsxx_sover} Summary: C++ API for the GNU Transport Layer Security Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n libgnutlsxx%{gnutlsxx_sover} @@ -111,7 +117,7 @@ %package -n libgnutls-devel Summary: Development package for the GnuTLS C API -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libgnutls%{gnutls_sover} = %{version} @@ -124,7 +130,7 @@ %if %{with dane} %package -n libgnutls-dane-devel Summary: Development package for GnuTLS DANE component -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: libgnutls-dane%{gnutls_dane_sover} = %{version} @@ -134,7 +140,7 @@ %package -n libgnutlsxx-devel Summary: Development package for the GnuTLS C++ API -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: libgnutls-devel = %{version} Requires: libgnutlsxx%{gnutlsxx_sover} = %{version} @@ -147,7 +153,7 @@ %if %{with guile} %package guile Summary: Guile wrappers for gnutls -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/Other Requires: guile ++++++ gnutls-3.6.0-disable-flaky-dtls_resume-test.patch ++++++ --- /var/tmp/diff_new_pack.qbLp60/_old 2018-03-30 11:56:11.726093363 +0200 +++ /var/tmp/diff_new_pack.qbLp60/_new 2018-03-30 11:56:11.726093363 +0200 @@ -1,22 +1,13 @@ -Index: gnutls-3.6.0/tests/dtls/Makefile.am +Index: gnutls-3.6.2/tests/Makefile.am =================================================================== ---- gnutls-3.6.0.orig/tests/dtls/Makefile.am 2017-04-19 21:49:27.000000000 +0200 -+++ gnutls-3.6.0/tests/dtls/Makefile.am 2017-09-20 14:33:56.763416427 +0200 -@@ -19,7 +19,7 @@ - # along with this file; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +--- gnutls-3.6.2.orig/tests/Makefile.am 2018-02-16 08:27:16.000000000 +0100 ++++ gnutls-3.6.2/tests/Makefile.am 2018-03-23 12:07:47.003150907 +0100 +@@ -330,7 +330,7 @@ if !WINDOWS + # List of tests not available/functional under windows + # --dist_check_SCRIPTS = dtls dtls-nb dtls-resume -+dist_check_SCRIPTS = dtls dtls-nb +-dist_check_SCRIPTS += dtls/dtls dtls/dtls-resume #dtls/dtls-nb ++dist_check_SCRIPTS += dtls/dtls #dtls/dtls-resume #dtls/dtls-nb - AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) - AM_CPPFLAGS = \ -@@ -41,7 +41,7 @@ LDADD = ../../lib/libgnutls.la \ - if !WINDOWS - - check_PROGRAMS = dtls-stress --TESTS = dtls dtls-resume -+TESTS = dtls - - endif + indirect_tests += dtls-stress

1 0

commit fwupd for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package fwupd for openSUSE:Factory checked in at 2018-03-30 11:55:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwupd (Old) and /work/SRC/openSUSE:Factory/.fwupd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fwupd" Fri Mar 30 11:55:57 2018 rev:7 rq:590828 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/fwupd/fwupd.changes 2018-03-16 10:35:59.132381682 +0100 +++ /work/SRC/openSUSE:Factory/.fwupd.new/fwupd.changes 2018-03-30 11:56:03.666384847 +0200 @@ -1,0 +2,30 @@ +Fri Mar 23 20:06:34 UTC 2018 - antoine.belvire(a)opensuse.org + +- Update to version 1.0.6: + + New Features: + - Add bash completion for fwupdmgr. + - Add support for newest Thunderbolt chips. + - Allow all functions that take device arguments to be + prompted. + - Allow devices to use the runtime version when in bootloader + mode. + - Allow overriding ESP mount point via conf file. + - Delete any old fwupdate capsules and efivars when launching + fwupd. + - Generate Vala bindings. + + Bugfixes: + - Allow ctrl-d out of the prompt for devices. + - Allow to create package out of provided binary. + - Correct handling of unknown Thunderbolt devices. + - Correctly detect new remotes that are manually copied. + - Fix a crash related to when passing device to downgrade in + CLI. + - Fix running the self tests when no fwupd is installed. + - Fix Unifying signature writing and parsing for Texas + bootloader. + - Only send success and failure reports to the server. + - Use a CNAME to redirect to the correct CDN for metadata. + - Use a longer timeout when powering back the Thunderbolt + device. + +------------------------------------------------------------------- Old: ---- fwupd-1.0.5.tar.xz New: ---- fwupd-1.0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwupd.spec ++++++ --- /var/tmp/diff_new_pack.T0BQ27/_old 2018-03-30 11:56:04.406358086 +0200 +++ /var/tmp/diff_new_pack.T0BQ27/_new 2018-03-30 11:56:04.414357797 +0200 @@ -22,7 +22,7 @@ %bcond_with efi_fw_update %endif Name: fwupd -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: Allow session software to update device firmware License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -64,6 +64,7 @@ BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libelf) # BuildRequires: pkgconfig(libtbtfwu) >= 1 +BuildRequires: vala BuildRequires: pkgconfig(libgcab-1.0) BuildRequires: pkgconfig(libsoup-2.4) >= 2.51.92 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 @@ -207,6 +208,7 @@ %dir %{_datadir}/metainfo %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %dir %{_localstatedir}/lib/%{name}/ +%{_datadir}/bash-completion/completions/fwupdmgr %files -n dfu-tool %{_bindir}/dfu-tool @@ -224,6 +226,8 @@ %files devel %doc %{_datadir}/gtk-doc/html/libfwupd/ %{_datadir}/gir-1.0/Fwupd-2.0.gir +%{_datadir}/vala/vapi/fwupd.deps +%{_datadir}/vala/vapi/fwupd.vapi %{_includedir}/fwupd-1/ %{_libdir}/pkgconfig/fwupd.pc %{_libdir}/libfwupd.so ++++++ _service ++++++ --- /var/tmp/diff_new_pack.T0BQ27/_old 2018-03-30 11:56:04.450356494 +0200 +++ /var/tmp/diff_new_pack.T0BQ27/_new 2018-03-30 11:56:04.454356350 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> - <param name="revision">refs/tags/1.0.5</param> + <param name="revision">refs/tags/1.0.6</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.T0BQ27/_old 2018-03-30 11:56:04.478355482 +0200 +++ /var/tmp/diff_new_pack.T0BQ27/_new 2018-03-30 11:56:04.486355193 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/hughsie/fwupd.git</param> - <param name="changesrevision">1ef028121e707068e7d3d1252ecf9d8ca580c956</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">d1b23e3c5a3582c9016dd5148438200219a05ad5</param></service></servicedata> \ No newline at end of file ++++++ fwupd-1.0.5.tar.xz -> fwupd-1.0.6.tar.xz ++++++ ++++ 21481 lines of diff (skipped)

1 0

commit librelp for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package librelp for openSUSE:Factory checked in at 2018-03-30 11:55:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librelp (Old) and /work/SRC/openSUSE:Factory/.librelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librelp" Fri Mar 30 11:55:51 2018 rev:31 rq:590808 version:1.2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2017-06-07 09:50:33.435943710 +0200 +++ /work/SRC/openSUSE:Factory/.librelp.new/librelp.changes 2018-03-30 11:55:55.214690509 +0200 @@ -1,0 +2,12 @@ +Sat Mar 24 08:48:48 UTC 2018 - astieger(a)suse.com + +- librelp 1.2.15: + * CVE-2018-1000140: A remote attackher could have used specially + crafted x509 certificates when connecting to rsyslog to trigger + a stack buffer overflow and run arbitrary code (bsc#1086730) + * bugfix: invalid handling of snprintf() return code + * bugfix: invalid assert predicate + * some code cleanup + * bugfix: error message on open error was truncated + +------------------------------------------------------------------- Old: ---- librelp-1.2.14.tar.gz New: ---- librelp-1.2.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librelp.spec ++++++ --- /var/tmp/diff_new_pack.6P9UtR/_old 2018-03-30 11:55:56.830632068 +0200 +++ /var/tmp/diff_new_pack.6P9UtR/_new 2018-03-30 11:55:56.830632068 +0200 @@ -1,7 +1,7 @@ # # spec file for package librelp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,7 +18,7 @@ %define library_name librelp0 Name: librelp -Version: 1.2.14 +Version: 1.2.15 Release: 0 Summary: A reliable logging library License: GPL-3.0+ @@ -26,7 +26,6 @@ Url: http://www.librelp.com/ Source: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz BuildRequires: pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 BuildRequires: pkgconfig(gnutls) >= 2.0.0 %else @@ -120,11 +119,9 @@ %postun -n %{library_name} -p /sbin/ldconfig %files -n librelp0 -%defattr(-,root,root,-) %{_libdir}/librelp.so.* %files devel -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README doc/*.html %{_includedir}/librelp.h %{_libdir}/librelp.so ++++++ librelp-1.2.14.tar.gz -> librelp-1.2.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/ChangeLog new/librelp-1.2.15/ChangeLog --- old/librelp-1.2.14/ChangeLog 2017-05-29 08:36:37.000000000 +0200 +++ new/librelp-1.2.15/ChangeLog 2018-03-21 09:43:07.000000000 +0100 @@ -1,4 +1,21 @@ ---------------------------------------------------------------------- +Version 1.2.15 - 2018-03-21 +- made build on Solaris again +- made build on AIX + Thanks to Philippe Duveau for providing the patches +- bugfix: invalid handling of snprintf() return code +- bugfix: invalid assert predicate + an assert could change status variable due to typo, so in debug + mode processing could fail. + thanks to github user KatMisato for alerting us + fixes https://github.com/rsyslog/librelp/issues/66 +- some code cleanup +- bugfix: error message on open error was truncated + The "connection already open" error message when trying to open + an already open connection was truncated due to too-small size + specified. + Thanks to rsyslog forum user AlanR for the problem report. +---------------------------------------------------------------------- Version 1.2.14 - 2017-05-29 - API extension: add relpSrvSetMaxDataSize() Thanks to Nathan Brown for the patch. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/Makefile.in new/librelp-1.2.15/Makefile.in --- old/librelp-1.2.14/Makefile.in 2017-05-29 08:37:25.000000000 +0200 +++ new/librelp-1.2.15/Makefile.in 2018-03-21 09:43:29.000000000 +0100 @@ -192,8 +192,8 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/relp.pc.in AUTHORS COPYING ChangeLog INSTALL NEWS \ - README compile config.guess config.sub install-sh ltmain.sh \ - missing + README compile config.guess config.sub depcomp install-sh \ + ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -302,6 +302,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOL_LIBS = @SOL_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/config.h.in new/librelp-1.2.15/config.h.in --- old/librelp-1.2.14/config.h.in 2017-05-29 08:37:24.000000000 +0200 +++ new/librelp-1.2.15/config.h.in 2018-03-21 09:43:33.000000000 +0100 @@ -70,6 +70,21 @@ /* Defined if debug mode is disabled. */ #undef NDEBUG +/* Indicator for a AIX OS */ +#undef OS_AIX + +/* Indicator for APPLE OS */ +#undef OS_APPLE + +/* Indicator for a BSD OS */ +#undef OS_BSD + +/* Indicator for a Linux OS */ +#undef OS_LINUX + +/* Indicator for a Solaris OS */ +#undef OS_SOLARIS + /* Name of package */ #undef PACKAGE @@ -112,6 +127,12 @@ /* Version number of package */ #undef VERSION +/* Use POSIX pthread semantics */ +#undef _POSIX_PTHREAD_SEMANTICS + +/* Use X/Open CAE Specification */ +#undef _XOPEN_SOURCE + /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/configure new/librelp-1.2.15/configure --- old/librelp-1.2.14/configure 2017-05-29 08:37:24.000000000 +0200 +++ new/librelp-1.2.15/configure 2018-03-21 09:43:29.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for librelp 1.2.14. +# Generated by GNU Autoconf 2.69 for librelp 1.2.15. # # Report bugs to <rgerhards(a)adiscon.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='librelp' PACKAGE_TARNAME='librelp' -PACKAGE_VERSION='1.2.14' -PACKAGE_STRING='librelp 1.2.14' +PACKAGE_VERSION='1.2.15' +PACKAGE_STRING='librelp 1.2.15' PACKAGE_BUGREPORT='rgerhards(a)adiscon.com' PACKAGE_URL='' @@ -690,6 +690,17 @@ LDFLAGS CFLAGS CC +OS_AIX_FALSE +OS_AIX_TRUE +OS_SOLARIS_FALSE +OS_SOLARIS_TRUE +OS_LINUX_FALSE +OS_LINUX_TRUE +xOS_LINUX_FALSE +xOS_LINUX_TRUE +OS_APPLE_FALSE +OS_APPLE_TRUE +SOL_LIBS AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -1337,7 +1348,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 librelp 1.2.14 to adapt to many kinds of systems. +\`configure' configures librelp 1.2.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1419,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of librelp 1.2.14:";; + short | recursive ) echo "Configuration of librelp 1.2.15:";; esac cat <<\_ACEOF @@ -1528,7 +1539,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -librelp configure 1.2.14 +librelp configure 1.2.15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2054,7 +2065,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by librelp $as_me 1.2.14, which was +It was created by librelp $as_me 1.2.15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2917,7 +2928,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.14' + VERSION='1.2.15' cat >>confdefs.h <<_ACEOF @@ -3032,7 +3043,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.14' + VERSION='1.2.15' cat >>confdefs.h <<_ACEOF @@ -3169,6 +3180,101 @@ +echo HOST: ${host} +case "${host}" in + *-*-linux*) + +$as_echo "#define OS_LINUX 1" >>confdefs.h + + os_type="linux" + ;; + *-*-*darwin*|*-*-dragonfly*|*-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + +$as_echo "#define OS_BSD 1" >>confdefs.h + + os_type="bsd" + ;; + *-apple-*) + +$as_echo "#define OS_APPLE 1" >>confdefs.h + + os_type="apple" + ;; + *-*-kfreebsd*) + # kernel is FreeBSD, but userspace is glibc - i.e. like linux + # do not DEFINE OS_BSD + os_type="bsd" + ;; + *-*-solaris*) + os_type="solaris" + +$as_echo "#define OS_SOLARIS 1" >>confdefs.h + + +$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + +$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h + + CPPFLAGS="-std=c99 $CPPFLAGS" + CFLAGS="-std=c99 $CFLAGS" + SOL_LIBS="-lsocket -lnsl" + # Solaris libuuid does not ship with a pkgconfig file so override the appropriate + # variables (but only if they have not been set by the user). + LIBUUID_CFLAGS=${LIBUUID_CFLAGS:= } + LIBUUID_LIBS=${LIBUUID_LIBS:=-luuid} + + ;; + *-*-aix*) + os_type="aix" + +$as_echo "#define OS_AIX 1" >>confdefs.h + + CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT" + LDFLAGS="$LDFLAGS -brtl" + ;; +esac + if test x$os_type == xapple; then + OS_APPLE_TRUE= + OS_APPLE_FALSE='#' +else + OS_APPLE_TRUE='#' + OS_APPLE_FALSE= +fi + + if test x$os_type == xlinux; then + xOS_LINUX_TRUE= + xOS_LINUX_FALSE='#' +else + xOS_LINUX_TRUE='#' + xOS_LINUX_FALSE= +fi + + if test x$os_type == xlinux; then + OS_LINUX_TRUE= + OS_LINUX_FALSE='#' +else + OS_LINUX_TRUE='#' + OS_LINUX_FALSE= +fi + + if test x$os_type == xsolaris; then + OS_SOLARIS_TRUE= + OS_SOLARIS_FALSE='#' +else + OS_SOLARIS_TRUE='#' + OS_SOLARIS_FALSE= +fi + + if test "x$os_type" = "xaix"; then + OS_AIX_TRUE= + OS_AIX_FALSE='#' +else + OS_AIX_TRUE='#' + OS_AIX_FALSE= +fi + + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -13376,6 +13482,26 @@ am__EXEEXT_FALSE= fi +if test -z "${OS_APPLE_TRUE}" && test -z "${OS_APPLE_FALSE}"; then + as_fn_error $? "conditional \"OS_APPLE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${xOS_LINUX_TRUE}" && test -z "${xOS_LINUX_FALSE}"; then + as_fn_error $? "conditional \"xOS_LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then + as_fn_error $? "conditional \"OS_LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OS_SOLARIS_TRUE}" && test -z "${OS_SOLARIS_FALSE}"; then + as_fn_error $? "conditional \"OS_SOLARIS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OS_AIX_TRUE}" && test -z "${OS_AIX_FALSE}"; then + as_fn_error $? "conditional \"OS_AIX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13785,7 +13911,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by librelp $as_me 1.2.14, which was +This file was extended by librelp $as_me 1.2.15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13851,7 +13977,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -librelp config.status 1.2.14 +librelp config.status 1.2.15 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/librelp-1.2.14/configure.ac new/librelp-1.2.15/configure.ac --- old/librelp-1.2.14/configure.ac 2017-05-29 08:36:58.000000000 +0200 +++ new/librelp-1.2.15/configure.ac 2018-03-21 09:43:20.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([librelp], [1.2.14], [rgerhards(a)adiscon.com] +AC_INIT([librelp], [1.2.15], [rgerhards(a)adiscon.com] AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -10,6 +10,52 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) +echo HOST: ${host} +case "${host}" in + *-*-linux*) + AC_DEFINE([OS_LINUX], [1], [Indicator for a Linux OS]) + os_type="linux" + ;; + *-*-*darwin*|*-*-dragonfly*|*-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + AC_DEFINE([OS_BSD], [1], [Indicator for a BSD OS]) + os_type="bsd" + ;; + *-apple-*) + AC_DEFINE([OS_APPLE], [1], [Indicator for APPLE OS]) + os_type="apple" + ;; + *-*-kfreebsd*) + # kernel is FreeBSD, but userspace is glibc - i.e. like linux + # do not DEFINE OS_BSD + os_type="bsd" + ;; + *-*-solaris*) + os_type="solaris" + AC_DEFINE([OS_SOLARIS], [1], [Indicator for a Solaris OS]) + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], [1], [Use POSIX pthread semantics]) + AC_DEFINE([_XOPEN_SOURCE], [600], [Use X/Open CAE Specification]) + CPPFLAGS="-std=c99 $CPPFLAGS" + CFLAGS="-std=c99 $CFLAGS" + SOL_LIBS="-lsocket -lnsl" + # Solaris libuuid does not ship with a pkgconfig file so override the appropriate + # variables (but only if they have not been set by the user). + LIBUUID_CFLAGS=${LIBUUID_CFLAGS:= } + LIBUUID_LIBS=${LIBUUID_LIBS:=-luuid} + AC_SUBST(SOL_LIBS) + ;; + *-*-aix*) + os_type="aix" + AC_DEFINE([OS_AIX], [1], [Indicator for a AIX OS]) + CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT" + LDFLAGS="$LDFLAGS -brtl" + ;; +esac +AM_CONDITIONAL(OS_APPLE, test x$os_type == xapple) +AM_CONDITIONAL(xOS_LINUX, test x$os_type == xlinux) +AM_CONDITIONAL(OS_LINUX, test x$os_type == xlinux) +AM_CONDITIONAL(OS_SOLARIS, test x$os_type == xsolaris) +AM_CONDITIONAL(OS_AIX, test "x$os_type" = "xaix") + # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/doc/Makefile.in new/librelp-1.2.15/doc/Makefile.in --- old/librelp-1.2.14/doc/Makefile.in 2017-05-29 08:37:25.000000000 +0200 +++ new/librelp-1.2.15/doc/Makefile.in 2018-03-21 09:43:29.000000000 +0100 @@ -188,6 +188,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOL_LIBS = @SOL_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/src/Makefile.am new/librelp-1.2.15/src/Makefile.am --- old/librelp-1.2.14/src/Makefile.am 2017-05-29 08:35:54.000000000 +0200 +++ new/librelp-1.2.15/src/Makefile.am 2018-03-20 18:27:30.000000000 +0100 @@ -1,7 +1,16 @@ -# Uncomment for debugging -DEBUG = -g -PTHREADS_CFLAGS = -pthread +if OS_SOLARIS +then + PTHREADS_CFLAGS = -pthread +else +if OS_AIX + PTHREADS_CFLAGS = -qthreaded +else + PTHREADS_CFLAGS = -mt +endif +endif +DEBUG = -g +# Uncomment for debugging #CFLAGS += $(DEBUG) lib_LTLIBRARIES = librelp.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/src/Makefile.in new/librelp-1.2.15/src/Makefile.in --- old/librelp-1.2.14/src/Makefile.in 2017-05-29 08:37:25.000000000 +0200 +++ new/librelp-1.2.15/src/Makefile.in 2018-03-21 09:43:29.000000000 +0100 @@ -277,6 +277,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOL_LIBS = @SOL_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -333,11 +334,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# Uncomment for debugging DEBUG = -g -PTHREADS_CFLAGS = -pthread - +# Uncomment for debugging #CFLAGS += $(DEBUG) lib_LTLIBRARIES = librelp.la librelp_la_SOURCES = \ @@ -823,6 +821,10 @@ .PRECIOUS: Makefile +@OS_SOLARIS_TRUE@then +@OS_SOLARIS_TRUE@ PTHREADS_CFLAGS = -pthread +@OS_AIX_TRUE@@OS_SOLARIS_FALSE@ PTHREADS_CFLAGS = -qthreaded +@OS_AIX_FALSE@@OS_SOLARIS_FALSE@ PTHREADS_CFLAGS = -mt # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/src/copen.c new/librelp-1.2.15/src/copen.c --- old/librelp-1.2.14/src/copen.c 2016-06-22 11:23:27.000000000 +0200 +++ new/librelp-1.2.15/src/copen.c 2017-10-16 11:50:12.000000000 +0200 @@ -134,7 +134,9 @@ pSess->pEngine->dbgprint("in open command handler\n"); if(pSess->bServerConnOpen) { - relpSessSendResponse(pSess, pFrame->txnr, (unsigned char*) "500 connection already open", 20); + relpSessSendResponse(pSess, pFrame->txnr, + (unsigned char*) "500 connection already open", + sizeof("500 connection already open") - 1); ABORT_FINALIZE(RELP_RET_SESSION_OPEN); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/src/librelp.h new/librelp-1.2.15/src/librelp.h --- old/librelp-1.2.14/src/librelp.h 2017-04-20 11:54:58.000000000 +0200 +++ new/librelp-1.2.15/src/librelp.h 2018-03-20 18:27:56.000000000 +0100 @@ -133,7 +133,7 @@ #define RELP_RET_CMD_DISABLED RELPERR_BASE + 23 /**< tried to use a cmd that is disabled in this session */ #define RELP_RET_INVALID_HDL RELPERR_BASE + 24 /**< invalid object handle (pointer) provided by caller */ #define RELP_RET_INCOMPAT_OFFERS RELPERR_BASE + 25 /**< client and server offers are incompatible */ -#define RELP_RET_RQD_FEAT_MISSING RELPERR_BASE + 26 /**< the remote peer does not support a feature required by us */ +#define RELP_RET_RQD_FEAT_MISSING RELPERR_BASE + 26 /**< the remote peer does not support a required feature */ #define RELP_RET_MALICIOUS_HNAME RELPERR_BASE + 27 /**< remote peer is trying malicious things with its hostname */ #define RELP_RET_INVALID_HNAME RELPERR_BASE + 28 /**< remote peer's hostname invalid or unobtainable */ #define RELP_RET_ADDR_UNKNOWN RELPERR_BASE + 29 /**< remote peer's IP address could not be obtained */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/src/relp.c new/librelp-1.2.15/src/relp.c --- old/librelp-1.2.14/src/relp.c 2016-11-23 13:52:21.000000000 +0100 +++ new/librelp-1.2.15/src/relp.c 2018-03-21 09:40:38.000000000 +0100 @@ -897,13 +897,14 @@ # ifdef ENABLE_TLS localRet = relpTcpRtryHandshake(pSessEtry->pSess->pTcp); if(localRet != RELP_RET_OK) { - pThis->dbgprint("relp session %d handshake iRet %d, tearing it down\n", + pThis->dbgprint("relp session %d handshake " + "iRet %d, tearing it down\n", sock, localRet); relpEngineDelSess(pThis, pSessEtry); } # else - pThis->dbgprint("librelp error: handshake retry requested in " - "non-TLS mode"); + pThis->dbgprint("librelp error: handshake retry " + "requested in non-TLS mode"); # endif /* #ifdef ENABLE_TLS */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/src/relpsess.c new/librelp-1.2.15/src/relpsess.c --- old/librelp-1.2.14/src/relpsess.c 2017-04-20 11:54:58.000000000 +0200 +++ new/librelp-1.2.15/src/relpsess.c 2018-03-21 09:40:38.000000000 +0100 @@ -400,7 +400,8 @@ pThis->pEngine->dbgprint("Warning: exceeding window size, max %d, curr %d\n", pThis->lenUnackedLst, pThis->sizeWindow); } - pThis->pEngine->dbgprint("ADD sess %p unacked %d, sessState %d\n", pThis, pThis->lenUnackedLst, pThis->sessState); + pThis->pEngine->dbgprint("ADD sess %p unacked %d, sessState %d\n", + pThis, pThis->lenUnackedLst, pThis->sessState); finalize_it: LEAVE_RELPFUNC; @@ -433,7 +434,8 @@ free(pUnackedLstEntry); - pThis->pEngine->dbgprint("DEL sess %p unacked %d, sessState %d\n", pThis, pThis->lenUnackedLst, pThis->sessState); + pThis->pEngine->dbgprint("DEL sess %p unacked %d, sessState %d\n", + pThis, pThis->lenUnackedLst, pThis->sessState); LEAVE_RELPFUNC; } @@ -646,7 +648,7 @@ ENTER_RELPFUNC; RELPOBJ_assert(pThis, Sess); - assert(pThis->sessState = eRelpSessState_BROKEN); + assert(pThis->sessState == eRelpSessState_BROKEN); CHKRet(relpTcpAbortDestruct(&pThis->pTcp)); CHKRet(relpSessConnect(pThis, pThis->protFamily, pThis->srvPort, pThis->srvAddr)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.14/src/tcp.c new/librelp-1.2.15/src/tcp.c --- old/librelp-1.2.14/src/tcp.c 2016-11-22 18:18:02.000000000 +0100 +++ new/librelp-1.2.15/src/tcp.c 2018-03-21 09:40:38.000000000 +0100 @@ -1,6 +1,6 @@ /* This implements the relp mapping onto TCP. * - * Copyright 2008-2016 by Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-2018 by Rainer Gerhards and Adiscon GmbH. * * This file is part of librelp. * @@ -68,6 +68,12 @@ # define SOL_TCP (getprotobyname("tcp")->p_proto) #endif +/* AIXPORT : MSG_DONTWAIT not supported */ +#if defined(_AIX) && !defined(MSG_DONTWAIT) +#define MSG_DONTWAIT MSG_NONBLOCK +#endif + + #ifdef ENABLE_TLS /* forward definitions */ #ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION @@ -77,7 +83,7 @@ /* helper to free permittedPeer structure */ static inline void -relpTcpFreePermittedPeers(relpTcp_t *pThis) +relpTcpFreePermittedPeers(relpTcp_t *const pThis) { int i; for(i = 0 ; i < pThis->permittedPeers.nmemb ; ++i) @@ -93,7 +99,9 @@ * to the "parent" client or server object, depending on connType. */ relpRetVal -relpTcpConstruct(relpTcp_t **ppThis, relpEngine_t *pEngine, int connType, void *pParent) +relpTcpConstruct(relpTcp_t **ppThis, relpEngine_t *const pEngine, + const int connType, + void *const pParent) { relpTcp_t *pThis; @@ -219,7 +227,7 @@ * shortcut for error handling (safes doing it twice). */ static int -chkGnutlsCode(relpTcp_t *pThis, char *emsg, relpRetVal ecode, int gnuRet) +chkGnutlsCode(relpTcp_t *const pThis, char *emsg, relpRetVal ecode, const int gnuRet) { char msgbuf[4096]; int r; @@ -238,7 +246,7 @@ /* helper to call onAuthErr if set */ static inline void -callOnAuthErr(relpTcp_t *pThis, char *authdata, char *emsg, relpRetVal ecode) +callOnAuthErr(relpTcp_t *const pThis, char *authdata, char *emsg, relpRetVal ecode) { pThis->pEngine->dbgprint("librelp: auth error: authdata:'%s', ecode %d, " "emsg '%s'\n", authdata, ecode, emsg); @@ -291,7 +299,7 @@ * into a function. */ static inline int8_t -isAnonAuth(relpTcp_t *pThis) +isAnonAuth(relpTcp_t *const pThis) { return pThis->ownCertFile == NULL; } @@ -306,7 +314,7 @@ * rgerhards, 2008-03-31 */ static relpRetVal -relpTcpSetRemHost(relpTcp_t *pThis, struct sockaddr *pAddr) +relpTcpSetRemHost(relpTcp_t *const pThis, struct sockaddr *pAddr) { relpEngine_t *pEngine; int error; @@ -407,7 +415,7 @@ } relpRetVal -relpTcpSetUsrPtr(relpTcp_t *pThis, void *pUsr) +relpTcpSetUsrPtr(relpTcp_t *const pThis, void *pUsr) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -416,7 +424,7 @@ } relpRetVal -relpTcpSetAuthMode(relpTcp_t *pThis, relpAuthMode_t authmode) +relpTcpSetAuthMode(relpTcp_t *const pThis, relpAuthMode_t authmode) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -425,7 +433,7 @@ } relpRetVal -relpTcpSetConnTimeout(relpTcp_t *pThis, int connTimeout) +relpTcpSetConnTimeout(relpTcp_t *const pThis, const int connTimeout) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -434,7 +442,7 @@ } relpRetVal -relpTcpSetGnuTLSPriString(relpTcp_t *pThis, char *pristr) +relpTcpSetGnuTLSPriString(relpTcp_t *const pThis, char *pristr) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -451,7 +459,7 @@ } relpRetVal -relpTcpSetCACert(relpTcp_t *pThis, char *cert) +relpTcpSetCACert(relpTcp_t *const pThis, char *cert) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -468,7 +476,7 @@ } relpRetVal -relpTcpSetOwnCert(relpTcp_t *pThis, char *cert) +relpTcpSetOwnCert(relpTcp_t *const pThis, char *cert) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -485,7 +493,7 @@ } relpRetVal -relpTcpSetPrivKey(relpTcp_t *pThis, char *cert) +relpTcpSetPrivKey(relpTcp_t *const pThis, char *cert) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -534,7 +542,7 @@ } relpRetVal -relpTcpSetDHBits(relpTcp_t *pThis, int bits) +relpTcpSetDHBits(relpTcp_t *const pThis, const int bits) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -545,7 +553,7 @@ #ifdef ENABLE_TLS /* set TLS priority string, common code both for client and server */ static relpRetVal -relpTcpTLSSetPrio(relpTcp_t *pThis) +relpTcpTLSSetPrio(relpTcp_t *const pThis) { int r; char pristringBuf[4096]; @@ -576,11 +584,13 @@ LEAVE_RELPFUNC; } +#ifndef _AIX #pragma GCC diagnostic push /* per https://lists.gnupg.org/pipermail/gnutls-help/2004-August/000154.html This is expected */ #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" +#endif static relpRetVal -relpTcpAcceptConnReqInitTLS(relpTcp_t *pThis, relpSrv_t *pSrv) +relpTcpAcceptConnReqInitTLS(relpTcp_t *const pThis, relpSrv_t *const pSrv) { int r; ENTER_RELPFUNC; @@ -630,7 +640,9 @@ finalize_it: LEAVE_RELPFUNC; } +#ifndef _AIX #pragma GCC diagnostic pop +#endif #endif /* #ifdef ENABLE_TLS */ /* Enable KEEPALIVE handling on the socket. */ @@ -711,7 +723,7 @@ * to be put asleep on some platforms. */ static void -doSleep(int iSeconds, int iuSeconds) +doSleep(int iSeconds, const int iuSeconds) { struct timeval tvSelectTimeout; tvSelectTimeout.tv_sec = iSeconds; @@ -724,7 +736,7 @@ * rgerhards, 2008-03-17 */ relpRetVal -relpTcpAcceptConnReq(relpTcp_t **ppThis, int sock, relpSrv_t *pSrv) +relpTcpAcceptConnReq(relpTcp_t **ppThis, const int sock, relpSrv_t *const pSrv) { relpTcp_t *pThis = NULL; int sockflags; @@ -799,7 +811,7 @@ * sufficiently large buffer. 512 bytes shall always do. */ static void -GenFingerprintStr(char *pFingerprint, int sizeFingerprint, char *fpBuf) +GenFingerprintStr(char *pFingerprint, const int sizeFingerprint, char *fpBuf) { int iSrc, iDst; @@ -812,7 +824,7 @@ /* Check the peer's ID in fingerprint auth mode. */ static int -relpTcpChkPeerFingerprint(relpTcp_t *pThis, gnutls_x509_crt_t cert) +relpTcpChkPeerFingerprint(relpTcp_t *const pThis, gnutls_x509_crt_t cert) { int r = 0; int i; @@ -858,7 +870,7 @@ * rgerhards, 2008-05-27 */ static relpRetVal -AddPermittedPeerWildcard(tcpPermittedPeerEntry_t *pEtry, char* pszStr, int lenStr) +AddPermittedPeerWildcard(tcpPermittedPeerEntry_t *pEtry, char* pszStr, const int lenStr) { tcpPermittedPeerWildcardComp_t *pNew = NULL; int iSrc; @@ -1027,7 +1039,8 @@ break; case tcpPEER_WILDCARD_AT_END: if( pWildcard->lenDomainPart > pC - pStart - || strncmp((char*)pStart, (char*)pWildcard->pszDomainPart, pWildcard->lenDomainPart)) { + || strncmp((char*)pStart, (char*)pWildcard->pszDomainPart, + pWildcard->lenDomainPart)) { goto done; } break; @@ -1072,7 +1085,7 @@ * called multiple times). */ static void -relpTcpChkOnePeerName(relpTcp_t *pThis, char *peername, int *pbFoundPositiveMatch) +relpTcpChkOnePeerName(relpTcp_t *const pThis, char *peername, int *pbFoundPositiveMatch) { int i; @@ -1104,7 +1117,7 @@ * Note that non-0 is also returned if no CN is found. */ static int -relpTcpGetCN(relpTcp_t *pThis, gnutls_x509_crt_t cert, char *namebuf, int lenNamebuf) +relpTcpGetCN(relpTcp_t *const pThis, gnutls_x509_crt_t cert, char *namebuf, const int lenNamebuf) { int r; int gnuRet; @@ -1161,9 +1174,35 @@ return r; } + +/* helper to consistently add names to error message buffer */ +static int +relpTcpAddToCertNamesBuffer(relpTcp_t *const pThis, + char *const buf, + const size_t buflen, + int *p_currIdx, + const char *const certName) +{ + int r = 0; + assert(buf != NULL); + assert(p_currIdx != NULL); + const int currIdx = *p_currIdx; + const int n = snprintf(buf + currIdx, buflen - currIdx, + "DNSname: %s; ", certName); + if(n < 0 || n >= (int) (buflen - currIdx)) { + callOnAuthErr(pThis, "", "certificate validation failed, names " + "inside certifcate are way to long (> 32KiB)", + RELP_RET_AUTH_CERT_INVL); + r = GNUTLS_E_CERTIFICATE_ERROR; + } else { + *p_currIdx += n; + } + return r; +} + /* Check the peer's ID in name auth mode. */ static int -relpTcpChkPeerName(relpTcp_t *pThis, gnutls_x509_crt_t cert) +relpTcpChkPeerName(relpTcp_t *const pThis, gnutls_x509_crt_t cert) { int r = 0; int ret; @@ -1202,8 +1241,9 @@ break; else if(gnuRet == GNUTLS_SAN_DNSNAME) { pThis->pEngine->dbgprint("librelp: subject alt dnsName: '%s'\n", szAltName); - iAllNames += snprintf(allNames+iAllNames, sizeof(allNames)-iAllNames, - "DNSname: %s; ", szAltName); + r = relpTcpAddToCertNamesBuffer(pThis, allNames, sizeof(allNames), + &iAllNames, szAltName); + if(r != 0) goto done; relpTcpChkOnePeerName(pThis, szAltName, &bFoundPositiveMatch); /* do NOT break, because there may be multiple dNSName's! */ } @@ -1214,8 +1254,9 @@ /* if we did not succeed so far, we try the CN part of the DN... */ if(relpTcpGetCN(pThis, cert, cnBuf, sizeof(cnBuf)) == 0) { pThis->pEngine->dbgprint("librelp: relpTcp now checking auth for CN '%s'\n", cnBuf); - iAllNames += snprintf(allNames+iAllNames, sizeof(allNames)-iAllNames, - "CN: %s; ", cnBuf); + r = relpTcpAddToCertNamesBuffer(pThis, allNames, sizeof(allNames), + &iAllNames, cnBuf); + if(r != 0) goto done; relpTcpChkOnePeerName(pThis, cnBuf, &bFoundPositiveMatch); } } @@ -1236,13 +1277,12 @@ relpTcpVerifyCertificateCallback(gnutls_session_t session) { int r = 0; - relpTcp_t *pThis; const gnutls_datum_t *cert_list; unsigned int list_size = 0; gnutls_x509_crt_t cert; int bMustDeinitCert = 0; - pThis = (relpTcp_t*) gnutls_session_get_ptr(session); + relpTcp_t *const pThis = (relpTcp_t*) gnutls_session_get_ptr(session); /* This function only works for X.509 certificates. */ if(gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) { @@ -1293,7 +1333,7 @@ /* initialize the listener for TLS use */ static relpRetVal -relpTcpLstnInitTLS(relpTcp_t *pThis) +relpTcpLstnInitTLS(relpTcp_t *const pThis) { int r; ENTER_RELPFUNC; @@ -1333,7 +1373,8 @@ r = gnutls_certificate_set_x509_trust_file(pThis->xcred, pThis->caCertFile, GNUTLS_X509_FMT_PEM); if(r < 0) { - chkGnutlsCode(pThis, "Failed to set certificate trust files", RELP_RET_ERR_TLS_SETUP, r); + chkGnutlsCode(pThis, "Failed to set certificate trust files", + RELP_RET_ERR_TLS_SETUP, r); ABORT_FINALIZE(RELP_RET_ERR_TLS_SETUP); } pThis->pEngine->dbgprint("librelp: obtained %d certificates from %s\n", r, pThis->caCertFile); @@ -1361,7 +1402,7 @@ * gerhards, 2008-03-17 */ relpRetVal -relpTcpLstnInit(relpTcp_t *pThis, unsigned char *pLstnPort, int ai_family) +relpTcpLstnInit(relpTcp_t *const pThis, unsigned char *pLstnPort, const int ai_family) { struct addrinfo hints, *res, *r; int error, maxs, *s, on = 1; @@ -1512,7 +1553,7 @@ * rgerhards, 2008-03-17 */ relpRetVal -relpTcpRcv(relpTcp_t *pThis, relpOctet_t *pRcvBuf, ssize_t *pLenBuf) +relpTcpRcv(relpTcp_t *const pThis, relpOctet_t *pRcvBuf, ssize_t *pLenBuf) { ENTER_RELPFUNC; RELPOBJ_assert(pThis, Tcp); @@ -1548,7 +1589,7 @@ * such option is available on the platform in question. */ static inline void -setCORKopt(int sock, int onOff) +setCORKopt(int sock, const int onOff) { #if defined(TCP_CORK) setsockopt(sock, SOL_TCP, TCP_CORK, &onOff, sizeof (onOff)); @@ -1564,13 +1605,13 @@ * does not interfere with normal operations. */ void -relpTcpHintBurstBegin(relpTcp_t *pThis) +relpTcpHintBurstBegin(relpTcp_t *const pThis) { setCORKopt(pThis->sock, 1); } /* this is the counterpart to relpTcpHintBurstBegin -- see there for doc */ void -relpTcpHintBurstEnd(relpTcp_t *pThis) +relpTcpHintBurstEnd(relpTcp_t *const pThis) { setCORKopt(pThis->sock, 0); } @@ -1583,7 +1624,7 @@ * rgerhards, 2008-03-19 */ relpRetVal -relpTcpSend(relpTcp_t *pThis, relpOctet_t *pBuf, ssize_t *pLenBuf) +relpTcpSend(relpTcp_t *const pThis, relpOctet_t *pBuf, ssize_t *pLenBuf) { ssize_t written; ENTER_RELPFUNC; @@ -1631,12 +1672,14 @@ } #ifdef ENABLE_TLS +#ifndef _AIX #pragma GCC diagnostic push /* we need to disable a warning below */ /* per https://lists.gnupg.org/pipermail/gnutls-help/2004-August/000154.html This is expected */ #pragma GCC diagnostic ignored "-Wint-to-pointer-cast" +#endif /* this is only called for client-initiated sessions */ static relpRetVal -relpTcpConnectTLSInit(relpTcp_t *pThis) +relpTcpConnectTLSInit(relpTcp_t *const pThis) { int r; int sockflags; @@ -1747,7 +1790,9 @@ finalize_it: LEAVE_RELPFUNC; } +#ifndef _AIX #pragma GCC diagnostic pop +#endif #endif /* #ifdef ENABLE_TLS */ /* open a connection to a remote host (server). @@ -1755,7 +1800,11 @@ * rgerhards, 2008-03-19 */ relpRetVal -relpTcpConnect(relpTcp_t *pThis, int family, unsigned char *port, unsigned char *host, unsigned char *clientIP) +relpTcpConnect(relpTcp_t *const pThis, + const int family, + unsigned char *port, + unsigned char *host, + unsigned char *clientIP) { struct addrinfo *res = NULL; struct addrinfo hints; @@ -1840,13 +1889,13 @@ * "0 if trying to read data, 1 if trying to write data." */ int -relpTcpGetRtryDirection(relpTcp_t *pThis) +relpTcpGetRtryDirection(relpTcp_t *const pThis) { return gnutls_record_get_direction(pThis->session); } relpRetVal -relpTcpRtryHandshake(relpTcp_t *pThis) +relpTcpRtryHandshake(relpTcp_t *const pThis) { int r; ENTER_RELPFUNC;

1 0

commit timezone for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package timezone for openSUSE:Factory checked in at 2018-03-30 11:55:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/timezone (Old) and /work/SRC/openSUSE:Factory/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "timezone" Fri Mar 30 11:55:44 2018 rev:119 rq:590806 version:2018d Changes: -------- --- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2018-01-29 14:54:41.410279605 +0100 +++ /work/SRC/openSUSE:Factory/.timezone.new/timezone-java.changes 2018-03-30 11:55:46.874992122 +0200 @@ -1,0 +2,9 @@ +Sat Mar 24 07:58:38 UTC 2018 - astieger(a)suse.com + +- timezone update 2018d (bsc#1086729): + * In 2018, Palestine starts DST on March 24, not March 31 + * Casey Station in Antarctica changed from +11 to +08 on + 2018-03-11 at 04:00 + * corrections for historical transitions + +------------------------------------------------------------------- timezone.changes: same change Old: ---- tzcode2018c.tar.gz tzcode2018c.tar.gz.asc tzdata2018c.tar.gz tzdata2018c.tar.gz.asc New: ---- tzcode2018d.tar.gz tzcode2018d.tar.gz.asc tzdata2018d.tar.gz tzdata2018d.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.AJLs0H/_old 2018-03-30 11:55:50.786850646 +0200 +++ /var/tmp/diff_new_pack.AJLs0H/_new 2018-03-30 11:55:50.790850501 +0200 @@ -25,7 +25,7 @@ # COMMON-BEGIN License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base -Version: 2018c +Version: 2018d Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.AJLs0H/_old 2018-03-30 11:55:50.818849489 +0200 +++ /var/tmp/diff_new_pack.AJLs0H/_new 2018-03-30 11:55:50.822849344 +0200 @@ -23,7 +23,7 @@ Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2018c +Version: 2018d Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz ++++++ tzcode2018c.tar.gz -> tzcode2018d.tar.gz ++++++ ++++ 3508 lines of diff (skipped) ++++++ tzdata2018c.tar.gz -> tzdata2018d.tar.gz ++++++ ++++ 4547 lines of diff (skipped)

1 0

commit util-linux for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2018-03-30 11:55:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Fri Mar 30 11:55:33 2018 rev:227 rq:590605 version:2.31.1 Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2018-02-23 15:27:43.743007595 +0100 +++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2018-03-30 11:55:38.307301981 +0200 @@ -1,0 +2,5 @@ +Tue Mar 20 13:02:18 CET 2018 - kukuk(a)suse.de + +- Use %license instead of %doc [bsc#1082318] + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libmount.spec ++++++ --- /var/tmp/diff_new_pack.vD77Fw/_old 2018-03-30 11:55:43.519113490 +0200 +++ /var/tmp/diff_new_pack.vD77Fw/_new 2018-03-30 11:55:43.523113346 +0200 @@ -72,8 +72,8 @@ %endif %endif Summary: %main_summary -License: GPL-2.0+ -Group: %main_group +License: GPL-2.0-or-later +Group: %group_pl BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -396,6 +396,7 @@ %if %build_util_linux %package -n python-libmount Summary: %summary_pl +License: GPL-2.0-or-later Group: %group_pl %description -n python-libmount @@ -884,11 +885,11 @@ # Common files for all archs %defattr(-,root,root) # util-linux documentation files -%doc README.licensing -%doc COPYING -%doc Documentation/licenses/COPYING.BSD-3 -%doc Documentation/licenses/COPYING.LGPLv2.1 -%doc Documentation/licenses/COPYING.UCB +%license README.licensing +%license COPYING +%license Documentation/licenses/COPYING.BSD-3 +%license Documentation/licenses/COPYING.LGPLv2.1 +%license Documentation/licenses/COPYING.UCB %doc Documentation/blkid.txt %doc Documentation/cal.txt %doc Documentation/col.txt ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.vD77Fw/_old 2018-03-30 11:55:43.567111755 +0200 +++ /var/tmp/diff_new_pack.vD77Fw/_new 2018-03-30 11:55:43.571111610 +0200 @@ -72,7 +72,7 @@ %endif %endif Summary: %main_summary -License: GPL-2.0+ +License: GPL-2.0-or-later Group: %main_group BuildRequires: audit-devel BuildRequires: bc @@ -884,11 +884,11 @@ # Common files for all archs %defattr(-,root,root) # util-linux documentation files -%doc README.licensing -%doc COPYING -%doc Documentation/licenses/COPYING.BSD-3 -%doc Documentation/licenses/COPYING.LGPLv2.1 -%doc Documentation/licenses/COPYING.UCB +%license README.licensing +%license COPYING +%license Documentation/licenses/COPYING.BSD-3 +%license Documentation/licenses/COPYING.LGPLv2.1 +%license Documentation/licenses/COPYING.UCB %doc Documentation/blkid.txt %doc Documentation/cal.txt %doc Documentation/col.txt ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.vD77Fw/_old 2018-03-30 11:55:43.591110887 +0200 +++ /var/tmp/diff_new_pack.vD77Fw/_new 2018-03-30 11:55:43.595110742 +0200 @@ -72,7 +72,7 @@ %endif %endif Summary: %main_summary -License: GPL-2.0+ +License: GPL-2.0-or-later Group: %main_group BuildRequires: audit-devel BuildRequires: bc @@ -884,11 +884,11 @@ # Common files for all archs %defattr(-,root,root) # util-linux documentation files -%doc README.licensing -%doc COPYING -%doc Documentation/licenses/COPYING.BSD-3 -%doc Documentation/licenses/COPYING.LGPLv2.1 -%doc Documentation/licenses/COPYING.UCB +%license README.licensing +%license COPYING +%license Documentation/licenses/COPYING.BSD-3 +%license Documentation/licenses/COPYING.LGPLv2.1 +%license Documentation/licenses/COPYING.UCB %doc Documentation/blkid.txt %doc Documentation/cal.txt %doc Documentation/col.txt

1 0

commit upower for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package upower for openSUSE:Factory checked in at 2018-03-30 11:55:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/upower (Old) and /work/SRC/openSUSE:Factory/.upower.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "upower" Fri Mar 30 11:55:23 2018 rev:59 rq:590598 version:0.99.7 Changes: -------- --- /work/SRC/openSUSE:Factory/upower/upower.changes 2018-03-09 10:47:28.572775806 +0100 +++ /work/SRC/openSUSE:Factory/.upower.new/upower.changes 2018-03-30 11:55:28.735648151 +0200 @@ -1,0 +2,6 @@ +Tue Mar 20 14:15:49 UTC 2018 - novell(a)mirell.de + +- Add upower-fix-ios-crash.patch to fix repeating crashes on some + iOS devices like the Apple TV (fdo#105625). + +------------------------------------------------------------------- New: ---- upower-fix-ios-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ upower.spec ++++++ --- /var/tmp/diff_new_pack.FpdCHI/_old 2018-03-30 11:55:29.823608803 +0200 +++ /var/tmp/diff_new_pack.FpdCHI/_new 2018-03-30 11:55:29.831608514 +0200 @@ -28,10 +28,12 @@ Summary: Power Device Enumeration Framework License: GPL-2.0-or-later Group: System/Daemons -URL: http://upower.freedesktop.org/ +Url: http://upower.freedesktop.org/ Source: http://upower.freedesktop.org/releases/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE upower-hibernate-insteadof-hybridsleep.patch boo#985741 dimstar(a)opensuse.org -- Set the system per default to hibernate, not hybridsleep Patch0: upower-hibernate-insteadof-hybridsleep.patch +# PATCH-FIX-UPSTREAM upower-fix-ios-crash.patch fdo#105625 novell(a)mirell.de -- Fix endless crash loop freezing the system with AppleTV attached +Patch1: upower-fix-ios-crash.patch BuildRequires: gobject-introspection-devel >= 0.9.9 BuildRequires: gtk-doc >= 1.11 BuildRequires: intltool @@ -102,6 +104,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure\ ++++++ upower-fix-ios-crash.patch ++++++ >From 9357aa60e7773d997e6208c9b3cab09adc166e38 Mon Sep 17 00:00:00 2001 From: Martin Szulecki <martin.szulecki(a)libimobiledevice.org> Date: Tue, 20 Mar 2018 15:00:21 +0100 Subject: [PATCH 1/2] linux: Prevent crash after attaching an Apple TV As Apple TVs do not have a battery and do not provide the "BatteryIsCharging" lockdown key, upower would crash due to a missing check whether the retrieved node is actually valid. https://bugzilla.freedesktop.org/show_bug.cgi?id=105625 --- src/linux/up-device-idevice.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c index 97d230c..a583881 100644 --- a/src/linux/up-device-idevice.c +++ b/src/linux/up-device-idevice.c @@ -297,6 +297,10 @@ up_device_idevice_refresh (UpDevice *device) /* get charging status */ node = plist_dict_get_item (dict, "BatteryIsCharging"); + if (!node) { + plist_free(dict); + goto out; + } plist_get_bool_val (node, &charging); if (percentage == 100) -- 2.16.2 >From 598fdbc5e00573d1b56d4107798f82bd615842b3 Mon Sep 17 00:00:00 2001 From: Martin Szulecki <martin.szulecki(a)libimobiledevice.org> Date: Tue, 20 Mar 2018 15:04:26 +0100 Subject: [PATCH 2/2] linux: Check "HasBattery" key for newer iOS versions This adds an extra check to query if the iOS device has a battery at all before actually trying to retrieve the battery status. Should still work for older iOS versions which do not provide this key. https://bugzilla.freedesktop.org/show_bug.cgi?id=105625 --- src/linux/up-device-idevice.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c index a583881..0c404cc 100644 --- a/src/linux/up-device-idevice.c +++ b/src/linux/up-device-idevice.c @@ -269,7 +269,7 @@ up_device_idevice_refresh (UpDevice *device) lockdownd_client_t client = NULL; plist_t dict, node; guint64 percentage; - guint8 charging; + guint8 charging, has_battery; UpDeviceState state; gboolean retval = FALSE; @@ -284,6 +284,15 @@ up_device_idevice_refresh (UpDevice *device) if (lockdownd_get_value (client, "com.apple.mobile.battery", NULL, &dict) != LOCKDOWN_E_SUCCESS) goto out; + node = plist_dict_get_item (dict, "HasBattery"); + if (node) { + plist_get_bool_val (node, &has_battery); + if (!has_battery) { + plist_free(dict); + goto out; + } + } + /* get battery status */ node = plist_dict_get_item (dict, "BatteryCurrentCapacity"); if (!node) { -- 2.16.2

1 0

commit usbutils for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package usbutils for openSUSE:Factory checked in at 2018-03-30 11:55:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbutils (Old) and /work/SRC/openSUSE:Factory/.usbutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "usbutils" Fri Mar 30 11:55:18 2018 rev:39 rq:590592 version:009 Changes: -------- --- /work/SRC/openSUSE:Factory/usbutils/usbutils.changes 2018-02-12 10:11:44.893001140 +0100 +++ /work/SRC/openSUSE:Factory/.usbutils.new/usbutils.changes 2018-03-30 11:55:20.595942534 +0200 @@ -1,0 +2,7 @@ +Tue Mar 13 15:35:44 UTC 2018 - mpluskal(a)suse.com + +- Use usb ids from hwdata +- Modernise spec file with spec-cleaner +- Make building more verbose + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbutils.spec ++++++ --- /var/tmp/diff_new_pack.nzZzlV/_old 2018-03-30 11:55:21.355915048 +0200 +++ /var/tmp/diff_new_pack.nzZzlV/_new 2018-03-30 11:55:21.355915048 +0200 @@ -20,9 +20,9 @@ Version: 009 Release: 0 Summary: Tools and libraries for USB devices -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Hardware/Other -Url: http://sourceforge.net/projects/linux-usb/ +URL: http://sourceforge.net/projects/linux-usb/ Source0: https://www.kernel.org/pub/linux/utils/usb/%{name}/%{name}-%{version}.tar.xz Source1: usbutils-rpmlintrc # PATCH-FIX-SUSE @@ -30,6 +30,7 @@ BuildRequires: libusb-1_0-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(libudev) >= 196 +Requires: hwdata %description This package contains a utility for inspecting devices connected to USB @@ -40,18 +41,23 @@ %patch0 %build -%configure --disable-zlib -make %{?_smp_mflags} +%configure \ + --datadir=%{_datadir}/hwdata \ + --disable-usbids +make %{?_smp_mflags} V=1 %install %make_install %files %doc AUTHORS ChangeLog -%defattr(0644, root, root, 0755) -%attr(0644, root, root) %{_mandir}/man1/* -%attr(0644, root, root) %{_mandir}/man8/* -%attr(0755, root, root) %{_bindir}/* +%{_bindir}/lsusb +%{_bindir}/lsusb.py +%{_bindir}/usb-devices +%{_bindir}/usbhid-dump +%{_mandir}/man1/usb-devices.1%{?ext_man} +%{_mandir}/man8/lsusb.8%{?ext_man} +%{_mandir}/man8/usbhid-dump.8%{?ext_man} %{_libdir}/pkgconfig/%{name}.pc %changelog

1 0

commit patch for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '18

30 Mar '18

Hello community, here is the log from the commit of package patch for openSUSE:Factory checked in at 2018-03-30 11:55:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patch (Old) and /work/SRC/openSUSE:Factory/.patch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patch" Fri Mar 30 11:55:13 2018 rev:41 rq:590591 version:2.7.6 Changes: -------- --- /work/SRC/openSUSE:Factory/patch/patch.changes 2015-03-16 06:55:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.patch.new/patch.changes 2018-03-30 11:55:15.032143755 +0200 @@ -1,0 +2,24 @@ +Thu Mar 22 09:43:43 CET 2018 - jdelvare(a)suse.de + +- Move COPYING from %doc to %license. + +------------------------------------------------------------------- +Wed Mar 21 16:44:09 CET 2018 - jdelvare(a)suse.de + +- Add AUTHORS and COPYING to %doc. +- fix-segfault-mangled-rename.patch: Fix segfault with mangled + rename patch (bsc#1080951, CVE-2018-6951, savannah#53132). + +------------------------------------------------------------------- +Wed Feb 7 18:43:51 UTC 2018 - astieger(a)suse.com + +- patch 2.7.6: + * Files specified on the command line are no longer verified to + be inside the current working directory, so commands like + "patch -i foo.diff ../foo" will work again + * Fixes CVE-2016-10713 (Out-of-bounds access within + pch_write_line() in pch.c could possibly lead to DoS via a + crafted input file; bsc#1080918) + * Various fixes + +------------------------------------------------------------------- Old: ---- patch-2.7.5.tar.xz patch-2.7.5.tar.xz.sig New: ---- fix-segfault-mangled-rename.patch patch-2.7.6.tar.xz patch-2.7.6.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patch.spec ++++++ --- /var/tmp/diff_new_pack.fLnRZr/_old 2018-03-30 11:55:15.904112220 +0200 +++ /var/tmp/diff_new_pack.fLnRZr/_new 2018-03-30 11:55:15.904112220 +0200 @@ -1,7 +1,7 @@ # # spec file for package patch # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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: patch -Version: 2.7.5 +Version: 2.7.6 Release: 0 Summary: GNU patch License: GPL-3.0+ @@ -26,13 +26,13 @@ Source: http://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=patch&download… -%if 0%{?suse_version} < 1220 -BuildRequires: xz -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch1: fix-segfault-mangled-rename.patch # See bnc#662957. The fix for CVE-2010-4651 breaks the way interdiff was # invoking patch, so interdiff had to be fixed too. Conflicts: patchutils < 0.3.2 +%if 0%{?suse_version} < 1220 +BuildRequires: xz +%endif %description The GNU patch program is used to apply diffs between original and @@ -40,6 +40,7 @@ %prep %setup -q +%patch1 -p1 %build export CFLAGS="%{optflags} -Wall -O2 -pipe" @@ -53,9 +54,13 @@ make install DESTDIR=%{buildroot} %{verbose:V=1} %files -%defattr(-,root,root) -%doc NEWS README +%doc AUTHORS NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif %{_bindir}/patch -%doc %{_mandir}/man1/patch.1.gz +%{_mandir}/man1/patch.1%{ext_man} %changelog ++++++ fix-segfault-mangled-rename.patch ++++++ From: Andreas Gruenbacher <agruen(a)gnu.org> Date: Mon, 12 Feb 2018 16:48:24 +0100 Subject: Fix segfault with mangled rename patch Patch-mainline: yes Git-commit: f290f48a621867084884bfff87f8093c15195e6a References: bsc#1080951, CVE-2018-6951, savannah#53133 http://savannah.gnu.org/bugs/?53132 * src/pch.c (intuit_diff_type): Ensure that two filenames are specified for renames and copies (fix the existing check). diff --git a/src/pch.c b/src/pch.c index ff9ed2c..bc6278c 100644 --- a/src/pch.c +++ b/src/pch.c @@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) if ((pch_rename () || pch_copy ()) && ! inname && ! ((i == OLD || i == NEW) && - p_name[! reverse] && + p_name[reverse] && p_name[! reverse] && + name_is_valid (p_name[reverse]) && name_is_valid (p_name[! reverse]))) { say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy"); ++++++ patch-2.7.5.tar.xz -> patch-2.7.6.tar.xz ++++++ ++++ 62545 lines of diff (skipped) ++++++ patch.keyring ++++++ Binary files /var/tmp/diff_new_pack.fLnRZr/_old and /var/tmp/diff_new_pack.fLnRZr/_new differ

1 0