version bump. netmon takes maintance. remove old security vulnerable versions

(Portage version: 2.0.52-r1)

8 files changed, 125 insertions, 5 deletions

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 </dev/null 2>"$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