SOURCES: net-snmp-rpm-implicit-libs.patch, net-snmp-link.patch, ne...

arekm arekm at pld-linux.org
Mon Jan 9 01:03:28 CET 2006 

Author: arekm                        Date: Mon Jan  9 00:03:28 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   net-snmp-rpm-implicit-libs.patch (1.2 -> 1.3) , net-snmp-link.patch (1.3 -> 1.4) , net-snmp-acfix.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/net-snmp-rpm-implicit-libs.patch
diff -u SOURCES/net-snmp-rpm-implicit-libs.patch:1.2 SOURCES/net-snmp-rpm-implicit-libs.patch:1.3
--- SOURCES/net-snmp-rpm-implicit-libs.patch:1.2	Tue Nov 18 21:51:44 2003
+++ SOURCES/net-snmp-rpm-implicit-libs.patch	Mon Jan  9 01:03:23 2006
@@ -1,13 +1,10 @@
---- 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})
+diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
+--- net-snmp-5.3.org/configure.in	2005-12-28 18:20:56.000000000 +0100
++++ net-snmp-5.3/configure.in	2006-01-09 00:57:24.173063750 +0100
+@@ -2396,20 +2396,6 @@
+   ])
+ 
  
--  # two variants of bzip2 need checking.
--  AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
--     AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
--
 -  # two variants of db1 need checking.
 -  AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
 -     AC_CHECK_LIB(db, dbopen, [_rpmlibs="-ldb $_rpmlibs"]))

================================================================
Index: SOURCES/net-snmp-link.patch
diff -u SOURCES/net-snmp-link.patch:1.3 SOURCES/net-snmp-link.patch:1.4
--- SOURCES/net-snmp-link.patch:1.3	Wed Dec 29 22:48:59 2004
+++ SOURCES/net-snmp-link.patch	Mon Jan  9 01:03:23 2006
@@ -1,30 +1,18 @@
---- net-snmp-5.1.1/snmplib/Makefile.in.orig	2004-03-04 14:41:19.000000000 +0100
-+++ net-snmp-5.1.1/snmplib/Makefile.in	2004-03-27 16:13:21.978939688 +0100
-@@ -115,7 +115,6 @@
+diff -ur net-snmp-5.3.org/agent/Makefile.in net-snmp-5.3/agent/Makefile.in
+--- net-snmp-5.3.org/agent/Makefile.in	2005-12-04 19:24:25.000000000 +0100
++++ net-snmp-5.3/agent/Makefile.in	2006-01-09 00:58:58.598965000 +0100
+@@ -133,7 +133,7 @@
  
- # libraries
- INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
--INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
- 
- #
- # Things to build
-@@ -178,13 +177,9 @@
  
- # how to build the libraries.
- libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
--	$(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
-+	$(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -lcrypto
- 	$(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS}
+-	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS)
++	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS)
+ 	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
  
--libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
--	$(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
--	$(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
--
- #
- # internal test objects
- #
---- net-snmp-5.1.1/Makefile.rules.orig	2004-02-13 23:42:28.000000000 +0100
-+++ net-snmp-5.1.1/Makefile.rules	2004-03-27 16:15:57.294328160 +0100
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
+diff -ur net-snmp-5.3.org/Makefile.rules net-snmp-5.3/Makefile.rules
+--- net-snmp-5.3.org/Makefile.rules	2005-10-10 20:47:48.000000000 +0200
++++ net-snmp-5.3/Makefile.rules	2006-01-09 00:58:13.044118000 +0100
 @@ -8,7 +8,7 @@
  
  # the standard items to build: libraries, bins, and sbins
@@ -34,7 +22,7 @@
  
  standardall: subdirs $(STANDARDTARGETS)
  
-@@ -161,17 +161,11 @@
+@@ -175,17 +175,11 @@
  		$(LIB_LDCONFIG_CMD) ; \
  	fi
  
@@ -57,14 +45,29 @@
  
  installsubdirlibs:
  	@if test "$(SUBDIRS)" != ""; then \
---- net-snmp-5.1.1/agent/Makefile.in.orig	2003-10-14 15:30:48.000000000 +0200
-+++ net-snmp-5.1.1/agent/Makefile.in	2004-03-27 16:24:52.646942192 +0100
-@@ -120,7 +120,7 @@
+diff -ur net-snmp-5.3.org/snmplib/Makefile.in net-snmp-5.3/snmplib/Makefile.in
+--- net-snmp-5.3.org/snmplib/Makefile.in	2005-10-30 20:01:14.000000000 +0100
++++ net-snmp-5.3/snmplib/Makefile.in	2006-01-09 00:58:13.044118000 +0100
+@@ -127,7 +127,6 @@
  
+ # libraries
+ INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  
- libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
--	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS)
-+	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS)
- 	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
+ #
+ # Things to build
+@@ -187,13 +186,9 @@
  
- libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
+ # how to build the libraries.
+ libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+-	$(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
++	$(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -lcrypto
+ 	$(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+-	$(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
+-	$(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+-
+ #
+ # internal test objects
+ #

================================================================
Index: SOURCES/net-snmp-acfix.patch
diff -u SOURCES/net-snmp-acfix.patch:1.4 SOURCES/net-snmp-acfix.patch:1.5
--- SOURCES/net-snmp-acfix.patch:1.4	Sat Mar 27 18:44:50 2004
+++ SOURCES/net-snmp-acfix.patch	Mon Jan  9 01:03:23 2006
@@ -1,23 +1,7 @@
---- 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\"")
-+AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS,"$ac_configure_args")
- CONFIGURE_OPTIONS="\"$ac_configure_args\""
- AC_SUBST(CONFIGURE_OPTIONS)
- 
-@@ -950,7 +950,6 @@
- 
- if test "x$with_res_locks" = "xyes"; then
-   AC_DEFINE(NS_REENTRANT)
--EOF
- 
-     case $target_os in
- 
-@@ -1942,7 +1941,7 @@
+diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
+--- net-snmp-5.3.org/configure.in	2005-12-28 18:20:56.000000000 +0100
++++ net-snmp-5.3/configure.in	2006-01-09 00:54:22.913735750 +0100
+@@ -2880,7 +2880,7 @@
  
  AC_MSG_RESULT([$ac_cv_type_ssize_t])
  if test $ac_cv_type_ssize_t = yes; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/net-snmp-rpm-implicit-libs.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/net-snmp-link.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/net-snmp-acfix.patch?r1=1.4&r2=1.5&f=u

More information about the pld-cvs-commit mailing list