packages: libnet/libnet-leaking-fd.patch, libnet/libnet-proc.patch, libnet/...

baggins baggins at pld-linux.org
Fri Apr 20 12:26:51 CEST 2012


Author: baggins                      Date: Fri Apr 20 10:26:51 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.1.6
- packetfactory is dead, no response to email, and no bug fixing
- updated patches
- removed obsolete patches

---- Files affected:
packages/libnet:
   libnet-leaking-fd.patch (1.1 -> 1.2) , libnet-proc.patch (1.1 -> 1.2) , libnet.spec (1.57 -> 1.58) , libnet-am.patch (1.1 -> NONE)  (REMOVED), libnet-shared.patch (1.6 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libnet/libnet-leaking-fd.patch
diff -u packages/libnet/libnet-leaking-fd.patch:1.1 packages/libnet/libnet-leaking-fd.patch:1.2
--- packages/libnet/libnet-leaking-fd.patch:1.1	Mon Nov  3 17:30:43 2008
+++ packages/libnet/libnet-leaking-fd.patch	Fri Apr 20 12:26:46 2012
@@ -8,47 +8,6 @@
  	return (-1);
      }
  #endif
-@@ -154,6 +155,10 @@
- 	snprintf(errbuf, LIBNET_ERRBUF_SIZE,
-                 "%s(): ioctl(SIOCGIFCONF) error: %s\n", 
-                 __func__, strerror(errno));
-+	close(fd);
-+#ifdef HAVE_LINUX_PROCFS
-+	fclose(fp);
-+#endif
- 	return(-1);
-     }
- 
-@@ -213,7 +218,7 @@
-             pifr = ifr;
-             continue;
- 	}
--	
-+
-         strncpy(nifr.ifr_name, device, sizeof(device) - 1);
-         nifr.ifr_name[sizeof(nifr.ifr_name) - 1] = '\0';
-         if (ioctl(fd, SIOCGIFADDR, (int8_t *)&nifr) < 0)
-@@ -224,6 +229,9 @@
-                         "%s(): SIOCGIFADDR: dev=%s: %s\n", __func__, device,
-                         strerror(errno));
-                 close(fd);
-+#ifdef HAVE_LINUX_PROCFS
-+                fclose(fp);
-+#endif
-                 return (-1);
- 	    }
-             else /* device has no IP address => set to 0 */
-@@ -240,6 +248,10 @@
-         {
-             snprintf(errbuf, LIBNET_ERRBUF_SIZE, 
-                     "%s(): strdup not enough memory\n", __func__);
-+            close(fd);
-+#ifndef HAVE_LINUX_PROCFS
-+            fclose(fp);
-+#endif
-             return(-1);
-         }
- 
 @@ -251,7 +263,9 @@
  #endif
  

================================================================
Index: packages/libnet/libnet-proc.patch
diff -u packages/libnet/libnet-proc.patch:1.1 packages/libnet/libnet-proc.patch:1.2
--- packages/libnet/libnet-proc.patch:1.1	Fri Aug 28 22:00:23 2009
+++ packages/libnet/libnet-proc.patch	Fri Apr 20 12:26:46 2012
@@ -3,7 +3,7 @@
 @@ -12,18 +12,9 @@
  dnl results:    HAVE_LINUX_PROCFS
  dnl
- AC_DEFUN(AC_LIBNET_LINUX_PROCFS,
+ AC_DEFUN([AC_LIBNET_LINUX_PROCFS],
 -    [AC_MSG_CHECKING(for Linux proc filesystem)
 -    AC_CACHE_VAL(ac_cv_libnet_linux_procfs,
 -        if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then

================================================================
Index: packages/libnet/libnet.spec
diff -u packages/libnet/libnet.spec:1.57 packages/libnet/libnet.spec:1.58
--- packages/libnet/libnet.spec:1.57	Fri Jan 28 14:22:46 2011
+++ packages/libnet/libnet.spec	Fri Apr 20 12:26:46 2012
@@ -3,18 +3,18 @@
 Summary(pl.UTF-8):	Biblioteka C do przenośnego tworzenia i wprowadzania pakietów
 Summary(pt_BR.UTF-8):	API para funções de rede de baixo nível
 Name:		libnet
-Version:	1.1.2.1
-Release:	7
+Version:	1.1.6
+Release:	1
 Epoch:		1
 License:	BSD
 Group:		Libraries
-Source0:	http://www.packetfactory.net/libnet/dist/%{name}-%{version}.tar.gz
-# Source0-md5:	be845c41170d72c7db524f3411b50256
+Source0:	http://sourceforge.net/projects/libnet-dev/files/%{name}-%{version}.tar.gz
+# Source0-md5:	710296fe424a49344e5fcc0d09e53317
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-am.patch
 Patch2:		%{name}-leaking-fd.patch
 Patch3:		%{name}-proc.patch
-URL:		http://www.packetfactory.net/libnet/
+URL:		http://www.sourceforge.net/projects/libnet-dev/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -91,9 +91,7 @@
 libnet - programy przykładowe.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
+%setup -q
 %patch2 -p1
 %patch3 -p1
 
@@ -102,10 +100,9 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure \
-	--with-pf_packet=yes
-%{__make} \
-	CFLAGS="%{rpmcflags}"
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,12 +112,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_libdir}/libnet.so.*.*.* $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libnet.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libnet.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libdir}/libnet.so
 
-ln -sf libnet.so	$RPM_BUILD_ROOT%{_libdir}/libpwrite.so
-ln -sf libnet.a		$RPM_BUILD_ROOT%{_libdir}/libpwrite.a
 install sample/*.[ch]	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install doc/man/man3/libnet-functions.h.3 $RPM_BUILD_ROOT%{_mandir}/man3
 install libnet-config	$RPM_BUILD_ROOT%{_bindir}
@@ -135,6 +130,7 @@
 %defattr(644,root,root,755)
 %doc README doc/{CHANGELOG,MIGRATION,PACKET_BUILDING}
 %attr(755,root,root) /%{_lib}/lib*.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/lib*.so.1
 
 %files devel
 %defattr(644,root,root,755)
@@ -159,6 +155,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2012/04/20 10:26:46  baggins
+- 1.1.6
+- packetfactory is dead, no response to email, and no bug fixing
+- updated patches
+- removed obsolete patches
+
 Revision 1.57  2011/01/28 13:22:46  baggins
 - rel 7
 - moved library to /lib for syslog-ng
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libnet/libnet-leaking-fd.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/libnet/libnet-proc.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/libnet/libnet.spec?r1=1.57&r2=1.58



More information about the pld-cvs-commit mailing list