rpms/linux-atm/devel linux-atm-2.5.0-disable-ilmidiag.patch, NONE, 1.1 linux-atm-2.5.0-br2684log.patch, 1.1, 1.2 linux-atm-2.5.0-types.patch, 1.1, 1.2 linux-atm.spec, 1.22, 1.23 linux-atm-2.5.0-gcc4.patch, 1.1, NONE linux-atm-2.5.0-stdlib.patch, 1.1, NONE

David Woodhouse (dwmw2) fedora-extras-commits at redhat.com
Thu Aug 23 08:34:49 UTC 2007


Author: dwmw2

Update of /cvs/pkgs/rpms/linux-atm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2387

Modified Files:
	linux-atm-2.5.0-br2684log.patch linux-atm-2.5.0-types.patch 
	linux-atm.spec 
Added Files:
	linux-atm-2.5.0-disable-ilmidiag.patch 
Removed Files:
	linux-atm-2.5.0-gcc4.patch linux-atm-2.5.0-stdlib.patch 
Log Message:
update from cvs

linux-atm-2.5.0-disable-ilmidiag.patch:

--- NEW FILE linux-atm-2.5.0-disable-ilmidiag.patch ---
--- linux-atm/src/ilmid/Makefile.am~	2007-07-11 17:07:57.000000000 +0100
+++ linux-atm/src/ilmid/Makefile.am	2007-08-23 09:22:45.000000000 +0100
@@ -2,7 +2,7 @@ SUBDIRS = asn1
 
 INCLUDES = -I$(srcdir)/../ilmid/asn1
 
-sbin_PROGRAMS = ilmid ilmidiag
+sbin_PROGRAMS = ilmid
 
 ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \
 			util.c util.h io.c io.h message.c message.h \

linux-atm-2.5.0-br2684log.patch:

Index: linux-atm-2.5.0-br2684log.patch
===================================================================
RCS file: /cvs/pkgs/rpms/linux-atm/devel/linux-atm-2.5.0-br2684log.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-atm-2.5.0-br2684log.patch	18 Jan 2005 14:58:55 -0000	1.1
+++ linux-atm-2.5.0-br2684log.patch	23 Aug 2007 08:34:45 -0000	1.2
@@ -1,15 +1,5 @@
-? 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
+--- linux-atm/src/br2684/br2684ctl.c.orig	2007-07-11 17:07:57.000000000 +0100
++++ linux-atm/src/br2684/br2684ctl.c	2007-08-23 09:17:58.000000000 +0100
 @@ -3,6 +3,8 @@
  #include <unistd.h>
  #include <errno.h>
@@ -32,7 +22,7 @@
  
  
  int lastsock, lastitf;
-@@ -39,10 +41,16 @@ void fatal(const char *str, int i)
+@@ -39,10 +41,16 @@ void fatal(const char *str, int err)
  
  void exitFunc(void)
  {
@@ -50,7 +40,7 @@
  int create_pidfile(int num)
  {
    FILE *pidfile = NULL;
-@@ -80,7 +88,7 @@ int create_br(char *nstr)
+@@ -84,7 +92,7 @@ int create_br(char *nstr, int payload)
        err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni);
    
        if (err == 0)
@@ -59,16 +49,16 @@
        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
+@@ -111,7 +119,7 @@ int assign_vcc(char *astr, int encap, in
+     if (err!=0)
+       syslog(LOG_ERR,"Could not parse ATM parameters (error=%d)\n",err);
+     
 -    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)
+@@ -270,11 +278,13 @@ int main (int argc, char **argv)
    }
    
    create_pidfile(itfnum);

linux-atm-2.5.0-types.patch:

Index: linux-atm-2.5.0-types.patch
===================================================================
RCS file: /cvs/pkgs/rpms/linux-atm/devel/linux-atm-2.5.0-types.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-atm-2.5.0-types.patch	22 Aug 2007 14:01:41 -0000	1.1
+++ linux-atm-2.5.0-types.patch	23 Aug 2007 08:34:45 -0000	1.2
@@ -1,23 +1,3 @@
---- linux-atm/src/arpd/itf.c	2007-08-22 14:54:18.000000000 +0100
-+++ linux-atm/src/arpd/itf.c	2007-08-22 14:53:44.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <linux/atmclip.h>
- #include <sys/socket.h>
- #define _LINUX_NETDEVICE_H /* glibc2 */
-+#include <linux/types.h>
- #include <linux/if_arp.h>
- 
- #include "atmd.h"
---- linux-atm/src/arpd/arp.c	2007-08-22 14:54:08.000000000 +0100
-+++ linux-atm/src/arpd/arp.c	2007-08-22 14:53:14.000000000 +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>
 --- linux-atm/src/mpoad/io.c~	2001-10-09 23:33:07.000000000 +0100
 +++ linux-atm/src/mpoad/io.c	2007-08-22 14:57:02.000000000 +0100
 @@ -19,6 +19,7 @@


Index: linux-atm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-atm.spec	22 Aug 2007 17:32:20 -0000	1.22
+++ linux-atm.spec	23 Aug 2007 08:34:45 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 3.20050118cvs
+Release: 4.20070823cvs
 License: BSD, GPLv2+, LGPLv2+
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
@@ -9,14 +9,12 @@
 # Older kernel headers had broken ATM includes
 BuildRequires: glibc-kernheaders >= 2.4-9.1.88
 BuildRequires: byacc automake libtool flex
-# cvs -rV2_5_0 -D2005-01-18
-Source: linux-atm-2.5.0-20050118.tar.gz
+Source: linux-atm-2.5.0-20070823.tar.gz
 # Patch from Debian to sanify syslogging
 Patch0: linux-atm-2.5.0-br2684log.patch
-Patch1: linux-atm-2.5.0-stdlib.patch
-Patch2: linux-atm-2.5.0-gcc4.patch
-Patch3: linux-atm-2.5.0-types.patch
-Patch4: linux-atm-2.5.0-open-macro.patch
+Patch1: linux-atm-2.5.0-types.patch
+Patch2: linux-atm-2.5.0-open-macro.patch
+Patch3: linux-atm-2.5.0-disable-ilmidiag.patch
 
 %description
 Tools to support ATM networking under Linux.
@@ -40,11 +38,10 @@
 
 %prep
 %setup -q -n linux-atm
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 ./autotools
@@ -90,6 +87,9 @@
 %{_libdir}/libatm.so
 
 %changelog
+* Thu Aug 23 2007 David Woodhouse <dwmw2 at infradead.org> - 2.5.0-4.20070823cvs
+- Update from CVS
+
 * Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> - 2.5.0-3.20050118cvs
 - Update licence
 - Handle open being a macro


--- linux-atm-2.5.0-gcc4.patch DELETED ---


--- linux-atm-2.5.0-stdlib.patch DELETED ---




More information about the fedora-extras-commits mailing list