Hello community,
here is the log from the commit of package libcryptopp for openSUSE:Factory
checked in at 2016-09-16 11:02:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcryptopp (Old)
and /work/SRC/openSUSE:Factory/.libcryptopp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcryptopp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcryptopp/libcryptopp.changes 2016-06-25
02:22:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libcryptopp.new/libcryptopp.changes
2016-09-16 11:02:02.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Sep 12 08:50:44 UTC 2016 - bwiedem...@suse.com
+
+- Update to 5.6.4
+ * Use proper openSUSE-style library naming
+ * Drop upstream libcryptopp-s390.patch
+ * Drop upstream libcryptopp-m68k.patch
+ * Drop upstream libcryptopp-CVE-2015-2141.patch
+ * Drop upstream cryptopp-gcc6.patch
+ * Rebase libcryptopp-shared.patch
+ * Rebase 0001-disable_os_rng_test.patch
+
+-------------------------------------------------------------------
Old:
----
cryptopp-gcc6.patch
cryptopp562.zip
libcryptopp-CVE-2015-2141.patch
libcryptopp-m68k.patch
libcryptopp-s390.patch
New:
----
cryptopp564.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcryptopp.spec ++++++
--- /var/tmp/diff_new_pack.AFcZIu/_old 2016-09-16 11:02:03.000000000 +0200
+++ /var/tmp/diff_new_pack.AFcZIu/_new 2016-09-16 11:02:03.000000000 +0200
@@ -18,7 +18,7 @@
%define major 5
%define minor 6
-%define patch 2
+%define patch 4
Name: libcryptopp
# When updating, remember to update cryptopp.pc and baselibs.conf as well.
@@ -27,7 +27,7 @@
%define pkg_version %{major}%{minor}%{patch}
# There is no upstream interface version information.
# Therefore we need unique basenames:
-%define soname -%{major}_%{minor}_%{patch}-0
+%define soname %{major}_%{minor}
Summary: Crypto++ Library
License: BSL-1.0
Group: Development/Libraries/C and C++
@@ -37,14 +37,8 @@
Source2: cryptopp.pc
# PATCH-FEATURE-OPENSUSE libcryptopp-shared.patch -- improve shared library
creation
Patch1: libcryptopp-shared.patch
-Patch2: libcryptopp-s390.patch
-Patch3: libcryptopp-m68k.patch
# PATCH-BUILDFIX-OPENSUSE 0001-disable_os_rng_test.patch sfal...@opensuse.org
-- disable OS Random Number Generator test
Patch4: 0001-disable_os_rng_test.patch
-# PATCH-FIX-UPSTREAM
-Patch5: libcryptopp-CVE-2015-2141.patch
-# PATCH-FIX-UPSTREAM fix gcc 6 narrowing conversion from unsigned int to int
inside {}
-Patch6: cryptopp-gcc6.patch
BuildRequires: gcc-c++
BuildRequires: pkg-config
BuildRequires: unzip
@@ -79,43 +73,35 @@
%prep
%setup -q -c "%{name}-%{version}"
%patch1 -p1
-%patch2
-%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#mv config.recommend config.h
%build
make %{?_smp_mflags} \
CXXFLAGS="-DNDEBUG %{optflags} -fpic -fPIC" \
- DESTDIR="" \
- PREFIX="%{_prefix}" \
- LIB="%{_lib}" \
CXX="g++" \
- LIBSUFFIX="-%{version}" \
- LDFLAGS="-pthread" \
all static
%install
make \
DESTDIR=%{buildroot} \
PREFIX="%{_prefix}" \
- LIB="%{_lib}" \
+ LIBDIR="%{_libdir}" \
LIBSUFFIX="-%{version}" \
install
-rm -rf "%{buildroot}%{_bindir}"
+rm -rf "%{buildroot}%{_bindir}" %{buildroot}%{_datadir}/cryptopp
mkdir %{buildroot}%{_libdir}/pkgconfig/
cp %{SOURCE2} %{buildroot}%{_libdir}/pkgconfig/
%check
-make test
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
%post -n %{name}%{soname} -p /sbin/ldconfig
%postun -n %{name}%{soname} -p /sbin/ldconfig
%files -n %{name}%{soname}
%defattr(-,root,root)
-%{_libdir}/libcryptopp-%{version}.so.0
+%{_libdir}/libcryptopp.so.%{major}.*
%files -n %{name}-devel
%defattr(-,root,root)
++++++ 0001-disable_os_rng_test.patch ++++++
--- /var/tmp/diff_new_pack.AFcZIu/_old 2016-09-16 11:02:03.000000000 +0200
+++ /var/tmp/diff_new_pack.AFcZIu/_new 2016-09-16 11:02:03.000000000 +0200
@@ -1,28 +1,27 @@
-Index: libcryptopp-5.6.2/test.cpp
+Index: libcryptopp-5.6.4/test.cpp
===================================================================
---- libcryptopp-5.6.2.orig/test.cpp
-+++ libcryptopp-5.6.2/test.cpp
-@@ -774,7 +774,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.2/validat1.cpp
+--- libcryptopp-5.6.4.orig/test.cpp
++++ libcryptopp-5.6.4/test.cpp
+@@ -882,7 +882,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.4/validat1.cpp
===================================================================
---- libcryptopp-5.6.2.orig/validat1.cpp
-+++ libcryptopp-5.6.2/validat1.cpp
-@@ -48,7 +48,9 @@ USING_NAMESPACE(std)
- 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=ValidateCRC32() && pass;
- pass=ValidateAdler32() && pass;
+--- libcryptopp-5.6.4.orig/validat1.cpp
++++ libcryptopp-5.6.4/validat1.cpp
+@@ -73,7 +73,8 @@ USING_NAMESPACE(std)
+ 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=TestAutoSeededX917() && pass;
+
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.AFcZIu/_old 2016-09-16 11:02:03.000000000 +0200
+++ /var/tmp/diff_new_pack.AFcZIu/_new 2016-09-16 11:02:03.000000000 +0200
@@ -1 +1 @@
-libcryptopp-5_6_2-0
+libcryptopp5_6
++++++ cryptopp.pc ++++++
--- /var/tmp/diff_new_pack.AFcZIu/_old 2016-09-16 11:02:03.000000000 +0200
+++ /var/tmp/diff_new_pack.AFcZIu/_new 2016-09-16 11:02:03.000000000 +0200
@@ -6,7 +6,7 @@
Name: libcrypto++
Description: General purpose cryptographic shared library
URL: http://www.cryptopp.com
-Version: 5.6.2
+Version: 5.6.4
Requires:
Libs: -lcryptopp
Cflags:
++++++ libcryptopp-shared.patch ++++++
--- /var/tmp/diff_new_pack.AFcZIu/_old 2016-09-16 11:02:03.000000000 +0200
+++ /var/tmp/diff_new_pack.AFcZIu/_new 2016-09-16 11:02:03.000000000 +0200
@@ -1,52 +1,15 @@
-diff -rupN cryptopp562/GNUmakefile cryptopp562_mod/GNUmakefile
---- cryptopp562/GNUmakefile 2013-02-20 15:30:52.000000000 +0100
-+++ cryptopp562_mod/GNUmakefile 2013-03-01 18:00:00.313404574 +0100
-@@ -1,7 +1,7 @@
- CXXFLAGS = -DNDEBUG -g -O2
- # -O3 fails to link on Cygwin GCC version 4.5.3
- # -fPIC is supported. Please report any breakage of -fPIC as a bug.
--# CXXFLAGS += -fPIC
-+CXXFLAGS += -fPIC
- # the following options reduce code size, but breaks link or makes link very
slow on some systems
- # CXXFLAGS += -ffunction-sections -fdata-sections
- # LDFLAGS += -Wl,--gc-sections
-@@ -142,17 +142,18 @@ static: libcryptopp.a
- dynamic: libcryptopp.so
+Index: libcryptopp-5.6.4/GNUmakefile
+===================================================================
+--- libcryptopp-5.6.4.orig/GNUmakefile
++++ libcryptopp-5.6.4/GNUmakefile
+@@ -646,8 +646,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)
- test: cryptest.exe
-- ./cryptest.exe v
-+ LD_LIBRARY_PATH=. ./cryptest.exe v
-
- clean:
- -$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS)
cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe
dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS)
-
- install:
-- $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
-- -$(CP) *.h $(PREFIX)/include/cryptopp
-- -$(CP) *.a $(PREFIX)/lib
-- -$(CP) *.so $(PREFIX)/lib
-- -$(CP) *.exe $(PREFIX)/bin
-+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp
$(DESTDIR)$(PREFIX)/$(LIB) $(DESTDIR)$(PREFIX)/bin
-+ $(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp
-+ $(CP) *.a $(DESTDIR)$(PREFIX)/$(LIB)
-+ $(CP) libcryptopp${LIBSUFFIX}.so.0 $(DESTDIR)$(PREFIX)/$(LIB)
-+ ln -s libcryptopp${LIBSUFFIX}.so.0
$(DESTDIR)$(PREFIX)/$(LIB)/libcryptopp.so
-+ $(CP) *.exe $(DESTDIR)$(PREFIX)/bin
-
- remove:
- -$(RM) -rf $(PREFIX)/include/cryptopp
-@@ -165,10 +166,11 @@ libcryptopp.a: $(LIBOBJS)
- $(RANLIB) $@
-
- libcryptopp.so: $(LIBOBJS)
-- $(CXX) -shared -o $@ $(LIBOBJS)
-+ $(CXX) -shared -Wl,-soname,libcryptopp${LIBSUFFIX}.so.0 -o
libcryptopp${LIBSUFFIX}.so.0 $(LIBOBJS) $(LDFLAGS) $(LDLIBS)
-+ ln -s libcryptopp${LIBSUFFIX}.so.0 $@
-
--cryptest.exe: libcryptopp.a $(TESTOBJS)
+-cryptest.exe: libcryptopp.a $(TESTOBJS) | config_warning
- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS)
$(LDLIBS)
-+cryptest.exe: libcryptopp.so $(TESTOBJS)
++cryptest.exe: libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(TESTOBJS) |
config_warning
+ $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
- nolib: $(OBJS) # makes it faster to test changes
- $(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
+ # Makes it faster to test changes
+ nolib: $(OBJS)
