April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit libseccomp for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package libseccomp for openSUSE:Factory checked in at 2016-04-22 16:17:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libseccomp (Old) and /work/SRC/openSUSE:Factory/.libseccomp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libseccomp" Changes: -------- --- /work/SRC/openSUSE:Factory/libseccomp/libseccomp.changes 2016-03-31 13:01:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libseccomp.new/libseccomp.changes 2016-04-22 16:17:51.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 19 16:00:29 UTC 2016 - jengelh(a)inai.de + +- Add 0001-tests-replace-socket-syscall-references-in-15-basic-.patch + +------------------------------------------------------------------- +Sun Apr 10 22:31:15 UTC 2016 - jengelh(a)inai.de + +- Add 0001-arch-fix-a-number-of-32-bit-x86-failures-related-to-.patch + +------------------------------------------------------------------- New: ---- 0001-arch-fix-a-number-of-32-bit-x86-failures-related-to-.patch 0001-tests-replace-socket-syscall-references-in-15-basic-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libseccomp.spec ++++++ --- /var/tmp/diff_new_pack.H2SqQY/_old 2016-04-22 16:17:52.000000000 +0200 +++ /var/tmp/diff_new_pack.H2SqQY/_new 2016-04-22 16:17:52.000000000 +0200 @@ -30,6 +30,8 @@ Source2: https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%ve… Source99: baselibs.conf Patch1: no-static.diff +Patch2: 0001-arch-fix-a-number-of-32-bit-x86-failures-related-to-.patch +Patch3: 0001-tests-replace-socket-syscall-references-in-15-basic-.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.11 @@ -97,10 +99,12 @@ %prep %setup -q -%patch -P 1 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build -perl -i -pe 's{AC_INIT$\[libseccomp\], \[0\.0\.0\]$}{AC_INIT([libseccomp], [2.3.0])}' configure.ac +if [ ! -e configure ]; then + perl -i -pe 's{AC_INIT$\[libseccomp\], \[0\.0\.0\]$}{AC_INIT([libseccomp], [2.3.0])}' configure.ac +fi autoreconf -fi %configure --includedir="%_includedir/%name" --disable-static make %{?_smp_mflags}; ++++++ 0001-arch-fix-a-number-of-32-bit-x86-failures-related-to-.patch ++++++ >From 73d83e45efbe8c31067c97155162f17ca51b7435 Mon Sep 17 00:00:00 2001 From: Paul Moore <paul(a)paul-moore.com> Date: Fri, 8 Apr 2016 17:10:03 -0400 Subject: [PATCH] arch: fix a number of 32-bit x86 failures related to socket syscalls It turns out there was still a few bugs with the 32-bit x86 socket syscalls, especially on systems with older kernel headers installed. This patch corrects these problems and perhaps more importantly, returns the resolver API functions to returning the negative pseudo syscall numbers in the case of 32-bit x86, this helps ensure things continue to work as they did before as the API does not change. It it important to note that libseccomp still generates filter code for both multiplexed and direct socket syscalls regardless. Signed-off-by: Paul Moore <paul(a)paul-moore.com> --- src/arch-x86-syscalls.c | 84 ++++++++++++++++++++++++++++++++++++++ src/arch-x86.c | 23 +++++++++-- tests/30-sim-socket_syscalls.tests | 3 +- 3 files changed, 105 insertions(+), 5 deletions(-) diff --git a/src/arch-x86-syscalls.c b/src/arch-x86-syscalls.c index e51dd83..58e0597 100644 --- a/src/arch-x86-syscalls.c +++ b/src/arch-x86-syscalls.c @@ -469,6 +469,48 @@ int x86_syscall_resolve_name(const char *name) const struct arch_syscall_def *table = x86_syscall_table; /* XXX - plenty of room for future improvement here */ + + if (strcmp(name, "accept") == 0) + return __PNR_accept; + if (strcmp(name, "accept4") == 0) + return __PNR_accept4; + else if (strcmp(name, "bind") == 0) + return __PNR_bind; + else if (strcmp(name, "connect") == 0) + return __PNR_connect; + else if (strcmp(name, "getpeername") == 0) + return __PNR_getpeername; + else if (strcmp(name, "getsockname") == 0) + return __PNR_getsockname; + else if (strcmp(name, "getsockopt") == 0) + return __PNR_getsockopt; + else if (strcmp(name, "listen") == 0) + return __PNR_listen; + else if (strcmp(name, "recv") == 0) + return __PNR_recv; + else if (strcmp(name, "recvfrom") == 0) + return __PNR_recvfrom; + else if (strcmp(name, "recvmsg") == 0) + return __PNR_recvmsg; + else if (strcmp(name, "recvmmsg") == 0) + return __PNR_recvmmsg; + else if (strcmp(name, "send") == 0) + return __PNR_send; + else if (strcmp(name, "sendmsg") == 0) + return __PNR_sendmsg; + else if (strcmp(name, "sendmmsg") == 0) + return __PNR_sendmmsg; + else if (strcmp(name, "sendto") == 0) + return __PNR_sendto; + else if (strcmp(name, "setsockopt") == 0) + return __PNR_setsockopt; + else if (strcmp(name, "shutdown") == 0) + return __PNR_shutdown; + else if (strcmp(name, "socket") == 0) + return __PNR_socket; + else if (strcmp(name, "socketpair") == 0) + return __PNR_socketpair; + for (iter = 0; table[iter].name != NULL; iter++) { if (strcmp(name, table[iter].name) == 0) return table[iter].num; @@ -492,6 +534,48 @@ const char *x86_syscall_resolve_num(int num) const struct arch_syscall_def *table = x86_syscall_table; /* XXX - plenty of room for future improvement here */ + + if (num == __PNR_accept) + return "accept"; + else if (num == __PNR_accept4) + return "accept4"; + else if (num == __PNR_bind) + return "bind"; + else if (num == __PNR_connect) + return "connect"; + else if (num == __PNR_getpeername) + return "getpeername"; + else if (num == __PNR_getsockname) + return "getsockname"; + else if (num == __PNR_getsockopt) + return "getsockopt"; + else if (num == __PNR_listen) + return "listen"; + else if (num == __PNR_recv) + return "recv"; + else if (num == __PNR_recvfrom) + return "recvfrom"; + else if (num == __PNR_recvmsg) + return "recvmsg"; + else if (num == __PNR_recvmmsg) + return "recvmmsg"; + else if (num == __PNR_send) + return "send"; + else if (num == __PNR_sendmsg) + return "sendmsg"; + else if (num == __PNR_sendmmsg) + return "sendmmsg"; + else if (num == __PNR_sendto) + return "sendto"; + else if (num == __PNR_setsockopt) + return "setsockopt"; + else if (num == __PNR_shutdown) + return "shutdown"; + else if (num == __PNR_socket) + return "socket"; + else if (num == __PNR_socketpair) + return "socketpair"; + for (iter = 0; table[iter].num != __NR_SCMP_ERROR; iter++) { if (num == table[iter].num) return table[iter].name; diff --git a/src/arch-x86.c b/src/arch-x86.c index 76a1e7e..1bab53f 100644 --- a/src/arch-x86.c +++ b/src/arch-x86.c @@ -104,6 +104,15 @@ int _x86_sock_demux(int socketcall) case -117: /* recvmsg */ return 372; + case -118: + /* accept4 */ + return 364; + case -119: + /* recvmmsg */ + return 337; + case -120: + /* sendmmsg */ + return 345; } return __NR_SCMP_ERROR; @@ -120,6 +129,12 @@ int _x86_sock_demux(int socketcall) int _x86_sock_mux(int syscall) { switch (syscall) { + case 337: + /* recvmmsg */ + return -119; + case 345: + /* sendmmsg */ + return -120; case 359: /* socket */ return -101; @@ -137,7 +152,7 @@ int _x86_sock_mux(int syscall) return -104; case 364: /* accept4 */ - return __NR_SCMP_UNDEF; + return -118; case 365: /* getsockopt */ return -115; @@ -183,7 +198,7 @@ int x86_syscall_rewrite(int *syscall) { int sys = *syscall; - if (sys <= -100 && sys >= -117) + if (sys <= -100 && sys >= -120) *syscall = __x86_NR_socketcall; else if (sys <= -200 && sys >= -211) *syscall = __x86_NR_ipc; @@ -215,8 +230,8 @@ int x86_rule_add(struct db_filter_col *col, struct db_filter *db, bool strict, int sys_a, sys_b; struct db_api_rule_list *rule_a, *rule_b; - if ((sys <= -100 && sys >= -117) || (sys >= 359 && sys <= 373)) { - /* (-100 to -117) : multiplexed socket syscalls + if ((sys <= -100 && sys >= -120) || (sys >= 359 && sys <= 373)) { + /* (-100 to -120) : multiplexed socket syscalls (359 to 373) : direct socket syscalls, Linux 4.4+ */ /* strict check for the multiplexed socket syscalls */ diff --git a/tests/30-sim-socket_syscalls.tests b/tests/30-sim-socket_syscalls.tests index 413629f..9d54b0e 100644 --- a/tests/30-sim-socket_syscalls.tests +++ b/tests/30-sim-socket_syscalls.tests @@ -18,7 +18,8 @@ test type: bpf-sim 30-sim-socket_syscalls +x86 373 0 1 2 N N N ALLOW 30-sim-socket_syscalls +x86 accept 5 N N N N N ALLOW 30-sim-socket_syscalls +x86 accept 0 1 2 N N N KILL -30-sim-socket_syscalls +x86 accept4 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86 accept4 18 1 2 N N N ALLOW +30-sim-socket_syscalls +x86 accept4 0 1 2 N N N KILL 30-sim-socket_syscalls +x86_64 socket 0 1 2 N N N ALLOW 30-sim-socket_syscalls +x86_64 connect 0 1 2 N N N ALLOW 30-sim-socket_syscalls +x86_64 accept4 0 1 2 N N N ALLOW -- 2.6.6 ++++++ 0001-tests-replace-socket-syscall-references-in-15-basic-.patch ++++++ >From 13e0bae9571c195ee979a66b329aa538b87ee65d Mon Sep 17 00:00:00 2001 From: Paul Moore <paul(a)paul-moore.com> Date: Tue, 19 Apr 2016 10:58:34 -0400 Subject: [PATCH] tests: replace socket syscall references in 15-basic-resolver On 32-bit x86 the resolved socket syscall() doesn't always resolve to the __NR_socket value due to the direct wired socket syscall so replace it with the read() syscall to ensure the test doesn't fail. Signed-off-by: Paul Moore <paul(a)paul-moore.com> --- tests/15-basic-resolver.c | 8 ++++---- tests/15-basic-resolver.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c index eff54fe..b3c9497 100644 --- a/tests/15-basic-resolver.c +++ b/tests/15-basic-resolver.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) if (seccomp_syscall_resolve_name("open") != __NR_open) goto fail; - if (seccomp_syscall_resolve_name("socket") != __NR_socket) + if (seccomp_syscall_resolve_name("read") != __NR_read) goto fail; if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR) goto fail; @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) "open") != __NR_open) goto fail; if (seccomp_syscall_resolve_name_arch(SCMP_ARCH_NATIVE, - "socket") != __NR_socket) + "read") != __NR_read) goto fail; if (seccomp_syscall_resolve_name_arch(SCMP_ARCH_NATIVE, "INVALID") != __NR_SCMP_ERROR) @@ -51,8 +51,8 @@ int main(int argc, char *argv[]) goto fail; free(name); - name = seccomp_syscall_resolve_num_arch(SCMP_ARCH_NATIVE, __NR_socket); - if (name == NULL || strcmp(name, "socket") != 0) + name = seccomp_syscall_resolve_num_arch(SCMP_ARCH_NATIVE, __NR_read); + if (name == NULL || strcmp(name, "read") != 0) goto fail; free(name); diff --git a/tests/15-basic-resolver.py b/tests/15-basic-resolver.py index 329754e..12c4d7d 100755 --- a/tests/15-basic-resolver.py +++ b/tests/15-basic-resolver.py @@ -33,7 +33,7 @@ def test(): # this differs from the native test as we don't support the syscall # resolution functions by themselves f.add_rule(ALLOW, "open") - f.add_rule(ALLOW, "socket") + f.add_rule(ALLOW, "read") try: f.add_rule(ALLOW, "INVALID") except RuntimeError: @@ -43,9 +43,9 @@ def test(): sys_name = resolve_syscall(Arch(), sys_num) if (sys_name != "open"): raise RuntimeError("Test failure") - sys_num = resolve_syscall(Arch(), "socket") + sys_num = resolve_syscall(Arch(), "read") sys_name = resolve_syscall(Arch(), sys_num) - if (sys_name != "socket"): + if (sys_name != "read"): raise RuntimeError("Test failure") test() -- 2.6.6

1 0

commit shotwell for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2016-04-22 16:17:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotwell (Old) and /work/SRC/openSUSE:Factory/.shotwell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shotwell" Changes: -------- --- /work/SRC/openSUSE:Factory/shotwell/shotwell.changes 2016-03-18 21:35:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2016-04-22 16:17:46.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Apr 16 15:09:34 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 0.22.1+git.20160416: + + build: Remove some shell magic. + + Do not use Posix.system(). + + Update .gitignore. + + Removed execution permissions of formats page. + + Fixed mentions to UI's option/item/button labels. + + Add '<gui>' tag to option/item/button mentions. + + Change "Date and Time" help's page filename to fit its content. + + Updated translations. + +------------------------------------------------------------------- Old: ---- shotwell-0.22.0+git.20160103.tar.xz New: ---- shotwell-0.22.1+git.20160416.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.sQ5Yft/_old 2016-04-22 16:17:47.000000000 +0200 +++ /var/tmp/diff_new_pack.sQ5Yft/_new 2016-04-22 16:17:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: shotwell -Version: 0.22.0+git.20160103 +Version: 0.22.1+git.20160416 Release: 0 Summary: Photo Manager for GNOME License: LGPL-2.1+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.sQ5Yft/_old 2016-04-22 16:17:47.000000000 +0200 +++ /var/tmp/diff_new_pack.sQ5Yft/_new 2016-04-22 16:17:47.000000000 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="url">git://git.gnome.org/shotwell</param> <param name="scm">git</param> - <param name="versionformat">0.22.0+git.%cd</param> + <param name="versionformat">0.22.1+git.%cd</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.sQ5Yft/_old 2016-04-22 16:17:47.000000000 +0200 +++ /var/tmp/diff_new_pack.sQ5Yft/_new 2016-04-22 16:17:47.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://git.gnome.org/shotwell</param> - <param name="changesrevision">f2fb1f7059e17b998a851626a7b076716020a7ac</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b0ea780baf21a60e9b0103a6c4242784da8a83a8</param></service></servicedata> \ No newline at end of file ++++++ shotwell-0.22.0+git.20160103.tar.xz -> shotwell-0.22.1+git.20160416.tar.xz ++++++ ++++ 23525 lines of diff (skipped)

1 0

commit gegl for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package gegl for openSUSE:Factory checked in at 2016-04-22 16:17:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gegl (Old) and /work/SRC/openSUSE:Factory/.gegl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gegl" Changes: -------- --- /work/SRC/openSUSE:Factory/gegl/gegl.changes 2016-01-30 11:34:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gegl.new/gegl.changes 2016-04-22 16:17:39.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 16 22:01:17 UTC 2016 - olaf(a)aepfle.de + +- Use pkgconfig instead of libffmpeg-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gegl.spec ++++++ --- /var/tmp/diff_new_pack.qUKrtG/_old 2016-04-22 16:17:40.000000000 +0200 +++ /var/tmp/diff_new_pack.qUKrtG/_new 2016-04-22 16:17:40.000000000 +0200 @@ -68,7 +68,9 @@ BuildRequires: suitesparse-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?BUILD_ORIG} -BuildRequires: ffmpeg-devel +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libswscale) %if 0%{?BUILD_ORIG_ADDON} Provides: patched_subset %else

1 0

commit opal for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package opal for openSUSE:Factory checked in at 2016-04-22 16:17:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opal (Old) and /work/SRC/openSUSE:Factory/.opal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opal" Changes: -------- --- /work/SRC/openSUSE:Factory/opal/opal.changes 2015-02-03 11:38:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opal.new/opal.changes 2016-04-22 16:17:33.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 16 22:01:17 UTC 2016 - olaf(a)aepfle.de + +- Use pkgconfig instead of libffmpeg-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opal.spec ++++++ --- /var/tmp/diff_new_pack.WpRIVf/_old 2016-04-22 16:17:34.000000000 +0200 +++ /var/tmp/diff_new_pack.WpRIVf/_new 2016-04-22 16:17:34.000000000 +0200 @@ -26,7 +26,8 @@ BuildRequires: libcelt-devel BuildRequires: libgsm-devel %if %{with ffmpeg} -BuildRequires: libffmpeg-devel +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavutil) %endif BuildRequires: libopenssl-devel BuildRequires: libpt-devel >= 2.10.1

1 0

commit kfilemetadata5 for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2016-04-22 16:17:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfilemetadata5" Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2016-04-12 19:16:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new/kfilemetadata5.changes 2016-04-22 16:17:28.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 17 18:39:27 UTC 2016 - olaf(a)aepfle.de + +- Use pkgconfig instead of libffmpeg-devel + ffmpeg-buildrequires.patch + +------------------------------------------------------------------- New: ---- ffmpeg-buildrequires.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.exTQys/_old 2016-04-22 16:17:29.000000000 +0200 +++ /var/tmp/diff_new_pack.exTQys/_new 2016-04-22 16:17:29.000000000 +0200 @@ -29,9 +29,12 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{vers… Source1: baselibs.conf Source99: kfilemetadata5-rpmlintrc +Patch0: ffmpeg-buildrequires.patch BuildRequires: extra-cmake-modules >= %{_tar_path} %if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" -BuildRequires: ffmpeg-devel +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) %endif BuildRequires: karchive-devel >= %{_tar_path} BuildRequires: kf5-filesystem @@ -65,6 +68,7 @@ %lang_package %prep %setup -q -n kfilemetadata-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ ffmpeg-buildrequires.patch ++++++ --- cmake/FindFFmpeg.cmake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) Index: kfilemetadata-5.21.0/cmake/FindFFmpeg.cmake =================================================================== --- kfilemetadata-5.21.0.orig/cmake/FindFFmpeg.cmake +++ kfilemetadata-5.21.0/cmake/FindFFmpeg.cmake @@ -9,11 +9,8 @@ # # For each of the components it will additionally set. # - AVCODEC -# - AVDEVICE # - AVFORMAT # - AVUTIL -# - POSTPROCESS -# - SWSCALE # the following variables will be defined # <component>_FOUND - System has <component> # <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers @@ -121,10 +118,7 @@ if (NOT FFMPEG_LIBRARIES) # Check for all possible component. find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h) find_component(AVFORMAT libavformat avformat libavformat/avformat.h) - find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h) find_component(AVUTIL libavutil avutil libavutil/avutil.h) - find_component(SWSCALE libswscale swscale libswscale/swscale.h) - find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h) # Check if the required components were found and add their stuff to the FFMPEG_* vars. foreach (_component ${FFmpeg_FIND_COMPONENTS}) @@ -155,7 +149,7 @@ if (NOT FFMPEG_LIBRARIES) endif () # Now set the noncached _FOUND vars for the components. -foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE) +foreach (_component AVCODEC AVFORMAT AVUTIL) set_component_found(${_component}) endforeach ()

1 0

commit libpcap for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2016-04-22 16:17:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpcap (Old) and /work/SRC/openSUSE:Factory/.libpcap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpcap" Changes: -------- --- /work/SRC/openSUSE:Factory/libpcap/libpcap.changes 2015-06-30 10:15:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2016-04-22 16:17:22.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Apr 17 02:42:52 UTC 2016 - crrodriguez(a)opensuse.org + +- libpcap-no-old-socket.patch: never fallback to the obsolete + SOCK_PACKET (kernel < 2.2) interface, this still happens + for example, when you update the kernel, run iftop and + the old kernel af_packet module wasn't loaded, program fails + and the kernel prints "iftop uses obsolete (PF_INET,SOCK_PACKET)" + +------------------------------------------------------------------- New: ---- libpcap-no-old-socket.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.GDE7I2/_old 2016-04-22 16:17:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GDE7I2/_new 2016-04-22 16:17:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libpcap # -# 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 @@ -35,6 +35,7 @@ Patch2: libpcap-1.0.0-ppp.patch Patch3: libpcap-1.0.0-s390.patch Patch4: libpcap-ocloexec.patch +Patch5: libpcap-no-old-socket.patch BuildRequires: automake BuildRequires: bison BuildRequires: dbus-1-devel @@ -105,6 +106,7 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 %build %ifarch %sparc pic="PIC" ++++++ libpcap-no-old-socket.patch ++++++ Index: libpcap-1.7.3/pcap-linux.c =================================================================== --- libpcap-1.7.3.orig/pcap-linux.c +++ libpcap-1.7.3/pcap-linux.c @@ -1425,16 +1425,10 @@ pcap_activate_linux(pcap_t *handle) } } else if (ret == 0) { - /* Non-fatal error; try old way */ - if ((ret = activate_old(handle)) != 1) { - /* - * Both methods to open the packet socket failed. - * Tidy up and report our failure (handle->errbuf - * is expected to be set by the functions above). - */ - status = ret; - goto fail; - } + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "af_packet module unavailable, missing a reboot to new kernel?"); + status = PCAP_ERROR; + goto fail; } /*

1 0

commit openssl for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at 2016-04-22 16:17:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl (Old) and /work/SRC/openSUSE:Factory/.openssl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Changes: -------- --- /work/SRC/openSUSE:Factory/openssl/openssl.changes 2016-03-05 11:21:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openssl.new/openssl.changes 2016-04-22 16:17:18.000000000 +0200 @@ -1,0 +2,27 @@ +Fri Apr 15 16:55:05 UTC 2016 - dvaleev(a)suse.com + +- Remove a hack for bsc#936563 +- Drop bsc936563_hack.patch + +------------------------------------------------------------------- +Fri Apr 15 11:59:48 UTC 2016 - vcizek(a)suse.com + +- import fips patches from SLE-12 + * openssl-fips-clearerror.patch + * openssl-fips-dont-fall-back-to-default-digest.patch + * openssl-fips-fix-odd-rsakeybits.patch + * openssl-fips-rsagen-d-bits.patch + * openssl-fips-selftests_in_nonfips_mode.patch + * openssl-fips_RSA_compute_d_with_lcm.patch + * openssl-fips_disallow_ENGINE_loading.patch + * openssl-fips_disallow_x931_rand_method.patch + * openssl-rsakeygen-minimum-distance.patch + * openssl-urandom-reseeding.patch + +------------------------------------------------------------------- +Tue Mar 8 12:50:28 UTC 2016 - vcizek(a)suse.com + +- add support for "ciphers" providing no encryption (bsc#937085) + * don't build with -DSSL_FORBID_ENULL + +------------------------------------------------------------------- Old: ---- bsc936563_hack.patch New: ---- openssl-fips-clearerror.patch openssl-fips-dont-fall-back-to-default-digest.patch openssl-fips-fix-odd-rsakeybits.patch openssl-fips-rsagen-d-bits.patch openssl-fips-selftests_in_nonfips_mode.patch openssl-fips_RSA_compute_d_with_lcm.patch openssl-fips_disallow_ENGINE_loading.patch openssl-fips_disallow_x931_rand_method.patch openssl-rsakeygen-minimum-distance.patch openssl-urandom-reseeding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.kAvHBL/_old 2016-04-22 16:17:20.000000000 +0200 +++ /var/tmp/diff_new_pack.kAvHBL/_new 2016-04-22 16:17:20.000000000 +0200 @@ -73,7 +73,17 @@ Patch35: openssl-1.0.1e-add-suse-default-cipher.patch Patch37: openssl-1.0.1e-add-test-suse-default-cipher-suite.patch Patch38: openssl-missing_FIPS_ec_group_new_by_curve_name.patch -Patch40: bsc936563_hack.patch +# FIPS patches from SLE-12 +Patch50: openssl-fips_disallow_x931_rand_method.patch +Patch51: openssl-fips_disallow_ENGINE_loading.patch +Patch52: openssl-fips_RSA_compute_d_with_lcm.patch +Patch53: openssl-rsakeygen-minimum-distance.patch +Patch54: openssl-urandom-reseeding.patch +Patch55: openssl-fips-rsagen-d-bits.patch +Patch56: openssl-fips-selftests_in_nonfips_mode.patch +Patch57: openssl-fips-fix-odd-rsakeybits.patch +Patch58: openssl-fips-clearerror.patch +Patch59: openssl-fips-dont-fall-back-to-default-digest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -184,15 +194,21 @@ %patch35 -p1 %patch37 -p1 %patch38 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 %if 0%{?suse_version} >= 1120 %patch3 %endif %patch8 -p1 %patch14 -p1 -#workaround https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66728 -%ifarch ppc64le -%patch40 -p1 -%endif cp -p %{S:10} . cp -p %{S:11} . echo "adding/overwriting some entries in the 'table' hash in Configure" @@ -264,7 +280,6 @@ -fno-common \ -DTERMIO \ -DPURIFY \ --DSSL_FORBID_ENULL \ -D_GNU_SOURCE \ -DOPENSSL_NO_BUF_FREELISTS \ $(getconf LFS_CFLAGS) \ ++++++ openssl-fips-clearerror.patch ++++++ Index: openssl-1.0.2g/crypto/o_init.c =================================================================== --- openssl-1.0.2g.orig/crypto/o_init.c 2016-04-14 10:54:05.763929573 +0200 +++ openssl-1.0.2g/crypto/o_init.c 2016-04-14 10:59:08.366168879 +0200 @@ -91,6 +91,7 @@ static void init_fips_mode(void) NONFIPS_selftest_check(); /* drop down to non-FIPS mode if it is not requested */ FIPS_mode_set(0); + ERR_clear_error(); } else { /* abort if selftest failed */ FIPS_selftest_check(); ++++++ openssl-fips-dont-fall-back-to-default-digest.patch ++++++ Index: openssl-1.0.2g/apps/dgst.c =================================================================== --- openssl-1.0.2g.orig/apps/dgst.c 2016-03-01 14:35:53.000000000 +0100 +++ openssl-1.0.2g/apps/dgst.c 2016-04-14 11:04:21.706558132 +0200 @@ -147,7 +147,7 @@ int MAIN(int argc, char **argv) /* first check the program name */ program_name(argv[0], pname, sizeof pname); - md = EVP_get_digestbyname(pname); + md = EVP_get_digestbyname_fips_disabled(pname); argc--; argv++; @@ -235,7 +235,7 @@ int MAIN(int argc, char **argv) macopts = sk_OPENSSL_STRING_new_null(); if (!macopts || !sk_OPENSSL_STRING_push(macopts, *(++argv))) break; - } else if ((m = EVP_get_digestbyname(&((*argv)[1]))) != NULL) + } else if ((m = EVP_get_digestbyname_fips_disabled(&((*argv)[1]))) != NULL) md = m; else break; Index: openssl-1.0.2g/apps/apps.c =================================================================== --- openssl-1.0.2g.orig/apps/apps.c 2016-03-01 14:35:53.000000000 +0100 +++ openssl-1.0.2g/apps/apps.c 2016-04-14 11:04:21.707558145 +0200 @@ -3226,3 +3226,45 @@ int raw_write_stdout(const void *buf, in return write(fileno(stdout), buf, siz); } #endif + + +const EVP_MD *EVP_get_digestbyname_fips_disabled(const char *name) + { + int saved_fips_mode = FIPS_mode(); + EVP_MD *md; + + if (saved_fips_mode) + FIPS_mode_set(0); + + OpenSSL_add_all_digests(); + md=EVP_get_digestbyname(name); + + if (saved_fips_mode && !FIPS_mode_set(saved_fips_mode)) { + ERR_load_crypto_strings(); + ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE)); + EXIT(1); + } + + return md; + } + +const EVP_CIPHER *EVP_get_cipherbyname_fips_disabled(const char *name) + { + int saved_fips_mode = FIPS_mode(); + EVP_CIPHER *ciph; + + if (saved_fips_mode) + FIPS_mode_set(0); + + OpenSSL_add_all_ciphers(); + ciph=EVP_get_cipherbyname(name); + + if (saved_fips_mode && !FIPS_mode_set(saved_fips_mode)) { + ERR_load_crypto_strings(); + ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE)); + EXIT(1); + } + + return ciph; + } + Index: openssl-1.0.2g/apps/apps.h =================================================================== --- openssl-1.0.2g.orig/apps/apps.h 2016-03-01 14:35:53.000000000 +0100 +++ openssl-1.0.2g/apps/apps.h 2016-04-14 11:04:21.707558145 +0200 @@ -348,6 +348,9 @@ void print_cert_checks(BIO *bio, X509 *x void store_setup_crl_download(X509_STORE *st); +const EVP_MD *EVP_get_digestbyname_fips_disabled(const char *name); +const EVP_CIPHER *EVP_get_cipherbyname_fips_disabled(const char *name); + # define FORMAT_UNDEF 0 # define FORMAT_ASN1 1 # define FORMAT_TEXT 2 Index: openssl-1.0.2g/apps/enc.c =================================================================== --- openssl-1.0.2g.orig/apps/enc.c 2016-03-01 14:35:05.000000000 +0100 +++ openssl-1.0.2g/apps/enc.c 2016-04-15 13:57:22.782628623 +0200 @@ -150,7 +150,7 @@ int MAIN(int argc, char **argv) do_zlib = 1; #endif - cipher = EVP_get_cipherbyname(pname); + cipher = EVP_get_cipherbyname_fips_disabled(pname); #ifdef ZLIB if (!do_zlib && !base64 && (cipher == NULL) && (strcmp(pname, "enc") != 0)) @@ -269,7 +269,7 @@ int MAIN(int argc, char **argv) } else if (strcmp(*argv, "-non-fips-allow") == 0) non_fips_allow = 1; else if ((argv[0][0] == '-') && - ((c = EVP_get_cipherbyname(&(argv[0][1]))) != NULL)) { + ((c = EVP_get_cipherbyname_fips_disabled(&(argv[0][1]))) != NULL)) { cipher = c; } else if (strcmp(*argv, "-none") == 0) cipher = NULL; @@ -322,6 +322,10 @@ int MAIN(int argc, char **argv) argv++; } + /* drop out of fips mode if we should allow non-fips algos */ + if (non_fips_allow) + FIPS_mode_set(0); + #ifndef OPENSSL_NO_ENGINE setup_engine(bio_err, engine, 0); #endif @@ -338,7 +342,7 @@ int MAIN(int argc, char **argv) goto end; } - if (md && (dgst = EVP_get_digestbyname(md)) == NULL) { + if (md && (dgst = EVP_get_digestbyname_fips_disabled(md)) == NULL) { BIO_printf(bio_err, "%s is an unsupported message digest type\n", md); goto end; } ++++++ openssl-fips-fix-odd-rsakeybits.patch ++++++ Index: openssl-1.0.2g/crypto/rsa/rsa_gen.c =================================================================== --- openssl-1.0.2g.orig/crypto/rsa/rsa_gen.c 2016-04-14 10:52:34.187646539 +0200 +++ openssl-1.0.2g/crypto/rsa/rsa_gen.c 2016-04-14 10:53:39.335559301 +0200 @@ -465,7 +465,8 @@ static int rsa_builtin_keygen(RSA *rsa, goto err; bitsp = (bits + 1) / 2; - bitsq = bits - bitsp; + /* Use the same number of bits for p and q, our checks assume it. */ + bitsq = bitsp; /* prepare a maximum for p and q */ /* 0xB504F334 is (sqrt(2)/2)*2^32 */ ++++++ openssl-fips-rsagen-d-bits.patch ++++++ Index: openssl-1.0.2g/crypto/rsa/rsa_gen.c =================================================================== --- openssl-1.0.2g.orig/crypto/rsa/rsa_gen.c 2016-04-14 10:23:50.941168136 +0200 +++ openssl-1.0.2g/crypto/rsa/rsa_gen.c 2016-04-14 10:47:56.651757817 +0200 @@ -237,6 +237,12 @@ static int FIPS_rsa_builtin_keygen(RSA * goto err; } + BN_copy(rsa->e, e_value); + + if (!BN_is_zero(rsa->p) && !BN_is_zero(rsa->q)) + test = 1; + +retry: /* prepare approximate minimum p and q */ if (!BN_set_word(r0, 0xB504F334)) goto err; @@ -249,12 +255,6 @@ static int FIPS_rsa_builtin_keygen(RSA * if (!BN_lshift(r3, r3, pbits - 100)) goto err; - BN_copy(rsa->e, e_value); - - if (!BN_is_zero(rsa->p) && !BN_is_zero(rsa->q)) - test = 1; - - retry: /* generate p and q */ for (i = 0; i < 5 * pbits; i++) { ploop: @@ -384,6 +384,8 @@ static int FIPS_rsa_builtin_keygen(RSA * if (!BN_mod_inverse(rsa->d, rsa->e, lcm_p1_q1, ctx)) goto err; /* d */ + /* test 2^(bits/2) < d < LCM((p-1)*(q-1)) */ + /* the LCM part is covered due to the generation by modulo above */ if (BN_num_bits(rsa->d) < pbits) goto retry; /* d is too small */ ++++++ openssl-fips-selftests_in_nonfips_mode.patch ++++++ Index: openssl-1.0.2g/crypto/fips/fips.c =================================================================== --- openssl-1.0.2g.orig/crypto/fips/fips.c 2016-04-14 10:49:37.460170356 +0200 +++ openssl-1.0.2g/crypto/fips/fips.c 2016-04-14 10:49:47.270307813 +0200 @@ -448,6 +448,44 @@ int FIPS_module_mode_set(int onoff, cons return ret; } +/* In non-FIPS mode, the selftests must succeed if the + * checksum files are present + */ +void NONFIPS_selftest_check(void) + { + int rv; + char *hmacpath; + char path[PATH_MAX+1]; + + if (fips_selftest_fail) + { + /* check if the checksum files are installed */ + rv = get_library_path("libcrypto.so." SHLIB_VERSION_NUMBER, "FIPS_mode_set", path, sizeof(path)); + if (rv < 0) + OpenSSLDie(__FILE__,__LINE__, "FATAL FIPS SELFTEST FAILURE"); + + hmacpath = make_hmac_path(path); + if (hmacpath == NULL) + OpenSSLDie(__FILE__,__LINE__, "FATAL FIPS SELFTEST FAILURE"); + + if (access(hmacpath, F_OK)) + { + /* no hmac file is present, ignore the failed selftests */ + if (errno == ENOENT) + { + free(hmacpath); + return; + } + /* we fail on any other error */ + } + /* if the file exists, but the selftests failed + (eg wrong checksum), we fail too */ + free(hmacpath); + OpenSSLDie(__FILE__,__LINE__, "FATAL FIPS SELFTEST FAILURE"); + } + /* otherwise ok, selftests were successful */ + } + static CRYPTO_THREADID fips_thread; static int fips_thread_set = 0; Index: openssl-1.0.2g/crypto/fips/fips.h =================================================================== --- openssl-1.0.2g.orig/crypto/fips/fips.h 2016-04-14 10:49:47.270307813 +0200 +++ openssl-1.0.2g/crypto/fips/fips.h 2016-04-14 10:50:45.867128848 +0200 @@ -107,6 +107,7 @@ extern "C" { int FIPS_selftest_drbg(void); int FIPS_selftest_drbg_all(void); int FIPS_selftest_cmac(void); + void NONFIPS_selftest_check(void); void FIPS_get_timevec(unsigned char *buf, unsigned long *pctr); Index: openssl-1.0.2g/crypto/o_init.c =================================================================== --- openssl-1.0.2g.orig/crypto/o_init.c 2016-04-14 10:49:47.270307813 +0200 +++ openssl-1.0.2g/crypto/o_init.c 2016-04-14 10:51:31.634770112 +0200 @@ -87,6 +87,8 @@ static void init_fips_mode(void) */ if (buf[0] != '1') { + /* abort if selftest failed and the module is complete */ + NONFIPS_selftest_check(); /* drop down to non-FIPS mode if it is not requested */ FIPS_mode_set(0); } else { ++++++ openssl-fips_RSA_compute_d_with_lcm.patch ++++++ Index: openssl-1.0.2g/crypto/rsa/rsa_gen.c =================================================================== --- openssl-1.0.2g.orig/crypto/rsa/rsa_gen.c 2016-04-13 15:07:34.371851679 +0200 +++ openssl-1.0.2g/crypto/rsa/rsa_gen.c 2016-04-13 15:18:00.630306031 +0200 @@ -177,6 +177,7 @@ static int FIPS_rsa_builtin_keygen(RSA * BIGNUM *r0 = NULL, *r1 = NULL, *r2 = NULL, *r3 = NULL, *tmp; BIGNUM local_r0, local_d, local_p; BIGNUM *pr0, *d, *p; + BIGNUM *gcd_p1_q1 = NULL, *lcm_p1_q1 = NULL; BN_CTX *ctx = NULL; int ok = -1; int i; @@ -204,6 +205,8 @@ static int FIPS_rsa_builtin_keygen(RSA * r1 = BN_CTX_get(ctx); r2 = BN_CTX_get(ctx); r3 = BN_CTX_get(ctx); + gcd_p1_q1 = BN_CTX_get(ctx); + lcm_p1_q1 = BN_CTX_get(ctx); if (r3 == NULL) goto err; @@ -372,12 +375,18 @@ static int FIPS_rsa_builtin_keygen(RSA * BN_with_flags(pr0, r0, BN_FLG_CONSTTIME); } else pr0 = r0; - if (!BN_mod_inverse(rsa->d, rsa->e, pr0, ctx)) + + /* calculate lcm(p-1,q-1) = (p-1)*(q-1) / gcd(p-1,q-1) */ + if (!BN_gcd(gcd_p1_q1, r1, r2, ctx)) + goto err; /* gcd(p-1,q-1) */ + if (!BN_div(lcm_p1_q1, NULL, pr0, gcd_p1_q1, ctx)) + goto err; + if (!BN_mod_inverse(rsa->d, rsa->e, lcm_p1_q1, ctx)) goto err; /* d */ if (BN_num_bits(rsa->d) < pbits) goto retry; /* d is too small */ - + /* set up d for correct BN_FLG_CONSTTIME flag */ if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) { d = &local_d; ++++++ openssl-fips_disallow_ENGINE_loading.patch ++++++ Index: openssl-1.0.2g/crypto/engine/eng_all.c =================================================================== --- openssl-1.0.2g.orig/crypto/engine/eng_all.c 2016-04-13 15:04:40.644190904 +0200 +++ openssl-1.0.2g/crypto/engine/eng_all.c 2016-04-13 15:06:04.092468490 +0200 @@ -70,11 +70,6 @@ void ENGINE_load_builtin_engines(void) #ifdef OPENSSL_FIPS OPENSSL_init_library(); if (FIPS_mode()) { - /* We allow loading dynamic engine as a third party - engine might be FIPS validated. - User is disallowed to load non-validated engines - by security policy. */ - ENGINE_load_dynamic(); return; } #endif ++++++ openssl-fips_disallow_x931_rand_method.patch ++++++ Index: openssl-1.0.2g/crypto/fips/fips_rand_lib.c =================================================================== --- openssl-1.0.2g.orig/crypto/fips/fips_rand_lib.c 2016-04-13 15:01:53.236630810 +0200 +++ openssl-1.0.2g/crypto/fips/fips_rand_lib.c 2016-04-13 15:02:48.986482927 +0200 @@ -73,8 +73,6 @@ int FIPS_rand_set_method(const RAND_METH if (!fips_rand_bits) { if (meth == FIPS_drbg_method()) fips_approved_rand_meth = 1; - else if (meth == FIPS_x931_method()) - fips_approved_rand_meth = 2; else { fips_approved_rand_meth = 0; if (FIPS_module_mode()) { ++++++ openssl-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.kAvHBL/_old 2016-04-22 16:17:20.000000000 +0200 +++ /var/tmp/diff_new_pack.kAvHBL/_new 2016-04-22 16:17:20.000000000 +0200 @@ -1,7 +1,7 @@ Index: crypto/bio/b_sock.c =================================================================== ---- crypto/bio/b_sock.c.orig 2015-12-05 00:04:11.291027369 +0100 -+++ crypto/bio/b_sock.c 2015-12-05 00:04:13.283055286 +0100 +--- crypto/bio/b_sock.c.orig 2016-04-14 11:01:01.957760118 +0200 ++++ crypto/bio/b_sock.c 2016-04-14 11:01:04.759799369 +0200 @@ -723,7 +723,7 @@ int BIO_get_accept_socket(char *host, in } @@ -31,8 +31,8 @@ sa.len.i = (int)sa.len.s; Index: crypto/bio/bss_conn.c =================================================================== ---- crypto/bio/bss_conn.c.orig 2015-12-05 00:04:11.291027369 +0100 -+++ crypto/bio/bss_conn.c 2015-12-05 00:04:13.283055286 +0100 +--- crypto/bio/bss_conn.c.orig 2016-04-14 11:01:01.957760118 +0200 ++++ crypto/bio/bss_conn.c 2016-04-14 11:01:04.759799369 +0200 @@ -195,7 +195,7 @@ static int conn_state(BIO *b, BIO_CONNEC c->them.sin_addr.s_addr = htonl(l); c->state = BIO_CONN_S_CREATE_SOCKET; @@ -44,9 +44,9 @@ ERR_add_error_data(4, "host=", c->param_hostname, Index: crypto/bio/bss_dgram.c =================================================================== ---- crypto/bio/bss_dgram.c.orig 2015-12-05 00:04:11.292027383 +0100 -+++ crypto/bio/bss_dgram.c 2015-12-05 00:04:13.284055300 +0100 -@@ -1177,7 +1177,7 @@ static int dgram_sctp_read(BIO *b, char +--- crypto/bio/bss_dgram.c.orig 2016-04-14 11:01:01.958760132 +0200 ++++ crypto/bio/bss_dgram.c 2016-04-14 11:01:04.760799384 +0200 +@@ -1175,7 +1175,7 @@ static int dgram_sctp_read(BIO *b, char msg.msg_control = cmsgbuf; msg.msg_controllen = 512; msg.msg_flags = 0; @@ -55,7 +55,7 @@ if (n <= 0) { if (n < 0) -@@ -1802,7 +1802,7 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b) +@@ -1800,7 +1800,7 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b) msg.msg_controllen = 0; msg.msg_flags = 0; @@ -64,7 +64,7 @@ if (n <= 0) { if ((n < 0) && (get_last_socket_error() != EAGAIN) && (get_last_socket_error() != EWOULDBLOCK)) -@@ -1824,7 +1824,7 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b) +@@ -1822,7 +1822,7 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b) msg.msg_controllen = 0; msg.msg_flags = 0; @@ -73,7 +73,7 @@ if (n <= 0) { if ((n < 0) && (get_last_socket_error() != EAGAIN) && (get_last_socket_error() != EWOULDBLOCK)) -@@ -1889,7 +1889,7 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b) +@@ -1887,7 +1887,7 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b) fcntl(b->num, F_SETFL, O_NONBLOCK); } @@ -82,7 +82,7 @@ if (is_dry) { fcntl(b->num, F_SETFL, sockflags); -@@ -1931,7 +1931,7 @@ int BIO_dgram_sctp_msg_waiting(BIO *b) +@@ -1929,7 +1929,7 @@ int BIO_dgram_sctp_msg_waiting(BIO *b) sockflags = fcntl(b->num, F_GETFL, 0); fcntl(b->num, F_SETFL, O_NONBLOCK); @@ -91,7 +91,7 @@ fcntl(b->num, F_SETFL, sockflags); /* if notification, process and try again */ -@@ -1951,7 +1951,7 @@ int BIO_dgram_sctp_msg_waiting(BIO *b) +@@ -1949,7 +1949,7 @@ int BIO_dgram_sctp_msg_waiting(BIO *b) msg.msg_control = NULL; msg.msg_controllen = 0; msg.msg_flags = 0; @@ -102,8 +102,8 @@ data->handle_notifications(b, data->notification_context, Index: crypto/bio/bss_file.c =================================================================== ---- crypto/bio/bss_file.c.orig 2015-12-05 00:04:11.292027383 +0100 -+++ crypto/bio/bss_file.c 2015-12-05 00:04:49.780566910 +0100 +--- crypto/bio/bss_file.c.orig 2016-04-14 11:01:01.958760132 +0200 ++++ crypto/bio/bss_file.c 2016-04-14 11:01:04.760799384 +0200 @@ -118,6 +118,10 @@ static BIO_METHOD methods_filep = { static FILE *file_fopen(const char *filename, const char *mode) { @@ -143,21 +143,21 @@ SYSerr(SYS_F_FOPEN, get_last_sys_error()); Index: crypto/rand/rand_unix.c =================================================================== ---- crypto/rand/rand_unix.c.orig 2015-12-05 00:04:11.292027383 +0100 -+++ crypto/rand/rand_unix.c 2015-12-05 00:04:13.285055314 +0100 -@@ -269,7 +269,7 @@ int RAND_poll(void) +--- crypto/rand/rand_unix.c.orig 2016-04-14 11:01:04.761799398 +0200 ++++ crypto/rand/rand_unix.c 2016-04-14 11:02:13.950768594 +0200 +@@ -270,7 +270,7 @@ int RAND_poll(void) for (i = 0; (i < sizeof(randomfiles) / sizeof(randomfiles[0])) && - (n < ENTROPY_NEEDED); i++) { + (n < sizeof(tmpbuf)); i++) { - if ((fd = open(randomfiles[i], O_RDONLY -+ if ((fd = open(randomfiles[i], O_RDONLY|O_CLOEXEC ++ if ((fd = open(randomfiles[i], O_RDONLY | O_CLOEXEC # ifdef O_NONBLOCK | O_NONBLOCK # endif Index: crypto/rand/randfile.c =================================================================== ---- crypto/rand/randfile.c.orig 2015-12-05 00:04:11.293027397 +0100 -+++ crypto/rand/randfile.c 2015-12-05 00:04:13.285055314 +0100 +--- crypto/rand/randfile.c.orig 2016-04-14 11:01:01.959760146 +0200 ++++ crypto/rand/randfile.c 2016-04-14 11:01:04.761799398 +0200 @@ -147,7 +147,7 @@ int RAND_load_file(const char *file, lon #ifdef OPENSSL_SYS_VMS in = vms_fopen(file, "rb", VMS_OPEN_ATTRS); ++++++ openssl-rsakeygen-minimum-distance.patch ++++++ Index: openssl-1.0.2g/crypto/rsa/rsa_gen.c =================================================================== --- openssl-1.0.2g.orig/crypto/rsa/rsa_gen.c 2016-04-13 15:18:47.520016582 +0200 +++ openssl-1.0.2g/crypto/rsa/rsa_gen.c 2016-04-13 15:36:32.309233030 +0200 @@ -465,6 +465,19 @@ static int rsa_builtin_keygen(RSA *rsa, bitsp = (bits + 1) / 2; bitsq = bits - bitsp; + /* prepare a maximum for p and q */ + /* 0xB504F334 is (sqrt(2)/2)*2^32 */ + if (!BN_set_word(r0, 0xB504F334)) + goto err; + if (!BN_lshift(r0, r0, bitsp - 32)) + goto err; + + /* prepare minimum p and q difference */ + if (!BN_one(r3)) + goto err; + if (!BN_lshift(r3, r3, bitsp - 100)) + goto err; + /* We need the RSA components non-NULL */ if (!rsa->n && ((rsa->n = BN_new()) == NULL)) goto err; @@ -489,6 +502,8 @@ static int rsa_builtin_keygen(RSA *rsa, for (;;) { if (!BN_generate_prime_ex(rsa->p, bitsp, 0, NULL, NULL, cb)) goto err; + if (BN_cmp(rsa->p, r0) < 0) + continue; if (!BN_sub(r2, rsa->p, BN_value_one())) goto err; if (!BN_gcd(r1, r2, rsa->e, ctx)) @@ -501,21 +516,17 @@ static int rsa_builtin_keygen(RSA *rsa, if (!BN_GENCB_call(cb, 3, 0)) goto err; for (;;) { - /* - * When generating ridiculously small keys, we can get stuck - * continually regenerating the same prime values. Check for this and - * bail if it happens 3 times. - */ - unsigned int degenerate = 0; - do { - if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb)) - goto err; - } while ((BN_cmp(rsa->p, rsa->q) == 0) && (++degenerate < 3)); - if (degenerate == 3) { - ok = 0; /* we set our own err */ - RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL); + /* This function will take care of setting the topmost bit via BN_rand(..,1,1), so + * the maximum distance between p and q is less than 2^bitsq */ + if(!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb)) + goto err; + if (BN_cmp(rsa->q, r0) < 0) + continue; + /* check for minimum distance between p and q, 2^(bitsp-100) */ + if (!BN_sub(r2, rsa->q, rsa->p)) goto err; - } + if (BN_ucmp(r2, r3) <= 0) + continue; if (!BN_sub(r2, rsa->q, BN_value_one())) goto err; if (!BN_gcd(r1, r2, rsa->e, ctx)) ++++++ openssl-urandom-reseeding.patch ++++++ Index: openssl-1.0.2g/crypto/rand/rand_unix.c =================================================================== --- openssl-1.0.2g.orig/crypto/rand/rand_unix.c 2016-04-15 14:27:32.058784436 +0200 +++ openssl-1.0.2g/crypto/rand/rand_unix.c 2016-04-15 14:27:32.711794567 +0200 @@ -245,7 +245,8 @@ int RAND_poll(void) unsigned long l; pid_t curr_pid = getpid(); # if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) - unsigned char tmpbuf[ENTROPY_NEEDED]; + /* STATE_SIZE is 1023 ... but it was suggested to seed with 1024 bytes */ + unsigned char tmpbuf[1024]; int n = 0; # endif # ifdef DEVRANDOM @@ -268,7 +269,7 @@ int RAND_poll(void) */ for (i = 0; (i < sizeof(randomfiles) / sizeof(randomfiles[0])) && - (n < ENTROPY_NEEDED); i++) { + (n < sizeof(tmpbuf)); i++) { if ((fd = open(randomfiles[i], O_RDONLY # ifdef O_NONBLOCK | O_NONBLOCK @@ -355,7 +356,7 @@ int RAND_poll(void) if (try_read) { r = read(fd, (unsigned char *)tmpbuf + n, - ENTROPY_NEEDED - n); + sizeof(tmpbuf) - n); if (r > 0) n += r; # if defined(OPENSSL_SYS_BEOS_R5) @@ -376,7 +377,7 @@ int RAND_poll(void) } while ((r > 0 || (errno == EINTR || errno == EAGAIN)) && usec != 0 - && n < ENTROPY_NEEDED); + && n < sizeof(tmpbuf)); close(fd); } @@ -389,12 +390,12 @@ int RAND_poll(void) * collecting daemon. */ - for (egdsocket = egdsockets; *egdsocket && n < ENTROPY_NEEDED; + for (egdsocket = egdsockets; *egdsocket && n < sizeof(tmpbuf); egdsocket++) { int r; r = RAND_query_egd_bytes(*egdsocket, (unsigned char *)tmpbuf + n, - ENTROPY_NEEDED - n); + sizeof(tmpbuf) - n); if (r > 0) n += r; } Index: openssl-1.0.2g/crypto/rand/md_rand.c =================================================================== --- openssl-1.0.2g.orig/crypto/rand/md_rand.c 2016-04-15 14:27:32.711794567 +0200 +++ openssl-1.0.2g/crypto/rand/md_rand.c 2016-04-15 14:28:18.865510438 +0200 @@ -360,6 +360,10 @@ int ssleay_rand_bytes(unsigned char *buf if (num <= 0) return 1; + /* special rule for /dev/urandom seeding ... seed with as much bytes + * from /dev/urandom as you get out */ + RAND_load_file("/dev/urandom", num); + EVP_MD_CTX_init(&m); /* round upwards to multiple of MD_DIGEST_LENGTH/2 */ num_ceil = Index: openssl-1.0.2g/crypto/fips/fips_drbg_rand.c =================================================================== --- openssl-1.0.2g.orig/crypto/fips/fips_drbg_rand.c 2016-04-15 14:27:32.712794583 +0200 +++ openssl-1.0.2g/crypto/fips/fips_drbg_rand.c 2016-04-15 14:29:30.192616518 +0200 @@ -77,6 +77,11 @@ static int fips_drbg_bytes(unsigned char int rv = 0; unsigned char *adin = NULL; size_t adinlen = 0; + + /* add entropy in 1:1 relation (number pulled bytes / number pushed from /dev/urandom) */ + if (count > dctx->min_entropy) + RAND_load_file("/dev/urandom", count - dctx->min_entropy); + CRYPTO_w_lock(CRYPTO_LOCK_RAND); do { size_t rcnt; Index: openssl-1.0.2g/crypto/rand/rand_lib.c =================================================================== --- openssl-1.0.2g.orig/crypto/rand/rand_lib.c 2016-04-15 14:27:32.712794583 +0200 +++ openssl-1.0.2g/crypto/rand/rand_lib.c 2016-04-15 14:30:45.074777402 +0200 @@ -238,7 +238,7 @@ static int drbg_rand_add(DRBG_CTX *ctx, RAND_SSLeay()->add(in, inlen, entropy); if (FIPS_rand_status()) { CRYPTO_w_lock(CRYPTO_LOCK_RAND); - FIPS_drbg_reseed(ctx, NULL, 0); + FIPS_drbg_reseed(ctx, in, inlen); CRYPTO_w_unlock(CRYPTO_LOCK_RAND); } return 1;

1 0

commit hdf5 for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2016-04-22 16:17:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hdf5" Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2016-03-26 15:12:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hdf5.new/hdf5.changes 2016-04-22 16:17:13.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 15 11:26:40 UTC 2016 - normand(a)linux.vnet.ibm.com + +- add hdf5-mpi.patch same as fedora commit id + 78ddcff82b10fd80eafb7b2dc5e4ce2bb9ecbe3c + should avoid transient hung of t_pflush1 test + +------------------------------------------------------------------- New: ---- hdf5-mpi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.atQKmX/_old 2016-04-22 16:17:14.000000000 +0200 +++ /var/tmp/diff_new_pack.atQKmX/_new 2016-04-22 16:17:14.000000000 +0200 @@ -55,6 +55,7 @@ %endif Patch5: hdf5-ldouble-ppc64le.patch Patch6: hdf5-buildcompare.patch +Patch7: hdf5-mpi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: gcc-c++ @@ -69,10 +70,10 @@ BuildRequires: mvapich2-devel %endif Requires: libhdf5-%{sonum} = %{version} -Requires: libhdf5_hl%{sonum_HL} = %{version} Requires: libhdf5_cpp%{sonum_CXX} = %{version} -Requires: libhdf5_hl_cpp%{sonum_HL_CXX} = %{version} Requires: libhdf5_fortran%{sonum_F} = %{version} +Requires: libhdf5_hl%{sonum_HL} = %{version} +Requires: libhdf5_hl_cpp%{sonum_HL_CXX} = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F} = %{version} %description @@ -99,8 +100,8 @@ Summary: Command-line programs for the HDF5 scientific data format Group: Productivity/Scientific/Other Requires: libhdf5-%{sonum}-openmpi = %{version} -Requires: libhdf5_hl%{sonum_HL}-openmpi = %{version} Requires: libhdf5_fortran%{sonum_F}-openmpi = %{version} +Requires: libhdf5_hl%{sonum_HL}-openmpi = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F}-openmpi = %{version} %description -n %{name}-openmpi @@ -128,8 +129,8 @@ Summary: Command-line programs for the HDF5 scientific data format Group: Productivity/Scientific/Other Requires: libhdf5-%{sonum}-mvapich2 = %{version} -Requires: libhdf5_hl%{sonum_HL}-mvapich2 = %{version} Requires: libhdf5_fortran%{sonum_F}-mvapich2 = %{version} +Requires: libhdf5_hl%{sonum_HL}-mvapich2 = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F}-mvapich2 = %{version} %description -n %{name}-mvapich2 @@ -567,10 +568,10 @@ Requires: %{name}-devel-data = %{version} # Required by Fortran programs? Requires: libhdf5-%{sonum} = %{version} -Requires: libhdf5_hl%{sonum_HL} = %{version} Requires: libhdf5_cpp%{sonum_CXX} = %{version} -Requires: libhdf5_hl_cpp%{sonum_HL_CXX} = %{version} Requires: libhdf5_fortran%{sonum_F} = %{version} +Requires: libhdf5_hl%{sonum_HL} = %{version} +Requires: libhdf5_hl_cpp%{sonum_HL_CXX} = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F} = %{version} %description devel @@ -601,8 +602,8 @@ Requires: %{name}-openmpi = %{version} # Required by Fortran programs? Requires: libhdf5-%{sonum}-openmpi = %{version} -Requires: libhdf5_hl%{sonum_HL}-openmpi = %{version} Requires: libhdf5_fortran%{sonum_F}-openmpi = %{version} +Requires: libhdf5_hl%{sonum_HL}-openmpi = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F}-openmpi = %{version} %description openmpi-devel @@ -633,8 +634,8 @@ Requires: %{name}-mvapich2 = %{version} # Required by Fortran programs? Requires: libhdf5-%{sonum}-mvapich2 = %{version} -Requires: libhdf5_hl%{sonum_HL}-mvapich2 = %{version} Requires: libhdf5_fortran%{sonum_F}-mvapich2 = %{version} +Requires: libhdf5_hl%{sonum_HL}-mvapich2 = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F}-mvapich2 = %{version} %description mvapich2-devel @@ -737,10 +738,10 @@ Summary: Examples for %{name} Group: Documentation/Other Requires: libhdf5-%{sonum} = %{version} -Requires: libhdf5_hl%{sonum_HL} = %{version} Requires: libhdf5_cpp%{sonum_CXX} = %{version} -Requires: libhdf5_hl_cpp%{sonum_HL_CXX} = %{version} Requires: libhdf5_fortran%{sonum_F} = %{version} +Requires: libhdf5_hl%{sonum_HL} = %{version} +Requires: libhdf5_hl_cpp%{sonum_HL_CXX} = %{version} Requires: libhdf5hl_fortran%{sonum_HL_F} = %{version} %description examples @@ -773,6 +774,7 @@ %endif %patch5 -p1 %patch6 -p1 +%patch7 -p1 echo "prepare parallel builds: %_mpi" for build_dir in build %_mpi; do ++++++ hdf5-mpi.patch ++++++ diff -up hdf5-1.8.16/testpar/t_pflush1.c.mpi hdf5-1.8.16/testpar/t_pflush1.c --- hdf5-1.8.16/testpar/t_pflush1.c.mpi 2015-10-23 23:13:44.000000000 -0600 +++ hdf5-1.8.16/testpar/t_pflush1.c 2016-03-20 21:46:42.089409776 -0600 @@ -171,6 +171,7 @@ main(int argc, char* argv[]) * because MPI_File_close wants to modify the file-handle variable. */ +#if 0 /* close file1 */ if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0) { printf("H5Fget_vfd_handle for file1 failed\n"); @@ -189,14 +190,17 @@ main(int argc, char* argv[]) printf("MPI_File_close for file2 failed\n"); goto error; } /* end if */ +#endif fflush(stdout); fflush(stderr); + MPI_Finalize(); HD_exit(0); error: fflush(stdout); fflush(stderr); + MPI_Finalize(); HD_exit(1); }

1 0

commit strace for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package strace for openSUSE:Factory checked in at 2016-04-22 16:17:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/strace (Old) and /work/SRC/openSUSE:Factory/.strace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "strace" Changes: -------- --- /work/SRC/openSUSE:Factory/strace/strace.changes 2016-01-04 09:20:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.strace.new/strace.changes 2016-04-22 16:17:09.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Apr 16 12:44:28 UTC 2016 - mpluskal(a)suse.com + +- Cleanup spec file with spec-cleaner +- Drop alpha/sparc conditionals, neither is supported +- Drop ppc/ppc64 provides/obsolete as no longer needed +- Do not export OPTFLAGS as they are used anyways + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strace.spec ++++++ --- /var/tmp/diff_new_pack.Vj0OuL/_old 2016-04-22 16:17:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Vj0OuL/_new 2016-04-22 16:17:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package strace # -# 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 @@ -23,31 +23,26 @@ License: BSD-3-Clause Group: Development/Tools/Debuggers Url: http://sourceforge.net/projects/strace/ - #Freecode-URL: http://freecode.com/projects/strace #Git-Clone: git://git.code.sf.net/p/strace/code -Source: http://downloads.sourceforge.net/strace/%name-%version.tar.xz -Source2: http://downloads.sourceforge.net/strace/%name-%version.tar.xz.asc -Source3: %name.keyring +Source: http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz +Source2: http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz.asc +Source3: %{name}.keyring Source4: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: haveged BuildRequires: libacl-devel BuildRequires: libaio-devel +BuildRequires: lksctp-tools-devel +BuildRequires: xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build # libunwind is broken on ppc and ppc64 and aarch64 -%ifarch %ix86 ia64 x86_64 %{arm} ppc64le +%ifarch %ix86 ia64 x86_64 %arm ppc64le BuildRequires: libunwind-devel %endif -BuildRequires: lksctp-tools-devel -%if 0%{suse_version} > 1140 +%if 0%{?suse_version} > 1140 BuildRequires: sysvinit-tools BuildRequires: time %endif -BuildRequires: xz -# bug437293 -%ifarch ppc64 -Obsoletes: strace-64bit -%endif %ifarch x86_64 Obsoletes: strace-32bit %endif @@ -57,51 +52,35 @@ about any system calls the program makes and the signals it receives and processes can be seen. Child processes can also be tracked. - - -Authors: --------- - Paul Kranenburg <pk(a)cs.few.eur.nl> - Branko Lankester <branko(a)hacktic.nl> - Rick Sladkey <rs(a)world.std.com> - %prep %setup -q %build -export CFLAGS="$RPM_OPT_FLAGS" -%ifarch alpha -CFLAGS="$CFLAGS -ffixed-8" -%endif -%configure \ -%ifarch %sparc - --host=%_target_platform \ -%endif - %{nil} +%configure make %{?_smp_mflags} # Have to exclude make check for qemu builds, which apparently don't support PTRACE. %if !(0%{?qemu_user_space_build}) %check -haveged=$(PATH=$PATH:/sbin:/usr/sbin type -p haveged) +haveged=$(PATH=$PATH:/sbin:%{_sbindir} type -p haveged) if test -n "$haveged" && ! /sbin/checkproc $haveged ; then $haveged --pidfile=$PWD/haveged.pid < /dev/null 1>&0 2>&0 || true fi -make check || { cat tests/test-suite.log; exit 1; } +make %{?_smp_mflags} check || { cat tests/test-suite.log; exit 1; } if test -s $PWD/haveged.pid ; then /sbin/killproc -p $PWD/haveged.pid $haveged fi %endif %install -make install DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} DESTDIR=%{buildroot} install %files %defattr(-,root,root) %doc CREDITS README README-linux-ptrace NEWS -%{_prefix}/bin/strace -%{_prefix}/bin/strace-graph -%{_prefix}/bin/strace-log-merge -%{_mandir}/man1/strace.1.gz +%{_bindir}/strace +%{_bindir}/strace-graph +%{_bindir}/strace-log-merge +%{_mandir}/man1/strace.1%{ext_man} %changelog

1 0

commit ktorrent for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '16

22 Apr '16

Hello community, here is the log from the commit of package ktorrent for openSUSE:Factory checked in at 2016-04-22 16:17:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktorrent (Old) and /work/SRC/openSUSE:Factory/.ktorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktorrent" Changes: -------- --- /work/SRC/openSUSE:Factory/ktorrent/ktorrent.changes 2016-03-16 10:25:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktorrent.new/ktorrent.changes 2016-04-22 16:17:03.000000000 +0200 @@ -1,0 +2,21 @@ +Sat Apr 16 11:37:50 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to version 5.0 + * Qt5/KF5 port + * QHttp-based tracker communication was dropped in favour of + KIO-based one + * fix issues found by Coverity static analyzer + * improve naming of few UI items + * initiate sequential download of media content automatically + when it is opened from filelist view + +- Drop upstream patches + * ipfilter_bugfix.diff + * properly-support-x-scheme-handler-magnet-mimetype.patch + +- Drop patch no longer needed: + * remove-plasma.diff + * icons.tar.bz2 + + +------------------------------------------------------------------- Old: ---- icons.tar.bz2 ipfilter_bugfix.diff ktorrent-4.3.1.tar.bz2 properly-support-x-scheme-handler-magnet-mimetype.patch remove-plasma.diff New: ---- ktorrent-5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.AMrl3e/_old 2016-04-22 16:17:04.000000000 +0200 +++ /var/tmp/diff_new_pack.AMrl3e/_new 2016-04-22 16:17:04.000000000 +0200 @@ -17,15 +17,13 @@ Name: ktorrent -Version: 4.3.1 +Version: 5.0 Release: 0 Summary: KDE BitTorrent Client License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Url: http://ktorrent.org/ -Source0: http://ktorrent.org/downloads/%{version}/%{name}-%{version}.tar.bz2 -# Mimetype icons -Source1: icons.tar.bz2 +Source0: http://download.kde.org/stable/ktorrent/%{version}/%{name}-%{version}.tar.xz Source2: ktorrent.1 Source3: ktupnptest.1 # PATCH-FIX-OPENSUSE remove-links.diff adrian(a)suse.de -- Remove links to some search engine with maybe legal problems @@ -34,37 +32,38 @@ Patch1: suse-dht-warning.diff # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69(a)yahoo.es -- InitialPreference to set it as the default torrent downloader Patch2: initial-preference.diff -# PATCH-FIX-UPSTREAM ipfilter_bugfix.diff -- Fix gzip not working in ipfilter plugin due to wrong mimetype, kde#315239 -Patch3: ipfilter_bugfix.diff -# PATCH-FIX-UPSTREAM properly-support-x-scheme-handler-magnet-mimetype.patch -- make ktorrent support magnet mimetype outside KDE4 -Patch4: properly-support-x-scheme-handler-magnet-mimetype.patch -# PATCH-FIX-OPENSUSE remove-plasma.diff -- disable building the Plasma applet -Patch5: remove-plasma.diff -BuildRequires: ImageMagick +BuildRequires: boost-devel +BuildRequires: extra-cmake-modules BuildRequires: fdupes -%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} -BuildRequires: kdebase4-workspace-devel -%endif -BuildRequires: libkdepimlibs4-devel -BuildRequires: libktorrent-devel >= 1.3.0 -%if %suse_version > 1200 -BuildRequires: pkgconfig(taglib) -%else -BuildRequires: taglib-devel -%endif -%if 0%{?suse_version} +BuildRequires: gmp-devel +BuildRequires: kcmutils-devel +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kdewebkit-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: knotifications-devel +BuildRequires: knotifyconfig-devel +BuildRequires: kross-devel +BuildRequires: kxmlgui-devel +BuildRequires: libktorrent-devel >= 2.0 +BuildRequires: libqca-qt5-devel +BuildRequires: phonon4qt5-devel +BuildRequires: plasma5-workspace-devel +BuildRequires: solid-devel +BuildRequires: sonnet-devel BuildRequires: update-desktop-files -%endif +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(taglib) Recommends: %{name}-lang = %{version} -# ktorrent-devel was last used in openSUSE 11.4 -Provides: ktorrent-devel = %{version} -Obsoletes: ktorrent-devel < %{version} -# libktcore12 was last used in openSUSE 11.4 -Provides: libktcore12 = %{version} -Obsoletes: libktcore12 < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_pimlibs_requires -%kde4_runtime_requires %description KTorrent is a bittorrent application for KDE which allows you to download files @@ -80,28 +79,16 @@ %patch1 %endif %patch2 -tar jxf %{SOURCE1} -%patch3 -%patch4 -p1 -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} -%patch5 -p1 -%endif %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -%kde4_makeinstall -C build +%kf5_makeinstall -C build # Not needed, fix "devel-file-in-non-devel-package" rpmlint warning -rm -f %{buildroot}%{_kde4_libdir}/libktcore.so - -# patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" -mogrify -strip -extent 16x16 -background transparent -gravity center %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png -rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png~ -mogrify -strip -scale 22x22 -background transparent %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png -rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png~ +rm -f %{buildroot}%{_libdir}/libktcore.so # Add man pages from help2man edited. mkdir -p %{buildroot}%{_mandir}/man1 @@ -114,24 +101,12 @@ else chmod -f 0755 `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ fi -%if 0%{?suse_version} -%suse_update_desktop_file -r %{name} Qt KDE Network P2P -%endif - -# Remove unneeded locales -%if 0%{?suse_version} && 0%{?suse_version} < 1140 -rm -rf %{buildroot}%{_datadir}/locale/ast/ -rm -rf %{buildroot}%{_datadir}/locale/hne/ -rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/ -rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ -%endif +%suse_update_desktop_file -r org.kde.ktorrent Qt KDE Network P2P %fdupes -s %{buildroot} %find_lang %{name} -%kde_post_install - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -139,31 +114,22 @@ %files %defattr(-,root,root,-) %doc COPYING ChangeLog RoadMap -%{_kde4_bindir}/ktmagnetdownloader -%{_kde4_bindir}/ktorrent -%{_kde4_bindir}/ktupnptest -%{_kde4_modulesdir}/kt*.so -%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} -%{_kde4_modulesdir}/plasma_applet_ktorrent.so -%{_kde4_modulesdir}/plasma_engine_ktorrent.so -%endif -%{_kde4_libdir}/libktcore.so.* -%{_kde4_applicationsdir}/ktorrent.desktop -%{_kde4_iconsdir}/hicolor/*/actions/kt-*.* -%{_kde4_iconsdir}/hicolor/*/apps/ktorrent.* -%{_kde4_iconsdir}/hicolor/*/mimetypes/torrent.* -%{_kde4_appsdir}/ktorrent/ -%{_kde4_servicesdir}/kt*.desktop -%{_kde4_servicetypesdir}/ktorrentplugin.desktop -%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} -%{_kde4_servicesdir}/plasma-applet-ktorrent.desktop -%{_kde4_servicesdir}/plasma-dataengine-ktorrent.desktop -%endif - %doc %{_mandir}/man1/ktorrent.1%{ext_man} %doc %{_mandir}/man1/ktupnptest.1%{ext_man} +%_bindir/ktorrent +%_libdir/libktcore.so.* +%_kf5_plugindir/ +%_kf5_applicationsdir/org.kde.ktorrent.desktop +%_kf5_iconsdir/hicolor/*/*/*.png +%_kf5_iconsdir/hicolor/*/*/*.svgz +%_kf5_notifydir/ktorrent.notifyrc +%_kf5_kxmlguidir/ktorrent/ +%_kf5_htmldir/en/ktorrent/ %files lang -f %{name}.lang %defattr(-,root,root,-) +%_kf5_htmldir/*/ktorrent/ +%dir %_kf5_htmldir/pt_BR +%exclude %_kf5_htmldir/en/ktorrent/ %changelog ++++++ initial-preference.diff ++++++ --- /var/tmp/diff_new_pack.AMrl3e/_old 2016-04-22 16:17:04.000000000 +0200 +++ /var/tmp/diff_new_pack.AMrl3e/_new 2016-04-22 16:17:04.000000000 +0200 @@ -1,9 +1,9 @@ ---- ktorrent/ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200 -+++ ktorrent/ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200 -@@ -106,6 +106,7 @@ +--- ktorrent/org.kde.ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200 ++++ ktorrent/org.kde.ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200 +@@ -120,6 +120,7 @@ Type=Application X-DocPath=ktorrent/index.html - MimeType=application/x-bittorrent;application/x-torrent; + MimeType=application/x-bittorrent;application/x-torrent;x-scheme-handler/magnet; +InitialPreference=5 X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.ktorrent.ktorrent ++++++ remove-links.diff ++++++ --- /var/tmp/diff_new_pack.AMrl3e/_old 2016-04-22 16:17:04.000000000 +0200 +++ /var/tmp/diff_new_pack.AMrl3e/_new 2016-04-22 16:17:04.000000000 +0200 @@ -1,17 +1,18 @@ ---- plugins/search/searchenginelist.cpp -+++ plugins/search/searchenginelist.cpp -@@ -41,10 +41,13 @@ namespace kt - default_opensearch_urls << KUrl("http://www.torrentz.com") << KUrl("http://isohunt.com"); - default_urls << KUrl("http://www.ktorrents.com") - << KUrl("http://www.bittorrent.com") +diff -urNB ktorrent-5.0/plugins/search/searchenginelist.cpp new/plugins/search/searchenginelist.cpp +--- plugins/search/searchenginelist.cpp 2016-03-30 11:25:13.000000000 +0200 ++++ plugins/search/searchenginelist.cpp 2016-04-16 18:46:41.622344264 +0200 +@@ -41,10 +41,13 @@ + default_opensearch_urls << QUrl(QLatin1String("http://www.torrentz.com")) << QUrl(QLatin1String("http://isohunt.com")); + default_urls << QUrl(QLatin1String("http://www.ktorrents.com")) + << QUrl(QLatin1String("http://www.bittorrent.com")) +#if 0 - << KUrl("http://www.mininova.org") - << KUrl("http://thepiratebay.org") - << KUrl("http://www.bitenova.org") -- << KUrl("http://btjunkie.org"); -+ << KUrl("http://btjunkie.org") + << QUrl(QLatin1String("http://www.mininova.org")) + << QUrl(QLatin1String("http://thepiratebay.org")) + << QUrl(QLatin1String("http://www.bitenova.org")) +- << QUrl(QLatin1String("http://btjunkie.org")); ++ << QUrl(QLatin1String("http://btjunkie.org")) +#endif -+ ; - } ++ ; + } ++++++ suse-dht-warning.diff ++++++ --- /var/tmp/diff_new_pack.AMrl3e/_old 2016-04-22 16:17:04.000000000 +0200 +++ /var/tmp/diff_new_pack.AMrl3e/_new 2016-04-22 16:17:04.000000000 +0200 @@ -1,20 +1,38 @@ -Index: ktorrent/CMakeLists.txt -=================================================================== ---- ktorrent/CMakeLists.txt.orig -+++ ktorrent/CMakeLists.txt -@@ -91,6 +91,7 @@ install(FILES ktorrentplugin.desktop DE - install(FILES ktorrentui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent ) - install(FILES kttorrentactivityui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent ) - install(FILES ktorrent.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktorrent ) -+install(FILES dhttip DESTINATION ${DATA_INSTALL_DIR}/ktorrent) - - if (NOT ${ENABLE_KIO_MAGNET}) - install(FILES magnet.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -Index: ktorrent/dhttip -=================================================================== ---- /dev/null -+++ ktorrent/dhttip -@@ -0,0 +1,11 @@ +diff -urNB ktorrent-5.0/CMakeLists.txt new/CMakeLists.txt +--- CMakeLists.txt 2016-04-15 00:30:28.000000000 +0200 ++++ CMakeLists.txt 2016-04-16 13:52:36.168059210 +0200 +@@ -16,7 +16,7 @@ + + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script) + +-find_package(KF5 5.15 REQUIRED I18n KIO XmlGui Notifications NotifyConfig Solid Config CoreAddons DocTools Kross KCMUtils Sonnet DBusAddons Crash Archive KDELibs4Support) ++find_package(KF5 5.15 REQUIRED I18n KIO XmlGui Notifications NotifyConfig Solid Config ConfigWidgets CoreAddons DocTools Kross KCMUtils Sonnet DBusAddons Crash Archive KDELibs4Support) + + find_package(LibKTorrent 1.9.50 CONFIG REQUIRED) + find_package(Boost REQUIRED) +diff -urNB ktorrent-5.0/ktorrent/CMakeLists.txt new/ktorrent/CMakeLists.txt +--- ktorrent/CMakeLists.txt 2016-03-30 11:25:13.000000000 +0200 ++++ ktorrent/CMakeLists.txt 2016-04-16 13:53:51.520453793 +0200 +@@ -88,6 +88,7 @@ + KF5::Parts + KF5::DBusAddons + KF5::KDELibs4Support ++ KF5::ConfigWidgets + ) + + install(TARGETS ktorrent_app ${INSTALL_TARGETS_DEFAULT_ARGS}) +@@ -95,6 +96,7 @@ + install(FILES ktorrentui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ktorrent ) + install(FILES kttorrentactivityui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ktorrent ) + install(FILES ktorrent.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} ) ++install(FILES dhttip DESTINATION ${KXMLGUI_INSTALL_DIR}/ktorrent ) + + + add_subdirectory(icons) +diff -urNB ktorrent-5.0/ktorrent/dhttip new/ktorrent/dhttip +--- ktorrent/dhttip 1970-01-01 01:00:00.000000000 +0100 ++++ ktorrent/dhttip 2016-04-16 13:54:19.072598069 +0200 +@@ -0,0 +1,10 @@ +<tip category="Ktorrent"> +<html> +<p> @@ -25,49 +43,44 @@ +</p> +</html> +</tip> -+ -Index: ktorrent/gui.cpp -=================================================================== ---- ktorrent/gui.cpp.orig -+++ ktorrent/gui.cpp -@@ -38,6 +38,7 @@ - #include <kpushbutton.h> +diff -urNB ktorrent-5.0/ktorrent/gui.cpp new/ktorrent/gui.cpp +--- ktorrent/gui.cpp 2016-03-30 11:25:13.000000000 +0200 ++++ ktorrent/gui.cpp 2016-04-16 18:15:12.284449587 +0200 +@@ -37,6 +37,7 @@ + #include <krecentdirs.h> #include <kxmlguifactory.h> #include <KNotifyConfigWidget> +#include <KTipDialog> #include <kio/jobclasses.h> #include <kio/jobuidelegate.h> #include <kparts/partmanager.h> -@@ -122,6 +123,8 @@ namespace kt - //markk.update(); - updateActions(); - core->startUpdateTimer(); +@@ -122,6 +123,8 @@ + //markk.update(); + updateActions(); + core->startUpdateTimer(); + -+ QTimer::singleShot(0, this, SLOT(showDhtTip())); - } ++ QTimer::singleShot(0, this, SLOT(showDhtTip())); + } + + GUI::~GUI() +@@ -571,4 +574,9 @@ + return torrent_activity; + } - GUI:: ~GUI() -@@ -597,6 +600,11 @@ namespace kt - return torrent_activity; - } - -+ void GUI::showDhtTip() -+ { -+ KTipDialog::showTip(this, "ktorrent/dhttip"); -+ } ++ void GUI::showDhtTip() ++ { ++ KTipDialog::showTip(this, "ktorrent/dhttip"); ++ } + } +diff -urNB ktorrent-5.0/ktorrent/gui.h new/ktorrent/gui.h +--- ktorrent/gui.h 2016-03-30 11:25:13.000000000 +0200 ++++ ktorrent/gui.h 2016-04-16 18:16:22.112815265 +0200 +@@ -112,6 +112,7 @@ + void configureNotifications(); + void activePartChanged(KParts::Part* p); + void quit(); ++ void showDhtTip(); - #include "gui.moc" -Index: ktorrent/gui.h -=================================================================== ---- ktorrent/gui.h.orig -+++ ktorrent/gui.h -@@ -113,6 +113,7 @@ namespace kt - void showOrHide(); - void configureNotifications(); - void activePartChanged(KParts::Part* p); -+ void showDhtTip(); - - private: - void setupActions(); + private: + void setupActions();

1 0