From 7377b22af6f5d9947137135193f1225754841dd73d9a81171ce9d93e428c37ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 5 Nov 2014 20:53:18 +0000 Subject: [PATCH] Accepting request 259951 from home:AndreasStieger:branches:devel:libraries:c_c++ libgcrypt 1.6.2 OBS-URL: https://build.opensuse.org/request/show/259951 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=65 --- libgcrypt-1.6.0-use-intenal-functions.patch | 21 ---------- libgcrypt-1.6.1-use-fipscheck.patch | 41 +++++++++++--------- libgcrypt-1.6.1.tar.bz2 | 3 -- libgcrypt-1.6.1.tar.bz2.sig | Bin 287 -> 0 bytes libgcrypt-1.6.2.tar.bz2 | 3 ++ libgcrypt-1.6.2.tar.bz2.sig | Bin 0 -> 287 bytes libgcrypt-fixed-sizet.patch | 13 ------- libgcrypt.changes | 15 +++++++ libgcrypt.spec | 9 +---- 9 files changed, 43 insertions(+), 62 deletions(-) delete mode 100644 libgcrypt-1.6.0-use-intenal-functions.patch delete mode 100644 libgcrypt-1.6.1.tar.bz2 delete mode 100644 libgcrypt-1.6.1.tar.bz2.sig create mode 100644 libgcrypt-1.6.2.tar.bz2 create mode 100644 libgcrypt-1.6.2.tar.bz2.sig delete mode 100644 libgcrypt-fixed-sizet.patch diff --git a/libgcrypt-1.6.0-use-intenal-functions.patch b/libgcrypt-1.6.0-use-intenal-functions.patch deleted file mode 100644 index fab227b..0000000 --- a/libgcrypt-1.6.0-use-intenal-functions.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Michal Vyskoci -Subject: Use internall malloc in fips.c - - ---- - src/fips.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libgcrypt-1.6.0/src/fips.c -=================================================================== ---- libgcrypt-1.6.0.orig/src/fips.c -+++ libgcrypt-1.6.0/src/fips.c -@@ -613,7 +613,7 @@ check_binary_integrity (void) - err = gpg_error (GPG_ERR_INTERNAL); - else - { -- fname = gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 ); -+ fname = _gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 ); - if (!fname) - err = gpg_error_from_syserror (); - else diff --git a/libgcrypt-1.6.1-use-fipscheck.patch b/libgcrypt-1.6.1-use-fipscheck.patch index 0f15509..3110887 100644 --- a/libgcrypt-1.6.1-use-fipscheck.patch +++ b/libgcrypt-1.6.1-use-fipscheck.patch @@ -1,7 +1,25 @@ -Index: libgcrypt-1.6.1/src/fips.c +--- + src/Makefile.in | 2 +- + src/fips.c | 39 ++++++++++++++++++++++++++++++++------- + 2 files changed, 33 insertions(+), 8 deletions(-) + +Index: libgcrypt-1.6.2/src/Makefile.in =================================================================== ---- libgcrypt-1.6.1.orig/src/fips.c -+++ libgcrypt-1.6.1/src/fips.c +--- libgcrypt-1.6.2.orig/src/Makefile.in 2014-11-05 20:33:18.000000000 +0000 ++++ libgcrypt-1.6.2/src/Makefile.in 2014-11-05 20:34:04.000000000 +0000 +@@ -449,7 +449,7 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \ + ../cipher/libcipher.la \ + ../random/librandom.la \ + ../mpi/libmpi.la \ +- ../compat/libcompat.la $(GPG_ERROR_LIBS) ++ ../compat/libcompat.la $(GPG_ERROR_LIBS) -ldl + + dumpsexp_SOURCES = dumpsexp.c + dumpsexp_CFLAGS = $(arch_gpg_error_cflags) +Index: libgcrypt-1.6.2/src/fips.c +=================================================================== +--- libgcrypt-1.6.2.orig/src/fips.c 2014-11-05 20:33:18.000000000 +0000 ++++ libgcrypt-1.6.2/src/fips.c 2014-11-05 20:34:04.000000000 +0000 @@ -589,23 +589,48 @@ run_random_selftests (void) return !!err; } @@ -60,8 +78,8 @@ Index: libgcrypt-1.6.1/src/fips.c err = gpg_error (GPG_ERR_INTERNAL); else { -- fname = _gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 ); -+ fname = _gcry_malloc (strlen (libpath) + 1 + 5 + 1 ); +- fname = xtrymalloc (strlen (info.dli_fname) + 1 + 5 + 1 ); ++ fname = xtrymalloc (strlen (libpath) + 1 + 5 + 1 ); if (!fname) err = gpg_error_from_syserror (); else @@ -74,16 +92,3 @@ Index: libgcrypt-1.6.1/src/fips.c p = strrchr (fname, '/'); if (p) p++; -Index: libgcrypt-1.6.1/src/Makefile.in -=================================================================== ---- libgcrypt-1.6.1.orig/src/Makefile.in -+++ libgcrypt-1.6.1/src/Makefile.in -@@ -449,7 +449,7 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \ - ../cipher/libcipher.la \ - ../random/librandom.la \ - ../mpi/libmpi.la \ -- ../compat/libcompat.la $(GPG_ERROR_LIBS) -+ ../compat/libcompat.la $(GPG_ERROR_LIBS) -ldl - - dumpsexp_SOURCES = dumpsexp.c - dumpsexp_CFLAGS = $(arch_gpg_error_cflags) diff --git a/libgcrypt-1.6.1.tar.bz2 b/libgcrypt-1.6.1.tar.bz2 deleted file mode 100644 index c3b1fca..0000000 --- a/libgcrypt-1.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070 -size 2470885 diff --git a/libgcrypt-1.6.1.tar.bz2.sig b/libgcrypt-1.6.1.tar.bz2.sig deleted file mode 100644 index c0530c0007494eb1dd328b9170a3bc495414b25e8e1139f8bdf793a7ca921db5..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0SEvF1p-p&-tqtn2@oWkInqxhUqHA-^4=QDbb?U z7?{q=kNY9nNB8t@O96Z{ZLQh5tlRg*OiEEY#A#NG@QvtjIy1224aFHkXR!nuWZ{0U zO*=$T=J&|Dwd2ICI}_uNJsn=h54IIAXvW{t`1CdvR@=+cTYfDA+*`?^f{{(EMZdNh lbOf?vaSUcNvvL7H{+`7(W|kx_wAZw%9Usm+T()Fk?qTszjbi`+ diff --git a/libgcrypt-1.6.2.tar.bz2 b/libgcrypt-1.6.2.tar.bz2 new file mode 100644 index 0000000..b9ceb8a --- /dev/null +++ b/libgcrypt-1.6.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c +size 2476101 diff --git a/libgcrypt-1.6.2.tar.bz2.sig b/libgcrypt-1.6.2.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..636e8525cef914cad0d40a07d99f4fb5f0fbc6f20f46741f5308701816908e92 GIT binary patch literal 287 zcmV+)0pR|L0UQJX0SEvF1p-s`@&y122@oWkInqxh@(yuNqYd6h zTg=6LOs%tQw4BN8Pm~GlbFDJ`oHI|F^|AQ?Z8fiat5WjGu-(|$JFT@5 z#v@{a>IkjSCazfy?_a~9KwPC)Jw6V2?qeHCA8Ts8fNpP0*0+&W=P9`eI-_i4!maf(TD9xg;D?j literal 0 HcmV?d00001 diff --git a/libgcrypt-fixed-sizet.patch b/libgcrypt-fixed-sizet.patch deleted file mode 100644 index e20d755..0000000 --- a/libgcrypt-fixed-sizet.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libgcrypt-1.6.1/random/rndlinux.c -=================================================================== ---- libgcrypt-1.6.1.orig/random/rndlinux.c -+++ libgcrypt-1.6.1/random/rndlinux.c -@@ -261,7 +261,7 @@ _gcry_rndlinux_gather_random (void (*add - - do - { -- int nbytes = length < sizeof(buffer)? length : sizeof(buffer); -+ size_t nbytes = length < sizeof(buffer)? length : sizeof(buffer); - n = read(fd, buffer, nbytes ); - if( n >= 0 && n > nbytes ) - { diff --git a/libgcrypt.changes b/libgcrypt.changes index 22866dd..df01bd7 100644 --- a/libgcrypt.changes +++ b/libgcrypt.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Nov 5 20:37:24 UTC 2014 - andreas.stieger@gmx.de + +- libgcrypt 1.6.2: + * Map deprecated RSA algo number to the RSA algo number for better + backward compatibility. + * Support a 0x40 compression prefix for EdDSA. + * Improve ARM hardware feature detection and building. + * Fix building for the x32 ABI platform. + * Fix some possible NULL deref bugs. +- remove libgcrypt-1.6.0-use-intenal-functions.patch, upstream + via xtrymalloc macro +- remove libgcrypt-fixed-sizet.patch, upstream +- adjust libgcrypt-1.6.1-use-fipscheck.patch for xtrymalloc change + ------------------------------------------------------------------- Sun Sep 21 10:08:39 UTC 2014 - vcizek@suse.com diff --git a/libgcrypt.spec b/libgcrypt.spec index 820e19b..2643d70 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -19,10 +19,10 @@ %define build_hmac256 1 %define separate_hmac256_binary 0 %define libsoname %{name}20 -%define sosuffix 20.0.1 +%define sosuffix 20.0.2 %define cavs_dir %{_libexecdir}/%{name}/cavs Name: libgcrypt -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: The GNU Crypto Library License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0+ @@ -45,9 +45,6 @@ Patch4: %{name}-sparcv9.diff Patch5: libgcrypt-unresolved-dladdr.patch #PATCH-FIX-SUSE: N/A Patch7: libgcrypt-1.5.0-LIBGCRYPT_FORCE_FIPS_MODE-env.diff -#PATCH-FIX-UPSTREAM: internal functions are supposed to be used inside libgcrypt, mvyskocil@suse.com -Patch8: libgcrypt-1.6.0-use-intenal-functions.patch -Patch11: libgcrypt-fixed-sizet.patch Patch12: libgcrypt-1.6.1-use-fipscheck.patch Patch13: libgcrypt-1.6.1-fips-cavs.patch #PATCH-FIX-SUSE: bnc#724841, fix a random device opening routine @@ -157,8 +154,6 @@ understanding of applied cryptography is required to use Libgcrypt. %patch4 -p1 %patch5 -p1 %patch7 -p1 -%patch8 -p1 -%patch11 -p1 %if 0%{?suse_version} > 1310 %patch12 -p1 %patch21 -p1