From bcabba1948e29b98a973b65a8e70664ed4b49fc8 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 23 May 2007 20:28:27 +0000 Subject: [PATCH] Clifford Wolf: Updated net-snmp (5.4) [2007051618073122786] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8437 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/net-snmp/head-tail.patch | 112 +++++--------------------- package/base/net-snmp/net-snmp.desc | 4 +- 2 files changed, 20 insertions(+), 96 deletions(-) diff --git a/package/base/net-snmp/head-tail.patch b/package/base/net-snmp/head-tail.patch index dffb2ee99..5ec31d3bb 100644 --- a/package/base/net-snmp/head-tail.patch +++ b/package/base/net-snmp/head-tail.patch @@ -1,25 +1,5 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/net-snmp/head-tail.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -dur net-snmp-5.1/aclocal.m4 net-snmp-5.1-p/aclocal.m4 ---- net-snmp-5.1/aclocal.m4 2003-02-13 17:01:23.000000000 +0100 -+++ net-snmp-5.1-p/aclocal.m4 2004-11-04 19:36:53.223558384 +0100 +--- ./acinclude.m4.orig 2007-05-16 17:45:55.000000000 +0200 ++++ ./acinclude.m4 2007-05-16 17:46:02.000000000 +0200 @@ -39,7 +39,7 @@ dnl AC_DEFUN([AC_PROMPT_USER], @@ -29,28 +9,9 @@ diff -dur net-snmp-5.1/aclocal.m4 net-snmp-5.1-p/aclocal.m4 AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1, [echo "" >&AC_FD_MSG AC_PROMPT_USER_NO_DEFINE($1,[$2],$3) -@@ -3545,7 +3545,7 @@ - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -+ lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure ---- net-snmp-5.1/configure 2003-11-14 03:56:34.000000000 +0100 -+++ net-snmp-5.1-p/configure 2004-11-04 19:36:41.327366880 +0100 -@@ -4106,7 +4106,7 @@ - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -+ lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -@@ -25980,7 +25980,7 @@ +--- ./configure.orig 2007-05-16 17:46:11.000000000 +0200 ++++ ./configure 2007-05-16 17:46:27.000000000 +0200 +@@ -47130,7 +47130,7 @@ ME=`$WHOAMI` if test -f /etc/resolv.conf; then @@ -59,7 +20,7 @@ diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure else LOC="@no.where" fi -@@ -26006,7 +26006,7 @@ +@@ -47156,7 +47156,7 @@ Providing the --with-default-snmp-version=\"x\" parameter to ./configure will avoid this prompt. @@ -67,8 +28,8 @@ diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure +Default version of SNMP to use" | tail -n1` echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 - if test "${ac_cv_user_prompt_DEFAULT_SNMP_VERSION+set}" = set; then -@@ -26087,7 +26087,7 @@ + if test "${ac_cv_user_prompt_NETSNMP_DEFAULT_SNMP_VERSION+set}" = set; then +@@ -47237,7 +47237,7 @@ Providing the --with-sys-contact=\"contact\" parameter to ./configure will avoid this prompt. @@ -76,8 +37,8 @@ diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure +System Contact Information" | tail -n1` echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 - if test "${ac_cv_user_prompt_SYS_CONTACT+set}" = set; then -@@ -26151,7 +26151,7 @@ + if test "${ac_cv_user_prompt_NETSNMP_SYS_CONTACT+set}" = set; then +@@ -47301,7 +47301,7 @@ Providing the --with-sys-location=\"location\" parameter to ./configure will avoid this prompt. @@ -85,8 +46,8 @@ diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure +System Location" | tail -n1` echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 - if test "${ac_cv_user_prompt_SYS_LOC+set}" = set; then -@@ -26221,7 +26221,7 @@ + if test "${ac_cv_user_prompt_NETSNMP_SYS_LOC+set}" = set; then +@@ -47371,7 +47371,7 @@ Providing the --with-logfile=\"path\" parameter to ./configure will avoid this prompt. @@ -94,8 +55,8 @@ diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure +Location to write logfile" | tail -n1` echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 - if test "${ac_cv_user_prompt_LOGFILE+set}" = set; then -@@ -26298,7 +26298,7 @@ + if test "${ac_cv_user_prompt_NETSNMP_LOGFILE+set}" = set; then +@@ -47448,7 +47448,7 @@ Providing the --with-persistent-directory=\"path\" parameter to ./configure will avoid this prompt. @@ -103,11 +64,10 @@ diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure +Location to write persistent information" | tail -n1` echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 - if test "${ac_cv_user_prompt_PERSISTENT_DIRECTORY+set}" = set; then -diff -dur net-snmp-5.1/configure.in net-snmp-5.1-p/configure.in ---- net-snmp-5.1/configure.in 2003-11-06 03:11:41.000000000 +0100 -+++ net-snmp-5.1-p/configure.in 2004-11-04 19:36:11.392917608 +0100 -@@ -2663,7 +2663,7 @@ + if test "${ac_cv_user_prompt_NETSNMP_PERSISTENT_DIRECTORY+set}" = set; then +--- ./configure.in.orig 2007-05-16 17:46:33.000000000 +0200 ++++ ./configure.in 2007-05-16 17:46:39.000000000 +0200 +@@ -4487,7 +4487,7 @@ ME=`$WHOAMI` if test -f /etc/resolv.conf; then @@ -116,39 +76,3 @@ diff -dur net-snmp-5.1/configure.in net-snmp-5.1-p/configure.in else LOC="@no.where" fi -diff -dur net-snmp-5.1/dist/net-snmp-solaris-build/DEVENV net-snmp-5.1-p/dist/net-snmp-solaris-build/DEVENV ---- net-snmp-5.1/dist/net-snmp-solaris-build/DEVENV 2003-03-01 05:02:18.000000000 +0100 -+++ net-snmp-5.1-p/dist/net-snmp-solaris-build/DEVENV 2004-11-04 19:36:03.998041800 +0100 -@@ -48,7 +48,7 @@ - - umask 022 - --user=`ps -f | tail -1 | awk '{print $1}' | sed -e 's, ,,g'` -+user=`ps -f | tail -n1 | awk '{print $1}' | sed -e 's, ,,g'` - [ "$user" = "root" ] && p="#" || p="$" - - PS1="`basename $TOP`@"'$HOSTNAME:${PWD##$TOP}$p '; export PS1 -diff -dur net-snmp-5.1/dist/net-snmp-solaris-build/elfdepend.sh net-snmp-5.1-p/dist/net-snmp-solaris-build/elfdepend.sh ---- net-snmp-5.1/dist/net-snmp-solaris-build/elfdepend.sh 2003-03-01 05:02:18.000000000 +0100 -+++ net-snmp-5.1-p/dist/net-snmp-solaris-build/elfdepend.sh 2004-11-04 19:35:22.221392816 +0100 -@@ -56,7 +56,7 @@ - done | sort -u | while read libpath other - do - [ "$libpath" = "#" ] && echo "$libpath $other" && continue # error message -- set -- `grep "^$libpath[ =]" /var/sadm/install/contents | head -1` -+ set -- `grep "^$libpath[ =]" /var/sadm/install/contents | head -n1` - path=$1; type=$2 - case $type in - f) # file -diff -dur net-snmp-5.1/local/snmp-ucd.sh net-snmp-5.1-p/local/snmp-ucd.sh ---- net-snmp-5.1/local/snmp-ucd.sh 2002-04-20 09:30:13.000000000 +0200 -+++ net-snmp-5.1-p/local/snmp-ucd.sh 2004-11-04 19:35:15.864359232 +0100 -@@ -106,7 +106,7 @@ - # Try looking for a /var/run file. - # - [ -f /var/run/$1.pid ] && { -- pid=`head -1 /var/run/$1.pid` -+ pid=`head -n1 /var/run/$1.pid` - - [ -n "$pid" ] && { - echo $pid diff --git a/package/base/net-snmp/net-snmp.desc b/package/base/net-snmp/net-snmp.desc index 2a2712e13..4a8abe9dc 100644 --- a/package/base/net-snmp/net-snmp.desc +++ b/package/base/net-snmp/net-snmp.desc @@ -37,8 +37,8 @@ [L] OpenSource [S] Stable -[V] 5.2.2 +[V] 5.4 [P] X -?---5---9 128.100 -[D] 3700767952 net-snmp-5.2.2.tar.gz http://dl.sourceforge.net/net-snmp/ +[D] 759266542 net-snmp-5.4.tar.gz http://dl.sourceforge.net/net-snmp/