fix quoting, minor cleanups, add tls patch

Package-Manager: portage-2.1.3.19

6 files changed, 80 insertions, 49 deletions

diff --git a/sys-apps/ucspi-ssl/ChangeLog b/sys-apps/ucspi-ssl/ChangeLog
index e7309290af51..875d6819abc6 100644
--- a/sys-apps/ucspi-ssl/ChangeLog
+++ b/sys-apps/ucspi-ssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/ucspi-ssl
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.6 2007/02/09 08:32:33 flameeyes Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.7 2008/01/25 22:57:30 bangert Exp $
+
+  25 Jan 2008; Thilo Bangert <bangert@gentoo.org>
+  +files/ucspi-ssl-0.70-fix-paths.patch, ucspi-ssl-0.50.ebuild,
+  ucspi-ssl-0.70.ebuild:
+  fix quoting, minor cleanups, add tls patch
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index d81f8d81a926..8a3319c297cd 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -2,20 +2,25 @@ AUX ucspi-ssl-0.50-errno.patch 238 RMD160 c21d1a797ee1a7f05a9cc95bf269649e70a1e4
 MD5 6e8ff4bc92ca237cdbf7946baacdda84 files/ucspi-ssl-0.50-errno.patch 238
 RMD160 c21d1a797ee1a7f05a9cc95bf269649e70a1e479 files/ucspi-ssl-0.50-errno.patch 238
 SHA256 f91617d204e34eeb35fb362457531f03df7430d12c6142c460aec1bbdfe0f3ae files/ucspi-ssl-0.50-errno.patch 238
+AUX ucspi-ssl-0.70-fix-paths.patch 1272 RMD160 c7f4ab448cd433873e9becb6ba84b18d3fc91edf SHA1 fdab5d51064ad55f5421f13043579b60b3662a74 SHA256 9b4cf73acfe865b91ed197ca1e7dce43aeb4471f225cceb6a526f66979905004
+MD5 80e56ae799d31fb603472b278d1f968e files/ucspi-ssl-0.70-fix-paths.patch 1272
+RMD160 c7f4ab448cd433873e9becb6ba84b18d3fc91edf files/ucspi-ssl-0.70-fix-paths.patch 1272
+SHA256 9b4cf73acfe865b91ed197ca1e7dce43aeb4471f225cceb6a526f66979905004 files/ucspi-ssl-0.70-fix-paths.patch 1272
 DIST ucspi-ssl-0.50.tar.gz 58264 RMD160 a2bba746c445f7668ebf29e1f4434f82ef4c948a SHA1 7e238e3c856d22eb7e8aa6d19b3cc0ceb6c94b25 SHA256 9c03522ddc7c252037d39f8551bfba3ad82b7e8b280bb6e73280f7d817fe6960
+DIST ucspi-ssl-0.70-ucspitls-0.1.patch 11967 RMD160 83f6dda689d3c5713d034c100dc09d6fc199dc0c SHA1 f49b9363ae69698c925aba4d3eb76ffce58f4e5b SHA256 90ac703776f7b34949621a24d24e301d97d85cd0f1942eec463dcdb687ec31d9
 DIST ucspi-ssl-0.70.tar.gz 85111 RMD160 68e8118b954e0f626b8fede95f562bdaa1f72659 SHA1 56466bc4a7272ebd937f4ae20dbdcce30235be27 SHA256 8834aaa83a6862457c853818ce829291285043a553d4466671c05663bc580cf5
-EBUILD ucspi-ssl-0.50.ebuild 907 RMD160 04879677a66f281cf0c75130fb7373408764acb1 SHA1 abf6feaf67faf1a1bd51af291f1ee90bdf275295 SHA256 7a95a5de0e7853bc2cbf79f00a3a559265bcb19343422a0b6ae25b218a7cd455
-MD5 60daa93f671daae057fecdc70eb0ccb8 ucspi-ssl-0.50.ebuild 907
-RMD160 04879677a66f281cf0c75130fb7373408764acb1 ucspi-ssl-0.50.ebuild 907
-SHA256 7a95a5de0e7853bc2cbf79f00a3a559265bcb19343422a0b6ae25b218a7cd455 ucspi-ssl-0.50.ebuild 907
-EBUILD ucspi-ssl-0.70.ebuild 1595 RMD160 97ce50c7ea8a249a75c50abf96d31f0d843f31d7 SHA1 42ec49b5c5ad2c9699a76caa652fafed7e0749ec SHA256 0f079ed9f73c671a556d073d979af42ea479526bb8fed7e710478904c9bcc03d
-MD5 31a51beead4fba061d9271205acb28fc ucspi-ssl-0.70.ebuild 1595
-RMD160 97ce50c7ea8a249a75c50abf96d31f0d843f31d7 ucspi-ssl-0.70.ebuild 1595
-SHA256 0f079ed9f73c671a556d073d979af42ea479526bb8fed7e710478904c9bcc03d ucspi-ssl-0.70.ebuild 1595
-MISC ChangeLog 881 RMD160 832842922302cbcf0fe76fdbe4814639cc1ea967 SHA1 c8d96c20f1c108f279b59c58dc79d576136d04a9 SHA256 ca8478e4fe88ffc3a716e38bb93d0371d688e6bba790615ba54980defaf1c827
-MD5 fa9e914edf0b9ae021316faeb6185732 ChangeLog 881
-RMD160 832842922302cbcf0fe76fdbe4814639cc1ea967 ChangeLog 881
-SHA256 ca8478e4fe88ffc3a716e38bb93d0371d688e6bba790615ba54980defaf1c827 ChangeLog 881
+EBUILD ucspi-ssl-0.50.ebuild 908 RMD160 4d1550babc577aa65f3786cdf69712efa6813d17 SHA1 565ce724834cbe3ef62cb86616065cd77c50e2df SHA256 9902392d61bc424098d63e74d2c760fd36747fc10664a33827af5b1f376efe60
+MD5 00421ee0d961b57f67fca1681dfc04f4 ucspi-ssl-0.50.ebuild 908
+RMD160 4d1550babc577aa65f3786cdf69712efa6813d17 ucspi-ssl-0.50.ebuild 908
+SHA256 9902392d61bc424098d63e74d2c760fd36747fc10664a33827af5b1f376efe60 ucspi-ssl-0.50.ebuild 908
+EBUILD ucspi-ssl-0.70.ebuild 1366 RMD160 33d6bcc04c589208ced1a91891470a27b0fc4e60 SHA1 bfdcfcf8ba90d3552d202d632d4641e400730d46 SHA256 ffed4d45dad82bbe5c6d575564ad121a78a5d05e015961b6a9065658e576ab49
+MD5 ab717161d92224bf5f833d96398f510e ucspi-ssl-0.70.ebuild 1366
+RMD160 33d6bcc04c589208ced1a91891470a27b0fc4e60 ucspi-ssl-0.70.ebuild 1366
+SHA256 ffed4d45dad82bbe5c6d575564ad121a78a5d05e015961b6a9065658e576ab49 ucspi-ssl-0.70.ebuild 1366
+MISC ChangeLog 1064 RMD160 8a211e33a831ae29380d3bdeb75b8056e5db241a SHA1 92e691c18b30816c869171eba2d6ef097a5cff39 SHA256 65ec3d64940bbd8f729a28632c2fea5c0d4715c05798e6cac5df37273f772bb7
+MD5 bfa191095b6b60c66d457213c0cf24d9 ChangeLog 1064
+RMD160 8a211e33a831ae29380d3bdeb75b8056e5db241a ChangeLog 1064
+SHA256 65ec3d64940bbd8f729a28632c2fea5c0d4715c05798e6cac5df37273f772bb7 ChangeLog 1064
 MISC metadata.xml 444 RMD160 46618068c084be64eeb7f78152963b6f06997cb0 SHA1 738d4ebab53426bc85bf73e771b413ac363057bd SHA256 deb00044a0a52deab35acd7713837b18a8ad97e7bbf413e5d5a03e8ef79dc47f
 MD5 ef631d5c1095e35bb772cc6cf5c028f3 metadata.xml 444
 RMD160 46618068c084be64eeb7f78152963b6f06997cb0 metadata.xml 444
@@ -23,6 +28,6 @@ SHA256 deb00044a0a52deab35acd7713837b18a8ad97e7bbf413e5d5a03e8ef79dc47f metadata
 MD5 1cca689839941ef7c90dc96e16f1ebf5 files/digest-ucspi-ssl-0.50 241
 RMD160 f939e5d5cf7bfe923b096323bffe14d737867547 files/digest-ucspi-ssl-0.50 241
 SHA256 16b13421a08a4d83c01a44dd3436db2984114583971fdb4627c52c07d4b60e46 files/digest-ucspi-ssl-0.50 241
-MD5 fc02878780e0391e3d0d1025703e7e99 files/digest-ucspi-ssl-0.70 241
-RMD160 33235c586cb4de90ad14cbb9741a70afca28f05d files/digest-ucspi-ssl-0.70 241
-SHA256 13b9baf0cbc764114443a1fcea927fd2ad192895b3f1cdb58501629b029dbfca files/digest-ucspi-ssl-0.70 241
+MD5 5342f7513ddb050ccf74018b4d5c1fcb files/digest-ucspi-ssl-0.70 518
+RMD160 1d4577f3939fb9598d4f8dd36d7a7bd1432ffa94 files/digest-ucspi-ssl-0.70 518
+SHA256 f199f64498a1568a889016fddd624aff1b5c721d9815c96e5740d168c685a50a files/digest-ucspi-ssl-0.70 518
diff --git a/sys-apps/ucspi-ssl/files/digest-ucspi-ssl-0.70 b/sys-apps/ucspi-ssl/files/digest-ucspi-ssl-0.70
index 4c25157b959a..098e051ee5aa 100644
--- a/sys-apps/ucspi-ssl/files/digest-ucspi-ssl-0.70
+++ b/sys-apps/ucspi-ssl/files/digest-ucspi-ssl-0.70
@@ -1,3 +1,6 @@
+MD5 7cc167b2a6f32ed136ab2c34e17671da ucspi-ssl-0.70-ucspitls-0.1.patch 11967
+RMD160 83f6dda689d3c5713d034c100dc09d6fc199dc0c ucspi-ssl-0.70-ucspitls-0.1.patch 11967
+SHA256 90ac703776f7b34949621a24d24e301d97d85cd0f1942eec463dcdb687ec31d9 ucspi-ssl-0.70-ucspitls-0.1.patch 11967
 MD5 22a2ebd0c6905726811c615286bac875 ucspi-ssl-0.70.tar.gz 85111
 RMD160 68e8118b954e0f626b8fede95f562bdaa1f72659 ucspi-ssl-0.70.tar.gz 85111
 SHA256 8834aaa83a6862457c853818ce829291285043a553d4466671c05663bc580cf5 ucspi-ssl-0.70.tar.gz 85111
diff --git a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.70-fix-paths.patch b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.70-fix-paths.patch
new file mode 100644
index 000000000000..55557e4d527d
--- /dev/null
+++ b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.70-fix-paths.patch
@@ -0,0 +1,30 @@
+diff -Naur ucspi-ssl-0.70.orig/src/https@.sh ucspi-ssl-0.70/src/https@.sh
+--- src.org/https@.sh	2008-01-25 22:31:48.000000000 +0100
++++ src/https@.sh	2008-01-25 22:34:28.000000000 +0100
+@@ -9,7 +9,7 @@
+ fi
+ echo "GET /$path HTTP/1.0
+ Host: $host:$port
+-" | HOME/command/sslclient -RHl0 $args -- "$host" "$port" sh -c '
++" | /usr/bin/sslclient -RHl0 $args -- "$host" "$port" sh -c '
+   TCPBIN/addcr >&7
+   exec TCPBIN/delcr <&6
+ ' | awk '/^$/ { body=1; next } { if (body) print }'
+diff -Naur ucspi-ssl-0.70.orig/src/sslcat.sh ucspi-ssl-0.70/src/sslcat.sh
+--- src.orig/sslcat.sh	2008-01-25 22:31:48.000000000 +0100
++++ src/sslcat.sh	2008-01-25 22:33:30.000000000 +0100
+@@ -6,4 +6,4 @@
+   shift; shift
+   args="$@"
+ fi
+-exec HOME/command/sslclient -RHl0 $args -- "$host" "$port" sh -c 'exec cat <&6'
++exec /usr/bin/sslclient -RHl0 $args -- "$host" "$port" sh -c 'exec cat <&6'
+diff -Naur ucspi-ssl-0.70.orig/src/sslconnect.sh ucspi-ssl-0.70/src/sslconnect.sh
+--- src.orig/sslconnect.sh	2008-01-25 22:31:48.000000000 +0100
++++ src/sslconnect.sh	2008-01-25 22:33:54.000000000 +0100
+@@ -6,4 +6,4 @@
+   shift; shift
+   args="$@"
+ fi
+-exec HOME/command/sslclient -RHl0 $args -- $host $port TCPBIN/mconnect-io
++exec /usr/bin/sslclient -RHl0 $args -- $host $port TCPBIN/mconnect-io
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild
index c6c3cb7df863..9ae0ff4f9dda 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild,v 1.5 2004/07/15 02:45:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild,v 1.6 2008/01/25 22:57:30 bangert Exp $
 
 inherit eutils
 
@@ -17,9 +17,10 @@ LICENSE="as-is"
 KEYWORDS="~x86 ~amd64"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-errno.patch
 
 	echo "gcc ${CFLAGS} -DTLS -I." > conf-cc
 	echo "/usr/" > conf-home
@@ -34,6 +35,5 @@ src_install() {
 	do
 		dobin $i
 	done
-
 	dodoc CHANGES FILES README SYSDEPS TARGETS TODO UCSPI-SSL VERSION
 }
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.70.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.70.ebuild
index ea69fe20d8dd..9fee7521553e 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.70.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.70.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.70.ebuild,v 1.2 2007/07/12 05:10:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.70.ebuild,v 1.3 2008/01/25 22:57:30 bangert Exp $
 
-inherit fixheadtails toolchain-funcs
-#eutils
+inherit fixheadtails toolchain-funcs eutils
 
-IUSE="perl"
+IUSE="perl tls"
 DESCRIPTION="Command-line tools for building SSL client-server applications."
 HOMEPAGE="http://www.superscript.com/ucspi-ssl/intro.html"
-SRC_URI="http://www.superscript.com/ucspi-ssl/${P}.tar.gz"
-
-#		http://www.suspectclass.com/~sgifford/ucspi-tls/files/ucspi-ssl-0.70-ucspitls-0.1.patch"
+SRC_URI="http://www.superscript.com/ucspi-ssl/${P}.tar.gz
+		http://www.suspectclass.com/~sgifford/ucspi-tls/files/ucspi-ssl-0.70-ucspitls-0.1.patch"
 DEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6g
 	sys-apps/ucspi-tcp"
@@ -18,16 +16,16 @@ DEPEND="virtual/libc
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/host/superscript.com/net/${P}/src"
+MY_WD="${WORKDIR}/host/superscript.com/net"
+S="${MY_WD}/${P}/src"
 
 src_unpack() {
 	unpack ${A}
-#	cd "${WORKDIR}/host/superscript.com/net/"
-#	epatch ${DISTDIR}/ucspi-ssl-0.70-ucspitls-0.1.patch
+	cd "${MY_WD}"
+	use tls && epatch "${DISTDIR}"/ucspi-ssl-0.70-ucspitls-0.1.patch
 	ht_fix_all
-	cd ${S}
-	#fix paths to work with gentoo...
-	sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh
+	cd "${S}"
+	epatch "${FILESDIR}"/ucspi-ssl-0.70-fix-paths.patch
 }
 
 src_compile() {
@@ -40,19 +38,9 @@ src_compile() {
 	package/compile || die
 }
 
-# selftest requires installation - expects files in /usr/bin
-#
-#src_test() {
-#	cd ..
-#	./package/rts || die 'self test failed'
-#}
-
 src_install() {
-	dodoc CHANGES TODO  UCSPI-SSL
-	cd ${WORKDIR}/host/superscript.com/net/${P}/command/
-	for i in sslserver sslclient sslcat sslconnect https\@
-	do
-		dobin $i
-	done
+	dodoc CHANGES TODO UCSPI-SSL
+	cd "${MY_WD}"/${P}/command/
+	dobin sslserver sslclient sslcat sslconnect https\@ || die
 	use perl && dobin sslperl
 }