From eb8a3de6ec71b7db92fda9168dd4cbe07c4dc8f5ef3c34ce2f19ab8a61a66f5b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 20 Apr 2008 14:07:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=9 --- iproute2-2.6.23-strip.diff | 36 +++++++++ iproute2.changes | 5 ++ iproute2.spec | 155 +++++++++++++++++++------------------ 3 files changed, 122 insertions(+), 74 deletions(-) create mode 100644 iproute2-2.6.23-strip.diff diff --git a/iproute2-2.6.23-strip.diff b/iproute2-2.6.23-strip.diff new file mode 100644 index 0000000..92b95b3 --- /dev/null +++ b/iproute2-2.6.23-strip.diff @@ -0,0 +1,36 @@ +--- ip/Makefile ++++ ip/Makefile +@@ -17,7 +17,7 @@ ip: $(IPOBJ) $(LIBNETLINK) $(LIBUTIL) + rtmon: $(RTMONOBJ) $(LIBNETLINK) + + install: all +- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) ++ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) + install -m 0755 $(SCRIPTS) $(DESTDIR)$(SBINDIR) + + clean: +--- misc/Makefile ++++ misc/Makefile +@@ -27,7 +27,7 @@ ssfilter.c: ssfilter.y + lnstat: $(LNSTATOBJ) + + install: all +- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) ++ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) + ln -sf lnstat $(DESTDIR)$(SBINDIR)/rtstat + ln -sf lnstat $(DESTDIR)$(SBINDIR)/ctstat + +--- tc/Makefile ++++ tc/Makefile +@@ -71,9 +71,9 @@ libtc.a: $(TCLIB) + + install: all + mkdir -p $(DESTDIR)/$(LIBDIR)/tc +- install -m 0755 -s tc $(DESTDIR)$(SBINDIR) ++ install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \ ++ do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \ + done + + clean: diff --git a/iproute2.changes b/iproute2.changes index ce03cbf..426e45a 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 16 18:23:45 CEST 2008 - schwab@suse.de + +- Don't strip binaries. + ------------------------------------------------------------------- Thu Oct 25 11:19:35 CEST 2007 - ms@suse.de diff --git a/iproute2.spec b/iproute2.spec index f444d35..3f970c5 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -1,7 +1,7 @@ # # spec file for package iproute2 (Version 2.6.23) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,6 +10,7 @@ # norootforbuild + Name: iproute2 BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 glib libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel License: GPL v2 or later @@ -17,7 +18,7 @@ Group: Productivity/Networking/Routing Provides: iproute AutoReqProv: on Version: 2.6.23 -Release: 1 +Release: 58 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version.tar.bz2 @@ -28,9 +29,11 @@ Patch3: %name-2.6.23-tc-flex-fixes.diff Patch4: %name-2.6.23-resolve-address.diff Patch5: %name-2.6.23-fragtimeout.diff Patch6: %name-2.6.23-flushcheckuid.diff +Patch7: %name-2.6.23-strip.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnlink +License: GPL v2 or later Summary: A Higher Level Interface to the Netlink Service Group: System/Libraries Provides: libnetlink @@ -62,6 +65,7 @@ Authors: %patch4 %patch5 %patch6 +%patch7 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -107,8 +111,11 @@ rm -rf $RPM_BUILD_ROOT %attr(644,root,root) /usr/include/* %_mandir/man3/libnetlink* %_libdir/lib* + %changelog -* Thu Oct 25 2007 - ms@suse.de +* Wed Apr 16 2008 schwab@suse.de +- Don't strip binaries. +* Thu Oct 25 2007 ms@suse.de - update to version 2.6.23, fixed (#336488) Reason for update: * The macvlan module, which got added to the kernel in version @@ -128,10 +135,10 @@ rm -rf $RPM_BUILD_ROOT ip link add link eth0 type macvlan Will create a macvlan0 device with a random MAC address on top of eth0. No iproute patches are required. -* Tue Oct 16 2007 - jdelvare@suse.de +* Tue Oct 16 2007 jdelvare@suse.de - libnetlink.3 is now part of the upstream package, no need to include our own copy. -* Wed Jul 11 2007 - ms@suse.de +* Wed Jul 11 2007 ms@suse.de - update to version 2.6.22, fixed (#288551) * Kim Woelders , various useful fixups: compilation with old kernels, cross-compiling, "all" == "any" in prefix spec. @@ -164,179 +171,179 @@ rm -rf $RPM_BUILD_ROOT * willy tarreau : "make install" target. * Tunable limit for sch_sfq. Patch to kernel activating this is about to be submitted. Reminded by Adi Nugroho -* Fri Apr 20 2007 - aj@suse.de +* Fri Apr 20 2007 aj@suse.de - Use texlive for building. -* Mon Apr 02 2007 - rguenther@suse.de +* Mon Apr 02 2007 rguenther@suse.de - add bison and flex BuildRequires -* Thu Feb 08 2007 - ms@suse.de +* Thu Feb 08 2007 ms@suse.de - fixed array size of name string in iptables.h (#243281) array of size IPT_FUNCTION_MAXNAMELEN - 1 is referenced at element IPT_FUNCTION_MAXNAMELEN - 1 which is outside the array bounds -* Mon Jan 29 2007 - ms@suse.de +* Mon Jan 29 2007 ms@suse.de - fixed wrong IPT_LIB_DIR value and replaced the code by a dynamic check for the /usr/%%lib/iptables directory (#238886) -* Tue Nov 07 2006 - ro@suse.de +* Tue Nov 07 2006 ro@suse.de - fix permissions for manpage -* Thu Jul 20 2006 - ms@suse.de +* Thu Jul 20 2006 ms@suse.de - replaced static HZ define to dynamic: [#]ifndef HZ [#]define HZ sysconf(_SC_CLK_TCK) [#]endif -* Fri May 26 2006 - schwab@suse.de +* Fri May 26 2006 schwab@suse.de - Fix crash while resolving addresses. -* Mon Apr 03 2006 - hvogel@suse.de +* Mon Apr 03 2006 hvogel@suse.de - fix flex input file to use uppercase STR to avoid conflicts. This prevented tc from being build [#162931] -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Jan 17 2006 - mrueckert@suse.de +* Tue Jan 17 2006 mrueckert@suse.de - update to version 2.6.15-060110 -* Tue Nov 08 2005 - mmj@suse.de +* Tue Nov 08 2005 mmj@suse.de - update to version 051107 -* Mon Oct 24 2005 - ro@suse.de +* Mon Oct 24 2005 ro@suse.de - fix filelist for libnlink -* Thu Oct 20 2005 - mmj@suse.de +* Thu Oct 20 2005 mmj@suse.de - update to version 051007 - fix buffer overflow in iproute.c [#129415] (thanks Richard, Marcus) - don't strip stuff -* Wed Aug 17 2005 - cthiel@suse.de +* Wed Aug 17 2005 cthiel@suse.de - update to version 050816 [#105087] -* Sat Aug 06 2005 - dmueller@suse.de +* Sun Aug 07 2005 dmueller@suse.de - add /bin/ip symlink (#102513) -* Wed Jun 15 2005 - meissner@suse.de +* Wed Jun 15 2005 meissner@suse.de - use RPM_OPT_FLAGS -* Mon May 09 2005 - mmj@suse.de +* Mon May 09 2005 mmj@suse.de - Update to 2.6.11-050330 -* Thu Feb 10 2005 - ro@suse.de +* Thu Feb 10 2005 ro@suse.de - remove dropped tetex subpackages from nfb -* Fri Feb 04 2005 - mmj@suse.de +* Fri Feb 04 2005 mmj@suse.de - Update to 2.6.10-ss050124 -* Tue Dec 07 2004 - mmj@suse.de +* Tue Dec 07 2004 mmj@suse.de - Don't trust that the kernel and do our own family check [#48600] -* Sun Oct 24 2004 - mmj@suse.de +* Sun Oct 24 2004 mmj@suse.de - Clean up spec file a bit - Update to new snapshot including even more of our patches -* Tue Oct 12 2004 - mmj@suse.de +* Tue Oct 12 2004 mmj@suse.de - Update to 2.6.9 including some of our patches -* Tue Aug 17 2004 - mmj@suse.de +* Tue Aug 17 2004 mmj@suse.de - Make ip print correct type when printing stats [#42589] -* Wed Apr 21 2004 - mmj@suse.de +* Wed Apr 21 2004 mmj@suse.de - Fix bufferoverflow in nstat [#39179] -* Fri Apr 16 2004 - kukuk@suse.de +* Sat Apr 17 2004 kukuk@suse.de - Fix compiling with 2.6.5 kernel headers - Remove backup files -* Wed Apr 14 2004 - mmj@suse.de +* Wed Apr 14 2004 mmj@suse.de - Don't remove buildroot before install -* Wed Mar 17 2004 - mmj@suse.de +* Thu Mar 18 2004 mmj@suse.de - No executables below /usr/include [#36342] -* Wed Mar 10 2004 - mmj@suse.de +* Wed Mar 10 2004 mmj@suse.de - Olaf Kirch fixed the kernel, so remove the fix for [#35288] -* Wed Mar 03 2004 - ak@suse.de +* Wed Mar 03 2004 ak@suse.de - Fix hang in ip addr flush (#35288) -* Wed Jan 07 2004 - mmj@suse.de +* Wed Jan 07 2004 mmj@suse.de - ifstat should store it's history in /var/tmp not /tmp -* Mon Nov 10 2003 - mmj@suse.de +* Mon Nov 10 2003 mmj@suse.de - Add more man-pages [#32981] -* Wed Oct 15 2003 - mmj@suse.de +* Wed Oct 15 2003 mmj@suse.de - Don't build as root -* Mon Aug 11 2003 - mmj@suse.de +* Mon Aug 11 2003 mmj@suse.de - Add all the pdf documentation [#28637] -* Thu Jun 12 2003 - kukuk@suse.de +* Thu Jun 12 2003 kukuk@suse.de - Fix filelist -* Wed Jun 04 2003 - kukuk@suse.de +* Wed Jun 04 2003 kukuk@suse.de - Don't use include-glibc directory - Fix arpd to compile with db4 -* Tue May 13 2003 - mmj@suse.de +* Tue May 13 2003 mmj@suse.de - Remove files we don't package -* Mon May 12 2003 - mmj@suse.de +* Mon May 12 2003 mmj@suse.de - Add glib-include from newer iputils, and change a kernel-include to make it build -* Tue Feb 11 2003 - ug@suse.de +* Tue Feb 11 2003 ug@suse.de - patch for HTB support applied since 2.4.20 supports it -* Fri Feb 07 2003 - mmj@suse.de +* Fri Feb 07 2003 mmj@suse.de - Make the man tar-ball not contain gzipped man-pages, it's already compressed once. - Apply patch from Andi Kleen for fragtimeout functionality -* Mon Nov 11 2002 - ro@suse.de +* Tue Nov 12 2002 ro@suse.de - changed neededforbuild to -* Mon Nov 11 2002 - ro@suse.de +* Mon Nov 11 2002 ro@suse.de - changed neededforbuild to -* Sun Oct 20 2002 - mmj@suse.de +* Sun Oct 20 2002 mmj@suse.de - Add manpages, thanks to ASPLinux [#21115] -* Wed Aug 21 2002 - mmj@suse.de +* Wed Aug 21 2002 mmj@suse.de - Added a patch to exit when regular user tries to flush routes or addresses. [#16000] -* Sun Aug 18 2002 - ro@suse.de +* Sun Aug 18 2002 ro@suse.de - added ghostscript-x11-packages to neededforbuild (for gs) -* Mon Apr 08 2002 - postadal@suse.cz +* Mon Apr 08 2002 postadal@suse.cz - updated to ss020116 * added several utilities several utilities: ss, nstat, ifstat, rtacct, arpd and module tcp_diag -* Fri Feb 01 2002 - ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild to -* Thu Jan 31 2002 - ro@suse.de +* Fri Feb 01 2002 ro@suse.de - added libgimpprint to neededforbuild -* Tue Jan 29 2002 - vinil@suse.cz +* Tue Jan 29 2002 vinil@suse.cz - /usr/lib -> %%_libdir -* Sun Jan 20 2002 - vinil@suse.cz +* Sun Jan 20 2002 vinil@suse.cz - new version ss010824 - spec file cleanup -* Mon Nov 19 2001 - bjacke@suse.de +* Mon Nov 19 2001 bjacke@suse.de - move ip to /sbin - add iproute2 config files to /etc/ -* Wed Oct 10 2001 - stepan@suse.de +* Wed Oct 10 2001 stepan@suse.de - fix compilation on ia64 -* Tue Sep 18 2001 - pthomas@suse.de +* Tue Sep 18 2001 pthomas@suse.de - Correct spelling in libnetlink.3 - Add both German and English descriptions for libnlink -* Mon Aug 27 2001 - kukuk@suse.de +* Mon Aug 27 2001 kukuk@suse.de - Fix compiling on SPARC -* Tue Aug 21 2001 - vinil@suse.cz +* Tue Aug 21 2001 vinil@suse.cz - new version ss010803 - get rid of kernel 2.2 patches -* Thu Jul 26 2001 - kukuk@suse.de +* Thu Jul 26 2001 kukuk@suse.de - add glib to needed for build -* Fri Jul 20 2001 - kukuk@suse.de +* Fri Jul 20 2001 kukuk@suse.de - changed neededforbuild to - changed neededforbuild to - changed neededforbuild to -* Wed Jun 27 2001 - ro@suse.de +* Wed Jun 27 2001 ro@suse.de - ETH_P_ECHO is apparently no longer defined -* Thu Mar 08 2001 - uli@suse.de +* Thu Mar 08 2001 uli@suse.de - added xshared to neededforbuild -* Mon Mar 05 2001 - kukuk@suse.de +* Mon Mar 05 2001 kukuk@suse.de - Remove bogus check for kernel header -* Fri Dec 01 2000 - kukuk@suse.de +* Fri Dec 01 2000 kukuk@suse.de - Update to iproute2-2.2.4-now-ss001007 to fix compile problems with new kernel and glibc -* Mon Aug 28 2000 - ak@suse.de +* Mon Aug 28 2000 ak@suse.de - fix permissions - fix advmss/mtu confusion between 2.2 and 2.4 (advmss now works with 2.2 kernels and is always enabled) - add a new subrpm for libnetlink - add libnetlink man page -* Tue Jul 04 2000 - mha@suse.de +* Tue Jul 04 2000 mha@suse.de - new version (2.2.4-now-ss000305) - new README.SuSE - use ps2pdf instead of pdflatex, because the latter produces unusable pdf files for some reason -* Thu Jun 01 2000 - vinil@suse.cz +* Thu Jun 01 2000 vinil@suse.cz - documentation enhancement -* Fri May 26 2000 - vinil@suse.cz +* Fri May 26 2000 vinil@suse.cz - new version (ss000225) - buildroot added - sorted in group -* Thu Feb 17 2000 - mha@suse.de +* Thu Feb 17 2000 mha@suse.de - new version (ss991023) -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu Jul 22 1999 - mha@suse.de +* Thu Jul 22 1999 mha@suse.de - new version - renamed package iproute->iproute2, because that's how the author calls it -* Tue Jul 13 1999 - ro@suse.de +* Tue Jul 13 1999 ro@suse.de - added psutils to neededforbuild -* Sun Jul 11 1999 - mha@suse.de +* Sun Jul 11 1999 mha@suse.de - new package: iproute (tools for using the advanced routing options in kernel 2.2)