Accepting request 89043 from security:netfilter

- Clarify license for iproute2.spec (bnc#720282)

- Add patch iproute2-xt-detect.diff to address shipped Makefiles'
  failure to use pkg-config to locate libxtables, and thus
  reenable m_xt

OBS-URL: https://build.opensuse.org/request/show/89043
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=50
This commit is contained in:
Stephan Kulow 2011-10-25 14:03:34 +00:00 committed by Git OBS Bridge
commit d80224025a
5 changed files with 90 additions and 16 deletions

View File

@ -1,5 +1,9 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-06-01 00:52:29+0200
Upstream: not sent yet
libxtables6 (iptables-1.4.11) had to change the signature of
xtables_merge_options to avoid invoking undefined behavior.
---
tc/m_xt.c | 6 ++++--

42
iproute2-xt-detect.diff Normal file
View File

@ -0,0 +1,42 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-09-24 23:37:34.405739159 +0200
Upstream: not sent yet
Any tests involving iptables _MUST_ utilize pkg-config to find the
proper locations of the installation.
---
configure | 2 +-
tc/Makefile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: iproute2-2.6.39/configure
===================================================================
--- iproute2-2.6.39.orig/configure
+++ iproute2-2.6.39/configure
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
EOF
-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
+if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
then
echo "TC_CONFIG_XT:=y" >>Config
echo "using xtables"
Index: iproute2-2.6.39/tc/Makefile
===================================================================
--- iproute2-2.6.39.orig/tc/Makefile
+++ iproute2-2.6.39/tc/Makefile
@@ -124,10 +124,10 @@ q_atm.so: q_atm.c
$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
m_xt.so: m_xt.c
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c -lxtables
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$(pkg-config xtables --cflags --libs)
m_xt_old.so: m_xt_old.c
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c -lxtables
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$(pkg-config xtables --cflags --libs)
%.yacc.c: %.y
$(YACC) $(YACCFLAGS) -o $@ $<

View File

@ -1,5 +1,9 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-06-01 00:52:07+0200
Upsteam: has not been sent yet
Requesting the xt action never succeeded because it registered
using the wrong name.
---
tc/m_xt.c | 4 ++--

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Oct 21 20:25:56 UTC 2011 - jengelh@medozas.de
- Clarify license for iproute2.spec (bnc#720282)
-------------------------------------------------------------------
Sat Sep 24 21:50:54 UTC 2011 - jengelh@medozas.de
- Add patch iproute2-xt-detect.diff to address shipped Makefiles'
failure to use pkg-config to locate libxtables, and thus
reenable m_xt
-------------------------------------------------------------------
Fri Jul 8 17:43:01 UTC 2011 - jengelh@medozas.de

View File

@ -15,29 +15,41 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: iproute2
License: GPLv2+
Group: Productivity/Networking/Routing
Provides: iproute
Version: 2.6.39
Release: 1
Summary: Linux network configuration utilities
Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
# Using GPL-2.0 instead of GPL-2.0+ because of tc_skbedit.h and tc/q_multiq.c
License: GPL-2.0
Source0: %name-%version.tar.xz
Patch0: %name-libdir-1.diff
Patch1: %name-HZ.diff
# PATCH-FIX-UPSTREAM iproute2-libdir-1.diff
Patch0: iproute2-libdir-1.diff
# PATCH-??-OPENSUSE iproute2-HZ.diff
Patch1: iproute2-HZ.diff
# PATCH-FIX-UPSTREAM iproute2-xt.diff
Patch4: iproute2-xt.diff
# PATCH-FIX-UPSTREAM iproute2-libxtables6.diff
Patch5: iproute2-libxtables6.diff
# PATCH-FIX-UPSTREAM iproute2-xt-detect.diff
Patch6: iproute2-xt-detect.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11
BuildRequires: libpng-devel libtiff-devel sgmltool texlive-latex
BuildRequires: bison db-devel flex
BuildRequires: libpng-devel libtiff-devel pkgconfig >= 0.19
BuildRequires: xorg-x11-devel xz
%if 0%{?suse_version}
BuildRequires: ghostscript-x11 sgmltool texlive-latex
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: ghostscript linuxdoc-tools sgml-common tetex-dvips tetex-latex
%endif
%define with_xt 1
%if 0%{?with_xt}
BuildRequires: iptables-devel
BuildRequires: iptables-devel >= 1.4.11
%endif
%description
@ -46,37 +58,37 @@ and advanced routing options of the Linux kernel. The SUSE Linux
distribution has used this package for network setup since SuSE Linux
8.0.
Authors:
--------
Alexey Kuznetsov <kuznet at ms2 dot inr dot ac dot ru>
Stephem Hemminger <shemminger at osdl dot org>
%package -n libnetlink-devel
License: GPLv2+
Summary: A Higher Level Interface to the Netlink Service
Group: Development/Libraries/C and C++
Provides: libnetlink = %version-%release
License: GPL-2.0+
%description -n libnetlink-devel
libnetlink provides a higher level interface to rtnetlink(7).
%package doc
License: GPLv2+
Summary: Documentation to iproute2
Group: Documentation
%if 0%{?suse_version} >= 1130
BuildArch: noarch
%endif
License: GPL-2.0+
%description doc
This package contains the PDF documentation from iproute2,
as well as examples and other outdated files.
%prep
%if 0%{?__xz:1}
%setup -q
%else
tar -xf "%{S:0}" --use=xz;
%setup -DTq
%endif
%patch0
%patch1
%patch -P 4 -P 5 -p1
%patch -P 4 -P 5 -P 6 -p1
find . -name *.orig -print0 | xargs -r0 rm -v
%build