From: Daniel Black Date: Thu, 5 Apr 2007 11:47:31 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ae042388007e197a4f76311903a395ad15a6d84;p=gentoo.git version bump Package-Manager: portage-2.1.2-r11 --- 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 + +files/socat-1.6.0.0-noptytest.patch, +socat-1.6.0.0.ebuild: + version bump 09 Feb 2007; Diego Pettenò ChangeLog: Regenerate digest in Manifest2 format. diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 003f23d509b6..aaf7589530ec 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -9,10 +9,15 @@ AUX socat-1.4.3.0-tmp-tail.patch 986 RMD160 048290b54742d76b722ee863223b20dcfd13 MD5 80bc464d7deaff0335540eb32a60c827 files/socat-1.4.3.0-tmp-tail.patch 986 RMD160 048290b54742d76b722ee863223b20dcfd132324 files/socat-1.4.3.0-tmp-tail.patch 986 SHA256 91347392b4b87e309a60ec3318be1326ba705bb2d0cd7e11fb8499d0007d5e0a files/socat-1.4.3.0-tmp-tail.patch 986 +AUX socat-1.6.0.0-noptytest.patch 3103 RMD160 2dce43dcb4c886350a086ba55ed6c64e6ad5cead SHA1 17c02371e6d469f7af1809aec4b3efb51ea89504 SHA256 a84e22ec4f08917ed278a569319d2b2c45b642e8336baa74c0053922f3ec65c2 +MD5 3518727dda2984f4b37f77957b7f486c files/socat-1.6.0.0-noptytest.patch 3103 +RMD160 2dce43dcb4c886350a086ba55ed6c64e6ad5cead files/socat-1.6.0.0-noptytest.patch 3103 +SHA256 a84e22ec4f08917ed278a569319d2b2c45b642e8336baa74c0053922f3ec65c2 files/socat-1.6.0.0-noptytest.patch 3103 DIST socat-1.4.0.3.tar.bz2 255824 RMD160 58f2c740c436c49156810a88d51d3c8e8fbf93b3 SHA1 9798a284fcdc314ad3293bbe358ea7e60fbb9ca7 SHA256 ac93fd482c561864bbe57facb8f88015bae6b71b37d03a0cd8a5616486442b12 DIST socat-1.4.2.0.tar.bz2 266022 RMD160 08d5f57affadbdbbe823fb0430a209f03f40ace9 SHA1 a726993fa3ecf65b72d008dc926b47168f7ff0c0 SHA256 deace56a2ffff60ee61df7c205c02c0da95f6756be2fa5cdcb731df912839ed9 DIST socat-1.4.3.0.tar.bz2 272236 RMD160 8f5f1031beb7df3256b6ee24418b0646d939d846 SHA1 cf53c2bb5da9d4d56667ea56adfc83633a778d92 SHA256 3dba71f7ac41dc3cacdf34a6542f1eba0c2fe3d8408cbe1c1438f5a504f3bbab DIST socat-1.4.3.1.tar.bz2 272746 RMD160 a158962b16343213fc37aea42fad207e7ffc0429 SHA1 764e9fe53d6bc2c7cdba033da454c46c1ad9a7b6 SHA256 97777014938e86d25a6ba8df95c0d2731e80fd2cb6dd2323662c51c4f24afa5f +DIST socat-1.6.0.0.tar.bz2 343285 RMD160 cf92590f2799cc876ddbc7c28e152f5d1feb2bb0 SHA1 fc35e11e4daf6862daaca498ee117d89f18aaf33 SHA256 157090b94ab616eac5598bc246c7a3f8c5867ecbdf31c7c2c1c364c7bf8a01c8 EBUILD socat-1.4.0.3.ebuild 1021 RMD160 ba66ce48dda68a743dde04dc81e2eae88c79ded2 SHA1 496098c96047ef19aacccb9aa296fb9a755ee0ff SHA256 93734a8f802945bcb8cbe2d81dcc5eadd9767244cce18dd5c2e1c169c4c9cd89 MD5 f3009c0be501848ecefacf09a76b117b socat-1.4.0.3.ebuild 1021 RMD160 ba66ce48dda68a743dde04dc81e2eae88c79ded2 socat-1.4.0.3.ebuild 1021 @@ -37,10 +42,14 @@ EBUILD socat-1.4.3.1.ebuild 1362 RMD160 579e7372ac152d4c9c98d80837c969498d31fea1 MD5 d3d61e58f8db8d3a5b4d6daec5621075 socat-1.4.3.1.ebuild 1362 RMD160 579e7372ac152d4c9c98d80837c969498d31fea1 socat-1.4.3.1.ebuild 1362 SHA256 88b0315b078fb67a6800a8da9c97d2ee8acef625c1ab280b260c52b5c378fa26 socat-1.4.3.1.ebuild 1362 -MISC ChangeLog 3879 RMD160 6dba3f552dd8995e1e4a2ffea5091f9718e11ae2 SHA1 fc689957ac54a084f57ad54287a8510043ca55be SHA256 db190d5e2a558d1ebea706243a3092b313976811fe513781ec971bc105631e5d -MD5 99fb59374887e4fbcafe5e31637f12a8 ChangeLog 3879 -RMD160 6dba3f552dd8995e1e4a2ffea5091f9718e11ae2 ChangeLog 3879 -SHA256 db190d5e2a558d1ebea706243a3092b313976811fe513781ec971bc105631e5d ChangeLog 3879 +EBUILD socat-1.6.0.0.ebuild 1267 RMD160 2f09ab39f52424d775a01422e39997c95e11db41 SHA1 63acb344b7ecae8ff6a9a73ffa4ad86059ea8cb0 SHA256 792fff4bbc90900892cfc8bf4e02fa493ce387e669a268345557aedd45088d6a +MD5 fe8d20b2a61f17aa634337acaa43bb02 socat-1.6.0.0.ebuild 1267 +RMD160 2f09ab39f52424d775a01422e39997c95e11db41 socat-1.6.0.0.ebuild 1267 +SHA256 792fff4bbc90900892cfc8bf4e02fa493ce387e669a268345557aedd45088d6a socat-1.6.0.0.ebuild 1267 +MISC ChangeLog 4044 RMD160 a068a1e887cfa49f17a6e21424f65a44d3ec8d4d SHA1 d5b581d68ed2926bae183ef3c8d8000c5a1678c9 SHA256 ffca1e9185446a78a85249e02460df793e4903a62ccb4ba436d13dc8e250f6b9 +MD5 60216d79ede5124ed03f6fc03acc9b3a ChangeLog 4044 +RMD160 a068a1e887cfa49f17a6e21424f65a44d3ec8d4d ChangeLog 4044 +SHA256 ffca1e9185446a78a85249e02460df793e4903a62ccb4ba436d13dc8e250f6b9 ChangeLog 4044 MISC metadata.xml 224 RMD160 b56e021883688e595b915158a146fb864ef06901 SHA1 68bcf1730fb34e19e6834e2d5390dbd55e4a35de SHA256 214e401ffbfe4cfffdcd14ceda3a264a79df771601a668da0e59c51cb91740dc MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224 RMD160 b56e021883688e595b915158a146fb864ef06901 metadata.xml 224 @@ -63,10 +72,13 @@ SHA256 8e4e76d70cfa98107b4888f6d47e3dbe8c2140bc3ac11dfb7b2b1e09b194d606 files/di MD5 076f67413d473bc8126f663dc9d4135b files/digest-socat-1.4.3.1 244 RMD160 d435c8a1354ba76c17a18bd9fac8500b5a112df2 files/digest-socat-1.4.3.1 244 SHA256 6ff88803fe555bf306695269029c3704958f913dddd3316e948c869103331ce9 files/digest-socat-1.4.3.1 244 +MD5 391171d3cbae6acdd1855105fd619ec1 files/digest-socat-1.6.0.0 244 +RMD160 7e84a9c98ee38954b962074024b20ee6b04072e2 files/digest-socat-1.6.0.0 244 +SHA256 8729d8d008efcc2c24277785e60a0d2ecb7bfe61d2d24c5b80b5b740e40e3004 files/digest-socat-1.6.0.0 244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFzC02AiZjviIA2XgRAonrAKCzJyGjr5FJCAqQcEIwdJ06Gzvx/ACg61ze -ENyDgsdW7YeIStFrrS2cRHM= -=/pSS +iD8DBQFGFOHymdTrptrqvGERAptYAJ0Uk26eM1CD0dilK8Y9LgP/Ng7VVACfRkR3 +oYE3cYHo8ryvicfcbek9KZA= +=YmEt -----END PGP SIGNATURE----- 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 +}