diff --git a/net-snmp-5.4.1-pie.patch b/net-snmp-5.4.1-pie.patch deleted file mode 100644 index 277b8c7..0000000 --- a/net-snmp-5.4.1-pie.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up net-snmp-5.4.1/agent/Makefile.in.backup_patch_4 net-snmp-5.4.1/agent/Makefile.in ---- net-snmp-5.4.1/agent/Makefile.in.backup_patch_4 2007-07-05 01:26:56.000000000 +0200 -+++ net-snmp-5.4.1/agent/Makefile.in 2008-07-25 12:52:44.000000000 +0200 -@@ -139,7 +139,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c - $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? - - snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) -- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS} -+ $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS} - - - libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) -diff -up net-snmp-5.4.1/apps/Makefile.in.backup_patch_4 net-snmp-5.4.1/apps/Makefile.in ---- net-snmp-5.4.1/apps/Makefile.in.backup_patch_4 2007-07-05 01:26:56.000000000 +0200 -+++ net-snmp-5.4.1/apps/Makefile.in 2008-07-25 12:52:44.000000000 +0200 -@@ -115,7 +115,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 $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} - - snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) - $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} diff --git a/net-snmp-5.6-pie.patch b/net-snmp-5.6-pie.patch new file mode 100644 index 0000000..dc59be7 --- /dev/null +++ b/net-snmp-5.6-pie.patch @@ -0,0 +1,24 @@ +diff -up net-snmp-5.6/agent/Makefile.in.pie net-snmp-5.6/agent/Makefile.in +--- net-snmp-5.6/agent/Makefile.in.pie 2010-06-08 23:05:11.000000000 +0200 ++++ net-snmp-5.6/agent/Makefile.in 2010-10-25 17:34:55.802975874 +0200 +@@ -245,7 +245,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c + $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? + + snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(MIBLIB) $(LIBTARG) +- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS} ++ $(LINK) $(CFLAGS) -pie -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS} + + + libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) +diff -up net-snmp-5.6/apps/Makefile.in.pie net-snmp-5.6/apps/Makefile.in +--- net-snmp-5.6/apps/Makefile.in.pie 2010-07-02 18:27:52.000000000 +0200 ++++ net-snmp-5.6/apps/Makefile.in 2010-10-25 17:03:57.414725652 +0200 +@@ -127,7 +127,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 $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} + + snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) + $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} diff --git a/net-snmp.spec b/net-snmp.spec index b183308..a0b308a 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -10,8 +10,8 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp -Version: 5.5 -Release: 21%{?dist} +Version: 5.6 +Release: 1%{?dist} Epoch: 1 License: BSD @@ -26,7 +26,7 @@ Source5: net-snmp-config Source6: net-snmp-trapd.redhat.conf Source7: net-snmpd.sysconfig Source8: net-snmptrapd.sysconfig -Patch1: net-snmp-5.4.1-pie.patch +Patch1: net-snmp-5.6-pie.patch Patch2: net-snmp-5.5-dir-fix.patch Patch3: net-snmp-5.5-multilib.patch Patch4: net-snmp-5.5-sensors3.patch @@ -424,6 +424,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/snmp/mibs/* %changelog +* Mon Oct 25 2010 Jan Safranek +- updated to net-snmp-5.6 + * Mon Oct 11 2010 Jan Safranek - 1:5.5-21 - fixed truncation of sysObjectID (#640848)