From 969e2b246bd6fb2e99a891b36c45000461f875c0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:22:27 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for libgcrypt --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 87928e42b21392d9399648a5152af10f81405106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Wed, 17 Jun 2009 18:27:47 +0000 Subject: [PATCH 2/5] - fix VIA padlock RNG inline assembly call (#505724) --- libgcrypt-1.4.4-padlock.patch | 28 ++++++++++++++++++++++++++++ libgcrypt.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 libgcrypt-1.4.4-padlock.patch diff --git a/libgcrypt-1.4.4-padlock.patch b/libgcrypt-1.4.4-padlock.patch new file mode 100644 index 0000000..e9501de --- /dev/null +++ b/libgcrypt-1.4.4-padlock.patch @@ -0,0 +1,28 @@ +diff -up libgcrypt-1.4.4/random/rndhw.c.padlock libgcrypt-1.4.4/random/rndhw.c +--- libgcrypt-1.4.4/random/rndhw.c.padlock 2008-09-03 12:04:43.000000000 +0200 ++++ libgcrypt-1.4.4/random/rndhw.c 2009-06-17 20:11:42.000000000 +0200 +@@ -41,7 +41,7 @@ static size_t + poll_padlock (void (*add)(const void*, size_t, enum random_origins), + enum random_origins origin, int fast) + { +- char buffer[64+8] __attribute__ ((aligned (8))); ++ volatile char buffer[64+8] __attribute__ ((aligned (8))); + char *p; + unsigned int nbytes, status; + +@@ -55,12 +55,11 @@ poll_padlock (void (*add)(const void*, s + nbytes = 0; + while (nbytes < 64) + { +- asm volatile ++ asm volatile + ("movl %1, %%edi\n\t" /* Set buffer. */ + "xorl %%edx, %%edx\n\t" /* Request up to 8 bytes. */ +- ".byte 0x0f, 0xa7, 0xc0\n\t" /* XSTORE RNG. */ +- "movl %%eax, %0\n" /* Return the status. */ +- : "=g" (status) ++ ".byte 0x0f, 0xa7, 0xc0\n" /* XSTORE RNG. */ ++ : "=a" (status) + : "g" (p) + : "%edx", "%edi", "cc" + ); diff --git a/libgcrypt.spec b/libgcrypt.spec index df1fcad..431ca4f 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -1,6 +1,6 @@ Name: libgcrypt Version: 1.4.4 -Release: 4%{?dist} +Release: 5%{?dist} Source0: libgcrypt-%{version}-hobbled.tar.bz2 # The original libgcrypt sources now contain potentially patented ECC # cipher support. We have to remove it in the tarball we ship with @@ -11,6 +11,7 @@ Source2: wk@g10code.com Source3: hobble-libgcrypt Patch1: libgcrypt-1.4.4-fips-no-access.patch Patch2: libgcrypt-1.4.4-use-fipscheck.patch +Patch3: libgcrypt-1.4.4-padlock.patch # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction. License: LGPLv2+ @@ -145,6 +146,9 @@ exit 0 %{_infodir}/gcrypt.info* %changelog +* Wed Jun 17 2009 Tomas Mraz 1.4.4-5 +- fix VIA padlock RNG inline assembly call (#505724) + * Thu Mar 5 2009 Tomas Mraz 1.4.4-4 - with the integrity verification check the library needs to link to libdl (#488702) From d0f0f8517d64e7ad8bd04001c0e9439d1ab9bdfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 18 Jun 2009 21:31:56 +0000 Subject: [PATCH 3/5] - and now really apply the padlock patch --- libgcrypt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libgcrypt.spec b/libgcrypt.spec index 431ca4f..3e9c9fd 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -1,6 +1,6 @@ Name: libgcrypt Version: 1.4.4 -Release: 5%{?dist} +Release: 6%{?dist} Source0: libgcrypt-%{version}-hobbled.tar.bz2 # The original libgcrypt sources now contain potentially patented ECC # cipher support. We have to remove it in the tarball we ship with @@ -42,6 +42,7 @@ applications using libgcrypt. %{SOURCE3} %patch1 -p1 -b .no-access %patch2 -p1 -b .use-fipscheck +%patch3 -p1 -b .padlock %build %configure --disable-static \ @@ -146,6 +147,9 @@ exit 0 %{_infodir}/gcrypt.info* %changelog +* Thu Jun 18 2009 Tomas Mraz 1.4.4-6 +- and now really apply the padlock patch + * Wed Jun 17 2009 Tomas Mraz 1.4.4-5 - fix VIA padlock RNG inline assembly call (#505724) From 1ffc9e8a6f53278f40651bd8d9ad9ab6b983a3d7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:47:43 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4de825d..58eb767 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libgcrypt -# $Id: Makefile,v 1.1 2004/09/09 07:25:33 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:00:34 notting Exp $ NAME := libgcrypt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From da8116682d5d008585142a4acbf2b42fcd6d3209 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:59:01 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 58eb767..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libgcrypt -# $Id: Makefile,v 1.2 2007/10/15 19:00:34 notting Exp $ -NAME := libgcrypt -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11