+++ /dev/null
---- net-snmp-5.0.7/local/Makefile.in.DESTDIR Wed Feb 12 16:28:42 2003
-+++ net-snmp-5.0.7/local/Makefile.in Wed Feb 12 16:29:27 2003
-@@ -90,9 +90,9 @@
-
- localinstall:
- @if test "x$(PERLPROG)" != "x" ; then \
-- for i in $(PERLSCRIPTS) ; do $(INSTALL) $$i.made $(bindir)/$$i ; echo "install: installed $$i in $(bindir)" ; done ; \
-- $(SHELL) $(srcdir)/../mkinstalldirs $(snmplibdir) ; \
-- for i in $(DATASRCS) ; do $(INSTALL) $(srcdir)/$$i $(snmplibdir)/$$i ; echo "install: installed $$i in $(snmplibdir)" ; done ; \
-- for i in $(CONFDIRS); do $(SHELL) $(srcdir)/../mkinstalldirs $(CONFINSTALLDIR)/$$i ; done ; \
-- for i in $(CONFFILES); do $(INSTALL) $(srcdir)/$(CONFDATASRC)/$$i $(CONFINSTALLDIR)/$$i; echo "install: installed $$i in $(CONFINSTALLDIR)"; done \
-+ for i in $(PERLSCRIPTS) ; do $(INSTALL) $$i.made $(DESTDIR)$(bindir)/$$i ; echo "install: installed $$i in $(DESTDIR)$(bindir)" ; done ; \
-+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(snmplibdir) ; \
-+ for i in $(DATASRCS) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(snmplibdir)/$$i ; echo "install: installed $$i in $(DESTDIR)$(snmplibdir)" ; done ; \
-+ for i in $(CONFDIRS); do $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(CONFINSTALLDIR)/$$i ; done ; \
-+ for i in $(CONFFILES); do $(INSTALL) $(srcdir)/$(CONFDATASRC)/$$i $(DESTDIR)$(CONFINSTALLDIR)/$$i; echo "install: installed $$i in $(DESTDIR)$(CONFINSTALLDIR)"; done \
- fi
---- net-snmp-5.0.8/man/Makefile.in.DESTDIR Wed Feb 12 16:29:44 2003
-+++ net-snmp-5.0.8/man/Makefile.in Wed Feb 12 16:30:53 2003
-@@ -143,19 +143,19 @@
- cat default_store.3.h $(srcdir)/default_store.3.bot >> default_store.3
-
- maninstall: maninstalldirs $(MAN1) $(MAN1G) $(MAN3) $(MAN5G) $(MAN8)
-- @for i in $(MAN1) ; do $(INSTALL) $(srcdir)/$$i $(man1dir) ; echo "install: installed $$i in $(man1dir)" ; done
-- @$(INSTALL_DATA) $(MAN1G) $(man1dir)
-- @for i in $(MAN1G) ; do echo "install: installed $$i in $(man1dir)" ; done
-- @for i in $(MAN3) ; do $(INSTALL) $(srcdir)/$$i $(man3dir) ; echo "install: installed $$i in $(man3dir)" ; done
-- @$(INSTALL_DATA) $(MAN3G) $(man3dir)
-- @for i in $(MAN3G) ; do echo "install: installed $$i in $(man3dir)" ; done
-- @$(INSTALL_DATA) $(MAN5G) $(man5dir)
-- @for i in $(MAN5G) ; do echo "install: installed $$i in $(man5dir)" ; done
-- @$(INSTALL_DATA) $(MAN8G) $(man8dir)
-- @for i in $(MAN8G) ; do echo "install: installed $$i in $(man8dir)" ; done
-+ @for i in $(MAN1) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(man1dir) ; echo "install: installed $$i in $(DESTDIR)$(man1dir)" ; done
-+ @$(INSTALL_DATA) $(MAN1G) $(DESTDIR)$(man1dir)
-+ @for i in $(MAN1G) ; do echo "install: installed $$i in $(DESTDIR)$(man1dir)" ; done
-+ @for i in $(MAN3) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(man3dir) ; echo "install: installed $$i in $(DESTDIR)$(man3dir)" ; done
-+ @$(INSTALL_DATA) $(MAN3G) $(DESTDIR)$(man3dir)
-+ @for i in $(MAN3G) ; do echo "install: installed $$i in $(DESTDIR)$(man3dir)" ; done
-+ @$(INSTALL_DATA) $(MAN5G) $(DESTDIR)$(man5dir)
-+ @for i in $(MAN5G) ; do echo "install: installed $$i in $(DESTDIR)$(man5dir)" ; done
-+ @$(INSTALL_DATA) $(MAN8G) $(DESTDIR)$(man8dir)
-+ @for i in $(MAN8G) ; do echo "install: installed $$i in $(DESTDIR)$(man8dir)" ; done
-
- maninstalldirs:
-- @$(SHELL) $(srcdir)/../mkinstalldirs $(man1dir) $(man3dir) $(man5dir) $(man8dir)
-+ @$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man3dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
-
-
- #
---- net-snmp-5.0.7/mibs/Makefile.in.DESTDIR Wed Feb 12 16:26:08 2003
-+++ net-snmp-5.0.7/mibs/Makefile.in Wed Feb 12 16:25:53 2003
-@@ -51,9 +51,9 @@
-
- mibsinstall: installdirs
- @for i in $(MIBS) ; do \
-- $(INSTALL_DATA) $(srcdir)/$$i $(mibdir) ; \
-- echo "install: installed $$i in $(mibdir)" ; \
-+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(mibdir) ; \
-+ echo "install: installed $$i in $(DESTDIR)$(mibdir)" ; \
- done
-
- installdirs:
-- @$(SHELL) $(srcdir)/../mkinstalldirs $(mibdir)
-+ @$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(mibdir)
---- net-snmp-5.0.7/Makefile.rules.DESTDIR Wed Feb 12 16:21:36 2003
-+++ net-snmp-5.0.7/Makefile.rules Wed Feb 12 16:25:17 2003
-@@ -44,48 +44,48 @@
-
- installlocalheaders:
- @if test "$(INSTALLHEADERS)" != "" ; then \
-- echo creating directory $(includedir) ; \
-+ echo creating directory $(DESTDIR)$(includedir) ; \
- it="$(INSTALLHEADERS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir) ; \
- for i in $$it ; do \
-- $(INSTALL) $(top_srcdir)/include/net-snmp/$$i $(includedir) ; \
-- echo "installing $$i in $(includedir)" ; \
-+ $(INSTALL) $(top_srcdir)/include/net-snmp/$$i $(DESTDIR)$(includedir) ; \
-+ echo "installing $$i in $(DESTDIR)$(includedir)" ; \
- done \
- fi
- @if test "$(INSTALLBUILTHEADERS)" != "" ; then \
-- echo creating directory $(includedir) ; \
-+ echo creating directory $(DESTDIR)$(includedir) ; \
- it="$(INSTALLBUILTHEADERS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir) ; \
- for i in $$it ; do \
-- $(INSTALL) $$i $(includedir) ; \
-- echo "installing $$i in $(includedir)" ; \
-+ $(INSTALL) $$i $(DESTDIR)$(includedir) ; \
-+ echo "installing $$i in $(DESTDIR)$(includedir)" ; \
- done \
- fi
- @if test "$(INCLUDESUBDIRHEADERS)" != "" ; then \
-- echo creating directory $(includedir)/$(INCLUDESUBDIR) ; \
-+ echo creating directory $(DESTDIR)$(includedir)/$(INCLUDESUBDIR) ; \
- it="$(INCLUDESUBDIRHEADERS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir)/$(INCLUDESUBDIR) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/$(INCLUDESUBDIR) ; \
- for i in $$it ; do \
-- $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR)/$$i $(includedir)/$(INCLUDESUBDIR) ; \
-- echo "installing $$i in $(includedir)/$(INCLUDESUBDIR)" ; \
-+ $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR)/$$i $(DESTDIR)$(includedir)/$(INCLUDESUBDIR) ; \
-+ echo "installing $$i in $(DESTDIR)$(includedir)/$(INCLUDESUBDIR)" ; \
- done \
- fi
- @if test "$(INCLUDESUBDIRHEADERS2)" != "" ; then \
-- echo creating directory $(includedir)/$(INCLUDESUBDIR2) ; \
-+ echo creating directory $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2) ; \
- it="$(INCLUDESUBDIRHEADERS2)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir)/$(INCLUDESUBDIR2) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2) ; \
- for i in $$it ; do \
-- $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR2)/$$i $(includedir)/$(INCLUDESUBDIR2) ; \
-- echo "installing $$i in $(includedir)/$(INCLUDESUBDIR2)" ; \
-+ $(INSTALL) $(top_srcdir)/include/net-snmp/$(INCLUDESUBDIR2)/$$i $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2) ; \
-+ echo "installing $$i in $(DESTDIR)$(includedir)/$(INCLUDESUBDIR2)" ; \
- done \
- fi
- @if test "$(INSTALLBUILTSUBDIRHEADERS)" != "" ; then \
-- echo creating directory $(includedir)/$(INSTALLBUILTSUBDIR) ; \
-+ echo creating directory $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR) ; \
- it="$(INSTALLBUILTSUBDIRHEADERS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(includedir)/$(INSTALLBUILTSUBDIR) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR) ; \
- for i in $$it ; do \
-- $(INSTALL) $$i $(includedir)/$(INSTALLBUILTSUBDIR) ; \
-- echo "installing $$i in $(includedir)/$(INSTALLBUILTSUBDIR)" ; \
-+ $(INSTALL) $$i $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR) ; \
-+ echo "installing $$i in $(DESTDIR)$(includedir)/$(INSTALLBUILTSUBDIR)" ; \
- done \
- fi
-
-@@ -103,12 +103,12 @@
-
- installucdheaders:
- @if test "$(INSTALLUCDHEADERS)" != "" ; then \
-- echo creating directory $(ucdincludedir) ; \
-+ echo creating directory $(DESTDIR)$(ucdincludedir) ; \
- it="$(INSTALLUCDHEADERS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(ucdincludedir) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ucdincludedir) ; \
- for i in $$it ; do \
-- $(INSTALL) $(top_srcdir)/include/ucd-snmp/$$i $(ucdincludedir) ; \
-- echo "installing $$i in $(ucdincludedir)" ; \
-+ $(INSTALL) $(top_srcdir)/include/ucd-snmp/$$i $(DESTDIR)$(ucdincludedir) ; \
-+ echo "installing $$i in $(DESTDIR)$(ucdincludedir)" ; \
- done \
- fi
-
-@@ -122,11 +122,11 @@
- installlocallibs: $(INSTALLLIBS)
- @if test "$(INSTALLLIBS)" != ""; then \
- it="$(INSTALLLIBS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(libdir) ; \
-- $(INSTALL) $(INSTALLLIBS) $(libdir) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) ; \
-+ $(INSTALL) $(INSTALLLIBS) $(DESTDIR)$(libdir) ; \
- for i in $$it ; do \
-- echo "installing $$i in $(libdir)"; \
-- $(RANLIB) $(libdir)/$$i ; \
-+ echo "installing $$i in $(DESTDIR)$(libdir)"; \
-+ $(RANLIB) $(DESTDIR)$(libdir)/$$i ; \
- done ; \
- $(LIB_LDCONFIG_CMD) ; \
- fi
-@@ -134,11 +134,11 @@
- installucdlibs: $(INSTALLUCDLIBS)
- @if test "$(INSTALLUCDLIBS)" != ""; then \
- it="$(INSTALLUCDLIBS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(libdir) ; \
-- $(INSTALL) $(INSTALLUCDLIBS) $(libdir) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) ; \
-+ $(INSTALL) $(INSTALLUCDLIBS) $(DESTDIR)$(libdir) ; \
- for i in $$it ; do \
-- echo "installing $$i in $(libdir)"; \
-- $(RANLIB) $(libdir)/$$i ; \
-+ echo "installing $$i in $(DESTDIR)$(libdir)"; \
-+ $(RANLIB) $(DESTDIR)$(libdir)/$$i ; \
- done ; \
- $(LIB_LDCONFIG_CMD) ; \
- fi
-@@ -164,11 +164,11 @@
-
- installlocalbin: $(INSTALLBINPROGS)
- @if test "$(INSTALLBINPROGS) $(INSTALLBINSCRIPTS)" != " "; then \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ; \
- it="$(INSTALLBINPROGS) $(INSTALLBINSCRIPTS)" ; \
-- $(INSTALL) $(INSTALLBINPROGS) $(INSTALLBINSCRIPTS) $(bindir) ; \
-+ $(INSTALL) $(INSTALLBINPROGS) $(INSTALLBINSCRIPTS) $(DESTDIR)$(bindir) ; \
- for i in $$it ; do \
-- echo "installing $$i in $(bindir)"; \
-+ echo "installing $$i in $(DESTDIR)$(bindir)"; \
- done \
- fi
-
-@@ -194,10 +194,10 @@
- installlocalsbin: $(INSTALLSBINPROGS)
- @if test "$(INSTALLSBINPROGS)" != ""; then \
- it="$(INSTALLSBINPROGS)" ; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(sbindir) ; \
-- $(INSTALL) $(INSTALLSBINPROGS) $(sbindir) ; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) ; \
-+ $(INSTALL) $(INSTALLSBINPROGS) $(DESTDIR)$(sbindir) ; \
- for i in $$it ; do \
-- echo "installing $$i in $(sbindir)"; \
-+ echo "installing $$i in $(DESTDIR)$(sbindir)"; \
- done \
- fi
-
---- net-snmp-5.0.7/apps/Makefile.in.DESTDIR Wed Feb 12 16:58:57 2003
-+++ net-snmp-5.0.7/apps/Makefile.in Wed Feb 12 16:59:24 2003
-@@ -112,5 +112,5 @@
- $(LINK) -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
-
- snmpinforminstall:
-- rm -f $(bindir)/snmpinform$(EXEEXT)
-- $(LN_S) snmptrap$(EXEEXT) $(bindir)/snmpinform$(EXEEXT)
-+ rm -f $(DESTDIR)$(bindir)/snmpinform$(EXEEXT)
-+ $(LN_S) snmptrap$(EXEEXT) $(DESTDIR)$(bindir)/snmpinform$(EXEEXT)
---- net-snmp-5.0.8/configure.in.orig 2003-03-06 07:41:13.000000000 +0100
-+++ net-snmp-5.0.8/configure.in 2003-05-17 12:55:45.000000000 +0200
-@@ -7,8 +7,8 @@
- dnl
- dnl save the configure arguments
- dnl
+--- net-snmp-5.1/configure.in.orig 2003-11-18 20:33:31.000000000 +0100
++++ net-snmp-5.1/configure.in 2003-11-18 20:41:43.917724056 +0100
+@@ -22,7 +22,7 @@
+ #
+ # save the configure arguments
+ #
-AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS,"\"$ac_configure_args\"")
--CONFIGURE_OPTIONS="\"$ac_configure_args\""
+AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS,"$ac_configure_args")
-+CONFIGURE_OPTIONS="$ac_configure_args"
+ CONFIGURE_OPTIONS="\"$ac_configure_args\""
AC_SUBST(CONFIGURE_OPTIONS)
- dnl
-@@ -554,9 +554,7 @@
- dnl get version number.
- AC_MSG_CHECKING(for net-snmp version number)
- VERSION=`grep NetSnmpVersionInfo.*= $srcdir/snmplib/snmp_version.c | sed 's/";.*//;s/.*"//;s/pre/0./;'`
--changequote(, )
--RELEASEVERSION=`echo $VERSION | sed 's/^\([0-9]\)\.\([0-9]\)/\1:\2:0/'`
--changequote([, ])
-+RELEASEVERSION=`echo $VERSION | sed ['s/^\([0-9]\)\.\([0-9]\)/\1:\2:0/']`
- AC_SUBST(VERSION)
- AC_SUBST(RELEASEVERSION)
- AC_MSG_RESULT($VERSION)
-@@ -574,10 +572,8 @@
-
- dnl system check
- AC_CANONICAL_SYSTEM
--changequote(, )
--PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'`
-+PARTIALTARGETOS=`echo $target_os | sed ['s/[-._].*//']`
- CFLAGS="$CFLAGS -D$PARTIALTARGETOS"
--changequote([, ])
- AC_MSG_CACHE_ADD(Building for: $PARTIALTARGETOS)
-
- dnl
-@@ -585,7 +581,6 @@
- dnl
-
- AC_MSG_CHECKING(for system include file)
--changequote(, )
- filebase=$target_os
- dnl ignore binary format indication
- filebase=`echo $filebase | sed 's/elf//'`
-@@ -595,9 +590,9 @@
- while test "x$filebase" != "x$last" -a ! -f $srcdir/include/net-snmp/system/$filebase.h
- do
- last=$filebase
-- filebase=`echo $filebase | sed 's/[-._][^-._]*$//'`
-+ filebase=`echo $filebase | sed ['s/[-._][^-._]*$//']`
- if test "x$filebase" = "x$last"; then
-- filebase=`echo $filebase | sed 's/[0-9]*$//'`
-+ filebase=`echo $filebase | sed ['s/[0-9]*$//']`
- fi
- done
-
-@@ -606,19 +601,17 @@
- fi
- ac_cv_SYSTEM_INCLUDE_FILE="net-snmp/system/$filebase.h"
-
--changequote([, ])
- AC_MSG_RESULT($ac_cv_SYSTEM_INCLUDE_FILE)
- AC_DEFINE_UNQUOTED(SYSTEM_INCLUDE_FILE, "$ac_cv_SYSTEM_INCLUDE_FILE")
-
- dnl second part, the CPU type.
-
- AC_MSG_CHECKING(for machine-type include file)
--changequote(, )
- filebase=$target_cpu
- while test "x$filebase" != "x$last" -a ! -f $srcdir/include/net-snmp/machine/$filebase.h
- do
- last=$filebase
-- filebase=`echo $filebase | sed 's/[-._][^-._]*$//'`
-+ filebase=`echo $filebase | sed ['s/[-._][^-._]*$//']`
- done
-
- if test "x$filebase" = "x$last"; then
-@@ -626,7 +619,6 @@
- fi
- ac_cv_MACHINE_INCLUDE_FILE="net-snmp/machine/$filebase.h"
-
--changequote([, ])
- AC_MSG_RESULT($ac_cv_MACHINE_INCLUDE_FILE)
- AC_DEFINE_UNQUOTED(MACHINE_INCLUDE_FILE, "$ac_cv_MACHINE_INCLUDE_FILE")
-
-@@ -737,7 +729,7 @@
- for i in v6d toshiba kame inria zeta linux-glibc linux-inet6; do
- case $i in
- v6d)
-- AC_EGREP_CPP(yes, [dnl
-+ AC_EGREP_CPP(yes, [
- #include </usr/local/v6/include/sys/types.h>
- #ifdef __V6D__
- yes
-@@ -747,7 +739,7 @@
- CFLAGS="-I/usr/local/v6/include $CFLAGS"])
- ;;
- toshiba)
-- AC_EGREP_CPP(yes, [dnl
-+ AC_EGREP_CPP(yes, [
- #include <sys/param.h>
- #ifdef _TOSHIBA_INET6
- yes
-@@ -757,7 +749,7 @@
- CFLAGS="-DINET6 $CFLAGS"])
- ;;
- kame)
-- AC_EGREP_CPP(yes, [dnl
-+ AC_EGREP_CPP(yes, [
- #include <netinet/in.h>
- #ifdef __KAME__
- yes
-@@ -768,7 +760,7 @@
- CFLAGS="-DINET6 $CFLAGS"])
- ;;
- inria)
-- AC_EGREP_CPP(yes, [dnl
-+ AC_EGREP_CPP(yes, [
- #include <netinet/in.h>
- #ifdef IPV6_INRIA_VERSION
- yes
-@@ -780,7 +772,7 @@
- CFLAGS="-DINET6 $CFLAGS"])
- ;;
- zeta)
-- AC_EGREP_CPP(yes, [dnl
-+ AC_EGREP_CPP(yes, [
- #include <sys/param.h>
- #ifdef _ZETA_MINAMI_INET6
- A
-@@ -791,7 +783,7 @@
- CFLAGS="-DINET6 $CFLAGS"])
- ;;
- linux-glibc)
-- AC_EGREP_CPP(yes, [dnl
-+ AC_EGREP_CPP(yes, [
- #include <features.h>
- #if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC_ > 2))
- yes
-@@ -840,7 +832,6 @@
+@@ -950,7 +950,6 @@
if test "x$with_res_locks" = "xyes"; then
AC_DEFINE(NS_REENTRANT)
case $target_os in
-@@ -1049,7 +1040,6 @@
- dnl Do hairy agent module processing.
- dnl
- AC_MSG_CHECKING(for and configuring mib modules to use)
--changequote(, )
-
- mibdir="agent/mibgroup"
- module_list=""
-@@ -1096,13 +1086,11 @@
- fi
- done
-
--changequote([, ])
- AC_MSG_RESULT($new_module_list.)
- AC_MSG_CACHE_ADD(Agent MIB code: $new_module_list)
-
- AC_MSG_CHECKING(for and configuring mib modules pieces to use)
- FD=AC_FD_MSG
--changequote(, )
-
- while test "x$new_module_list" != "x"; do
- for i in $new_module_list
-@@ -1127,13 +1115,9 @@
- for j in $new_list
- do
- if test ! -f $srcdir/$mibdir/$j.h; then
-- changequote([, ])
- AC_MSG_ERROR(mib module "$i" requires module "$j" but $j.h or $j.c could not be found in $srcdir/$mibdir)
-- changequote(, )
- elif echo " $new_with_out_mib_modules " | grep " $j " > /dev/null; then
-- changequote([, ])
- AC_MSG_WARN(mib module "$i" requires module "$j" but you told me to compile without it)
-- changequote(, )
- elif echo " $module_list $new_list_two $new_module_list " | grep " $j " > /dev/null; then
- :
- else
-@@ -1158,9 +1142,7 @@
- done
- fi
- else
-- changequote([, ])
- AC_MSG_ERROR(module files $i.h or $i.c could not be found in $srcdir/$mibdir)
-- changequote(, )
- fi
- module_list="$module_list $i"
- echo '#include "'"mibgroup/$i.h"'"' >> $mibdir/mib_module_includes.h
-@@ -1177,18 +1159,16 @@
- fi
- fi
- if test "x`echo $i | sed 's/\///g;'`" != "x$i"; then
-- mnd=`echo $i | sed 's/\/[^/]*$//;'`
-+ mnd=`echo $i | sed ['s/\/[^/]*$//;']`
- if test ! -d ./$mibdir/$mnd; then
- module_directories="$module_directories ./$mibdir/$mnd"
- fi
- fi
- if grep config_load_mib $srcdir/$mibdir/$i.h > /dev/null 2>&1; then
-- changequote([, ])
- AC_MSG_WARN(mib module "$i" uses the "config_load_mib" directive, which is no longer supported. It probably won't work.)
-- changequote(, )
- fi
-- grep config_parse_dot_conf $srcdir/$mibdir/$i.h | sed 's@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@' >> $mibdir/mib_module_dot_conf.h
-- sym="`echo ${i} | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`"
-+ grep config_parse_dot_conf $srcdir/$mibdir/$i.h | sed ['s@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@'] >> $mibdir/mib_module_dot_conf.h
-+ sym="`echo ${i} | sed ['s/[^a-zA-Z0-9_]/_/g'] | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`"
- echo "/* Define if compiling with the ${i} module files. */" >> include/net-snmp/agent/mib_module_config.h
- echo "#define USING_${sym}_MODULE 1" >> include/net-snmp/agent/mib_module_config.h
- echo " " >> include/net-snmp/agent/mib_module_config.h
-@@ -1198,12 +1178,11 @@
- new_module_list="$new_list_two"
- new_list_two=""
- done
--module_list_o=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.o /g'`
--module_list_lo=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.lo /g'`
--module_list_c=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.c /g'`
--mibgroup_list_o=`echo " $module_list_o " | sed 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g'`
--mibgroup_list_lo=`echo " $module_list_lo " | sed 's@ \([^ ]*\)\.lo@ mibgroup/\1.lo @g'`
--changequote([, ])
-+module_list_o=`echo "$module_list_code " | sed ['s/\([^ ]\) /\1.o /g']`
-+module_list_lo=`echo "$module_list_code " | sed ['s/\([^ ]\) /\1.lo /g']`
-+module_list_c=`echo "$module_list_code " | sed ['s/\([^ ]\) /\1.c /g']`
-+mibgroup_list_o=`echo " $module_list_o " | sed ['s@ \([^ ]*\)\.o@ mibgroup/\1.o @g']`
-+mibgroup_list_lo=`echo " $module_list_lo " | sed ['s@ \([^ ]*\)\.lo@ mibgroup/\1.lo @g']`
- MODULE_LIST=$module_list_code
- AC_SUBST(MODULE_LIST)
- AC_SUBST(module_list_c)
-@@ -1361,8 +1340,8 @@
- fi
-
- _libs=${LIBS}
-- AC_CHECK_HEADER(tcpd.h, ,
-- AC_MSG_ERROR(Asked to use libwrap but I couldn't find tcpd.h.))
-+ AC_CHECK_HEADER(tcpd.h, ,[
-+ AC_MSG_ERROR(Asked to use libwrap but I couldn't find tcpd.h.)])
-
- LIBS="$LIBS -lwrap"
- AC_MSG_CHECKING(for TCP wrappers library -lwrap)
-@@ -1378,21 +1357,21 @@
- [
- AC_MSG_RESULT(no)
- dnl Linux RedHat 6.1 won't link libwrap without libnsl
-- AC_CHECK_FUNC(yp_get_default_domain, ,
-- AC_CHECK_LIB(nsl, yp_get_default_domain))
-+ AC_CHECK_FUNC(yp_get_default_domain, ,[
-+ AC_CHECK_LIB(nsl, yp_get_default_domain)])
- AC_MSG_CHECKING(for TCP wrappers library -lwrap linked with -lnsl)
- AC_TRY_LINK([#include <tcpd.h>
- int allow_severity = 0;
- int deny_severity = 0;
-- ],[hosts_access((void *)0)],
-+ ],[hosts_access((void *)0)],[
-
- AC_MSG_RESULT(yes)
- AC_DEFINE(USE_LIBWRAP)
- test "$with_libwrap" != no -a "$with_libwrap" != yes && WRAPLIBS="-L$with_libwrap/lib"
-- WRAPLIBS="$WRAPLIBS -lwrap -lnsl",
-+ WRAPLIBS="$WRAPLIBS -lwrap -lnsl"],[
-
- AC_MSG_RESULT(no)
-- AC_MSG_ERROR(Asked to use libwrap but I couldn't find it.))
-+ AC_MSG_ERROR(Asked to use libwrap but I couldn't find it.)])
- ])
- CPPFLAGS=${_cppflags}
- LDFLAGS=${_ldflags}
-@@ -1649,17 +1628,15 @@
- dnl so we do it by hand.
- AC_MSG_CHECKING(for socklen_t)
- AC_CACHE_VAL(ac_cv_type_$1,
--[AC_EGREP_CPP(dnl
--changequote(<<,>>)dnl
--<<socklen_t[^a-zA-Z_0-9]>>dnl
--changequote([,]), [#include <sys/types.h>
-+[AC_EGREP_CPP([socklen_t[^a-zA-Z_0-9]]
-+, [#include <sys/types.h>
- #if STDC_HEADERS
- #include <stdlib.h>
- #include <stddef.h>
- #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
--#endif], ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)])dnl
-+#endif], [ac_cv_type_socklen_t=yes], [ac_cv_type_socklen_t=no])])
-
- AC_MSG_RESULT($ac_cv_type_socklen_t)
- if test $ac_cv_type_socklen_t = yes; then
-@@ -1669,10 +1646,8 @@
- dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
- AC_MSG_CHECKING(for in_addr_t)
- AC_CACHE_VAL(ac_cv_type_$1,
--[AC_EGREP_CPP(dnl
--changequote(<<,>>)dnl
--<<in_addr_t[^a-zA-Z_0-9]>>dnl
--changequote([,]), [#include <sys/types.h>
-+[AC_EGREP_CPP([in_addr_t[^a-zA-Z_0-9]]
-+, [#include <sys/types.h>
- #if STDC_HEADERS
- #include <stdlib.h>
- #include <stddef.h>
---- net-snmp-5.0.8/acconfig.h.orig 2003-02-25 19:04:04.000000000 +0100
-+++ net-snmp-5.0.8/acconfig.h 2003-05-17 12:54:27.000000000 +0200
-@@ -46,9 +46,11 @@
- #undef _REENTRANT
-
- /* debugging stuff */
--#undef SNMP_NO_DEBUGGING /* if defined, we optimize the code
-+#undef SNMP_NO_DEBUGGING
-+ /* if defined, we optimize the code
- to exclude all debugging calls. */
--#define SNMP_ALWAYS_DEBUG 0 /* Always print debugging information and
-+#define SNMP_ALWAYS_DEBUG 0
-+ /* Always print debugging information and
- ignore the -D flag passed to the cmds */
-
- /* reverse encoding BER packets is both faster and more efficient in space. */
-@@ -616,4 +616,9 @@
-
- #undef INET6
-
-+#ifndef NETSNMP_INLINE
-+# define NETSNMP_NO_INLINE
-+# define NETSNMP_INLINE
-+#endif
-+
- #endif /* NET_SNMP_CONFIG_H */
---- net-snmp-5.0.8/net-snmp-config.in.orig 2003-03-12 19:40:33.000000000 +0100
-+++ net-snmp-5.0.8/net-snmp-config.in 2003-05-17 13:10:21.000000000 +0200
-@@ -27,24 +27,24 @@
- echo @MODULE_LIST@
+--- net-snmp-5.1/net-snmp-config.in.orig 2003-10-14 18:15:47.000000000 +0200
++++ net-snmp-5.1/net-snmp-config.in 2003-11-18 20:29:20.152793512 +0100
+@@ -29,7 +29,7 @@
+
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-NSC_LDFLAGS="@LDFLAGS@"
++NSC_LDFLAGS=""
+ NSC_LIBDIR=-L@libdir@
+ NSC_LIBS="@LIBS@"
+ NSC_AGENTLIBS="@AGENTLIBS@"
+@@ -66,10 +66,10 @@
;;
+ #################################################### compile
--base-cflags)
- echo @CFLAGS@ @CPPFLAGS@ -I@includedir@
+ echo @CPPFLAGS@ -I@includedir@
- echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I@includedir@
+ echo @DEVFLAGS@ @CPPFLAGS@ -I. -I@includedir@
;;
- --agent-libs)
- # use this one == --netsnmp-agent-libs + --external-libs
-- echo @LDFLAGS@ -L@libdir@ $NSC_BASE_AGENT_LIBS @AGENTLIBS@ @WRAPLIBS@
-+ echo -L@libdir@ $NSC_BASE_AGENT_LIBS @AGENTLIBS@ @WRAPLIBS@
- ;;
- --libs)
- # use this one == --netsnmp-libs + --external-libs
-- echo @LDFLAGS@ -L@libdir@ -lnetsnmp @LIBS@
-+ echo -L@libdir@ -lnetsnmp @LIBS@
- ;;
- --external-libs)
-- echo @LDFLAGS@ @LIBS@
-+ echo @LIBS@
- ;;
- --external-agent-libs)
-- echo @LDFLAGS@ @AGENTLIBS@ @WRAPLIBS@
-+ echo @AGENTLIBS@ @WRAPLIBS@
- ;;
- --netsnmp-libs)
- echo -L@libdir@ -lnetsnmp
-@@ -265,7 +265,7 @@
+ --srcdir)
+ echo $NSC_SRCDIR
+@@ -409,7 +409,7 @@
+ echo "Ack. Can't create $tmpfile."
exit 1
fi
- prefix=@prefix@
-- cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles @LDFLAGS@ -L@exec_prefix@/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp @AGENTLIBS@ $ldflags"
-+ cmd="@CC@ $cflags @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles -L@exec_prefix@/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp @AGENTLIBS@ $ldflags"
+- cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles $NSC_LDFLAGS -L$NSC_EXEC_PREFIX/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp $NSC_AGENTLIBS $ldflags"
++ cmd="@CC@ $cflags @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles $NSC_LDFLAGS -L$NSC_EXEC_PREFIX/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp $NSC_AGENTLIBS $ldflags"
echo "running: $cmd"
`$cmd`
if test "x$norm" != "x1" ; then
---- net-snmp-5.0.8/configure.in.orig 2003-05-17 15:51:58.000000000 +0200
-+++ net-snmp-5.0.8/configure.in 2003-05-17 17:26:14.000000000 +0200
+--- net-snmp-5.1/configure.in.orig 2003-05-17 15:51:58.000000000 +0200
++++ net-snmp-5.1/configure.in 2003-05-17 17:26:14.000000000 +0200
@@ -1423,8 +1423,7 @@
- dnl Replace `main' with a function in -lkvm:
+ # Replace `main' with a function in -lkvm:
AC_CHECK_LIB(kvm, kvm_read)
- dnl DYNAMIC MODULE SUPPORT
+ # DYNAMIC MODULE SUPPORT
-AC_CHECK_LIB(dl, dlopen)
-AC_CHECK_FUNCS(dlopen)
+AC_CHECK_LIB(dl, dlopen, [AC_DEFINE([HAVE_DLOPEN],,[dlopen function])])
---- net-snmp-5.0.8/Makefile.top.orig 2003-03-05 21:08:26.000000000 +0100
-+++ net-snmp-5.0.8/Makefile.top 2003-05-17 17:43:03.000000000 +0200
-@@ -27,7 +27,7 @@
- snmplibdir = $(datadir)/snmp
- mibdir = $(snmplibdir)/mibs
- persistentdir = @PERSISTENT_DIRECTORY@
--
-+sysconfdir = @sysconfdir@
-
- #
- # Programs
--- net-snmp-5.0.8/man/mib2c.1.def.orig 2003-02-25 19:20:33.000000000 +0100
+++ net-snmp-5.0.8/man/mib2c.1.def 2003-05-17 17:40:02.000000000 +0200
@@ -35,7 +35,7 @@
---- net-snmp-5.0.7/configure.in.wiget Wed Feb 12 16:04:32 2003
-+++ net-snmp-5.0.7/configure.in Wed Feb 12 16:08:36 2003
+--- net-snmp-5.1/configure.in.wiget Wed Feb 12 16:04:32 2003
++++ net-snmp-5.1/configure.in Wed Feb 12 16:08:36 2003
@@ -1403,24 +1403,6 @@
AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
-- dnl two variants of bzip2 need checking.
+- # two variants of bzip2 need checking.
- AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
- AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
-
-- dnl two variants of db1 need checking.
+- # two variants of db1 need checking.
- AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
- AC_CHECK_LIB(db, dbopen, [_rpmlibs="-ldb $_rpmlibs"]))
-
-- dnl two variants of db3 need checking.
+- # two variants of db3 need checking.
- AC_CHECK_LIB(db-3.1, db_create, [_rpmlibs="-ldb-3.1 $_rpmlibs"],
- AC_CHECK_LIB(db-3.0, db_create, [_rpmlibs="-ldb-3.0 $_rpmlibs"]))
-
-- dnl rpm-3.0.5 and later needs popt.
+- # rpm-3.0.5 and later needs popt.
- AC_CHECK_LIB(popt, poptParseArgvString, [_rpmlibs="-lpopt $_rpmlibs"])
-
-- dnl rpm-4.0.x needs rpmio.
+- # rpm-4.0.x needs rpmio.
- AC_CHECK_LIB(rpmio, Fopen, [_rpmlibs="-lrpmio $_rpmlibs"],,$_rpmlibs)
-
- dnl now check for rpm using the appropriate libraries.
+ # now check for rpm using the appropriate libraries.
AC_CHECK_LIB(rpm, rpmGetFilesystemList,[
AC_DEFINE(HAVE_LIBRPM)
Summary(ru): îÁÂÏÒ ÕÔÉÌÉÔ ÄÌÑ ÐÒÏÔÏËÏÌÁ SNMP ÏÔ UC-Davis
Summary(uk): îÁÂ¦Ò ÕÔÉÌ¦Ô ÄÌÑ ÐÒÏÔÏËÏÌÕ SNMP ×¦Ä UC-Davis
Name: net-snmp
-Version: 5.0.9
+Version: 5.1
Release: 0.1
License: BSD-like
Group: Networking/Daemons
Source0: http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: cecd5ec74f5c546c1ea7ed7987b5932b
+# Source0-md5: 14217471edb2b805b0e28c4c3cfd8c75
Source1: %{name}d.init
Source2: %{name}d.conf
Source3: %{name}d.sysconfig
Source5: %{name}trapd.conf
Source6: %{name}trapd.sysconfig
Source7: ftp://ucd-snmp.ucdavis.edu/contrib/ucd-ipchains.tar.gz
-# Source7-md5: 29949f1008f1a04d6efefd5b3ea607da
+# Source7-md5: 29949f1008f1a04d6efefd5b3ea607da
Patch0: %{name}-acinclude.patch
Patch1: %{name}-acfix.patch
Patch2: %{name}-rpm-implicit-libs.patch
-Patch3: %{name}-DESTDIR.patch
-Patch4: %{name}-config-noflags.patch
-Patch5: %{name}-dlopen-fix.patch
-Patch6: %{name}-manpage.patch
-Patch7: %{name}-link.patch
-Patch8: %{name}-llinterfaces.patch
-Patch9: %{name}-usr_local_bin_perl.patch
+Patch3: %{name}-config-noflags.patch
+Patch4: %{name}-dlopen-fix.patch
+Patch5: %{name}-manpage.patch
+Patch6: %{name}-link.patch
+Patch7: %{name}-llinterfaces.patch
+Patch8: %{name}-usr_local_bin_perl.patch
URL: http://www.net-snmp.org/
BuildRequires: autoconf >= 2.57-3
BuildRequires: automake
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p2
-%patch9 -p0
+%patch7 -p2
+%patch8 -p0
%build
%{__libtoolize}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/{snmp,rc.d/init.d,sysconfig},/var/log}
+install -d $RPM_BUILD_ROOT{/etc/{snmp,rc.d/init.d,sysconfig},/var/log}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+ INSTALL_PREFIX=$RPM_BUILD_ROOT
+# DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
:> $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.local.conf
%attr(755,root,root) %{_bindir}/snmpbulkget
%attr(755,root,root) %{_bindir}/snmpbulkwalk
%attr(755,root,root) %{_bindir}/snmpdelta
+%attr(755,root,root) %{_bindir}/snmpdf
%attr(755,root,root) %{_bindir}/snmpget
%attr(755,root,root) %{_bindir}/snmpgetnext
+%attr(755,root,root) %{_bindir}/snmpinform
%attr(755,root,root) %{_bindir}/snmpnetstat
%attr(755,root,root) %{_bindir}/snmpset
%attr(755,root,root) %{_bindir}/snmpstatus
%attr(755,root,root) %{_bindir}/snmptranslate
%attr(755,root,root) %{_bindir}/snmptrap
%attr(755,root,root) %{_bindir}/snmpusm
-%attr(755,root,root) %{_bindir}/snmpwalk
-%attr(755,root,root) %{_bindir}/snmpdf
-%attr(755,root,root) %{_bindir}/snmpinform
%attr(755,root,root) %{_bindir}/snmpvacm
+%attr(755,root,root) %{_bindir}/snmpwalk
#%%{_datadir}/snmp/snmpconf/snmp.conf
%{_mandir}/man1/snmpbulkwalk.1*
%{_mandir}/man1/snmpcmd.1*
%{_mandir}/man1/snmpdelta.1*
+%{_mandir}/man1/snmpdf.1*
%{_mandir}/man1/snmpget.1*
%{_mandir}/man1/snmpgetnext.1*
+%{_mandir}/man1/snmpinform.1*
%{_mandir}/man1/snmpnetstat.1*
%{_mandir}/man1/snmpset.1*
%{_mandir}/man1/snmpstatus.1*
%{_mandir}/man1/snmptranslate.1*
%{_mandir}/man1/snmptrap.1*
%{_mandir}/man1/snmpusm.1*
+%{_mandir}/man1/snmpvacm.1*
%{_mandir}/man1/snmpwalk.1*
-%{_mandir}/man1/snmpdf.1*
-%{_mandir}/man1/snmpinform.1*
%{_mandir}/man5/snmp.conf.5*
%{_mandir}/man5/snmp_config.5*
%files utils-perl
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fixproc
%attr(755,root,root) %{_bindir}/snmpcheck
%attr(755,root,root) %{_bindir}/traptoemail
daemon /usr/bin/setsid /usr/sbin/snmpd \
$([ -n "$CONF_FILE" ] && echo "-C -c $CONF_FILE") \
$( is_yes "$LOG_WARNINGS_MESSAGES_TO_SYSLOG" && \
- echo "-s" ) </dev/null
+ echo "-Lsd" ) </dev/null
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/snmpd
else
projects / packages / net-snmp.git / commitdiff