tag 617212 patch
tag 555767 patch
kthxbye
Hi,
I was going to NMU this, but it seems dpkg-source hates me and I can't
seem to be able to build a source package thanks to the stupid 3.0
stuff. So here's my tentative diff anyway in the hope that somebody
will have more luck.
diff -Nru net-snmp-5.4.3~dfsg/debian/changelog
net-snmp-5.4.3~dfsg.new/debian/changelog
--- net-snmp-5.4.3~dfsg/debian/changelog 2011-01-05 13:12:04.000000000
+0100
+++ net-snmp-5.4.3~dfsg.new/debian/changelog 2011-05-07 02:50:33.000000000
+0200
@@ -1,3 +1,13 @@
+net-snmp (5.4.3~dfsg-2.1) unstable; urgency=high
+
+ * Non-maintainer upload to fix FTBFS.
+ * Don't hardcode SHELL to /bin/sh in Makefile.top, libtool wants bash
+ (closes: #617212).
+ * Add missing libraries to link commands to make newer gcc happy (closes:
+ #555767)
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 07 May 2011 02:50:18 +0200
+
net-snmp (5.4.3~dfsg-2) unstable; urgency=high
* Add libperl-dev to libsnmp-dev dependencies (Closes: #608794)
diff -Nru net-snmp-5.4.3~dfsg/debian/patches/63_fix_shell.patch
net-snmp-5.4.3~dfsg.new/debian/patches/63_fix_shell.patch
--- net-snmp-5.4.3~dfsg/debian/patches/63_fix_shell.patch 1970-01-01
01:00:00.000000000 +0100
+++ net-snmp-5.4.3~dfsg.new/debian/patches/63_fix_shell.patch 2011-05-07
02:13:26.000000000 +0200
@@ -0,0 +1,13 @@
+Index: net-snmp-5.4.3~dfsg/Makefile.top
+===================================================================
+--- net-snmp-5.4.3~dfsg.orig/Makefile.top
++++ net-snmp-5.4.3~dfsg/Makefile.top
+@@ -1,7 +1,7 @@
+ #
+ # Minimum environment and virtual path setup
+ #
+-SHELL = /bin/sh
++SHELL = @SHELL@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VERSION = @VERSION@
diff -Nru net-snmp-5.4.3~dfsg/debian/patches/64_missing_lib.patch
net-snmp-5.4.3~dfsg.new/debian/patches/64_missing_lib.patch
--- net-snmp-5.4.3~dfsg/debian/patches/64_missing_lib.patch 1970-01-01
01:00:00.000000000 +0100
+++ net-snmp-5.4.3~dfsg.new/debian/patches/64_missing_lib.patch 2011-05-07
02:44:45.000000000 +0200
@@ -0,0 +1,56 @@
+Index: net-snmp-5.4.3~dfsg/configure.in
+===================================================================
+--- net-snmp-5.4.3~dfsg.orig/configure.in
++++ net-snmp-5.4.3~dfsg/configure.in
+@@ -2727,6 +2727,7 @@ elif test "x$askedpkcs" = "xyes"; then
+ AC_CHECK_LIB(pkcs11, C_Initialize, AC_DEFINE(HAVE_LIBPKCS11)
+ LIBPKCS11="-lpkcs11")
+ fi
++AC_SUBST(LIBCRYPTO)
+
+ LIBS=$NONAGENTLIBS
+
+@@ -2779,10 +2780,12 @@ AC_ARG_WITH(libwrap,
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(Asked to use libwrap but I couldn't find
it.))])
+ LAGENTLIBS="$_wraplibs"
++ LIBWRAP="$_wraplibs"
+ CPPFLAGS=${_cppflags}
+ LDFLAGS=${_ldflags}
+ LIBS=${_libs}
+ fi
++ AC_SUBST(LIBWRAP)
+ ])
+
+ AC_CHECK_HEADERS(rpm/rpmlib.h rpm/header.h)
+Index: net-snmp-5.4.3~dfsg/apps/Makefile.in
+===================================================================
+--- net-snmp-5.4.3~dfsg.orig/apps/Makefile.in
++++ net-snmp-5.4.3~dfsg/apps/Makefile.in
+@@ -50,6 +50,8 @@ HELPERLIB = ../agent/helpers/libne
+ AGENTLIB = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
+ MIBLIB = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+ USEAGENTLIBS = $(MIBLIB) $(AGENTLIB) $(HELPERLIB) $(USELIBS)
++LIBCRYPTO = @LIBCRYPTO@
++LIBWRAP = @LIBWRAP@
+
+ #
+ # link path in src dir
+@@ -115,7 +117,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX
+ $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS}
${LIBS}
+
+ snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
+- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS)
${LDFLAGS} ${TRAPLIBS}
++ $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS)
${LDFLAGS} ${TRAPLIBS} $(LIBWRAP)
+
+ snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
+ $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS}
${LIBS}
+@@ -128,7 +130,7 @@ snmpset$(EXEEXT): snmpset.$(OSUFFIX)
+ $(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS}
${LIBS}
+
+ snmpusm$(EXEEXT): snmpusm.$(OSUFFIX) $(USELIBS)
+- $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS}
${LIBS}
++ $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS}
${LIBS} $(LIBCRYPTO)
+
+ snmpvacm$(EXEEXT): snmpvacm.$(OSUFFIX) $(USELIBS)
+ $(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS}
${LIBS}
diff -Nru net-snmp-5.4.3~dfsg/debian/patches/series
net-snmp-5.4.3~dfsg.new/debian/patches/series
--- net-snmp-5.4.3~dfsg/debian/patches/series 2011-01-05 13:12:04.000000000
+0100
+++ net-snmp-5.4.3~dfsg.new/debian/patches/series 2011-05-07
02:23:47.000000000 +0200
@@ -12,3 +12,5 @@
60_libsensors_api.patch
61_vacm_missing_dependency_check.patch
62_add_lib_cflags.patch
+63_fix_shell.patch
+64_missing_lib.patch
Cheers,
Julien
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
