diff options
| -rw-r--r-- | net/net-snmp/Makefile | 3 | ||||
| -rw-r--r-- | net/net-snmp/distinfo | 5 | ||||
| -rw-r--r-- | net/net-snmp/patches/patch-ac | 126 | ||||
| -rw-r--r-- | net/net-snmp/patches/patch-af | 144 |
4 files changed, 227 insertions, 51 deletions
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 670b9a4c484..463e7c1d422 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2007/02/15 21:47:21 rillig Exp $ +# $NetBSD: Makefile,v 1.59 2007/05/20 13:55:28 seb Exp $ DISTNAME= net-snmp-5.4 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \ ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/ diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index 41d21c36a6e..16edbc5c118 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.37 2007/02/05 19:18:37 joerg Exp $ +$NetBSD: distinfo,v 1.38 2007/05/20 13:55:28 seb Exp $ SHA1 (net-snmp-5.4.tar.gz) = 8edb17509eba9f8c9cfb015fe35a1024048129eb RMD160 (net-snmp-5.4.tar.gz) = 8ad1f9a3def8022eea48d9b74ae71d8efb59ca61 Size (net-snmp-5.4.tar.gz) = 5031685 bytes SHA1 (patch-aa) = 77d27909157fb2caa4efb4e587395c7998dade12 SHA1 (patch-ab) = 3227eeb8b54b37813d8b6949f8c6ddc446038bf2 +SHA1 (patch-ac) = a91d776fc41c2ffe813ae0a281da57647e0d1662 SHA1 (patch-ae) = 721e62bb42b6d3787f36316cf2628cd71ae6a6ce -SHA1 (patch-af) = cbd871f747d14badb3e2859923d0340e590fbf0f +SHA1 (patch-af) = edf87cf96b812ab870f373c4a90ff37ef2961450 SHA1 (patch-ag) = 7021f7238c37635c9c32ceca681fd42aa125437f SHA1 (patch-aj) = eb17148368c9d02c0e589052b99003e7e21f2917 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08 diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac new file mode 100644 index 00000000000..bc8ce2dfa3c --- /dev/null +++ b/net/net-snmp/patches/patch-ac @@ -0,0 +1,126 @@ +$NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $ + +--- configure.in.orig 2006-11-24 17:53:18.000000000 +0000 ++++ configure.in +@@ -2670,6 +2670,8 @@ elif test "x$askedpkcs" = "xyes"; then + AC_CHECK_LIB(pkcs11, C_Initialize) + fi + ++AC_CHECK_LIB(des, des_cbc_encrypt) ++ + # Check for libraries that the agent needs + # saving old libraries + NONAGENTLIBS=$LIBS +@@ -3347,6 +3349,12 @@ AC_CHECK_HEADERS(netinet/ip6.h netinet6/ + #if HAVE_NETINET_IP6_H + #include <netinet/ip6.h> + #endif ++#if HAVE_NET_IF_H ++#include <net/if.h> ++#endif ++#if HAVE_NET_ROUTE_H ++#include <net/route.h> ++#endif + ]]) + # DYNAMIC MODULE SUPPORT + AC_CHECK_HEADERS(dlfcn.h) +@@ -3732,7 +3740,9 @@ AC_CHECK_STRUCT_FOR([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3744,7 +3754,9 @@ AC_CHECK_STRUCT_FOR([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3780,7 +3792,9 @@ AC_CHECK_STRUCT_FOR([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3798,7 +3812,9 @@ AC_TRY_COMPILE([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3822,7 +3838,9 @@ AC_TRY_COMPILE([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3879,7 +3897,9 @@ AC_TRY_COMPILE([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3903,7 +3923,9 @@ AC_CHECK_STRUCT_FOR([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3916,7 +3938,9 @@ AC_CHECK_STRUCT_FOR([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3929,7 +3953,9 @@ AC_CHECK_STRUCT_FOR([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL +@@ -3942,7 +3968,9 @@ AC_CHECK_STRUCT_FOR([ + #endif + #include <sys/types.h> + #define KERNEL ++#if !defined(__DragonFly__) + #define _KERNEL ++#endif + #include <sys/socket.h> + #undef KERNEL + #undef _KERNEL diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af index f499251ad27..1c032ac875e 100644 --- a/net/net-snmp/patches/patch-af +++ b/net/net-snmp/patches/patch-af @@ -1,62 +1,110 @@ -$NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ +$NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $ ---- configure.orig 2006-11-24 18:56:15.000000000 +0100 +--- configure.orig 2006-11-24 17:56:15.000000000 +0000 +++ configure -@@ -27031,6 +27031,53 @@ fi +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in Revision: 5.295 . ++# From configure.in Revision: 5.296 . + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.59 for Net-SNMP 5.4. + # +@@ -27031,6 +27031,81 @@ fi fi -+echo $ac_n "checking for des_cbc_encrypt in -ldes""... $ac_c" 1>&6 -+echo "configure:8529: checking for des_cbc_encrypt in -ldes" >&5 -+ac_lib_var=`echo des'_'des_cbc_encrypt | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ ++echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5 ++echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 ++if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else -+ ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 11217 "configure" -+#include "confdefs.h" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ +/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif +/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char des_cbc_encrypt(); -+ -+int main() { -+des_cbc_encrypt() -+; return 0; } -+EOF -+if { (eval echo configure:8548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" ++ builtin and then its argument prototype would still apply. */ ++char des_cbc_encrypt (); ++int ++main () ++{ ++des_cbc_encrypt (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_des_des_cbc_encrypt=yes +else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ac_cv_lib_des_des_cbc_encrypt=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo des | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_lib 1 -+EOF ++echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 ++if test $ac_cv_lib_des_des_cbc_encrypt = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDES 1 ++_ACEOF + + LIBS="-ldes $LIBS" + -+else -+ echo "$ac_t""no" 1>&6 +fi + ++ # Check for libraries that the agent needs # saving old libraries NONAGENTLIBS=$LIBS -@@ -40752,7 +40799,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -35037,6 +35112,12 @@ cat >>conftest.$ac_ext <<_ACEOF + #if HAVE_NETINET_IP6_H + #include <netinet/ip6.h> + #endif ++#if HAVE_NET_IF_H ++#include <net/if.h> ++#endif ++#if HAVE_NET_ROUTE_H ++#include <net/route.h> ++#endif + + + #include <$ac_header> +@@ -40752,7 +40833,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -66,7 +114,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -40850,7 +40899,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -40850,7 +40933,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -76,7 +124,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41144,7 +41195,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41144,7 +41229,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -86,7 +134,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41231,7 +41284,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41231,7 +41318,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -96,7 +144,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41298,7 +41353,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41298,7 +41387,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -106,7 +154,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41436,7 +41493,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41436,7 +41527,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -116,7 +164,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41531,7 +41590,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41531,7 +41624,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -126,7 +174,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41630,7 +41691,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41630,7 +41725,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -136,7 +184,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41729,7 +41792,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41729,7 +41826,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL @@ -146,7 +194,7 @@ $NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $ #include <sys/socket.h> #undef KERNEL #undef _KERNEL -@@ -41828,7 +41893,9 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -41828,7 +41927,9 @@ cat >>conftest.$ac_ext <<_ACEOF #endif #include <sys/types.h> #define KERNEL |