← Back to branch summary

~ubuntu-branches/ubuntu/quantal/net-snmp/quantal-security

« back to all changes in this revision

Viewing changes to debian/patches/64_missing_lib.patch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-10 06:14:05 UTC
  • mfrom: (1.1.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110510061405-xd2cqlxvs59u3uja
Tags: 5.4.3~dfsg-2.2ubuntu1
https://launchpad.net/bugs/780149
* Resynchronise with Debian (LP: #780149).  Remaining changes:
  - net-snmp-config: Use bash.
  - Removed multiuser option when calling update-rc.d.
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in
    snmpcmd.1.
  - debian/snmpd.postinst: Source debconf before doing work.
  - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
    by snmp user before install/uninstall.
  - Add apport hook.
  - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
    arches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/64_missing_lib.patch
 
1
Index: net-snmp-5.4.3~dfsg/configure.in
 
2
===================================================================
 
3
--- net-snmp-5.4.3~dfsg.orig/configure.in       2011-05-07 10:22:19.000000000 +0000
 
4
+++ net-snmp-5.4.3~dfsg/configure.in    2011-05-07 10:24:48.425604190 +0000
 
5
@@ -2727,6 +2727,7 @@
 
6
     AC_CHECK_LIB(pkcs11, C_Initialize, AC_DEFINE(HAVE_LIBPKCS11)
 
7
             LIBPKCS11="-lpkcs11")
 
8
 fi
 
9
+AC_SUBST(LIBCRYPTO)
 
10
 
 
11
 LIBS=$NONAGENTLIBS
 
12
 
 
13
@@ -2779,10 +2780,12 @@
 
14
                        AC_MSG_RESULT(no)
 
15
                        AC_MSG_ERROR(Asked to use libwrap but I couldn't find it.))])
 
16
     LAGENTLIBS="$_wraplibs"
 
17
+    LIBWRAP="$_wraplibs"
 
18
     CPPFLAGS=${_cppflags}
 
19
     LDFLAGS=${_ldflags}
 
20
     LIBS=${_libs}
 
21
   fi
 
22
+  AC_SUBST(LIBWRAP)
 
23
 ])
 
24
 
 
25
 AC_CHECK_HEADERS(rpm/rpmlib.h rpm/header.h)
 
26
Index: net-snmp-5.4.3~dfsg/apps/Makefile.in
 
27
===================================================================
 
28
--- net-snmp-5.4.3~dfsg.orig/apps/Makefile.in   2007-07-04 23:26:56.000000000 +0000
 
29
+++ net-snmp-5.4.3~dfsg/apps/Makefile.in        2011-05-07 10:27:52.989604084 +0000
 
30
@@ -50,6 +50,8 @@
 
31
 AGENTLIB        = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
 
32
 MIBLIB          = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
 
33
 USEAGENTLIBS   = $(MIBLIB) $(AGENTLIB) $(HELPERLIB) $(USELIBS)
 
34
+LIBCRYPTO       = @LIBCRYPTO@
 
35
+LIBWRAP         = @LIBWRAP@
 
36
 
 
37
 #
 
38
 # link path in src dir
 
39
@@ -115,7 +117,7 @@
 
40
        $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
 
41
 
 
42
 snmptrapd$(EXEEXT):    $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
 
43
-       $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
 
44
+       $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} $(LIBWRAP)
 
45
 
 
46
 snmptrap$(EXEEXT):    snmptrap.$(OSUFFIX) $(USELIBS)
 
47
        $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
 
48
@@ -128,7 +130,7 @@
 
49
        $(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
 
50
 
 
51
 snmpusm$(EXEEXT):    snmpusm.$(OSUFFIX) $(USELIBS)
 
52
-       $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
 
53
+       $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} $(LIBCRYPTO)
 
54
 
 
55
 snmpvacm$(EXEEXT):    snmpvacm.$(OSUFFIX) $(USELIBS)
 
56
        $(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}