[packages/libnids] - drop libnet1 patch, switch to libnet >= 1.1; dsniff also uses libnet 1.1+ now - release 3

qboosh qboosh at pld-linux.org
Sat May 23 16:25:11 CEST 2020 

commit 412ab953530a34990ee580ea4347946007658d80
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 23 16:25:41 2020 +0200

    - drop libnet1 patch, switch to libnet >= 1.1; dsniff also uses libnet 1.1+ now
    - release 3

 libnids-libnet1.patch | 94 ---------------------------------------------------
 libnids.spec          | 27 ++++++++-------
 2 files changed, 14 insertions(+), 107 deletions(-)
---
diff --git a/libnids.spec b/libnids.spec
index a0f7ad2..86575a7 100644
--- a/libnids.spec
+++ b/libnids.spec
@@ -1,23 +1,24 @@
+# note: there is some fork at https://github.com/MITRECND/libnids with 1.25
 Summary:	Implementation of E-component of Network Intrusion Detection System
 Summary(pl.UTF-8):	Implementacja E-komponentu NIDS (sieciowego systemu wykrywania intruzów)
 Name:		libnids
 Version:	1.24
-Release:	2
+Release:	3
 Epoch:		1
 License:	BSD
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/libnids/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/libnids/%{name}-%{version}.tar.gz
 # Source0-md5:	72d37c79c85615ffe158aa524d649610
-Patch0:		%{name}-libnet1.patch
-Patch1:		%{name}-nolibs.patch
-Patch2:		gcc5.patch
+Patch0:		%{name}-nolibs.patch
+Patch1:		gcc5.patch
 URL:		http://libnids.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	glib2-devel >= 1:2.2.0
-BuildRequires:	libnet1-devel
+BuildRequires:	libnet-devel
 BuildRequires:	libpcap-devel
 BuildRequires:	pkgconfig
+Requires:	glib2 >= 1:2.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,6 +38,7 @@ Summary:	Header files and development documentation for libnids
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumetacja do libnids
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	libpcap-devel
 
 %description devel
 Header files and development documentation for libnids.
@@ -60,7 +62,6 @@ Biblioteka statyczna libnids.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -85,15 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README CREDITS MISC doc/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc CHANGES README CREDITS MISC doc/{API.html,LINUX,PERFORMANCE,TESTS,bugtraq_post}
+%attr(755,root,root) %{_libdir}/libnids.so.%{version}
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/*.h
-%{_mandir}/man3/*
+%attr(755,root,root) %{_libdir}/libnids.so
+%{_includedir}/nids.h
+%{_mandir}/man3/libnids.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libnids.a
diff --git a/libnids-libnet1.patch b/libnids-libnet1.patch
deleted file mode 100644
index bd951e2..0000000
--- a/libnids-libnet1.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- libnids-1.18/configure.in.orig	2003-10-15 01:40:00.000000000 +0200
-+++ libnids-1.18/configure.in	2003-10-27 23:00:07.224952248 +0100
-@@ -127,18 +127,18 @@
-      ;;
-   *)
-      AC_MSG_RESULT($withval)
--     if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
-+     if test -f $withval/include/libnet1.h -a -f $withval/lib/libnet1.a -a -f $withval/libnet1-config ; then
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
--	LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
--	LNETLIB="-L$withval/lib -lnet"
--     elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
-+	LNET_CFLAGS="-I$withval/include `$withval/libnet1-config --defines`"
-+	LNETLIB="-L$withval/lib -lnet1"
-+     elif test -f $withval/include/libnet1.h -a -f $withval/src/libnet1.a; then
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
- 	LNET_CFLAGS="-I$withval/include"
--	LNETLIB="-L$withval/src -lnet"
-+	LNETLIB="-L$withval/src -lnet1"
-      else
--	echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
-+	echo "A working combination of libnet1.h, libnet1.a and libnet1-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
-         AC_ERROR(libnet)
-      fi
-      ;;
-@@ -146,12 +146,12 @@
- [ if test "x"$LIBNET_VER = "x"-1 ; then
- 	AC_MSG_RESULT(skipping libnet)
-   else
--	if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.a ; then
--	     LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet-config --defines 2>/dev/null`"
--	     LNETLIB="-L${exec_prefix}/lib -lnet"
-+	if test -f ${prefix}/include/libnet1.h -a ${exec_prefix}/lib/libnet1.a ; then
-+	     LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet1-config --defines 2>/dev/null`"
-+	     LNETLIB="-L${exec_prefix}/lib -lnet1"
- 	else
--	     LNET_CFLAGS="`libnet-config --defines 2>/dev/null`"
--	     LNETLIB="-lnet"
-+	     LNET_CFLAGS="`libnet1-config --defines 2>/dev/null`"
-+	     LNETLIB="-lnet1"
- 	fi
-   fi ]
- )
-@@ -161,15 +161,15 @@
- 	TMPL="$LIBS"
- 	CFLAGS="$CFLAGS $LNET_CFLAGS"
- 	LIBS="$LNETLIB $LIBS"
--	AC_TRY_LINK([#include <libnet.h>], libnet_get_prand(0),
-+	AC_TRY_LINK([#include <libnet1.h>], libnet_get_prand(0),
- 		LIBNET_FOUND=1,LIBNET_FOUND=0)
- 	CFLAGS="$TMPC"
- 	LIBS="$TMPL"
- 	if test $LIBNET_FOUND = 1 ; then
--		LNETLIB="-lnet"
-+		LNETLIB="-lnet1"
- 		AC_MSG_RESULT(yes)
- 	else
--		echo "Working libnet not found; get it from www.packetfactory.net/projects/libnet and reinstall"
-+		echo "Working libnet1 not found; get it from www.packetfactory.net/projects/libnet and reinstall"
- 		AC_ERROR(libnet)
- 	fi
- fi
-@@ -227,7 +227,7 @@
- 	TMP=$CFLAGS
- 	CFLAGS="$CFLAGS $LNET_CFLAGS"
- 	AC_MSG_CHECKING(libnet version)
--	AC_TRY_COMPILE([#include <libnet.h>], int c=LIBNET_PTAG_INITIALIZER,
-+	AC_TRY_COMPILE([#include <libnet1.h>], int c=LIBNET_PTAG_INITIALIZER,
- 	LIBNET_VER=1,LIBNET_VER=0)
- 	CFLAGS=$TMP
- 	if test $LIBNET_VER = 1 ; then 
-diff -Nur libnids-1.17.orig/src/killtcp.c libnids-1.17/src/killtcp.c
---- libnids-1.17.orig/src/killtcp.c	Wed Aug 21 18:19:40 2002
-+++ libnids-1.17/src/killtcp.c	Wed Aug 27 23:20:28 2003
-@@ -9,7 +9,7 @@
- #include "util.h"
- #include "nids.h"
- #if LIBNET_VER == 0
--#include <libnet.h>
-+#include <libnet1.h>
- 
- static int libnetsock = 0;
- 
-@@ -46,7 +46,7 @@
- 	return 1;
- }
- #elif LIBNET_VER == 1
--#include <libnet.h>
-+#include <libnet1.h>
- static libnet_ptag_t tcp_tag = LIBNET_PTAG_INITIALIZER,
-     ip_tag = LIBNET_PTAG_INITIALIZER;
- static libnet_t *l = 0;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libnids.git/commitdiff/412ab953530a34990ee580ea4347946007658d80

More information about the pld-cvs-commit mailing list