[net-snmp] fixed perl linking
Jan Šafránek
jsafrane at fedoraproject.org
Wed Oct 5 13:12:13 UTC 2011
commit a6d519fe7704c0619a6a5101da0a589d8fb6b492
Author: Jan Safranek <jsafrane at redhat.com>
Date: Wed Oct 5 15:11:40 2011 +0200
fixed perl linking
net-snmp-5.7-libtool.patch | 14 ++++++++++++++
net-snmp-5.7-mibs-perl-linking.patch | 16 ++++++++++++++++
net-snmp.spec | 9 ++++++++-
3 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/net-snmp-5.7-libtool.patch b/net-snmp-5.7-libtool.patch
new file mode 100644
index 0000000..235f56d
--- /dev/null
+++ b/net-snmp-5.7-libtool.patch
@@ -0,0 +1,14 @@
+Fix a typo in libtool, seems to be related to bug #742678
+
+diff -up net-snmp-5.7.1/ltmain.sh.orig net-snmp-5.7.1/ltmain.sh
+--- net-snmp-5.7.1/ltmain.sh.orig 2011-09-28 06:53:47.000000000 +0200
++++ net-snmp-5.7.1/ltmain.sh 2011-10-04 09:48:11.022131513 +0200
+@@ -8051,7 +8051,7 @@ EOF
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+- *) func_apped perm_rpath " $libdir" ;;
++ *) func_append perm_rpath " $libdir" ;;
+ esac
+ fi
+ done
diff --git a/net-snmp-5.7-mibs-perl-linking.patch b/net-snmp-5.7-mibs-perl-linking.patch
new file mode 100644
index 0000000..f3eefad
--- /dev/null
+++ b/net-snmp-5.7-mibs-perl-linking.patch
@@ -0,0 +1,16 @@
+742678: libnetsnmpmibs.so.30 is linked against libperl.so
+
+add perl rpath to libnetsnmpmibs.so
+
+diff -up net-snmp-5.7.1/agent/Makefile.in.orig net-snmp-5.7.1/agent/Makefile.in
+--- net-snmp-5.7.1/agent/Makefile.in.orig 2011-10-04 09:49:26.762027506 +0200
++++ net-snmp-5.7.1/agent/Makefile.in 2011-10-04 10:31:48.092899541 +0200
+@@ -302,7 +302,7 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VE
+ $(RANLIB) $(AGENTLIB)
+
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
+- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
++ $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
+ $(RANLIB) $(MIBLIB)
+
+ agentlib: $(AGENTLIB)
diff --git a/net-snmp.spec b/net-snmp.spec
index 03caba2..3608f3e 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -11,7 +11,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: 5.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: BSD
@@ -38,6 +38,8 @@ Patch6: net-snmp-5.5-perl-linking.patch
Patch7: net-snmp-5.6-test-debug.patch
Patch8: net-snmp-5.6.1-mysql.patch
Patch9: net-snmp-5.7.1-systemd.patch
+Patch10: net-snmp-5.7-libtool.patch
+Patch11: net-snmp-5.7-mibs-perl-linking.patch
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -199,6 +201,8 @@ The net-snmp-sysvinit package provides SysV init scripts for Net-SNMP daemons.
%patch7 -p1
%patch8 -p1 -b .mysql
%patch9 -p1 -b .systemd
+%patch10 -p1 -b .libtool
+%patch11 -p1 -b .mibs-perl
%ifarch sparc64 s390 s390x
# disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@@ -505,6 +509,9 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmptrapd
%changelog
+* Wed Oct 5 2011 Jan Safranek <jsafrane at redhat.com> - 1:5.7.1-2
+- fixed perl linking (#742678)
+
* Tue Oct 4 2011 Jan Safranek <jsafrane at redhat.com> - 1:5.7.1-1
- updated to 5.7.1:
- Fixed the mib-parsing-bug introduced shortly before 5.7
More information about the scm-commits
mailing list