~ubuntu-branches/ubuntu/wily/net-snmp/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/ld-no-add-needed.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
* 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:
1
 
--- net-snmp-5.4.3~dfsg.orig/apps/Makefile.in
2
 
+++ net-snmp-5.4.3~dfsg/apps/Makefile.in
3
 
@@ -64,7 +64,7 @@ TRAPDWITHAGENT  = $(USETRAPLIBS) @AGENTL
4
 
 TRAPDWITHOUTAGENT = $(LIBS)
5
 
 
6
 
 # these will be set by configure to one of the above 2 lines
7
 
-TRAPLIBS       = @TRAPLIBS@ $(PERLLDOPTS_FOR_APPS)
8
 
+TRAPLIBS       = @TRAPLIBS@ $(PERLLDOPTS_FOR_APPS) -lwrap
9
 
 USETRAPLIBS    = @USETRAPLIBS@
10
 
 
11
 
 CPPFLAGS       = $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(HELPER_INCLUDES) \
12
 
@@ -128,7 +128,7 @@ snmpset$(EXEEXT):    snmpset.$(OSUFFIX)
13
 
        $(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
14
 
 
15
 
 snmpusm$(EXEEXT):    snmpusm.$(OSUFFIX) $(USELIBS)
16
 
-       $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
17
 
+       $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} -lcrypto
18
 
 
19
 
 snmpvacm$(EXEEXT):    snmpvacm.$(OSUFFIX) $(USELIBS)
20
 
        $(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}