diff options
author | 2007-04-05 11:47:31 +0000 | |
---|---|---|
committer | 2007-04-05 11:47:31 +0000 | |
commit | 16e9d1a749aa9e6380d6329d894d737594bfd55d (patch) | |
tree | 4f1f964430401e844a3d872654fb8a62fcd02b5e /net-misc/socat | |
parent | Cleanup. (diff) | |
download | gentoo-2-16e9d1a749aa9e6380d6329d894d737594bfd55d.tar.gz gentoo-2-16e9d1a749aa9e6380d6329d894d737594bfd55d.tar.bz2 gentoo-2-16e9d1a749aa9e6380d6329d894d737594bfd55d.zip |
version bump
(Portage version: 2.1.2-r11)
Diffstat (limited to 'net-misc/socat')
-rw-r--r-- | net-misc/socat/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/socat/files/digest-socat-1.6.0.0 | 3 | ||||
-rw-r--r-- | net-misc/socat/files/socat-1.6.0.0-noptytest.patch | 99 | ||||
-rw-r--r-- | net-misc/socat/socat-1.6.0.0.ebuild | 50 |
4 files changed, 159 insertions, 1 deletions
diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog index a8044710d060..a6ef037b6079 100644 --- a/net-misc/socat/ChangeLog +++ b/net-misc/socat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/socat # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.29 2007/02/09 08:13:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.30 2007/04/05 11:47:31 dragonheart Exp $ + +*socat-1.6.0.0 (05 Apr 2007) + + 05 Apr 2007; Daniel Black <dragonheart@gentoo.org> + +files/socat-1.6.0.0-noptytest.patch, +socat-1.6.0.0.ebuild: + version bump 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Regenerate digest in Manifest2 format. diff --git a/net-misc/socat/files/digest-socat-1.6.0.0 b/net-misc/socat/files/digest-socat-1.6.0.0 new file mode 100644 index 000000000000..1dea05a2ecc4 --- /dev/null +++ b/net-misc/socat/files/digest-socat-1.6.0.0 @@ -0,0 +1,3 @@ +MD5 810135eb1c3e892b1577735b7deca8ef socat-1.6.0.0.tar.bz2 343285 +RMD160 cf92590f2799cc876ddbc7c28e152f5d1feb2bb0 socat-1.6.0.0.tar.bz2 343285 +SHA256 157090b94ab616eac5598bc246c7a3f8c5867ecbdf31c7c2c1c364c7bf8a01c8 socat-1.6.0.0.tar.bz2 343285 diff --git a/net-misc/socat/files/socat-1.6.0.0-noptytest.patch b/net-misc/socat/files/socat-1.6.0.0-noptytest.patch new file mode 100644 index 000000000000..c38c3f9a5961 --- /dev/null +++ b/net-misc/socat/files/socat-1.6.0.0-noptytest.patch @@ -0,0 +1,99 @@ +--- socat-1.6.0.0/test.sh.original 2007-04-05 18:53:07.000000000 +1000 ++++ socat-1.6.0.0/test.sh 2007-04-05 19:06:28.000000000 +1000 +@@ -979,7 +979,7 @@ + #------------------------------------------------------------------------------ + + #if false; then +-if true; then ++if false; then + for addr in exec system; do + ADDR=$(echo "$addr" |tr a-z A-Z) + +@@ -5176,87 +5176,6 @@ + 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 $F_n $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 -T 10 -lpsocat2 file:/dev/null unix-connect:"$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" +- numOK=$((numOK+1)) +-else +- $PRINTF "${YELLOW}FAILED${NORMAL}\n" +- cat "$te1" +- #cat "$te2" # not of interest +- cat "$te3" +- cat "$te4" +- cat "$tdiff" +- numCANT=$((numCANT+1)) +-fi +-} +- +-NAME=PTMXWAITSLAVE +-PTYTYPE=ptmx +-case "$TESTS" in +-*%functions%*|*%pty%*|*%$NAME%*) +-TEST="$NAME: test if master pty ($PTYTYPE) waits for slave connection" +-if ! feat=$(testaddrs pty); then +- $PRINTF "test $F_n $TEST... ${YELLOW}$(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +- numCANT=$((numCANT+1)) +-elif ! feat=$(testoptions "$PTYTYPE" pty-wait-slave); then +- $PRINTF "test $F_n $TEST... ${YELLOW}option $(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +- numCANT=$((numCANT+1)) +-else +- testptywaitslave "$N" "$TEST" "$PTYTYPE" "$opts" +-fi +-esac +-N=$((N+1)) +- +-NAME=OPENPTYWAITSLAVE +-PTYTYPE=openpty +-case "$TESTS" in +-*%functions%*|*%pty%*|*%$NAME%*) +-TEST="$NAME: test if master pty ($PTYTYPE) waits for slave connection" +-if ! feat=$(testaddrs pty); then +- $PRINTF "test $F_n $TEST... ${YELLOW}$(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +- numCANT=$((numCANT+1)) +-elif ! feat=$(testoptions "$PTYTYPE" pty-wait-slave); then +- $PRINTF "test $F_n $TEST... ${YELLOW}option $(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N +- numCANT=$((numCANT+1)) +-else +- testptywaitslave "$N" "$TEST" "$PTYTYPE" "$opts" +-fi +-esac +-N=$((N+1)) +- +- + NAME=CONNECTTIMEOUT + case "$TESTS" in + *%functions%*|*%$NAME%*) diff --git a/net-misc/socat/socat-1.6.0.0.ebuild b/net-misc/socat/socat-1.6.0.0.ebuild new file mode 100644 index 000000000000..994cc9edf466 --- /dev/null +++ b/net-misc/socat/socat-1.6.0.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.6.0.0.ebuild,v 1.1 2007/04/05 11:47:31 dragonheart Exp $ + +inherit eutils + +DESCRIPTION="Multipurpose relay (SOcket CAT)" +HOMEPAGE="http://www.dest-unreach.org/socat/" +SRC_URI="http://www.dest-unreach.org/socat/download/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +IUSE="ssl readline ipv6 tcpd" + +DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 ) + readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) + tcpd? ( sys-apps/tcp-wrappers ) + virtual/libc" + +src_unpack() { + unpack ${A} + #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) \ + $(use_enable tcpd libwrap) \ + || die "econf failed" + emake || die +} + +src_test() { + TMPDIR="${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 + docinto examples + dodoc *.sh + dohtml socat.html +} |