Hello community, here is the log from the commit of package libcryptopp for openSUSE:Factory checked in at 2019-07-31 14:15:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcryptopp (Old) and /work/SRC/openSUSE:Factory/.libcryptopp.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcryptopp" Wed Jul 31 14:15:39 2019 rev:31 rq:718852 version:8.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libcryptopp/libcryptopp.changes 2018-12-04 20:57:20.732652082 +0100 +++ /work/SRC/openSUSE:Factory/.libcryptopp.new.4126/libcryptopp.changes 2019-07-31 14:15:41.446752510 +0200 @@ -1,0 +2,41 @@ +Sat Jul 20 09:34:46 UTC 2019 - Dave Plater <[email protected]> + +- Update to major version 8.2.0 +- Filter out -flto= flag for arm7 see cryptopp issue#865 +- Remove 0001-disable_os_rng_test.patch which is no longer needed. +- Rebase libcryptopp-shared.patch +- Added patchs from git which is indicated in cryptopp issue#865: + 0001-Fix-TCXXFLAGS-using-openSUSE-standard-flags-GH-865.patch + and 0001-Fix-missing-if-statement.patch. + Upstream changes since 7.0.0: + *use PowerPC unaligned loads and stores with Power8 + *add SKIPJACK test vectors + *fix SHAKE-128 and SHAKE-256 compile + *removed IS_NEON from Makefile + *fix Aarch64 build on Fedora 29 + *fix missing GF2NT_233_Multiply_Reduce_CLMUL in FIPS DLL + *add missing BLAKE2 constructors + *fix missing BlockSize() in BLAKE2 classes + *add CRYPTOPP_BUGGY_SIMD_LOAD_AND_STORE + *add carryless multiplies for NIST b233 and k233 curves + *fix OpenMP build due to use of OpenMP 4 with down-level compilers + *add SignStream and VerifyStream for ed25519 and large files + *fix missing AlgorithmProvider in PanamaHash + *add SHAKE-128 and SHAKE-256 + *fix AVX2 build due to _mm256_broadcastsi128_si256 + *add IETF ChaCha, XChaCha, ChaChaPoly1305 and XChaChaPoly1305 + *add x25519 key exchange and ed25519 signature scheme + *add limited Asymmetric Key Package support from RFC 5958 + *add Power9 DARN random number generator support + *add CHAM, HC-128, HC-256, Hight, LEA, Rabbit, Simeck + *fix FixedSizeAllocatorWithCleanup may be unaligned on some + platforms + *cutover to GNU Make-based cpu feature tests + *rename files with dashes to underscores + *fix LegacyDecryptor and LegacyDecryptorWithMAC use wrong MAC + *avoid Singleton<T> when possible, avoid std::call_once completely + *fix SPARC alignment problems due to GetAlignmentOf<T>() on word64 + *add ARM AES asm implementation from Cryptogams + *remove CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS support + +------------------------------------------------------------------- Old: ---- 0001-disable_os_rng_test.patch cryptopp700.zip New: ---- 0001-Fix-TCXXFLAGS-using-openSUSE-standard-flags-GH-865.patch 0001-Fix-missing-if-statement.patch CRYPTOPP_8_2_0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcryptopp.spec ++++++ --- /var/tmp/diff_new_pack.BlmMpL/_old 2019-07-31 14:15:42.010751466 +0200 +++ /var/tmp/diff_new_pack.BlmMpL/_new 2019-07-31 14:15:42.014751459 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcryptopp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%define major 7 -%define minor 0 +%define major 8 +%define minor 2 %define patch 0 %define pkg_version %{major}%{minor}%{patch} Name: libcryptopp # WARNING: Execute "sh precheckin_baselibs.sh" to update baselibs.conf -# WARNING: uses source zip file name to create lib name. +# WARNING: uses source tarball name to create lib name. Version: %{major}.%{minor}.%{patch} Release: 0 # There is no upstream interface version information. @@ -33,13 +33,14 @@ License: BSL-1.0 Group: Development/Libraries/C and C++ Url: http://www.cryptopp.com -Source: http://www.cryptopp.com/cryptopp%{major}%{minor}%{patch}.zip +Source: https://github.com/weidai11/cryptopp/archive/CRYPTOPP_%{major}_%{minor}_%{patch}.tar.gz Source1: precheckin_baselibs.sh Source2: baselibs.conf # PATCH-FEATURE-OPENSUSE libcryptopp-shared.patch -- improve shared library creation 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-UPSTREAM from git see https://github.com/weidai11/cryptopp/issues/865 +Patch4: 0001-Fix-TCXXFLAGS-using-openSUSE-standard-flags-GH-865.patch +Patch5: 0001-Fix-missing-if-statement.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: unzip @@ -76,21 +77,20 @@ %prep -%setup -q -c "%{name}-%{version}" +%setup -q -n "cryptopp-CRYPTOPP_%{major}_%{minor}_%{patch}" %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 +%ifarch %{arm} +%define _lto_cflags %{nil} %endif +CXXFLAGS="-DNDEBUG %{optflags} -fpic -fPIC -pthread -fopenmp" +# aarch64 arm -march=armv7-a -mfpu=neon %ifarch ppc64 CXXFLAGS="$CXXFLAGS -DCRYPTOPP_DISABLE_ALTIVEC" %endif @@ -111,9 +111,10 @@ LIB="%{_lib}" \ LIBSUFFIX="-%{version}" \ install + rm -rf "%{buildroot}%{_bindir}" %{buildroot}%{_datadir}/cryptopp rm -rf "%{buildroot}%{_bindir}" -rm %{buildroot}%{_libdir}/*.a +rm -rf %{buildroot}%{_libdir}/*.a # Install .pc file with correct version field. mkdir %{buildroot}%{_libdir}/pkgconfig/ echo "prefix=%{_prefix}" >%{buildroot}%{_libdir}/pkgconfig/cryptopp.pc @@ -140,10 +141,12 @@ %files -n %{name}%{sover} %defattr(-,root,root) %{_libdir}/libcryptopp.so.%{major}.* +%license License.txt %files -n %{name}-devel %defattr(-,root,root) -%doc License.txt Readme.txt +%doc Readme.txt +%license License.txt %{_includedir}/cryptopp %{_libdir}/libcryptopp.so %{_libdir}/pkgconfig/cryptopp.pc ++++++ 0001-Fix-TCXXFLAGS-using-openSUSE-standard-flags-GH-865.patch ++++++ >From 058a59814f0be1d89e2a0fa11438c2037112cd7a Mon Sep 17 00:00:00 2001 From: Jeffrey Walton <[email protected]> Date: Fri, 19 Jul 2019 00:14:25 -0400 Subject: [PATCH] Fix TCXXFLAGS using openSUSE standard flags (GH #865) --- GNUmakefile | 2 +- GNUmakefile-cross | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 405a26fa..6fee54d3 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -121,7 +121,7 @@ endif # Strip out -Wall, -Wextra and friends for feature testing ifeq ($(DETECT_FEATURES),1) - TCXXFLAGS := $(filter-out -Wall -Wextra -Werror% -Wunused -Wconversion -Wp%, $(CXXFLAGS)) + TCXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=1 -D_FORTIFY_SOURCE=2 -Wall -Wextra -Werror% -Wunused -Wconversion -Wp%, $(CXXFLAGS)) ifneq ($(strip $(TCXXFLAGS)),) $(info Using testing flags: $(TCXXFLAGS)) endif diff --git a/GNUmakefile-cross b/GNUmakefile-cross index c84b399a..7c151c59 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -194,8 +194,7 @@ endif # Strip out -Wall, -Wextra and friends for feature testing ifeq ($(DETECT_FEATURES),1) - TCXXFLAGS := $(filter-out -Wall -Wextra -Werror% -Wunused -Wconversion -Wp%, $(CXXFLAGS)) - ifneq ($(strip $(TCXXFLAGS)),) + TCXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=1 -D_FORTIFY_SOURCE=2 -Wall -Wextra -Werror% -Wunused -Wconversion -Wp%, $(CXXFLAGS)) $(info Using testing flags: $(TCXXFLAGS)) endif #TPROG = TestPrograms/test_cxx.cxx -- 2.16.4 ++++++ 0001-Fix-missing-if-statement.patch ++++++ >From 417fbd719ab6a40aa35d7dfe2562e56b0e425130 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton <[email protected]> Date: Fri, 19 Jul 2019 00:16:23 -0400 Subject: [PATCH] Fix missing if statement Copy/paste error from the regular GNUmakefile --- GNUmakefile-cross | 1 + 1 file changed, 1 insertion(+) diff --git a/GNUmakefile-cross b/GNUmakefile-cross index 7c151c59..d32139ed 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -195,6 +195,7 @@ endif # Strip out -Wall, -Wextra and friends for feature testing ifeq ($(DETECT_FEATURES),1) TCXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=1 -D_FORTIFY_SOURCE=2 -Wall -Wextra -Werror% -Wunused -Wconversion -Wp%, $(CXXFLAGS)) + ifneq ($(strip $(TCXXFLAGS)),) $(info Using testing flags: $(TCXXFLAGS)) endif #TPROG = TestPrograms/test_cxx.cxx -- 2.16.4 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.BlmMpL/_old 2019-07-31 14:15:42.058751378 +0200 +++ /var/tmp/diff_new_pack.BlmMpL/_new 2019-07-31 14:15:42.058751378 +0200 @@ -1,2 +1,2 @@ -libcryptopp7_0_0 +libcryptopp8_2_0 ++++++ libcryptopp-shared.patch ++++++ --- /var/tmp/diff_new_pack.BlmMpL/_old 2019-07-31 14:15:42.066751363 +0200 +++ /var/tmp/diff_new_pack.BlmMpL/_new 2019-07-31 14:15:42.066751363 +0200 @@ -1,8 +1,8 @@ -Index: cryptopp700/GNUmakefile +Index: cryptopp-CRYPTOPP_8_2_0/GNUmakefile =================================================================== ---- cryptopp700.orig/GNUmakefile -+++ cryptopp700/GNUmakefile -@@ -139,7 +139,7 @@ ifeq ($(DATADIR),) +--- cryptopp-CRYPTOPP_8_2_0.orig/GNUmakefile 2019-07-20 10:55:12.852313936 +0200 ++++ cryptopp-CRYPTOPP_8_2_0/GNUmakefile 2019-07-20 11:15:12.773950685 +0200 +@@ -174,7 +174,7 @@ ifeq ($(DATADIR),) DATADIR := $(PREFIX)/share endif ifeq ($(LIBDIR),) @@ -11,20 +11,20 @@ endif ifeq ($(BINDIR),) BINDIR := $(PREFIX)/bin -@@ -690,7 +690,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) +@@ -1009,7 +1009,7 @@ SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) + ifneq ($(IS_LINUX)$(IS_HURD),00) + # Linux uses full version suffix for shared library SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) - # 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 - - ########################################################### -@@ -918,8 +918,8 @@ endif + endif + # Solaris uses -Wl,-h + ifeq ($(IS_SUN),1) +@@ -1302,8 +1302,8 @@ endif libcryptopp.dylib: $(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) +-cryptest.exe:libcryptopp.a $(TESTOBJS) - $(CXX) -o $@ $(strip $(CXXFLAGS)) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) +cryptest.exe: libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(TESTOBJS) + $(CXX) -o $@ $(strip $(CXXFLAGS)) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS) ++++++ precheckin_baselibs.sh ++++++ --- /var/tmp/diff_new_pack.BlmMpL/_old 2019-07-31 14:15:42.082751333 +0200 +++ /var/tmp/diff_new_pack.BlmMpL/_new 2019-07-31 14:15:42.086751326 +0200 @@ -1,4 +1,4 @@ #!/bin/bash rm baselibs.conf -echo "libcryptopp$(ls -1 *zip |cut -b 9)_$(ls -1 *zip |cut -b 10)_$(ls -1 *zip |cut -b 11)" > baselibs.conf +echo "libcryptopp$(ls -1 *tar.gz |cut -b 10)_$(ls -1 *tar.gz |cut -b 12)_$(ls -1 *tar.gz |cut -b 14)" > baselibs.conf echo "" >> baselibs.conf
