Hello community, here is the log from the commit of package libcryptopp for openSUSE:Factory checked in at 2018-12-04 20:57:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcryptopp (Old) and /work/SRC/openSUSE:Factory/.libcryptopp.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcryptopp" Tue Dec 4 20:57:17 2018 rev:30 rq:653713 version:7.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libcryptopp/libcryptopp.changes 2017-06-01 16:28:01.035032133 +0200 +++ /work/SRC/openSUSE:Factory/.libcryptopp.new.19453/libcryptopp.changes 2018-12-04 20:57:20.732652082 +0100 @@ -1,0 +2,11 @@ +Sat Nov 17 14:27:33 UTC 2018 - Adam Mizerski <[email protected]> + +- update to v7.0.0 + * changelog available at https://cryptopp.com/release700.html + and in packaged Readme.txt +- Refreshed patches + * 0001-disable_os_rng_test.patch + * libcryptopp-shared.patch +- Dropped patch reproducible.patch - merged upstream + +------------------------------------------------------------------- Old: ---- cryptopp565.zip reproducible.patch New: ---- cryptopp700.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcryptopp.spec ++++++ --- /var/tmp/diff_new_pack.wXUf7n/_old 2018-12-04 20:57:21.344651407 +0100 +++ /var/tmp/diff_new_pack.wXUf7n/_new 2018-12-04 20:57:21.348651402 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcryptopp # -# 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 @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define major 5 -%define minor 6 -%define patch 5 +%define major 7 +%define minor 0 +%define patch 0 %define pkg_version %{major}%{minor}%{patch} Name: libcryptopp @@ -40,8 +40,6 @@ Patch1: libcryptopp-shared.patch # PATCH-BUILDFIX-OPENSUSE 0001-disable_os_rng_test.patch [email protected] -- disable OS Random Number Generator test Patch4: 0001-disable_os_rng_test.patch -# PATCH-FIX-UPSTREAM reproducible.patch bmwiedemann https://github.com/weidai11/cryptopp -Patch5: reproducible.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: unzip @@ -79,16 +77,25 @@ %prep %setup -q -c "%{name}-%{version}" -%patch1 -p0 +%patch1 -p1 %patch4 -p1 -%patch5 -p1 echo %{major}.%{minor}.%{patch} echo %{pkg_version} #mv config.recommend config.h %build +CXXFLAGS="-DNDEBUG %{optflags} -fpic -fPIC -pthread -fopenmp" +%ifarch %{arm} aarch64 +%if %{suse_version} < 1500 +sed -i 's/# define CRYPTOPP_ARM_ACLE_AVAILABLE 1//g' config.h +CXXFLAGS="$CXXFLAGS -DCRYPTOPP_DISABLE_ASM" +%endif +%endif +%ifarch ppc64 +CXXFLAGS="$CXXFLAGS -DCRYPTOPP_DISABLE_ALTIVEC" +%endif make %{?_smp_mflags} \ - CXXFLAGS="-DNDEBUG %{optflags} -fpic -fPIC -pthread -fopenmp" \ + CXXFLAGS="$CXXFLAGS" \ DESTDIR="" \ PREFIX="%{_prefix}" \ LIB="%{_lib}" \ ++++++ 0001-disable_os_rng_test.patch ++++++ --- /var/tmp/diff_new_pack.wXUf7n/_old 2018-12-04 20:57:21.364651384 +0100 +++ /var/tmp/diff_new_pack.wXUf7n/_new 2018-12-04 20:57:21.368651380 +0100 @@ -1,27 +1,27 @@ -Index: libcryptopp-5.6.5/test.cpp +Index: cryptopp700/test.cpp =================================================================== ---- libcryptopp-5.6.5.orig/test.cpp -+++ libcryptopp-5.6.5/test.cpp -@@ -898,7 +898,7 @@ bool Validate(int alg, bool thorough, co +--- cryptopp700.orig/test.cpp ++++ cryptopp700/test.cpp +@@ -868,7 +868,7 @@ bool Validate(int alg, bool thorough, co { case 0: result = ValidateAll(thorough); break; case 1: result = TestSettings(); break; - case 2: result = TestOS_RNG(); break; +// case 2: result = TestOS_RNG(); break; - case 3: result = ValidateMD5(); break; - case 4: result = ValidateSHA(); break; - case 5: result = ValidateDES(); break; -Index: libcryptopp-5.6.5/validat1.cpp + // case 3: result = TestSecRandom(); break; + case 4: result = ValidateMD5(); break; + case 5: result = ValidateSHA(); break; +Index: cryptopp700/validat1.cpp =================================================================== ---- libcryptopp-5.6.5.orig/validat1.cpp -+++ libcryptopp-5.6.5/validat1.cpp -@@ -69,7 +69,8 @@ USING_NAMESPACE(std) +--- cryptopp700.orig/validat1.cpp ++++ cryptopp700/validat1.cpp +@@ -75,7 +75,8 @@ NAMESPACE_BEGIN(Test) bool ValidateAll(bool thorough) { bool pass=TestSettings(); - pass=TestOS_RNG() && pass; + // this does not work reliably in our kvm buildroots, they have not much randomness + // pass=TestOS_RNG() && pass; - pass=TestAutoSeeded() && pass; + pass=TestRandomPool() && pass; + #if !defined(NO_OS_DEPENDENCE) && defined(OS_RNG_AVAILABLE) pass=TestAutoSeededX917() && pass; - ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.wXUf7n/_old 2018-12-04 20:57:21.388651358 +0100 +++ /var/tmp/diff_new_pack.wXUf7n/_new 2018-12-04 20:57:21.388651358 +0100 @@ -1,2 +1,2 @@ -libcryptopp5_6_5 +libcryptopp7_0_0 ++++++ libcryptopp-shared.patch ++++++ --- /var/tmp/diff_new_pack.wXUf7n/_old 2018-12-04 20:57:21.404651341 +0100 +++ /var/tmp/diff_new_pack.wXUf7n/_new 2018-12-04 20:57:21.404651341 +0100 @@ -1,8 +1,8 @@ -Index: GNUmakefile +Index: cryptopp700/GNUmakefile =================================================================== ---- GNUmakefile.orig 2016-10-11 01:49:54.000000000 +0200 -+++ GNUmakefile 2017-03-03 06:40:32.760437872 +0200 -@@ -74,7 +74,7 @@ ifeq ($(DATADIR),) +--- cryptopp700.orig/GNUmakefile ++++ cryptopp700/GNUmakefile +@@ -139,7 +139,7 @@ ifeq ($(DATADIR),) DATADIR := $(PREFIX)/share endif ifeq ($(LIBDIR),) @@ -11,23 +11,23 @@ endif ifeq ($(BINDIR),) BINDIR := $(PREFIX)/bin -@@ -405,7 +405,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) +@@ -690,7 +690,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) - # Different patchlevels are compatible, minor versions are not - SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR) + # Different patchlevels and minors are compatible since 6.1 + SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) -SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) +SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_VERSION_SUFFIX) endif # HAS_SOLIB_VERSION ########################################################### -@@ -640,8 +640,8 @@ endif +@@ -918,8 +918,8 @@ endif libcryptopp.dylib: $(LIBOBJS) - $(CXX) -dynamiclib -o $@ $(CXXFLAGS) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" -headerpad_max_install_names $(LDFLAGS) $(LIBOBJS) + $(CXX) -dynamiclib -o $@ $(strip $(CXXFLAGS)) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" -headerpad_max_install_names $(LDFLAGS) $(LIBOBJS) -cryptest.exe: libcryptopp.a $(TESTOBJS) -- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) +- $(CXX) -o $@ $(strip $(CXXFLAGS)) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) +cryptest.exe: libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(TESTOBJS) -+ $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS) ++ $(CXX) -o $@ $(strip $(CXXFLAGS)) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS) # Makes it faster to test changes nolib: $(OBJS)
