pool/linux-atm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 214990 from home:aeneas_jaissle:branches:Base:System

Browse Source 
- Cleanup spec file, remove %clean section
- Updated to 2.5.2
- Removed linux-atm-2.5.0.diff (in mainline)
- Removed linux-atm-2.5.0-include.patch (in mainline)
- Rebased linux-atm-2.5.0-fdleak.patch as linux-atm-2.5.2_fdleak.patch
- Added linux-atm-2.5.2_implicit-fortify-decl.patch to fix implicit declarations

OBS-URL: https://build.opensuse.org/request/show/214990
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-atm?expand=0&rev=15
This commit is contained in:
Marcus Meissner 2014-01-24 08:10:14 +00:00 committed by Git OBS Bridge
parent fe11d9175e
commit a6b729bdf1
9 changed files with 86 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
linux-atm-2.5.0-fdleak.patch
View File

@ -1,22 +0,0 @@
Index: src/arpd/atmarp.c
===================================================================
--- src/arpd/atmarp.c.orig 2009-10-10 01:49:14.000000000 +0200
+++ src/arpd/atmarp.c 2009-10-10 01:51:34.000000000 +0200
@@ -90,14 +90,17 @@ static int print_table(void)
}
while ((size = read(fd,buffer,BUF_SIZE))) {
if (size < 0) {
+ close(fd);
perror("read " ATMARP_DUMP_DIR "/" ATMARP_DUMP_FILE);
return 1;
}
if (write(0,buffer,size) < 0) {
+ close(fd);
perror("write stdout");
return 1;
}
}
+ close(fd);
return 0;
}

132
linux-atm-2.5.0-include.patch
View File

@ -1,132 +0,0 @@
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 <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>
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 <net/if_arp.h>
#include <stdint.h>
+#include <linux/types.h>
#include <linux/atmarp.h>
#include <linux/atmclip.h>
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 <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 */
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 <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 */
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
#include <atm.h>
+#include <linux/types.h>
#include <linux/atmioc.h>
#include <linux/atmmpc.h>
#include <sys/types.h>
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 <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"
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 <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"
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 <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>
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 <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>
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 <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 */
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 <getopt.h>
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <atm.h>
#include <atmd.h>

238
linux-atm-2.5.0.diff
View File

@ -1,238 +0,0 @@
Index: src/ilmid/atmf_uni.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/atmf_uni.c,v
retrieving revision 1.2.2.1
diff -u -w -r1.2.2.1 atmf_uni.c
--- src/ilmid/atmf_uni.c 19 Jul 2003 21:07:19 -0000 1.2.2.1
+++ src/ilmid/atmf_uni.c 22 Apr 2005 09:41:13 -0000
@@ -203,6 +203,7 @@
int cmp;
NetPrefixNode *prefix, *newPrefix;
AsnOid *varBindName;
+ NetPrefixNode *node;
diag(COMPONENT,DIAG_DEBUG,"setNetPrefix");
varBindName = &varbind->name;
@@ -217,7 +218,9 @@
varBindName->octs[NETPREFIX_LEN + 1] != NETPREFIX_STRINGLEN)
return NOSUCHNAME;
- for(prefix = (NetPrefixNode *) var->value, cmp = AsnOidLess;
+ node = (NetPrefixNode *) var->value;
+
+ for(prefix = node, cmp = AsnOidLess;
prefix != NULL && (cmp = AsnOidCompare(varBindName, prefix->name)) <
AsnOidEqual;
prefix = prefix->next);
@@ -228,7 +231,7 @@
newPrefix->name = alloc_t(AsnOid);
newPrefix->name->octs = alloc(varBindName->octetLen);
AsnOidCopy(newPrefix->name, varBindName);
- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
+ Q_INSERT_BEFORE(node, newPrefix, prefix);
if(atmNetPrefix.octs == NULL)
{
atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
@@ -238,7 +241,7 @@
}
else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
{
- Q_REMOVE((NetPrefixNode *) var->value, prefix);
+ Q_REMOVE(node, prefix);
}
return NOERROR;
Index: src/lane/lecs_db.l
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/lecs_db.l,v
retrieving revision 1.2
diff -u -w -r1.2 lecs_db.l
--- src/lane/lecs_db.l 9 Oct 2001 22:33:07 -0000 1.2
+++ src/lane/lecs_db.l 22 Apr 2005 09:41:13 -0000
@@ -7,6 +7,7 @@
/*Standard includes*/
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
/* Local includes */
#include "lecs_load.h"
Index: src/lane/load_lex.l
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/load_lex.l,v
retrieving revision 1.2
diff -u -w -r1.2 load_lex.l
--- src/lane/load_lex.l 9 Oct 2001 22:33:07 -0000 1.2
+++ src/lane/load_lex.l 22 Apr 2005 09:41:13 -0000
@@ -4,6 +4,7 @@
#include <config.h>
#endif
+#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
Index: src/lane/mem_lecs.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/mem_lecs.c,v
retrieving revision 1.2
diff -u -w -r1.2 mem_lecs.c
--- src/lane/mem_lecs.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/lane/mem_lecs.c 22 Apr 2005 09:41:13 -0000
@@ -13,6 +13,7 @@
/* System includes */
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
/* Local includes */
Index: src/maint/atmtcp.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/maint/atmtcp.c,v
retrieving revision 1.2
diff -u -w -r1.2 atmtcp.c
--- src/maint/atmtcp.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/maint/atmtcp.c 22 Apr 2005 09:41:13 -0000
@@ -60,7 +60,7 @@
static IN *inputs = NULL;
static fd_set in_set;
static int fds = 0;
-static int debug = 0;
+/* static */ int debug = 0;
static int links = 0;
Index: src/mpoad/k_interf.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/k_interf.c,v
retrieving revision 1.2
diff -u -w -r1.2 k_interf.c
--- src/mpoad/k_interf.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/mpoad/k_interf.c 22 Apr 2005 09:41:13 -0000
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <unistd.h>
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/param.h> /* for OPEN_MAX */
Index: src/mpoad/p_factory.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/p_factory.c,v
retrieving revision 1.2
diff -u -w -r1.2 p_factory.c
--- src/mpoad/p_factory.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/mpoad/p_factory.c 22 Apr 2005 09:41:13 -0000
@@ -34,7 +34,9 @@
while( count > 1 ) {
/* This is the inner loop */
- sum += * ((uint16_t *) addr)++;
+ // sum += * ((uint16_t *) addr)++;
+ sum += * ((uint16_t *) addr);
+ addr += 2;
count -= 2;
}
Index: src/qgen/qlib.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/qlib.c,v
retrieving revision 1.2
diff -u -w -r1.2 qlib.c
--- src/qgen/qlib.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/qgen/qlib.c 22 Apr 2005 09:41:13 -0000
@@ -26,7 +26,7 @@
#include "op.h"
-static int debug = 0;
+/* static */ int debug = 0;
void PREFIX(report)(int severity,const char *msg,...)
Index: src/sigd/cfg_y.y
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/cfg_y.y,v
retrieving revision 1.2.2.1
diff -u -w -r1.2.2.1 cfg_y.y
--- src/sigd/cfg_y.y 20 Apr 2005 16:40:47 -0000 1.2.2.1
+++ src/sigd/cfg_y.y 22 Apr 2005 09:41:13 -0000
@@ -10,6 +10,7 @@
#include <string.h>
#include <ctype.h>
#include <limits.h>
+#include <stdlib.h>
#include "atm.h"
#include "atmd.h"
Index: src/switch/cfg_y.y
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/cfg_y.y,v
retrieving revision 1.2.2.1
diff -u -w -r1.2.2.1 cfg_y.y
--- src/switch/cfg_y.y 20 Apr 2005 16:40:47 -0000 1.2.2.1
+++ src/switch/cfg_y.y 22 Apr 2005 09:41:13 -0000
@@ -10,6 +10,7 @@
#include <string.h>
#include <errno.h>
#include <limits.h>
+#include <stdlib.h>
#include "atm.h"
Index: src/switch/debug/debug.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/debug/debug.c,v
retrieving revision 1.2
diff -u -w -r1.2 debug.c
--- src/switch/debug/debug.c 9 Oct 2001 22:33:08 -0000 1.2
+++ src/switch/debug/debug.c 22 Apr 2005 09:41:13 -0000
@@ -43,7 +43,8 @@
void fab_init(CALL *call)
{
- PRV(call) = alloc_t(FAB);
+ // PRV(call) = alloc_t(FAB);
+ call->fab = alloc_t(FAB);
PRV(call)->next = calls;
calls = call;
}
@@ -59,7 +60,8 @@
diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
*walk = PRV(call)->next;
free(PRV(call));
- PRV(call) = NULL;
+ // PRV(call) = NULL;
+ call->fab = NULL;
}
Index: src/switch/tcp/tcpsw.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/tcp/tcpsw.c,v
retrieving revision 1.2
diff -u -w -r1.2 tcpsw.c
--- src/switch/tcp/tcpsw.c 9 Oct 2001 22:33:08 -0000 1.2
+++ src/switch/tcp/tcpsw.c 22 Apr 2005 09:41:13 -0000
@@ -345,7 +345,8 @@
void fab_init(CALL *call)
{
- PRV(call) = alloc_t(FAB);
+ // PRV(call) = alloc_t(FAB);
+ call->fab = alloc_t(FAB);
PRV(call)->active = 0;
PRV(call)->next = calls;
calls = call;
@@ -362,7 +363,8 @@
diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
*walk = PRV(call)->next;
free(PRV(call));
- PRV(call) = NULL;
+ // PRV(call) = NULL;
+ call->fab = NULL;
}

3
linux-atm-2.5.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e73aa34dc00c9fd50da73d8b528da994f28003dcdd1d23485d251bb451220ca8
size 1036180

BIN
linux-atm-2.5.2.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

29
linux-atm-2.5.2_fdleak.patch Normal file
View File

@ -0,0 +1,29 @@
diff -Ppru linux-atm-2.5.2.orig/.directory linux-atm-2.5.2/.directory
--- linux-atm-2.5.2.orig/.directory 1970-01-01 01:00:00.000000000 +0100
+++ linux-atm-2.5.2/.directory 2014-01-23 23:39:47.120089077 +0100
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2014,1,23,23,39,47
+Version=3
+ViewMode=1
diff -Ppru linux-atm-2.5.2.orig/src/arpd/atmarp.c linux-atm-2.5.2/src/arpd/atmarp.c
--- linux-atm-2.5.2.orig/src/arpd/atmarp.c 2009-11-30 17:56:52.000000000 +0100
+++ linux-atm-2.5.2/src/arpd/atmarp.c 2014-01-23 23:44:31.170128564 +0100
@@ -89,14 +89,17 @@ static int print_table(void)
}
while ((size = read(fd,buffer,BUF_SIZE))) {
if (size < 0) {
+ close(fd);
perror("read " ATMARP_DUMP_DIR "/" ATMARP_DUMP_FILE);
return 1;
}
if (write(1,buffer,size) < 0) {
+ close(fd);
perror("write stdout");
return 1;
}
}
+ close(fd);
return 0;
}

10
linux-atm-2.5.2_implicit-fortify-decl.patch Normal file
View File

@ -0,0 +1,10 @@
diff -Ppru linux-atm-2.5.2.orig/src/maint/hediag.c linux-atm-2.5.2/src/maint/hediag.c
--- linux-atm-2.5.2.orig/src/maint/hediag.c 2009-11-30 17:56:52.000000000 +0100
+++ linux-atm-2.5.2/src/maint/hediag.c 2014-01-23 23:29:56.288066939 +0100
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/types.h>

10
linux-atm.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jan 23 21:59:12 UTC 2014 - aj@ajaissle.de
- Cleanup spec file, remove %clean section
- Updated to 2.5.2
- Removed linux-atm-2.5.0.diff (in mainline)
- Removed linux-atm-2.5.0-include.patch (in mainline)
- Rebased linux-atm-2.5.0-fdleak.patch as linux-atm-2.5.2_fdleak.patch
- Added linux-atm-2.5.2_implicit-fortify-decl.patch to fix implicit declarations
-------------------------------------------------------------------
Tue Apr 16 08:05:54 UTC 2013 - mmeister@suse.com

64
linux-atm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package linux-atm
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -17,79 +17,83 @@
Name: linux-atm
%define sover 1
BuildRequires: bison
BuildRequires: flex
BuildRequires: glibc-devel
Url: http://sourceforge.net/projects/linux-atm/
Version: 2.5.2
Release: 0
%global sover 1
Summary: Tools for ATM
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Networking/Other
Version: 2.5.0
Release: 0
Url: http://linux-atm.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
Patch0: linux-atm-%{version}.diff
Patch1: linux-atm-2.5.0-include.patch
Patch2: linux-atm-2.5.0-fdleak.patch
# PATCH-FIX-UPSTREAM linux-atm-2.5.2_fdleak.patch
Patch0: linux-atm-2.5.2_fdleak.patch
# PATCH-FIX-UPSTREAM linux-atm-2.5.2_implicit-fortify-decl.patch -- fix implicit declarations
Patch1: linux-atm-2.5.2_implicit-fortify-decl.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: glibc-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Tools to support ATM (Asynchronous Transfer Mode) networking.
%package -n libatm%sover
%package -n libatm%{sover}
Summary: Libraries for ATM
Group: System/Libraries
%description -n libatm%sover
%description -n libatm%{sover}
Libraries for ATM (Asynchronous Transfer Mode) networking.
%package devel
Summary: Development for ATM
Group: Development/Libraries/C and C++
Requires: libatm%sover = %version
Requires: libatm%{sover} = %{version}
%description devel
Libraries and header files for ATM (Asynchronous Transfer Mode)
networking.
%prep
%setup -q -n linux-atm-%{version}
%patch0
%setup -q
%patch0 -p1
%patch1 -p1
%patch2
%build
%configure --disable-static
%{__make} %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
%{__make} install DESTDIR=%{buildroot}
%{__rm} -rf %{buildroot}%{_libdir}/*.la
%clean
rm -rf %{buildroot}
%post -n libatm%{sover} -p /sbin/ldconfig
%post -n libatm%sover -p /sbin/ldconfig
%postun -n libatm%sover -p /sbin/ldconfig
%postun -n libatm%{sover} -p /sbin/ldconfig
%files
%defattr(-,root,root)
%config(noreplace) /etc/atmsigd.conf
/usr/bin/*
/usr/sbin/*
%config(noreplace) %{_sysconfdir}/atmsigd.conf
%config(noreplace) %{_sysconfdir}/hosts.atm
%{_bindir}/*
%{_sbindir}/*
/lib/firmware/*
%doc README AUTHORS ChangeLog NEWS THANKS BUGS
%doc COPYING COPYING.GPL COPYING.LGPL
%doc %{_mandir}/man*/*.gz
%files -n libatm%sover
%files -n libatm%{sover}
%defattr(-,root,root)
%{_libdir}/*.so
%{_libdir}/*.so.*
%{_libdir}/libatm.so.%{sover}*
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_includedir}/atm*.h
%{_libdir}/libatm.so
%changelog