From 5f3ecc6996b16678ac17b9233819cb83e26bef66 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@fedoraproject.org>
Date: Jan 18 2005 14:58:55 +0000
Subject: v2.5.0 snapshot


---

diff --git a/.cvsignore b/.cvsignore
index 97dff42..5d1b05c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-linux-atm-2.4.1.tar.gz
+linux-atm-2.5.0-0.20050118.src.rpm
diff --git a/linux-atm-2.5.0-br2684log.patch b/linux-atm-2.5.0-br2684log.patch
new file mode 100644
index 0000000..b9b3e34
--- /dev/null
+++ b/linux-atm-2.5.0-br2684log.patch
@@ -0,0 +1,85 @@
+? src/br2684/.deps
+? src/br2684/.libs
+? src/br2684/Makefile
+? src/br2684/Makefile.in
+? src/br2684/br2684ctl
+Index: src/br2684/br2684ctl.c
+===================================================================
+RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,v
+retrieving revision 1.1.2.3
+diff -u -p -r1.1.2.3 br2684ctl.c
+--- src/br2684/br2684ctl.c	26 Feb 2004 00:59:04 -0000	1.1.2.3
++++ src/br2684/br2684ctl.c	18 Jan 2005 14:39:03 -0000
+@@ -3,6 +3,8 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
++#include <signal.h>
+ #include <string.h>
+ #include <syslog.h>
+ #include <atm.h>
+@@ -22,9 +24,9 @@
+ */
+ 
+ 
+-#define LOG_NAME "RFC1483/2684 bridge"
+-#define LOG_OPTION     LOG_PERROR
+-#define LOG_FACILITY   LOG_LOCAL0
++#define LOG_NAME       "br2684ctl"
++#define LOG_OPTION     LOG_PERROR|LOG_PID
++#define LOG_FACILITY   LOG_LOCAL2
+ 
+ 
+ int lastsock, lastitf;
+@@ -39,10 +41,16 @@ void fatal(const char *str, int i)
+ 
+ void exitFunc(void)
+ {
+-  syslog (LOG_PID,"Daemon terminated\n");	
++  syslog (LOG_NOTICE,"Daemon terminated\n");
+ }
+ 
+ 
++void int_signal(int dummy)
++{
++  syslog (LOG_INFO,"Killed by a signal\n");
++  exit(0);
++}
++
+ int create_pidfile(int num)
+ {
+   FILE *pidfile = NULL;
+@@ -80,7 +88,7 @@ int create_br(char *nstr)
+       err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni);
+   
+       if (err == 0)
+-	syslog(LOG_INFO, "Interface \"%s\" created sucessfully\n",ni.ifname);
++	syslog(LOG_NOTICE, "Interface \"%s\" created sucessfully\n",ni.ifname);
+       else
+ 	syslog(LOG_INFO, "Interface \"%s\" could not be created, reason: %s\n",
+ 	       ni.ifname,
+@@ -112,7 +120,7 @@ int assign_vcc(char *astr, int encap, in
+     addr.sap_addr.vpi = 0;
+     addr.sap_addr.vci = vci;
+ #endif
+-    syslog(LOG_INFO,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf,
++    syslog(LOG_NOTICE,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf,
+ 	   addr.sap_addr.vpi,
+ 	   addr.sap_addr.vci,
+ 	   encap?"VC mux":"LLC");
+@@ -261,11 +269,13 @@ int main (int argc, char **argv)
+   }
+   
+   create_pidfile(itfnum);
++  signal(SIGINT, int_signal);
++  signal(SIGTERM, int_signal);
+ 
+   syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n");	
+   atexit (exitFunc);
+   
+-  while (1) sleep(30);	/* to keep the sockets... */
++  while (1) pause();	/* to keep the sockets... */
+   return 0;
+ }
+ 
diff --git a/linux-atm.spec b/linux-atm.spec
index bf9c779..155e2dd 100644
--- a/linux-atm.spec
+++ b/linux-atm.spec
@@ -1,14 +1,17 @@
 Summary: Tools to support ATM networking under Linux.
 Name: linux-atm
-Version: 2.4.1
-Release: 4
+Version: 2.5.0
+Release: 0.20050118
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Source: http://prdownloads.sourceforge.net/linux-atm/linux-atm-%{version}.tar.gz
-Patch0: linux-atm-2.4.1-kernheaderworkaround.patch
-Patch1: linux-atm-2.4.1-labelplacement.patch
+# Older kernel headers had broken ATM includes
+BuildRequires: glibc-kernheaders >= 2.4-9.1.88
+# cvs -rV2_5_0 -D2005-01-18
+Source: linux-atm-2.5.0-20050118.tar.gz
+# Patch from Debian to sanify syslogging
+Patch0: linux-atm-2.5.0-br2684log.patch
 
 %description
 Tools to support ATM networking under Linux.
@@ -24,17 +27,18 @@ This package contains the ATM library required for userspace ATM tools.
 Summary: Development files for Linux ATM API library
 Group: Development/Libraries
 Requires: linux-atm-libs = %{version}
+Requires: glibc-kernheaders >= 2.4-9.1.88
 
 %description libs-devel
 This package contains header files and libraries for development using the
 Linux ATM API.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -n linux-atm
+%patch0 -p0
 
 %build
+./autotools
 %{configure}
 make
 
diff --git a/sources b/sources
index b34df58..f61da67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84fef49cc39ff2605204246666f65864  linux-atm-2.4.1.tar.gz
+9e9c40741a5be0f520038f4ac1a65ee4  linux-atm-2.5.0-0.20050118.src.rpm