From 44db8cc1641752fbd7ddff91fd0515428340c65aa5334db94d8e3f88047af3bf Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 12 Oct 2009 12:49:15 +0000 Subject: [PATCH] Accepting request 22204 from Base:System Copy from Base:System/linux-atm based on submit request 22204 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/22204 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/linux-atm?expand=0&rev=7 --- linux-atm-2.5.0-fdleak.patch | 22 ++++++++++++++++ linux-atm.changes | 6 +++++ linux-atm.spec | 49 +++++++----------------------------- 3 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 linux-atm-2.5.0-fdleak.patch diff --git a/linux-atm-2.5.0-fdleak.patch b/linux-atm-2.5.0-fdleak.patch new file mode 100644 index 0000000..c419b97 --- /dev/null +++ b/linux-atm-2.5.0-fdleak.patch @@ -0,0 +1,22 @@ +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; + } + diff --git a/linux-atm.changes b/linux-atm.changes index 5ea6d91..4e90939 100644 --- a/linux-atm.changes +++ b/linux-atm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 10 00:00:26 UTC 2009 - crrodriguez@opensuse.org + +- fix fdleak [bnc#544223] +- remove static libraries and "la" files + ------------------------------------------------------------------- Fri Jun 12 14:23:35 CEST 2009 - coolo@novell.com diff --git a/linux-atm.spec b/linux-atm.spec index 0366b91..4f48da5 100644 --- a/linux-atm.spec +++ b/linux-atm.spec @@ -21,14 +21,15 @@ Name: linux-atm BuildRequires: bison flex glibc-devel Url: http://sourceforge.net/projects/linux-atm/ -License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later +License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later Group: Productivity/Networking/Other Summary: Tools for ATM Version: 2.5.0 -Release: 136 +Release: 137 Source0: linux-atm-%{version}.tar.bz2 Patch0: linux-atm-%{version}.diff Patch1: linux-atm-2.5.0-include.patch +Patch2: linux-atm-2.5.0-fdleak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,7 +44,7 @@ Authors: Paul B. Schroeder, %package lib -License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later +License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later Group: System/Libraries Summary: Libraries for ATM @@ -59,7 +60,7 @@ Authors: Paul B. Schroeder, %package devel -License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later +License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: Development for ATM Requires: linux-atm-lib = %version @@ -80,15 +81,16 @@ Authors: %setup -q -n linux-atm-%{version} %patch0 %patch1 -p1 +%patch2 %build %{?suse_update_config} -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=/usr --sysconf=/etc --mandir=%{_mandir} --libdir=%{_libdir} -make +%configure --disable-static +%{__make} %{?jobs:-j%jobs} %install make install DESTDIR=$RPM_BUILD_ROOT +%{__rm} -rf %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} @@ -113,39 +115,6 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root) -%{_libdir}/*.a -%{_libdir}/*.la %{_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 -* Sat May 27 2006 schwab@suse.de -- Don't strip binaries. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Fri Apr 22 2005 arvin@suse.de -- updated to latest CVS -* Wed Apr 20 2005 arvin@suse.de -- updated to 2.5.0 CVS + my GCC 4.0 and other patches -* Mon Apr 18 2005 arvin@suse.de -- some (but not all) gcc 4.0 fixes -* Tue Apr 20 2004 arvin@suse.de -- removed some compile warnings -* Sat Jan 10 2004 adrian@suse.de -- add %%run_ldconfig -* Sat Jul 19 2003 meissner@suse.de -- drop 1 line from ltconfig, so it builds shared libs on ppc64. -* Mon May 26 2003 arvin@suse.de -- split package into linux-atm, linux-atm-lib and linux-atm-devel -- include all programs/files to make rpm v4 happy -* Thu Apr 18 2002 kukuk@suse.de -- Add suse_update_config for x86_64 -* Tue Jan 08 2002 arvin@suse.de -- include some documentation in the package -* Mon Jan 07 2002 arvin@suse.de -- initial package for atm