From d8f74a3182eecafae31bb83a43c7d191339280fc Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Thu, 7 Feb 2013 10:23:05 +0100
Subject: [PATCH] fixed net-snmp-create-v3-user to have the same content on all
 architectures Resolves: #881218

---
 net-snmp-5.7.2-create-user-multilib.patch | 40 +++++++++++++++++++++++
 net-snmp.spec                             |  5 +++
 2 files changed, 45 insertions(+)
 create mode 100644 net-snmp-5.7.2-create-user-multilib.patch

diff --git a/net-snmp-5.7.2-create-user-multilib.patch b/net-snmp-5.7.2-create-user-multilib.patch
new file mode 100644
index 0000000..ffc6c26
--- /dev/null
+++ b/net-snmp-5.7.2-create-user-multilib.patch
@@ -0,0 +1,40 @@
+Make net-snmp-create-v3-user multilib-clean
+
+The file had different NSC_AGENTLIBS on different architectures.
+
+Source: upstream
+
+commit 68300a9fb43568c5d833c48a2fef3ff16c2923c3
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Feb 7 10:14:33 2013 +0100
+
+    Remove unused variables.
+
+diff --git a/net-snmp-create-v3-user.in b/net-snmp-create-v3-user.in
+index 5288f3b..efa19c3 100644
+--- a/net-snmp-create-v3-user.in
++++ b/net-snmp-create-v3-user.in
+@@ -10,23 +10,6 @@ exec_prefix=@exec_prefix@
+ includedir=@includedir@
+ libdir=@libdir@
+ datarootdir=@datarootdir@
+-NSC_LDFLAGS="@LDFLAGS@"
+-NSC_INCLUDEDIR=${includedir}
+-NSC_LIBDIR=-L${libdir}
+-NSC_LIBS="@LIBS@"
+-NSC_AGENTLIBS="@AGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
+-NSC_PREFIX=$prefix
+-NSC_EXEC_PREFIX=$exec_prefix
+-NSC_SRCDIR=@srcdir@
+-NSC_INCDIR=${NSC_PREFIX}/include
+-NSC_BASE_SUBAGENT_LIBS="-lnetsnmpagent -lnetsnmp"
+-NSC_BASE_AGENT_LIBS="-lnetsnmpagent -lnetsnmpmibs -lnetsnmp"
+-NSC_SRC_LIBDIRS="agent/.libs snmplib/.libs"
+-NSC_SRC_LIBDEPS="agent/.libs/libnetsnmpmibs.a agent/.libs/libnetsnmpagent.a snmplib/.libs/libnetsnmp.a"
+-
+-if test "x$NSC_SRCDIR" = "x." ; then
+-   NSC_SRCDIR="NET-SNMP-SOURCE-DIR"
+-fi
+ 
+ if @PSCMD@ | egrep ' snmpd *$' > /dev/null 2>&1 ; then
+     echo "Apparently at least one snmpd demon is already running."
diff --git a/net-snmp.spec b/net-snmp.spec
index b84522a..2fc7112 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -36,6 +36,7 @@ Patch4: net-snmp-5.5-apsl-copying.patch
 Patch5: net-snmp-5.6-test-debug.patch
 Patch6: net-snmp-5.7.2-systemd.patch
 Patch7: net-snmp-5.7.2-python-ipaddress-size.patch
+Patch8: net-snmp-5.7.2-create-user-multilib.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -196,6 +197,7 @@ The net-snmp-sysvinit package provides SysV init scripts for Net-SNMP daemons.
 %patch5 -p1
 %patch6 -p1 -b .systemd
 %patch7 -p1 -b .ipaddress-size
+%patch8 -p1 -b .multilib
 
 %ifarch sparc64 s390 s390x
 # disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@@ -489,6 +491,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_initrddir}/snmptrapd
 
 %changelog
+* Thu Feb  7 2013 Jan Safranek <jsafrane@redhat.com>
+- fixed net-snmp-create-v3-user to have the same content on all architectures
+
 * Thu Jan 17 2013 Jan Safranek <jsafrane@redhat.com> - 1:5.7.2-5
 - Python: fixed IPADDRESS size on 64-bit systems (#895357)