5.2.2 and 5.3_rc2 version bumps for bug 116392. fix-insecure-fixproc was fixed upstream, so this patch can be dropped.

(Portage version: 2.1_pre1)

6 files changed, 146 insertions, 3 deletions

diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2
new file mode 100644
index 000000000000..0cbebdac5c7a
--- /dev/null
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2
@@ -0,0 +1 @@
+MD5 2d9cdf956d6be5c5fcf2f898b403389b net-snmp-5.2.2.tar.gz 3919826
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624
deleted file mode 100644
index 0d624c73a669..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c80189cc847c3db4e13cc19f85d40ef net-snmp-5.3.20050624.tar.gz 4003978
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624-r1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624-r1
deleted file mode 100644
index 0d624c73a669..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3.20050624-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c80189cc847c3db4e13cc19f85d40ef net-snmp-5.3.20050624.tar.gz 4003978
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3_pre4 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3_pre4
deleted file mode 100644
index aeeaf987b230..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.3_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3c53f4f5cd91ae4a1ad2199b10f903d net-snmp-5.3.pre4.tar.gz 4270081
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.3_rc2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.3_rc2
new file mode 100644
index 000000000000..2670c7fb1b23
--- /dev/null
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.3_rc2
@@ -0,0 +1 @@
+MD5 852071981fadb2ecff552497b54c679a net-snmp-5.3.rc2.tar.gz 4176303
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch b/net-analyzer/net-snmp/files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch
new file mode 100644
index 000000000000..362fcbcc87be
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch
@@ -0,0 +1,144 @@
+diff --exclude='*~' -Naur net-snmp-5.2.2.orig/configure net-snmp-5.2.2/configure
+--- net-snmp-5.2.2.orig/configure	2005-12-26 19:05:44.000000000 -0200
++++ net-snmp-5.2.2/configure	2005-12-26 19:10:47.000000000 -0200
+@@ -1254,7 +1254,9 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+   --with-pic              try to use only PIC/non-PIC objects default=use both
+   --with-libwrap=LIBPATH Compile in libwrap (tcp_wrappers) support.
++  --without-elf        use elf libraries
+   --with-zlib=DIR        use libz in DIR
++  --with-bzip2=DIR          use libbzip2 in DIR
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -5935,7 +5937,7 @@
+ case $host in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5938 "configure"' > conftest.$ac_ext
++  echo '#line 5940 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -6507,7 +6509,7 @@
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+ compiler_c_o=no
+-if { (eval echo configure:6510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++if { (eval echo configure:6512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+   # The compiler can only warn and ignore the option if not recognized
+   # So say no if there are warnings
+   if test -s out/conftest.err; then
+@@ -8471,7 +8473,7 @@
+     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 8474 "configure"
++#line 8476 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13996,6 +13998,12 @@
+ 
+ # nlist is needed for uptime on some sytems in the generic library
+ # add hosts which don't use nlist to the blank first line
++# Check whether --with-elf or --without-elf was given.
++if test "${with_elf+set}" = set; then
++  withval="$with_elf"
++
++  if test "x$with_elf" != "xno"; then
++
+ case $target_os in
+ 	linux*) ;;
+ 	irix*) # Check for nlist in mld (irix)
+@@ -14226,6 +14234,10 @@
+ 		;;
+ esac
+ 
++  fi
++
++fi;
++
+ # On some platforms (Irix) libnsl and libsocket should not be used.
+ echo "$as_me:$LINENO: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+@@ -16020,7 +16032,16 @@
+ 
+ 
+   # two variants of bzip2 need checking.
+-  echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5
++# Check whether --with-bzip2 or --without-bzip2 was given.
++if test "${with_bzip2+set}" = set; then
++  withval="$with_bzip2"
++
++    if test -d "$withval"; then
++      CPPFLAGS="${CPPFLAGS} -I$withval/include"
++      LDFLAGS="${LDFLAGS} -L$withval/lib"
++    fi
++    if test "x$with_bzip2" != "xno"; then
++      echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5
+ echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
+ if test "${ac_cv_lib_bz2_bzread+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16157,6 +16178,9 @@
+ 
+ fi
+ 
++    fi
++
++fi;
+ 
+   # two variants of db1 need checking.
+   echo "$as_me:$LINENO: checking for dbopen in -ldb1" >&5
+diff --exclude='*~' -Naur net-snmp-5.2.2.orig/configure.in net-snmp-5.2.2/configure.in
+--- net-snmp-5.2.2.orig/configure.in	2005-12-26 19:05:44.000000000 -0200
++++ net-snmp-5.2.2/configure.in	2005-12-26 19:23:50.000000000 -0200
+@@ -1,3 +1,4 @@
++Wrpm
+ # Portions of this file are subject to the following copyright.  See
+ # the Net-SNMP's COPYING file for more details and other copyrights
+ # that may apply:
+@@ -2152,11 +2153,21 @@
+ case $target_os in
+ 	linux*) ;;
+ 	irix*) # Check for nlist in mld (irix)
+-		AC_CHECK_LIB(elf, nlist)
++		AC_ARG_WITH(elf,
++		[  --without-elf        use elf libraries],[
++		if test "x$with_elf" != "xno"; then
++		   AC_CHECK_LIB(elf, nlist)
++		fi
++		])
+ 		AC_CHECK_LIB(mld, nlist)
+ 		;;
+ 	*) # default
+-		AC_CHECK_LIB(elf, nlist)
++		AC_ARG_WITH(elf,
++		[  --without-elf        use elf libraries],[
++		if test "x$with_elf" != "xno"; then
++		   AC_CHECK_LIB(elf, nlist)
++		fi
++		])
+ 		;;
+ esac
+ 
+@@ -2280,8 +2291,17 @@
+       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+ 
+   # two variants of bzip2 need checking.
+-  AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
+-     AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
++  AC_ARG_WITH(bzip2,
++  [  --with-bzip2[=DIR]          use libbzip2 in DIR],[
++    if test -d "$withval"; then
++      CPPFLAGS="${CPPFLAGS} -I$withval/include"
++      LDFLAGS="${LDFLAGS} -L$withval/lib"
++    fi
++    if test "x$with_bzip2" != "xno"; then
++      AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
++      AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
++    fi
++  ])
+ 
+   # two variants of db1 need checking.
+   AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],