From 0caaa5d4438f8f5911fa6589f0d3525fc23e7431 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 25 Sep 2005 10:32:25 +0000 Subject: version bump. netmon takes maintance. remove old security vulnerable versions (Portage version: 2.0.52-r1) --- net-misc/socat/ChangeLog | 11 ++- net-misc/socat/Manifest | 17 ++-- net-misc/socat/files/digest-socat-1.3.0.1 | 1 - net-misc/socat/files/digest-socat-1.3.1.0 | 1 - net-misc/socat/files/digest-socat-1.3.2.0 | 1 - net-misc/socat/files/digest-socat-1.3.2.1 | 1 - net-misc/socat/files/digest-socat-1.3.2.2 | 1 - net-misc/socat/files/digest-socat-1.4.3.0 | 1 + net-misc/socat/files/socat-1.4.3.0-noptytest.patch | 95 ++++++++++++++++++++++ net-misc/socat/files/socat-1.4.3.0-tmp-tail.patch | 29 +++++++ net-misc/socat/metadata.xml | 8 ++ net-misc/socat/socat-1.3.0.1.ebuild | 70 ---------------- net-misc/socat/socat-1.3.1.0.ebuild | 70 ---------------- net-misc/socat/socat-1.3.2.0.ebuild | 66 --------------- net-misc/socat/socat-1.3.2.1.ebuild | 66 --------------- net-misc/socat/socat-1.3.2.2.ebuild | 39 --------- net-misc/socat/socat-1.4.3.0.ebuild | 51 ++++++++++++ 17 files changed, 200 insertions(+), 328 deletions(-) delete mode 100644 net-misc/socat/files/digest-socat-1.3.0.1 delete mode 100644 net-misc/socat/files/digest-socat-1.3.1.0 delete mode 100644 net-misc/socat/files/digest-socat-1.3.2.0 delete mode 100644 net-misc/socat/files/digest-socat-1.3.2.1 delete mode 100644 net-misc/socat/files/digest-socat-1.3.2.2 create mode 100644 net-misc/socat/files/digest-socat-1.4.3.0 create mode 100644 net-misc/socat/files/socat-1.4.3.0-noptytest.patch create mode 100644 net-misc/socat/files/socat-1.4.3.0-tmp-tail.patch create mode 100644 net-misc/socat/metadata.xml delete mode 100644 net-misc/socat/socat-1.3.0.1.ebuild delete mode 100644 net-misc/socat/socat-1.3.1.0.ebuild delete mode 100644 net-misc/socat/socat-1.3.2.0.ebuild delete mode 100644 net-misc/socat/socat-1.3.2.1.ebuild delete mode 100644 net-misc/socat/socat-1.3.2.2.ebuild create mode 100644 net-misc/socat/socat-1.4.3.0.ebuild (limited to 'net-misc') diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog index 5dd81d7e4e91..66d810f3dfe4 100644 --- a/net-misc/socat/ChangeLog +++ b/net-misc/socat/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/socat # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.18 2005/08/13 23:28:37 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.19 2005/09/25 10:32:24 dragonheart Exp $ + +*socat-1.4.3.0 (25 Sep 2005) + + 25 Sep 2005; Daniel Black + +files/socat-1.4.3.0-noptytest.patch, +files/socat-1.4.3.0-tmp-tail.patch, + +metadata.xml, -socat-1.3.0.1.ebuild, -socat-1.3.1.0.ebuild, + -socat-1.3.2.0.ebuild, -socat-1.3.2.1.ebuild, -socat-1.3.2.2.ebuild, + +socat-1.4.3.0.ebuild: + version bump. netmon takes maintance. remove old security vulnerable versions 13 Aug 2005; Michael Hanselmann socat-1.4.2.0.ebuild: Stable on ppc. diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 3d4fd426867f..f11e5f7d4d2a 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,15 +1,10 @@ -MD5 a3eb4662c67693c94118403649886a49 socat-1.3.2.0.ebuild 1558 -MD5 f3009c0be501848ecefacf09a76b117b socat-1.4.0.3.ebuild 1021 -MD5 4b9683262208a004f2c527bc11a62bef socat-1.3.2.2.ebuild 1045 MD5 07e1c2a08d67c27e6116909cbd8bfdbb ChangeLog 2234 -MD5 6868a1145dcaf596d34ef61ce81d596b socat-1.3.2.1.ebuild 1590 -MD5 7ee39ebbd7687780e549be670e4cf99c socat-1.3.1.0.ebuild 1635 +MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224 +MD5 f3009c0be501848ecefacf09a76b117b socat-1.4.0.3.ebuild 1021 MD5 7496b06950337734d9a6c273d9ee67b4 socat-1.4.2.0.ebuild 1024 -MD5 04d9d09b592cd41b4e4cadfd25f4fbab socat-1.3.0.1.ebuild 1634 -MD5 a7603fa9eae81b2f857ba740fedb09d7 files/digest-socat-1.3.2.0 66 -MD5 f36a8969db98f4b05d53cce1c71a4161 files/digest-socat-1.3.2.1 66 -MD5 3716109facbed0db26250a872dd6eda1 files/digest-socat-1.3.1.0 66 +MD5 854cb0868998b7fd8392196538c697f4 socat-1.4.3.0.ebuild 1259 +MD5 c69f1c15c04237f76ac1c77d96a70dc0 files/digest-socat-1.4.3.0 66 +MD5 80bc464d7deaff0335540eb32a60c827 files/socat-1.4.3.0-tmp-tail.patch 986 +MD5 6d502092a174c12aa520b1ab3ac8798f files/socat-1.4.3.0-noptytest.patch 2906 MD5 3e1450e1811fbf675f8069ed1bbe2a18 files/digest-socat-1.4.0.3 66 MD5 7e75e101e793cb7f39eddab4eeb0d286 files/digest-socat-1.4.2.0 66 -MD5 506ab9d342949b2589479d2c61ff4038 files/digest-socat-1.3.0.1 66 -MD5 e4628aa35442d5e26f3f91ec6efc3b1f files/digest-socat-1.3.2.2 66 diff --git a/net-misc/socat/files/digest-socat-1.3.0.1 b/net-misc/socat/files/digest-socat-1.3.0.1 deleted file mode 100644 index 4f9a9b5be3fd..000000000000 --- a/net-misc/socat/files/digest-socat-1.3.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 193e3648771a4cd02b8600ad98ee4ad2 socat-1.3.0.1.tar.bz2 214819 diff --git a/net-misc/socat/files/digest-socat-1.3.1.0 b/net-misc/socat/files/digest-socat-1.3.1.0 deleted file mode 100644 index cb9b92fb307f..000000000000 --- a/net-misc/socat/files/digest-socat-1.3.1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 a93ad11c5e322a4bb3d5fd8cf93ea57c socat-1.3.1.0.tar.bz2 218525 diff --git a/net-misc/socat/files/digest-socat-1.3.2.0 b/net-misc/socat/files/digest-socat-1.3.2.0 deleted file mode 100644 index 7cd1b2c17692..000000000000 --- a/net-misc/socat/files/digest-socat-1.3.2.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 5b845a84d2c53dbf9ec412ea558d86ec socat-1.3.2.0.tar.bz2 226132 diff --git a/net-misc/socat/files/digest-socat-1.3.2.1 b/net-misc/socat/files/digest-socat-1.3.2.1 deleted file mode 100644 index e7ba764849a3..000000000000 --- a/net-misc/socat/files/digest-socat-1.3.2.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 860fe417ea5e9ca2d2b2225192b85b87 socat-1.3.2.1.tar.bz2 226156 diff --git a/net-misc/socat/files/digest-socat-1.3.2.2 b/net-misc/socat/files/digest-socat-1.3.2.2 deleted file mode 100644 index 1fa0577e1ce9..000000000000 --- a/net-misc/socat/files/digest-socat-1.3.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 57f33e67bf62f67ed32e0c9acc45f3a3 socat-1.3.2.2.tar.bz2 228880 diff --git a/net-misc/socat/files/digest-socat-1.4.3.0 b/net-misc/socat/files/digest-socat-1.4.3.0 new file mode 100644 index 000000000000..5c9a18f142de --- /dev/null +++ b/net-misc/socat/files/digest-socat-1.4.3.0 @@ -0,0 +1 @@ +MD5 ce574e75c2fda4456e8efd4efb86ec5e socat-1.4.3.0.tar.bz2 272236 diff --git a/net-misc/socat/files/socat-1.4.3.0-noptytest.patch b/net-misc/socat/files/socat-1.4.3.0-noptytest.patch new file mode 100644 index 000000000000..e27690805b4a --- /dev/null +++ b/net-misc/socat/files/socat-1.4.3.0-noptytest.patch @@ -0,0 +1,95 @@ +--- socat-1.4/test.sh.original 2005-09-25 19:59:59.000000000 +1000 ++++ socat-1.4/test.sh 2005-09-25 19:59:51.000000000 +1000 +@@ -623,8 +623,7 @@ + fi + #------------------------------------------------------------------------------ + +-#if false; then +-if true; then ++if false; then + for addr in exec system; do + ADDR=$(echo "$addr" |tr a-z A-Z) + +@@ -3124,82 +3123,6 @@ + esac + N=$((N+1)) + +- +-testptywaitslave () { +- local N="$1" +- local TEST="$2" +- local PTYTYPE="$3" # ptmx or openpty +- local opts="$4" +- +-tp="$td/test$N.pty" +-ts="$td/test$N.socket" +-tf="$td/test$N.file" +-tdiff="$td/test$N.diff" +-te1="$td/test$N.stderr1" +-te2="$td/test$N.stderr2" +-te3="$td/test$N.stderr3" +-te4="$td/test$N.stderr4" +-da="test$N.1 $(date) $RANDOM" +-printf "test %2d $TEST... " $N +-# first generate a pty, then a socket +-($SOCAT $opts -lpsocat1 pty,$PTYTYPE,pty-wait-slave,link="$tp" unix-listen:"$ts" 2>"$te1"; rm -f "$tp") 2>/dev/null & +-pid=$! +-waitfile "$tp" +-# if pty was non-blocking, the socket is active, and socat1 will term +-$SOCAT $opts -lpsocat2 file:/dev/null unix:"$ts" 2>"$te2" +-# if pty is blocking, first socat is still active and we get a connection now +-#((echo "$da"; sleep 2) |$SOCAT -lpsocat3 $opts - file:"$tp",$PTYOPTS2 >"$tf" 2>"$te3") & +-( (waitfile "$ts"; echo "$da"; sleep 1) |$SOCAT -lpsocat3 $opts - file:"$tp",$PTYOPTS2 >"$tf" 2>"$te3") & +-waitfile "$ts" +-# but we need an echoer on the socket +-$SOCAT $opts -lpsocat4 unix:"$ts" echo 2>"$te4" +-# now $tf file should contain $da +-#kill $pid 2>/dev/null +-wait +-# +-if echo "$da" |diff - "$tf"> "$tdiff"; then +- $PRINTF "$OK\n" +-else +- $PRINTF "${YELLOW}FAILED${NORMAL}\n" +- cat "$tdiff" +- cat "$te1" +- #cat "$te2" # not of interest +- cat "$te3" +- cat "$te4" +-fi +-} +- +-NAME=PTMXWAITSLAVE +-PTYTYPE=ptmx +-case "$TESTS" in +-*%$NAME%*|*%FUNCTIONS%*) +-TEST="$NAME: test if master pty ($PTYTYPE) waits for slave connection" +-if ! feat=$(testaddrs pty); then +- $PRINTF "test %2d $TEST... ${YELLOW}$(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +-elif ! feat=$(testoptions "$PTYTYPE" pty-wait-slave); then +- $PRINTF "test %2d $TEST... ${YELLOW}option $(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +-else +- testptywaitslave "$N" "$TEST" "$PTYTYPE" "$opts" +-fi +-esac +-N=$((N+1)) +- +-NAME=OPENPTYWAITSLAVE +-PTYTYPE=openpty +-case "$TESTS" in +-*%$NAME%*|*%FUNCTIONS%*) +-TEST="$NAME: test if master pty ($PTYTYPE) waits for slave connection" +-if ! feat=$(testaddrs pty); then +- $PRINTF "test %2d $TEST... ${YELLOW}$(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +-elif ! feat=$(testoptions "$PTYTYPE" pty-wait-slave); then +- $PRINTF "test %2d $TEST... ${YELLOW}option $(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +-else +- testptywaitslave "$N" "$TEST" "$PTYTYPE" "$opts" +-fi +-esac +-N=$((N+1)) +- +- + NAME=CONNECTTIMEOUT + case "$TESTS" in + *%$NAME%*|*%FUNCTIONS%*) diff --git a/net-misc/socat/files/socat-1.4.3.0-tmp-tail.patch b/net-misc/socat/files/socat-1.4.3.0-tmp-tail.patch new file mode 100644 index 000000000000..c377ccb45335 --- /dev/null +++ b/net-misc/socat/files/socat-1.4.3.0-tmp-tail.patch @@ -0,0 +1,29 @@ +--- socat-1.4/test.sh.orig 2005-09-25 18:59:31.000000000 +1000 ++++ socat-1.4/test.sh 2005-09-25 18:59:20.000000000 +1000 +@@ -112,7 +112,7 @@ + [ -z "$TESTS" ] && TESTS="CONSISTENCY FUNCTIONS FILAN" + + [ -z "$USER" ] && USER="$LOGNAME" # HP-UX +-TD="/tmp/$USER/$$"; td="$TD" ++TD="${TMP:-/tmp}/$USER/$$"; td="$TD" + rm -rf "$TD" || (echo "cannot rm $TD" >&2; exit 1) + mkdir -p "$TD" + #trap "rm -r $TD" 0 3 +@@ -3089,7 +3089,7 @@ + TEST="$NAME: check type printed for directories" + te="$td/test$N.stderr" + printf "test %2d $TEST... " $N +-type=$($FILAN -f . 2>$te |tail -1 |awk '{print($2);}') ++type=$($FILAN -f . 2>$te |tail -n 1 |awk '{print($2);}') + if [ "$type" = "dir" ]; then + $PRINTF "$OK\n" + else +@@ -3111,7 +3111,7 @@ + $SOCAT unix-l:"$ts" /dev/null "$te1" & + spid=$! + waitfile "$ts" 1 +-type=$($FILAN -f "$ts" 2>$te2 |tail -1 |awk '{print($2);}') ++type=$($FILAN -f "$ts" 2>$te2 |tail -n 1 |awk '{print($2);}') + if [ "$type" = "socket" ]; then + $PRINTF "$OK\n" + else diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml new file mode 100644 index 000000000000..5e366aa416d5 --- /dev/null +++ b/net-misc/socat/metadata.xml @@ -0,0 +1,8 @@ + + + + netmon + + netmon@gentoo.org + + diff --git a/net-misc/socat/socat-1.3.0.1.ebuild b/net-misc/socat/socat-1.3.0.1.ebuild deleted file mode 100644 index 1ad2962ab7c0..000000000000 --- a/net-misc/socat/socat-1.3.0.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.3.0.1.ebuild,v 1.8 2005/03/21 23:10:18 chriswhite Exp $ - -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/" -SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="x86" - -IUSE="ssl readline ipv6" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) - virtual/libc" -RDEPEND="virtual/libc" - -S="${WORKDIR}/socat-1.3" - -src_compile() { - - # Construct the config options for the optional features. - local myconf - use ssl || myconf="--disable-openssl" - use readline || myconf="${myconf} --disable-readline" - use ipv6 || myconf="${myconf} --disable-ip6" - - mv Makefile.in Makefile.in.org - einfo "Sed" - sed -e "s:-Wall:${CFLAGS} -Wall:" Makefile.in.org > Makefile.in - einfo "Sed fertgi" - econf ${myconf} || die "econf failed" - - # Calculating dependencies - # (this seems to error out (due to gcc3?) but compiles work - # nonetheless) - make depend - - # Starting the compile - emake || die -} - -src_install() { - # The original install target is a bit broken when installing - # into temporary roots. - - # The docs. - dodoc BUGREPORTS CHANGES COPYING* DEVELOPMENT - dodoc EXAMPLES FAQ FILES PORTING README - dodoc SECURITY VERSION - dodoc xio.help - - # The example scripts - dodoc daemon.sh ftp.sh mail.sh - - # The html docs - dohtml socat.html - - # The manpage - doman socat.1 - - # And the executables - exeinto /usr/bin - doexe socat - doexe procan - doexe filan -} - diff --git a/net-misc/socat/socat-1.3.1.0.ebuild b/net-misc/socat/socat-1.3.1.0.ebuild deleted file mode 100644 index 90d220a4c5e1..000000000000 --- a/net-misc/socat/socat-1.3.1.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.3.1.0.ebuild,v 1.6 2005/03/21 23:10:18 chriswhite Exp $ - -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/" -SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86" - -IUSE="ssl readline ipv6" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) - virtual/libc" -RDEPEND="virtual/libc" - -S="${WORKDIR}/socat-1.3" - -src_compile() { - - # Construct the config options for the optional features. - local myconf - use ssl || myconf="--disable-openssl" - use readline || myconf="${myconf} --disable-readline" - use ipv6 || myconf="${myconf} --disable-ip6" - - mv Makefile.in Makefile.in.org - einfo "Sed" - sed -e "s:-Wall:${CFLAGS} -Wall:" Makefile.in.org > Makefile.in - einfo "Sed fertgi" - econf ${myconf} || die "econf failed" - - # Calculating dependencies - # (this seems to error out (due to gcc3?) but compiles work - # nonetheless) - make depend - - # Starting the compile - emake || die -} - -src_install() { - # The original install target is a bit broken when installing - # into temporary roots. - - # The docs. - dodoc BUGREPORTS CHANGES COPYING* DEVELOPMENT - dodoc EXAMPLES FAQ FILES PORTING README - dodoc SECURITY VERSION - dodoc xio.help - - # The example scripts - dodoc daemon.sh ftp.sh mail.sh - - # The html docs - dohtml socat.html - - # The manpage - doman socat.1 - - # And the executables - exeinto /usr/bin - doexe socat - doexe procan - doexe filan -} - diff --git a/net-misc/socat/socat-1.3.2.0.ebuild b/net-misc/socat/socat-1.3.2.0.ebuild deleted file mode 100644 index c610ed23e540..000000000000 --- a/net-misc/socat/socat-1.3.2.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.3.2.0.ebuild,v 1.7 2005/03/21 23:10:18 chriswhite Exp $ - -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/" -SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86 ~alpha" - -IUSE="ssl readline ipv6" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) - virtual/libc" -RDEPEND="virtual/libc" - -S="${WORKDIR}/socat-1.3" - -src_compile() { - - # Construct the config options for the optional features. - local myconf - use ssl || myconf="--disable-openssl" - use readline || myconf="${myconf} --disable-readline" - use ipv6 || myconf="${myconf} --disable-ip6" - - sed -i "s:-Wall:${CFLAGS} -Wall:" Makefile.in - econf ${myconf} || die "econf failed" - - # Calculating dependencies - # (this seems to error out (due to gcc3?) but compiles work - # nonetheless) - make depend - - # Starting the compile - emake || die -} - -src_install() { - # The original install target is a bit broken when installing - # into temporary roots. - - # The docs. - dodoc BUGREPORTS CHANGES COPYING* DEVELOPMENT - dodoc EXAMPLES FAQ FILES PORTING README - dodoc SECURITY VERSION - dodoc xio.help - - # The example scripts - dodoc daemon.sh ftp.sh mail.sh - - # The html docs - dohtml socat.html - - # The manpage - doman socat.1 - - # And the executables - exeinto /usr/bin - doexe socat - doexe procan - doexe filan -} diff --git a/net-misc/socat/socat-1.3.2.1.ebuild b/net-misc/socat/socat-1.3.2.1.ebuild deleted file mode 100644 index 33b385ea331d..000000000000 --- a/net-misc/socat/socat-1.3.2.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.3.2.1.ebuild,v 1.6 2005/03/21 23:10:18 chriswhite Exp $ - -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/" -SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86 ~alpha ~ppc ~hppa ~amd64 ~sparc ~mips " - -IUSE="ssl readline ipv6" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) - virtual/libc" -RDEPEND="virtual/libc" - -S="${WORKDIR}/socat-1.3" - -src_compile() { - - # Construct the config options for the optional features. - local myconf - use ssl || myconf="--disable-openssl" - use readline || myconf="${myconf} --disable-readline" - use ipv6 || myconf="${myconf} --disable-ip6" - - sed -i "s:-Wall:${CFLAGS} -Wall:" Makefile.in - econf ${myconf} || die "econf failed" - - # Calculating dependencies - # (this seems to error out (due to gcc3?) but compiles work - # nonetheless) - make depend - - # Starting the compile - emake || die -} - -src_install() { - # The original install target is a bit broken when installing - # into temporary roots. - - # The docs. - dodoc BUGREPORTS CHANGES COPYING* DEVELOPMENT - dodoc EXAMPLES FAQ FILES PORTING README - dodoc SECURITY VERSION - dodoc xio.help - - # The example scripts - dodoc daemon.sh ftp.sh mail.sh - - # The html docs - dohtml socat.html - - # The manpage - doman socat.1 - - # And the executables - exeinto /usr/bin - doexe socat - doexe procan - doexe filan -} diff --git a/net-misc/socat/socat-1.3.2.2.ebuild b/net-misc/socat/socat-1.3.2.2.ebuild deleted file mode 100644 index 41b71e1995a7..000000000000 --- a/net-misc/socat/socat-1.3.2.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.3.2.2.ebuild,v 1.5 2005/03/21 23:10:19 chriswhite Exp $ - -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/" -SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips alpha ~hppa ~amd64" -IUSE="ssl readline ipv6" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) - virtual/libc" -RDEPEND="virtual/libc" - -S=${WORKDIR}/socat-${PV:0:3} - -src_compile() { - econf \ - `use_enable ssl openssl` \ - `use_enable readline` \ - `use_enable ipv6 ip6` \ - || die "econf failed" - emake || die -} - -src_install() { - dodir /usr/bin /usr/share/man/man1 - make install DESTDIR=${D} || die - - dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \ - FAQ FILES PORTING README SECURITY VERSION xio.help - docinto examples - dodoc *.sh - dohtml socat.html -} diff --git a/net-misc/socat/socat-1.4.3.0.ebuild b/net-misc/socat/socat-1.4.3.0.ebuild new file mode 100644 index 000000000000..f0063276b55a --- /dev/null +++ b/net-misc/socat/socat-1.4.3.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.3.0.ebuild,v 1.1 2005/09/25 10:32:25 dragonheart Exp $ + +inherit eutils + +DESCRIPTION="Multipurpose relay (SOcket CAT)" +HOMEPAGE="http://www.dest-unreach.org/socat/" +SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +IUSE="ssl readline ipv6" + +DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 ) + readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) + virtual/libc" + +S=${WORKDIR}/socat-${PV:0:3} + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/${P}-tmp-tail.patch + cp ${S}/test.sh ${S}/test.sh.original + epatch ${FILESDIR}/${P}-noptytest.patch +} + +src_compile() { + econf \ + $(use_enable ssl openssl) \ + $(use_enable readline) \ + $(use_enable ipv6 ip6) \ + || die "econf failed" + emake || die +} + +src_test() { + TMP=${T} make test || die 'self test failed' +} + +src_install() { + dodir /usr/bin /usr/share/man/man1 + make install DESTDIR="${D}" || die + + dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \ + FAQ FILES PORTING README SECURITY VERSION xio.help + docinto examples + dodoc *.sh + dohtml socat.html +} -- cgit v1.2.3-65-gdbad