diff --git a/linux-atm-2.5.0-include.patch b/linux-atm-2.5.0-include.patch index 672690a..9155d3f 100644 --- a/linux-atm-2.5.0-include.patch +++ b/linux-atm-2.5.0-include.patch @@ -1,6 +1,7 @@ -diff -Naur linux-atm-2.5.0.org/src/arpd/arp.c linux-atm-2.5.0/src/arpd/arp.c ---- linux-atm-2.5.0.org/src/arpd/arp.c 2007-03-23 11:53:22.313563000 +0100 -+++ linux-atm-2.5.0/src/arpd/arp.c 2007-03-23 12:01:36.903688000 +0100 +Index: linux-atm-2.5.0/src/arpd/arp.c +=================================================================== +--- linux-atm-2.5.0.orig/src/arpd/arp.c ++++ linux-atm-2.5.0/src/arpd/arp.c @@ -16,6 +16,7 @@ #include /* for linux/if_arp.h */ #include /* for ntohs, etc. */ @@ -9,9 +10,10 @@ diff -Naur linux-atm-2.5.0.org/src/arpd/arp.c linux-atm-2.5.0/src/arpd/arp.c #include #include #include -diff -Naur linux-atm-2.5.0.org/src/arpd/atmarp.c linux-atm-2.5.0/src/arpd/atmarp.c ---- linux-atm-2.5.0.org/src/arpd/atmarp.c 2007-03-23 11:53:22.387482000 +0100 -+++ linux-atm-2.5.0/src/arpd/atmarp.c 2007-03-23 11:55:58.542174000 +0100 +Index: linux-atm-2.5.0/src/arpd/atmarp.c +=================================================================== +--- linux-atm-2.5.0.orig/src/arpd/atmarp.c ++++ linux-atm-2.5.0/src/arpd/atmarp.c @@ -19,6 +19,7 @@ #include @@ -20,9 +22,10 @@ diff -Naur linux-atm-2.5.0.org/src/arpd/atmarp.c linux-atm-2.5.0/src/arpd/atmarp #include #include -diff -Naur linux-atm-2.5.0.org/src/arpd/io.c linux-atm-2.5.0/src/arpd/io.c ---- linux-atm-2.5.0.org/src/arpd/io.c 2007-03-23 11:53:22.303568000 +0100 -+++ linux-atm-2.5.0/src/arpd/io.c 2007-03-23 12:18:22.325264000 +0100 +Index: linux-atm-2.5.0/src/arpd/io.c +=================================================================== +--- linux-atm-2.5.0.orig/src/arpd/io.c ++++ linux-atm-2.5.0/src/arpd/io.c @@ -19,6 +19,7 @@ #include #include @@ -31,9 +34,10 @@ diff -Naur linux-atm-2.5.0.org/src/arpd/io.c linux-atm-2.5.0/src/arpd/io.c #include /* for CLIP_DEFAULT_IDLETIMER */ #include #define _LINUX_NETDEVICE_H /* glibc2 */ -diff -Naur linux-atm-2.5.0.org/src/arpd/itf.c linux-atm-2.5.0/src/arpd/itf.c ---- linux-atm-2.5.0.org/src/arpd/itf.c 2007-03-23 11:53:22.344524000 +0100 -+++ linux-atm-2.5.0/src/arpd/itf.c 2007-03-23 12:20:21.795673000 +0100 +Index: linux-atm-2.5.0/src/arpd/itf.c +=================================================================== +--- linux-atm-2.5.0.orig/src/arpd/itf.c ++++ linux-atm-2.5.0/src/arpd/itf.c @@ -10,6 +10,7 @@ #include #include @@ -42,9 +46,10 @@ diff -Naur linux-atm-2.5.0.org/src/arpd/itf.c linux-atm-2.5.0/src/arpd/itf.c #include #include #define _LINUX_NETDEVICE_H /* glibc2 */ -diff -Naur linux-atm-2.5.0.org/src/mpoad/io.c linux-atm-2.5.0/src/mpoad/io.c ---- linux-atm-2.5.0.org/src/mpoad/io.c 2007-03-23 11:53:24.383484000 +0100 -+++ linux-atm-2.5.0/src/mpoad/io.c 2007-03-23 12:23:01.121187000 +0100 +Index: linux-atm-2.5.0/src/mpoad/io.c +=================================================================== +--- linux-atm-2.5.0.orig/src/mpoad/io.c ++++ linux-atm-2.5.0/src/mpoad/io.c @@ -19,6 +19,7 @@ _syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout); #endif @@ -53,9 +58,10 @@ diff -Naur linux-atm-2.5.0.org/src/mpoad/io.c linux-atm-2.5.0/src/mpoad/io.c #include #include #include -diff -Naur linux-atm-2.5.0.org/src/mpoad/k_interf.c linux-atm-2.5.0/src/mpoad/k_interf.c ---- linux-atm-2.5.0.org/src/mpoad/k_interf.c 2007-03-23 11:53:24.398469000 +0100 -+++ linux-atm-2.5.0/src/mpoad/k_interf.c 2007-03-23 12:25:43.438710000 +0100 +Index: linux-atm-2.5.0/src/mpoad/k_interf.c +=================================================================== +--- linux-atm-2.5.0.orig/src/mpoad/k_interf.c ++++ linux-atm-2.5.0/src/mpoad/k_interf.c @@ -10,6 +10,7 @@ #include /* for OPEN_MAX */ #include @@ -64,9 +70,10 @@ diff -Naur linux-atm-2.5.0.org/src/mpoad/k_interf.c linux-atm-2.5.0/src/mpoad/k_ #include #include #include "k_interf.h" -diff -Naur linux-atm-2.5.0.org/src/mpoad/lecs.c linux-atm-2.5.0/src/mpoad/lecs.c ---- linux-atm-2.5.0.org/src/mpoad/lecs.c 2007-03-23 11:53:24.409458000 +0100 -+++ linux-atm-2.5.0/src/mpoad/lecs.c 2007-03-23 12:36:28.007491000 +0100 +Index: linux-atm-2.5.0/src/mpoad/lecs.c +=================================================================== +--- linux-atm-2.5.0.orig/src/mpoad/lecs.c ++++ linux-atm-2.5.0/src/mpoad/lecs.c @@ -11,6 +11,7 @@ #include #include @@ -75,9 +82,10 @@ diff -Naur linux-atm-2.5.0.org/src/mpoad/lecs.c linux-atm-2.5.0/src/mpoad/lecs.c #include /* for MPOA Device type TLV */ #include "lecs.h" #include "k_interf.h" -diff -Naur linux-atm-2.5.0.org/src/mpoad/main.c linux-atm-2.5.0/src/mpoad/main.c ---- linux-atm-2.5.0.org/src/mpoad/main.c 2007-03-23 11:53:24.416451000 +0100 -+++ linux-atm-2.5.0/src/mpoad/main.c 2007-03-23 12:28:05.961046000 +0100 +Index: linux-atm-2.5.0/src/mpoad/main.c +=================================================================== +--- linux-atm-2.5.0.orig/src/mpoad/main.c ++++ linux-atm-2.5.0/src/mpoad/main.c @@ -9,6 +9,7 @@ #include #include @@ -86,9 +94,10 @@ diff -Naur linux-atm-2.5.0.org/src/mpoad/main.c linux-atm-2.5.0/src/mpoad/main.c #include #include #include -diff -Naur linux-atm-2.5.0.org/src/mpoad/p_factory.c linux-atm-2.5.0/src/mpoad/p_factory.c ---- linux-atm-2.5.0.org/src/mpoad/p_factory.c 2007-03-23 11:53:24.455415000 +0100 -+++ linux-atm-2.5.0/src/mpoad/p_factory.c 2007-03-23 12:29:56.340551000 +0100 +Index: linux-atm-2.5.0/src/mpoad/p_factory.c +=================================================================== +--- linux-atm-2.5.0.orig/src/mpoad/p_factory.c ++++ linux-atm-2.5.0/src/mpoad/p_factory.c @@ -5,6 +5,7 @@ #include #include @@ -97,9 +106,10 @@ diff -Naur linux-atm-2.5.0.org/src/mpoad/p_factory.c linux-atm-2.5.0/src/mpoad/p #include #include #include -diff -Naur linux-atm-2.5.0.org/src/mpoad/p_recogn.c linux-atm-2.5.0/src/mpoad/p_recogn.c ---- linux-atm-2.5.0.org/src/mpoad/p_recogn.c 2007-03-23 11:53:24.459410000 +0100 -+++ linux-atm-2.5.0/src/mpoad/p_recogn.c 2007-03-23 12:32:09.135623000 +0100 +Index: linux-atm-2.5.0/src/mpoad/p_recogn.c +=================================================================== +--- linux-atm-2.5.0.orig/src/mpoad/p_recogn.c ++++ linux-atm-2.5.0/src/mpoad/p_recogn.c @@ -7,6 +7,7 @@ #include #include @@ -108,3 +118,15 @@ diff -Naur linux-atm-2.5.0.org/src/mpoad/p_recogn.c linux-atm-2.5.0/src/mpoad/p_ #include #include #include /* For UINT_MAX */ +Index: linux-atm-2.5.0/src/led/main.c +=================================================================== +--- linux-atm-2.5.0.orig/src/led/main.c ++++ linux-atm-2.5.0/src/led/main.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/linux-atm.changes b/linux-atm.changes index b206ca2..5ea6d91 100644 --- a/linux-atm.changes +++ b/linux-atm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 12 14:23:35 CEST 2009 - coolo@novell.com + +- fix build with glibc 2.10 + ------------------------------------------------------------------- Thu Mar 29 14:31:31 CEST 2007 - rguenther@suse.de diff --git a/linux-atm.spec b/linux-atm.spec index 3441131..0366b91 100644 --- a/linux-atm.spec +++ b/linux-atm.spec @@ -1,7 +1,7 @@ # # spec file for package linux-atm (Version 2.5.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later Group: Productivity/Networking/Other Summary: Tools for ATM Version: 2.5.0 -Release: 135 +Release: 136 Source0: linux-atm-%{version}.tar.bz2 Patch0: linux-atm-%{version}.diff Patch1: linux-atm-2.5.0-include.patch @@ -118,11 +118,13 @@ rm -rf %{buildroot} %{_includedir}/* %changelog +* Fri Jun 12 2009 coolo@novell.com +- fix build with glibc 2.10 * Thu Mar 29 2007 rguenther@suse.de - add bison and flex BuildRequires * Fri Mar 23 2007 ssommer@suse.de - fix build with newer kernel headers -* Sun May 28 2006 schwab@suse.de +* Sat May 27 2006 schwab@suse.de - Don't strip binaries. * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires