From b42540ed2061b5d4c139bfc426d7b1b0eef53e13597e8bff32ed3787c7bdffe4 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 27 Jan 2010 17:48:02 +0000
Subject: [PATCH] Accepting request 30459 from network:utilities

Copy from network:utilities/ebtables based on submit request 30459 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/30459
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ebtables?expand=0&rev=9
---
 ebtables.changes |  7 +++++++
 ebtables.spec    | 13 +++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ebtables.changes b/ebtables.changes
index 908305d..eff0870 100644
--- a/ebtables.changes
+++ b/ebtables.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 25 23:19:23 CET 2010 - jengelh@medozas.de
+
+- Switch to SUSE_ASNEEDED=0 to fix segmentation fault/NULL dereference
+  (caused by plugins not being loaded, due to them not being linked in)
+  [bnc#567267]
+
 -------------------------------------------------------------------
 Wed Jan  6 13:52:39 CET 2010 - prusnak@suse.cz
 
diff --git a/ebtables.spec b/ebtables.spec
index 60a6f61..d77a2f7 100644
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -22,7 +22,7 @@ Name:           ebtables
 License:        GPLv2+
 Group:          Productivity/Networking/Security
 Version:        v2.0.9
-Release:        1
+Release:        2
 Summary:        Ethernet Bridge Tables
 Source:         %{name}-%{version}-1.tar.bz2
 Patch0:         %{name}-v2.0.8-makefile.diff
@@ -51,6 +51,8 @@ Authors:
 %patch1
 
 %build
+# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
+export SUSE_ASNEEDED=0
 # delete all kernel headers, but keep ebt_ip6.h and ebt_nflog.h
 mv include/linux/netfilter_bridge/ebt_ip6.{h,h.save}
 mv include/linux/netfilter_bridge/ebt_nflog.{h,h.save}
@@ -61,7 +63,7 @@ mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h}
 make \
     CFLAGS="$RPM_OPT_FLAGS" \
     CXXFLAGS="$RPM_OPT_FLAGS" \
-    LIBDIR=%{_libdir} \
+    LIBDIR=%{_libdir}/%{name} \
     MANDIR=%{_mandir} \
     BINDIR=%{_sbindir} \
     ETCDIR=%{_sysconfdir} \
@@ -69,11 +71,13 @@ make \
     SYSCONFIGDIR=%{_sysconfdir}
 
 %install
+# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
+export SUSE_ASNEEDED=0
 install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 make \
     DESTDIR=$RPM_BUILD_ROOT \
-    LIBDIR=%{_libdir} \
+    LIBDIR=%{_libdir}/%{name} \
     MANDIR=%{_mandir} \
     BINDIR=%{_sbindir} \
     ETCDIR=%{_sysconfdir} \
@@ -103,7 +107,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ebtables-config
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_sysconfdir}/init.d/ebtables
-%{_libdir}/*.so
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.so
 %{_sbindir}/ebtables
 %{_sbindir}/ebtables-restore
 %{_sbindir}/ebtables-save