update to ucd-snmp 4.2.6

from Sergio Jimenez Romero <tripledes@eslack.org>
This commit is contained in:
danh 2003-04-22 15:11:05 +00:00
parent c7794cdd68
commit 14a604a2c8
9 changed files with 56 additions and 164 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.36 2002/12/29 21:14:12 fgsch Exp $
# $OpenBSD: Makefile,v 1.37 2003/04/22 15:11:05 danh Exp $
COMMENT= "extendable SNMP implementation"
VERSION= 4.2.3
VERSION= 4.2.6
DISTNAME= ucd-snmp-${VERSION}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-defaults --with-logfile='/var/log/snmpd' \
--with-libwrap='/usr' --with-openssl --with-zlib \
--with-sys-contact='default@' \
--with-sys-location='Default Location'
CONFIGURE_ENV= VERSION_INFO='42:2:0'
CONFIGURE_ENV= VERSION_INFO='42:6:0'
NO_REGRESS= Yes
SNMP_BIN= encode_keychange snmpbulkget snmpbulkwalk snmpdelta \

View File

@ -1,3 +1,3 @@
MD5 (ucd-snmp-4.2.3.tar.gz) = e42df4c7558b5f12cd442b36428ec4bb
RMD160 (ucd-snmp-4.2.3.tar.gz) = 289ed11c114cede8c82f66535212827fede61739
SHA1 (ucd-snmp-4.2.3.tar.gz) = ee4f9543dcfef129313db0a2d2c49230a1ba1c4f
MD5 (ucd-snmp-4.2.6.tar.gz) = cf3f24e6a69a4f52c14affe0064116b1
RMD160 (ucd-snmp-4.2.6.tar.gz) = 96b31aa57b94c41497d3ada2b83640edce5b2c7e
SHA1 (ucd-snmp-4.2.6.tar.gz) = aa189ddd76091bf2d1327f4c5ce51acf4e595ad9

View File

@ -1,19 +1,18 @@
$OpenBSD: patch-Makefile_top,v 1.2 2001/01/05 09:19:46 danh Exp $
--- Makefile.top.orig Sun Nov 19 15:58:05 2000
+++ Makefile.top Fri Jan 5 03:51:50 2001
--- Makefile.top.orig Fri Feb 15 20:00:19 2002
+++ Makefile.top Tue Apr 22 10:29:09 2003
@@ -6,6 +6,7 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
VERSION = @VERSION@
+VERSION_INFO = @VERSION_INFO@
+VERSION_INFO = @VERSION_INFO@
@SET_MAKE@
#
@@ -51,10 +52,10 @@ EXEEXT = @EXEEXT@
@@ -52,10 +53,10 @@ SHVFLAGS = @SHVFLAGS@
# Misc Compiling Stuff
CC = @CC@
# version number is prefixed by a 0 for a better shared library version number
-LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release 0.$(VERSION) -o
-LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o
+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(VERSION_INFO) -o
LIB_EXTENSION = la
LIB_VERSION =

View File

@ -1,23 +1,16 @@
$OpenBSD: patch-agent_mibgroup_mibII_interfaces_c,v 1.2 2002/06/16 20:01:20 pvalchev Exp $
--- agent/mibgroup/mibII/interfaces.c.orig Wed Nov 28 15:30:33 2001
+++ agent/mibgroup/mibII/interfaces.c Sun Jun 16 13:44:49 2002
@@ -1684,15 +1684,16 @@ static int Interface_Scan_By_Index(int I
}
--- agent/mibgroup/mibII/interfaces.c.orig Mon Jun 10 06:10:24 2002
+++ agent/mibgroup/mibII/interfaces.c Tue Apr 22 10:28:42 2003
@@ -1889,11 +1889,10 @@ static int Interface_Scan_Get_Count (voi
#else /* hpux11 */
-static int Interface_Count=0;
-static time_t scan_time = 0;
-
static int Interface_Scan_Get_Count (void)
{
+ static int Interface_Count = 0;
+ static time_t scan_time = 0;
+
time_t time_now = time(NULL);
- time_t time_now = time(NULL);
+ static time_t scan_time = 0;
+ time_t time_now = time(NULL);
if (!Interface_Count || (time_now > scan_time + 60)) {
scan_time = time_now;
+ Interface_Count = 0;
Interface_Scan_Init();
Interface_Count = 0;
while (Interface_Scan_Next(NULL, NULL, NULL, NULL) != 0) {

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_ucd_snmp_h,v 1.3 2001/10/11 19:16:19 danh Exp $
--- agent/mibgroup/ucd_snmp.h.orig Sun Sep 16 17:16:16 2001
+++ agent/mibgroup/ucd_snmp.h Thu Oct 11 14:23:12 2001
@@ -32,8 +32,10 @@ config_arch_require(freebsd5, ucd-snmp/v
$OpenBSD: patch-agent_mibgroup_ucd_snmp_h,v 1.4 2003/04/22 15:11:05 danh Exp $
--- agent/mibgroup/ucd_snmp.h.orig Thu Feb 7 10:39:26 2002
+++ agent/mibgroup/ucd_snmp.h Tue Apr 22 10:28:42 2003
@@ -34,8 +34,10 @@ config_arch_require(freebsd5, ucd-snmp/v
config_arch_require(freebsd5, ucd-snmp/memory_freebsd2)
config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1)
config_arch_require(netbsd1, ucd-snmp/memory_netbsd1)

View File

@ -1,104 +1,17 @@
$OpenBSD: patch-configure,v 1.4 2002/06/16 20:02:19 pvalchev Exp $
--- configure.orig Thu Nov 29 15:21:53 2001
+++ configure Sun Jun 16 13:54:56 2002
@@ -2114,6 +2114,16 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
+openbsd*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ else
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -3118,7 +3128,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -3641,7 +3658,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -4045,10 +4064,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -4537,9 +4570,22 @@ newsos6)
openbsd*)
--- configure.orig Fri Oct 11 08:10:26 2002
+++ configure Tue Apr 22 10:28:42 2003
@@ -4696,7 +4696,10 @@ openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
need_lib_prefix=no
need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -6425,27 +6471,6 @@ fi
case "$host_os" in
openbsd2.[89] | openbsd2.[89].*)
shlibpath_overrides_runpath=no
@@ -6674,27 +6677,6 @@ fi
echo "$ac_t""$EXTRACPPFLAGS" 1>&6
@ -126,32 +39,32 @@ $OpenBSD: patch-configure,v 1.4 2002/06/16 20:02:19 pvalchev Exp $
SNMPLIBPATH=""
tmpset="$libdir/snmp"
while test "x$tmpset" != "x$SNMPLIBPATH"; do
@@ -7345,6 +7370,7 @@ echo "configure:7345: checking for TCP w
@@ -7601,6 +7583,7 @@ echo "configure:7601: checking for TCP w
cat > conftest.$ac_ext <<EOF
#line 7347 "configure"
#line 7603 "configure"
#include "confdefs.h"
+#include <sys/types.h>
#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
@@ -7469,6 +7495,7 @@ echo "configure:7469: checking for TCP w
int allow_severity = 0;
int deny_severity = 0;
@@ -7723,6 +7706,7 @@ echo "configure:7723: checking for TCP w
cat > conftest.$ac_ext <<EOF
#line 7471 "configure"
#line 7725 "configure"
#include "confdefs.h"
+#include <sys/types.h>
#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
@@ -8185,7 +8212,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
int allow_severity = 0;
int deny_severity = 0;
@@ -8576,7 +8560,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lcrypto $LIBS"
+LIBS="-lcrypto -ldes $LIBS"
cat > conftest.$ac_ext <<EOF
#line 8191 "configure"
#line 8582 "configure"
#include "confdefs.h"
@@ -8219,7 +8246,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
@@ -8610,7 +8594,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
#define $ac_tr_lib 1
EOF
@ -160,7 +73,7 @@ $OpenBSD: patch-configure,v 1.4 2002/06/16 20:02:19 pvalchev Exp $
else
echo "$ac_t""no" 1>&6
@@ -15237,6 +15264,7 @@ s%@AUTOCONF@%$AUTOCONF%g
@@ -16631,6 +16615,7 @@ s%@AUTOCONF@%$AUTOCONF%g
s%@AUTOHEADER@%$AUTOHEADER%g
s%@UNAMEPROG@%$UNAMEPROG%g
s%@VERSION@%$VERSION%g

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2001/10/11 19:16:19 danh Exp $
--- ltmain.sh.orig Thu Oct 11 10:05:17 2001
+++ ltmain.sh Thu Oct 11 10:16:40 2001
@@ -1031,12 +1031,34 @@ compiler."
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
$OpenBSD: patch-ltmain_sh,v 1.5 2003/04/22 15:11:05 danh Exp $
--- ltmain.sh.orig Fri Mar 1 10:17:36 2002
+++ ltmain.sh Tue Apr 22 10:28:42 2003
@@ -1054,12 +1054,34 @@ compiler."
# Do not include libc_r directly, use -pthread flag.
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
@ -36,17 +36,7 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2001/10/11 19:16:19 danh Exp $
-module)
module=yes
continue
@@ -2408,6 +2430,9 @@ compiler."
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test $build_libtool_need_lc = "yes"; then
@@ -4412,40 +4437,6 @@ relink_command=\"$relink_command\""
@@ -4446,40 +4471,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/10/11 19:16:19 danh Exp $
lib/libsnmp.so.42.2
lib/libucdagent.so.42.2
lib/libucdmibs.so.42.2
@comment $OpenBSD: PFRAG.shared,v 1.4 2003/04/22 15:11:05 danh Exp $
lib/libsnmp.so.42.6
lib/libucdagent.so.42.6
lib/libucdmibs.so.42.6
DYNLIBDIR(%B)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2001/10/11 19:16:19 danh Exp $
@comment $OpenBSD: PLIST,v 1.9 2003/04/22 15:11:05 danh Exp $
@unexec rm -f %D/share/snmp/mibs/.index
@mode 0555
bin/encode_keychange
@ -207,11 +207,8 @@ share/snmp/snmpconf/snmptrapd.conf/formatting
share/snmp/snmpconf/snmptrapd.conf/traphandle
@mode
lib/libsnmp.a
lib/libsnmp.la
lib/libucdagent.a
lib/libucdagent.la
lib/libucdmibs.a
lib/libucdmibs.la
%%SHARED%%
@dirrm share/snmp/snmpconf/snmptrapd.conf
@dirrm share/snmp/snmpconf/snmpd.conf