OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/linux-atm?expand=0&rev=2

2007-03-23 21:25:49 +00:00 · 2007-03-23 21:25:49 +00:00 · 4bc7e97a91
commit 4bc7e97a91
parent 39f46dcf09
3 changed files with 124 additions and 4 deletions
--- a/linux-atm-2.5.0-include.patch
+++ b/linux-atm-2.5.0-include.patch
@ -0,0 +1,110 @@
+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
+@@ -16,6 +16,7 @@
+ #include <sys/socket.h> /* for linux/if_arp.h */
+ #include <netinet/in.h> /* for ntohs, etc. */
+ #define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */
+#include <linux/types.h>
+ #include <linux/if_arp.h>
+ #include <linux/if_ether.h>
+ #include <atm.h>
+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
+@@ -19,6 +19,7 @@
+ #include <net/if_arp.h>
+ 
+ #include <stdint.h>
+#include <linux/types.h>
+ #include <linux/atmarp.h>
+ #include <linux/atmclip.h>
+ 
+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
+@@ -19,6 +19,7 @@
+ #include <net/if.h>
+ #include <netinet/in.h>
+ #include <atm.h>
+#include <linux/types.h>
+ #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */
+ #include <linux/atmarp.h>
+ #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
+@@ -10,6 +10,7 @@
+ #include <stdint.h>
+ #include <string.h>
+ #include <sys/types.h>
+#include <linux/types.h>
+ #include <linux/atmclip.h>
+ #include <sys/socket.h>
+ #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
+@@ -19,6 +19,7 @@
+ _syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout);
+ #endif
+ #include <atm.h>
+#include <linux/types.h>
+ #include <linux/atmioc.h>
+ #include <linux/atmmpc.h>
+ #include <sys/types.h>
+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
+@@ -10,6 +10,7 @@
+ #include <sys/param.h> /* for OPEN_MAX   */
+ #include <stdint.h>
+ #include <netinet/in.h> /* for ntohl()    */
+#include <linux/types.h>
+ #include <linux/atmmpc.h>
+ #include <atm.h>
+ #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
+@@ -11,6 +11,7 @@
+ #include <errno.h>
+ #include <atm.h>
+ #include <atmsap.h>
+#include <linux/types.h>
+ #include <linux/atmmpc.h>   /* 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
+@@ -9,6 +9,7 @@
+ #include <time.h>
+ #include <sys/ioctl.h>
+ #include <atm.h>
+#include <linux/types.h>
+ #include <linux/atmdev.h>
+ #include <linux/atmmpc.h>
+ #include <sys/socket.h>
+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
+@@ -5,6 +5,7 @@
+ #include <sys/types.h>
+ #include <stdint.h>
+ #include <netinet/in.h>
+#include <linux/types.h>
+ #include <linux/atmmpc.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
+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
+@@ -7,6 +7,7 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <atm.h>
+#include <linux/types.h>
+ #include <linux/atmmpc.h>
+ #include <netinet/in.h>
+ #include <limits.h> /* For UINT_MAX */
--- a/linux-atm.changes
+++ b/linux-atm.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 23 12:44:27 CET 2007 - ssommer@suse.de
+
+- fix build with newer kernel headers
+
 -------------------------------------------------------------------
 Sat May 27 23:01:13 CEST 2006 - schwab@suse.de

--- a/linux-atm.spec
+++ b/linux-atm.spec
@ -1,7 +1,7 @@
 #
 # spec file for package linux-atm (Version 2.5.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 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.
 #
@ -11,14 +11,16 @@
 # norootforbuild

 Name:           linux-atm
+BuildRequires:  glibc-devel
 URL:            http://sourceforge.net/projects/linux-atm/
-License:        BSD, GPL
+License:        BSD License and BSD-like, GNU General Public License (GPL)
 Group:          Productivity/Networking/Other
 Summary:        Tools for ATM
 Version:        2.5.0
-Release:        14
+Release:        41
 Source0:        linux-atm-%{version}.tar.bz2
 Patch0:         linux-atm-%{version}.diff
+Patch1:         linux-atm-2.5.0-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -67,6 +69,7 @@ Authors:
 %prep
 %setup -q -n linux-atm-%{version}
 %patch0
+%patch1 -p1

 %build
 %{?suse_update_config}
@ -106,7 +109,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.la
 %{_includedir}/*

-%changelog -n linux-atm
+%changelog
+* Fri Mar 23 2007 - ssommer@suse.de
+- fix build with newer kernel headers
 * Sat May 27 2006 - schwab@suse.de
 - Don't strip binaries.
 * Wed Jan 25 2006 - mls@suse.de