diff options
| -rw-r--r-- | sys-apps/ucspi-ssl/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/ucspi-ssl/files/digest-ucspi-ssl-0.70 | 3 | ||||
| -rw-r--r-- | sys-apps/ucspi-ssl/files/ucspi-ssl-0.70-fix-paths.patch | 30 | ||||
| -rw-r--r-- | sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild | 10 | ||||
| -rw-r--r-- | sys-apps/ucspi-ssl/ucspi-ssl-0.70.ebuild | 42 |
5 files changed, 60 insertions, 34 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/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 } |