Add support for --as-needed and openssl-0.9.8.

Package-Manager: portage-2.1.2_pre1

6 files changed, 76 insertions, 9 deletions

diff --git a/app-crypt/sign/ChangeLog b/app-crypt/sign/ChangeLog
index 377821de5b9b..999d4978823f 100644
--- a/app-crypt/sign/ChangeLog
+++ b/app-crypt/sign/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for app-crypt/sign
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/sign/ChangeLog,v 1.10 2005/09/20 19:15:35 grobian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/sign/ChangeLog,v 1.11 2006/09/16 17:26:31 swegener Exp $
+
+  16 Sep 2006; Sven Wegener <swegener@gentoo.org>
+  +files/1.0.7-openssl-0.9.8.patch, +files/1.0.7-as-needed.patch,
+  sign-1.0.7.ebuild:
+  Add support for --as-needed and openssl-0.9.8.
 
   20 Sep 2005; Fabian Groffen <grobian@gentoo.org> sign-1.0.7.ebuild:
-  Markgin ~ppc-macos (bug #106614)
+  Marking ~ppc-macos (bug #106614)
 
   16 May 2005; Sven Wegener <swegener@gentoo.org> sign-1.0.7.ebuild:
   Added cross-compile support.
diff --git a/app-crypt/sign/Manifest b/app-crypt/sign/Manifest
index e53d66f92393..72eb23fb451f 100644
--- a/app-crypt/sign/Manifest
+++ b/app-crypt/sign/Manifest
@@ -1,4 +1,34 @@
-MD5 797658bc99eb0a90917fbe8d32041ed9 sign-1.0.7.ebuild 732
-MD5 54566839c2510ad1498a41dca1c7b359 ChangeLog 1404
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.0.7-as-needed.patch 383 RMD160 63b4767fee112f5b9e19bf24072e7e616e231fcd SHA1 4906e4685f209daa7d94c2a7e7c4cc4437ca556d SHA256 ed9a3234ef12aac2c4b5cb546784946eff5d357fb2b274bfb2715ad2c997bf3d
+MD5 0d74cfa44129f8e82175bfe7eb9e82c7 files/1.0.7-as-needed.patch 383
+RMD160 63b4767fee112f5b9e19bf24072e7e616e231fcd files/1.0.7-as-needed.patch 383
+SHA256 ed9a3234ef12aac2c4b5cb546784946eff5d357fb2b274bfb2715ad2c997bf3d files/1.0.7-as-needed.patch 383
+AUX 1.0.7-openssl-0.9.8.patch 503 RMD160 936901a8e7e4bb7b06a629e0f7ea86aa3de74d1b SHA1 71cabd9de28e56663a5894ba32a8b4cfa3216ee4 SHA256 6acaabb6086e836d4a53121f6caeedd426fded7e25284cf0e536fbacd463b692
+MD5 301957956e18696a7ca9b5ef6c141272 files/1.0.7-openssl-0.9.8.patch 503
+RMD160 936901a8e7e4bb7b06a629e0f7ea86aa3de74d1b files/1.0.7-openssl-0.9.8.patch 503
+SHA256 6acaabb6086e836d4a53121f6caeedd426fded7e25284cf0e536fbacd463b692 files/1.0.7-openssl-0.9.8.patch 503
+DIST sign-1.0.7.tar.gz 28535 RMD160 cebad14a3c68bd103bf790ae054c1497c2ce3853 SHA1 dc828892a987982a48fdb95a0ba965bd3f03821e SHA256 c5f005eff29880807af37a128724f064cccb166fc9f49acab5f1403c9b72d4b9
+EBUILD sign-1.0.7.ebuild 917 RMD160 3ff7beee3d8ce756f6e68afc5d4939385f3aad6e SHA1 fa03d6da6cd9559eb6f4d8e9067304178d7548db SHA256 ce6375f7c5b785b375f7bb3b25bda20ae4239098dc0e0631bb0c22b6950fa5f1
+MD5 7ad88612bb8d1b3800ea1e07945bdeab sign-1.0.7.ebuild 917
+RMD160 3ff7beee3d8ce756f6e68afc5d4939385f3aad6e sign-1.0.7.ebuild 917
+SHA256 ce6375f7c5b785b375f7bb3b25bda20ae4239098dc0e0631bb0c22b6950fa5f1 sign-1.0.7.ebuild 917
+MISC ChangeLog 1592 RMD160 75deb52618bdafd61ecbca742aa9360133bad553 SHA1 ce63a3656fe82cd9c4129816376241fee13bd515 SHA256 ffd30cf196b9811a2218a3c2c53256f1f1f9245fe0ce5cc3dd988392fa3b93f8
+MD5 5e1d6ed1efaace610e1e328887c4b911 ChangeLog 1592
+RMD160 75deb52618bdafd61ecbca742aa9360133bad553 ChangeLog 1592
+SHA256 ffd30cf196b9811a2218a3c2c53256f1f1f9245fe0ce5cc3dd988392fa3b93f8 ChangeLog 1592
+MISC metadata.xml 609 RMD160 b16d4b6bb3f4321cd7a0b93c04897f55182c860e SHA1 a3804e4531a27e862e2a01e843a48cf268d49eea SHA256 5fa1227cfeeb70219636972c46b92dfc4ba6f0b5f94c303268b1bd0cdf26b09b
 MD5 6ef7a5432875c276bc23cfa8e7a68cf0 metadata.xml 609
-MD5 0ac7cdafd31002ee1d7a434783a90c24 files/digest-sign-1.0.7 61
+RMD160 b16d4b6bb3f4321cd7a0b93c04897f55182c860e metadata.xml 609
+SHA256 5fa1227cfeeb70219636972c46b92dfc4ba6f0b5f94c303268b1bd0cdf26b09b metadata.xml 609
+MD5 3287deeb85a7502da766c40670483d69 files/digest-sign-1.0.7 229
+RMD160 3c79839a280f2fb62812bf98de6d701a77682214 files/digest-sign-1.0.7 229
+SHA256 4e79188fe68bf6083ae5947dd3f49baeb29c7607b654c439fbee778db2318399 files/digest-sign-1.0.7 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFDDN+I1lqEGTUzyQRAnVYAKDNyWQZvyeTIHg590sIWHjgaUbZzgCfZcI+
+K0byeMcsp8kmLO3IejXztnM=
+=z/8g
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/sign/files/1.0.7-as-needed.patch b/app-crypt/sign/files/1.0.7-as-needed.patch
new file mode 100644
index 000000000000..56574d7131d7
--- /dev/null
+++ b/app-crypt/sign/files/1.0.7-as-needed.patch
@@ -0,0 +1,10 @@
+diff -Nur sign-1.0.7.orig/src/Makefile sign-1.0.7/src/Makefile
+--- sign-1.0.7.orig/src/Makefile	2004-08-07 07:15:00.000000000 +0000
++++ sign-1.0.7/src/Makefile	2006-09-16 17:21:12.400977608 +0000
+@@ -1,5 +1,5 @@
+ CFLAGS += -Wall -DNDEBUG -g
+-LDFLAGS += -lcrypto
++LDLIBS += -lcrypto
+ 
+ OBJS =	buf.o die.o msg.o digest.o uue.o pki.o str.o system-nix.o \
+ 	system-nix-readpass.o util.o
diff --git a/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch b/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
new file mode 100644
index 000000000000..179efbe77ef5
--- /dev/null
+++ b/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
@@ -0,0 +1,12 @@
+diff -Nur sign-1.0.7.orig/src/pki.c sign-1.0.7/src/pki.c
+--- sign-1.0.7.orig/src/pki.c	2004-08-04 04:10:35.000000000 +0000
++++ sign-1.0.7/src/pki.c	2006-09-16 17:17:34.335535125 +0000
+@@ -286,7 +286,7 @@
+ 
+ 		/* if it's not a decryption problem - bail out */
+ 		if (ERR_get_error() != ERR_PACK(ERR_LIB_EVP,
+-		                                EVP_F_EVP_DECRYPTFINAL,
++		                                EVP_F_EVP_DECRYPTFINAL_EX,
+ 		                                EVP_R_BAD_DECRYPT))
+ 			goto cleanup;
+ 
diff --git a/app-crypt/sign/files/digest-sign-1.0.7 b/app-crypt/sign/files/digest-sign-1.0.7
index d499546cdf98..8ffafa6e73ac 100644
--- a/app-crypt/sign/files/digest-sign-1.0.7
+++ b/app-crypt/sign/files/digest-sign-1.0.7
@@ -1 +1,3 @@
 MD5 f01c3f5dffc80d3ccd096d039e0c94f1 sign-1.0.7.tar.gz 28535
+RMD160 cebad14a3c68bd103bf790ae054c1497c2ce3853 sign-1.0.7.tar.gz 28535
+SHA256 c5f005eff29880807af37a128724f064cccb166fc9f49acab5f1403c9b72d4b9 sign-1.0.7.tar.gz 28535
diff --git a/app-crypt/sign/sign-1.0.7.ebuild b/app-crypt/sign/sign-1.0.7.ebuild
index a5ecefa7c664..6034ea843305 100644
--- a/app-crypt/sign/sign-1.0.7.ebuild
+++ b/app-crypt/sign/sign-1.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/sign/sign-1.0.7.ebuild,v 1.6 2005/09/20 19:15:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/sign/sign-1.0.7.ebuild,v 1.7 2006/09/16 17:26:31 swegener Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="File signing and signature verification utility"
 HOMEPAGE="http://swapped.cc/sign/"
@@ -14,6 +14,14 @@ IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.6"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	has_version ">=dev-libs/openssl-0.9.8" && epatch "${FILESDIR}"/${PV}-openssl-0.9.8.patch
+	epatch "${FILESDIR}"/${PV}-as-needed.patch
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" || die "emake failed"
 }