remove Makefile diff from patch files

diff --git a/bin/pkcs11/openssl-0.9.8s-patch b/bin/pkcs11/openssl-0.9.8s-patch
index bb3728e6743b8fba8bc6c34371aa7018959d0024..cdf12342d523efbe19d7807ac769787e72234ca7 100644 (file)
--- a/bin/pkcs11/openssl-0.9.8s-patch
+++ b/bin/pkcs11/openssl-0.9.8s-patch
@@ -134,95 +134,6 @@ diff -u openssl/Configure:1.8.6.1 openssl/Configure:1.8
        s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/;
        s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/;
        s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
-Index: openssl/Makefile
-diff -u openssl/Makefile:1.8.6.1 openssl/Makefile:1.8.2.1
---- openssl/Makefile:1.8.6.1   Sun Jan 15 15:45:33 2012
-+++ openssl/Makefile   Sun Jan 15 15:51:39 2012
-@@ -11,11 +11,11 @@
- SHLIB_VERSION_HISTORY=
- SHLIB_MAJOR=0
- SHLIB_MINOR=9.8
--SHLIB_EXT=
--PLATFORM=dist
--OPTIONS= no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic
--CONFIGURE_ARGS=dist
--SHLIB_TARGET=
-+SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-+PLATFORM=solaris64-x86_64-gcc
-+OPTIONS=--pk11-libname=/usr/lib/64/libpkcs11.so.1 no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic
-+CONFIGURE_ARGS=solaris64-x86_64-gcc --pk11-libname=/usr/lib/64/libpkcs11.so.1
-+SHLIB_TARGET=solaris-shared
- 
- # HERE indicates where this Makefile lives.  This can be used to indicate
- # where sub-Makefiles are expected to be.  Currently has very limited usage,
-@@ -28,6 +28,9 @@
- INSTALL_PREFIX=
- INSTALLTOP=/usr/local/ssl
- 
-+# You must set this through --pk11-libname configure option.
-+PK11_LIB_LOCATION=/usr/lib/64/libpkcs11.so.1
-+
- # Do not edit this manually. Use Configure --openssldir=DIR do change this!
- OPENSSLDIR=/usr/local/ssl
- 
-@@ -59,11 +62,11 @@
- # equal 4.
- # PKCS1_CHECK - pkcs1 tests.
- 
--CC= cc
--CFLAG= -O
-+CC= gcc
-+CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DPK11_LIB_LOCATION=\"/usr/lib/64/libpkcs11.so.1\" -m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM
- DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED
- PEX_LIBS= 
--EX_LIBS= 
-+EX_LIBS= -lsocket -lnsl -ldl
- EXE_EXT= 
- ARFLAGS= 
- AR= ar $(ARFLAGS) r
-@@ -72,7 +75,7 @@
- PERL= /usr/bin/perl
- TAR= tar
- TARFLAGS= --no-recursion
--MAKEDEPPROG=makedepend
-+MAKEDEPPROG= gcc
- LIBDIR=lib
- 
- # We let the C compiler driver to take care of .s files. This is done in
-@@ -88,16 +91,16 @@
- PROCESSOR= 
- 
- # CPUID module collects small commonly used assembler snippets
--CPUID_OBJ= 
--BN_ASM= bn_asm.o
-+CPUID_OBJ= x86_64cpuid.o
-+BN_ASM= x86_64-gcc.o x86_64-mont.o
- DES_ENC= des_enc.o fcrypt_b.o
--AES_ASM_OBJ= aes_core.o aes_cbc.o
-+AES_ASM_OBJ= aes-x86_64.o
- BF_ENC= bf_enc.o
- CAST_ENC= c_enc.o
--RC4_ENC= rc4_enc.o rc4_skey.o
-+RC4_ENC= rc4-x86_64.o
- RC5_ENC= rc5_enc.o
--MD5_ASM_OBJ= 
--SHA1_ASM_OBJ= 
-+MD5_ASM_OBJ= md5-x86_64.o
-+SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
- RMD160_ASM_OBJ= 
- 
- # KRB5 stuff
-@@ -170,8 +173,8 @@
- SHARED_SSL=libssl$(SHLIB_EXT)
- SHARED_FIPS=
- SHARED_LIBS=
--SHARED_LIBS_LINK_EXTS=
--SHARED_LDFLAGS=
-+SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
-+SHARED_LDFLAGS=-m64 -shared -static-libgcc
- 
- GENERAL=        Makefile
- BASENAME=       openssl
 Index: openssl/Makefile.org
 diff -u openssl/Makefile.org:1.4.6.1 openssl/Makefile.org:1.4
 --- openssl/Makefile.org:1.4.6.1       Sun Jan 15 15:45:33 2012
@@ -12647,7 +12558,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
 +++ openssl/crypto/engine/pkcs11.h     Wed Oct 24 23:27:09 2007
 @@ -0,0 +1,299 @@
 +/* pkcs11.h include file for PKCS #11. */
-+/* $Revision: 1.2 $ */
++/* $Revision: 1.3 $ */
 +
 +/* License to copy and use this software is granted provided that it is
 + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
@@ -12951,7 +12862,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
 +++ openssl/crypto/engine/pkcs11f.h    Wed Oct 24 23:27:09 2007
 @@ -0,0 +1,912 @@
 +/* pkcs11f.h include file for PKCS #11. */
-+/* $Revision: 1.2 $ */
++/* $Revision: 1.3 $ */
 +
 +/* License to copy and use this software is granted provided that it is
 + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
@@ -13868,7 +13779,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
 +++ openssl/crypto/engine/pkcs11t.h    Sat Aug 30 11:58:07 2008
 @@ -0,0 +1,1885 @@
 +/* pkcs11t.h include file for PKCS #11. */
-+/* $Revision: 1.2 $ */
++/* $Revision: 1.3 $ */
 +
 +/* License to copy and use this software is granted provided that it is
 + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface

diff --git a/bin/pkcs11/openssl-1.0.0f-patch b/bin/pkcs11/openssl-1.0.0f-patch
index 7fe36c5043e02e113d23677630d76f774569bbe9..9cef8e3057ddc31c02f58fffc9397960cde1b67a 100644 (file)
--- a/bin/pkcs11/openssl-1.0.0f-patch
+++ b/bin/pkcs11/openssl-1.0.0f-patch
@@ -134,95 +134,6 @@ diff -u openssl/Configure:1.9.2.1 openssl/Configure:1.10
        s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/;
        s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/;
        s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
-Index: openssl/Makefile
-diff -u openssl/Makefile:1.9.2.1 openssl/Makefile:1.10
---- openssl/Makefile:1.9.2.1   Sun Jan 15 16:09:40 2012
-+++ openssl/Makefile   Sun Jan 15 16:30:04 2012
-@@ -11,11 +11,11 @@
- SHLIB_VERSION_HISTORY=
- SHLIB_MAJOR=1
- SHLIB_MINOR=0.0
--SHLIB_EXT=
--PLATFORM=dist
--OPTIONS= no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-shared no-store no-zlib no-zlib-dynamic static-engine
--CONFIGURE_ARGS=dist
--SHLIB_TARGET=
-+SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-+PLATFORM=solaris64-x86_64-gcc
-+OPTIONS=--pk11-libname=/usr/lib/64/libpkcs11.so.1 no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic
-+CONFIGURE_ARGS=solaris64-x86_64-gcc --pk11-libname=/usr/lib/64/libpkcs11.so.1
-+SHLIB_TARGET=solaris-shared
- 
- # HERE indicates where this Makefile lives.  This can be used to indicate
- # where sub-Makefiles are expected to be.  Currently has very limited usage,
-@@ -28,6 +28,9 @@
- INSTALL_PREFIX=
- INSTALLTOP=/usr/local/ssl
- 
-+# You must set this through --pk11-libname configure option.
-+PK11_LIB_LOCATION=/usr/lib/64/libpkcs11.so.1
-+
- # Do not edit this manually. Use Configure --openssldir=DIR do change this!
- OPENSSLDIR=/usr/local/ssl
- 
-@@ -59,11 +62,11 @@
- # equal 4.
- # PKCS1_CHECK - pkcs1 tests.
- 
--CC= cc
--CFLAG= -O
-+CC= gcc
-+CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DPK11_LIB_LOCATION=\"/usr/lib/64/libpkcs11.so.1\" -m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM
- DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE
- PEX_LIBS= 
--EX_LIBS= 
-+EX_LIBS= -lsocket -lnsl -ldl
- EXE_EXT= 
- ARFLAGS= 
- AR= ar $(ARFLAGS) r
-@@ -72,7 +75,7 @@
- PERL= /usr/bin/perl
- TAR= tar
- TARFLAGS= --no-recursion
--MAKEDEPPROG=makedepend
-+MAKEDEPPROG= gcc
- LIBDIR=lib
- 
- # We let the C compiler driver to take care of .s files. This is done in
-@@ -88,16 +91,16 @@
- PROCESSOR= 
- 
- # CPUID module collects small commonly used assembler snippets
--CPUID_OBJ= mem_clr.o
--BN_ASM= bn_asm.o
-+CPUID_OBJ= x86_64cpuid.o
-+BN_ASM= x86_64-gcc.o x86_64-mont.o
- DES_ENC= des_enc.o fcrypt_b.o
--AES_ENC= aes_core.o aes_cbc.o
-+AES_ASM_OBJ= aes-x86_64.o
- BF_ENC= bf_enc.o
- CAST_ENC= c_enc.o
--RC4_ENC= rc4_enc.o rc4_skey.o
-+RC4_ENC= rc4-x86_64.o
- RC5_ENC= rc5_enc.o
--MD5_ASM_OBJ= 
--SHA1_ASM_OBJ= 
-+MD5_ASM_OBJ= md5-x86_64.o
-+SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
- RMD160_ASM_OBJ= 
- WP_ASM_OBJ= wp_block.o
- CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
-@@ -149,8 +152,8 @@
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
- SHARED_SSL=libssl$(SHLIB_EXT)
- SHARED_LIBS=
--SHARED_LIBS_LINK_EXTS=
--SHARED_LDFLAGS=
-+SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
-+SHARED_LDFLAGS=-m64 -shared -static-libgcc
- 
- GENERAL=        Makefile
- BASENAME=       openssl
 Index: openssl/Makefile.org
 diff -u openssl/Makefile.org:1.5.2.1 openssl/Makefile.org:1.5
 --- openssl/Makefile.org:1.5.2.1       Sun Jan 15 16:09:41 2012
@@ -12628,7 +12539,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
 +++ openssl/crypto/engine/pkcs11.h     Wed Oct 24 23:27:09 2007
 @@ -0,0 +1,299 @@
 +/* pkcs11.h include file for PKCS #11. */
-+/* $Revision: 1.1 $ */
++/* $Revision: 1.2 $ */
 +
 +/* License to copy and use this software is granted provided that it is
 + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
@@ -12932,7 +12843,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
 +++ openssl/crypto/engine/pkcs11f.h    Wed Oct 24 23:27:09 2007
 @@ -0,0 +1,912 @@
 +/* pkcs11f.h include file for PKCS #11. */
-+/* $Revision: 1.1 $ */
++/* $Revision: 1.2 $ */
 +
 +/* License to copy and use this software is granted provided that it is
 + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
@@ -13849,7 +13760,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
 +++ openssl/crypto/engine/pkcs11t.h    Sat Aug 30 11:58:07 2008
 @@ -0,0 +1,1885 @@
 +/* pkcs11t.h include file for PKCS #11. */
-+/* $Revision: 1.1 $ */
++/* $Revision: 1.2 $ */
 +
 +/* License to copy and use this software is granted provided that it is
 + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface