SOURCES: net-snmp-link.patch - remove krb5 breakage
baggins
baggins at pld-linux.org
Sun Apr 1 21:33:35 CEST 2007
Author: baggins Date: Sun Apr 1 19:33:35 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- remove krb5 breakage
---- Files affected:
SOURCES:
net-snmp-link.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/net-snmp-link.patch
diff -u SOURCES/net-snmp-link.patch:1.7 SOURCES/net-snmp-link.patch:1.8
--- SOURCES/net-snmp-link.patch:1.7 Thu Dec 21 02:25:13 2006
+++ SOURCES/net-snmp-link.patch Sun Apr 1 21:33:30 2007
@@ -30,49 +30,6 @@
$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-diff -urN net-snmp-5.4.org/configure.in net-snmp-5.4/configure.in
---- net-snmp-5.4.org/configure.in 2006-11-24 18:53:18.000000000 +0100
-+++ net-snmp-5.4/configure.in 2006-12-21 01:17:16.166418250 +0100
-@@ -1699,6 +1699,8 @@
- rebuilt_new_with_security=
- already_checked_krb5=no
-
-+KRB5_LIBS=
-+AC_SUBST(KRB5_LIBS)
- for sec in $new_with_security
- do
- if test "x$sec" = "xksm" -a "xyes" = "x$already_checked_krb5"; then
-@@ -1718,7 +1720,7 @@
-
- if test no != $krb5_config; then
- CPPFLAGS="$CPPFLAGS `$krb5_config --cflags`"
-- LIBS="$LIBS `$krb5_config --libs`"
-+ KRB5_LIBS="`$krb5_config --libs`"
- elif test $krb5path != no; then
- AC_ADD_SEARCH_PATH($krb5path)
- else
-@@ -1755,10 +1757,10 @@
- if test $ac_cv_heimdal = yes; then
- AC_DEFINE(NETSNMP_USE_KERBEROS_HEIMDAL)
- if test no = $krb5_config; then
-- LIBS="$LIBS -lkrb5 -lasn1 -lcom_err -lroken"
-+ KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lroken"
- fi
- elif test no = $krb5_config; then
-- LIBS="$LIBS -lkrb5 -lcom_err"
-+ KRB5_LIBS="-lkrb5 -lcom_err"
- fi
-
- AC_MSG_CHECKING([to see which crypto API we need to use])
-@@ -1773,7 +1775,7 @@
- AC_MSG_RESULT(new MIT crypto API)
- AC_DEFINE(NETSNMP_USE_KERBEROS_MIT)
- if test no = $krb5_config; then
-- LIBS="$LIBS -lk5crypto"
-+ KRB5_LIBS="-lk5crypto"
- fi
- else
- AC_MSG_RESULT(old MIT crypto API)])
diff -urN net-snmp-5.4.org/Makefile.rules net-snmp-5.4/Makefile.rules
--- net-snmp-5.4.org/Makefile.rules 2005-10-10 20:47:48.000000000 +0200
+++ net-snmp-5.4/Makefile.rules 2006-12-21 01:17:16.166418250 +0100
@@ -119,12 +76,8 @@
#
# Things to build
-@@ -188,13 +187,9 @@
-
- # how to build the libraries.
- libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
-- $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
-+ $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @KRB5_LIBS@ @LIBCRYPTO@
+@@ -188,10 +187,6 @@
+ $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
$(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/net-snmp-link.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list