3 files changed, 9 insertions, 82 deletions
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index e5e869a83..2844d15b7 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -6,20 +6,20 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libnids
-PKG_VERSION:=		1.18
+PKG_VERSION:=		1.23
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9ee6dcdfac97bae6fe611aa27d2594a5
-PKG_DESCR:=		implementation of an E-component of Network Intrusion Detection System
+PKG_MD5SUM:=		af35e8ef403a0ca95df2da94db856428
+PKG_DESCR:=		Network Intrusion Detection System library
 PKG_SECTION:=		libs
-PKG_SITES:=		http://www.packetfactory.net/projects/libnids/dist/
+PKG_DEPENDS:=		libnet libpcap
+PKG_URL:=		http://libnids.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnids/}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBNIDS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--with-libnet="${STAGING_DIR}/usr" \
-			--with-libpcap="${STAGING_DIR}/usr"
 XAKE_FLAGS+=		install_prefix="${WRKINST}"
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
diff --git a/package/libnids/patches/configure.patch b/package/libnids/patches/configure.patch
deleted file mode 100644
index b6ec19388..000000000
--- a/package/libnids/patches/configure.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nur libnids-1.18/configure libnids-1.18.patched/configure
---- libnids-1.18.orig/configure	2003-10-15 01:40:09.000000000 +0200
-+++ libnids-1.18/configure	2007-01-23 00:18:43.000000000 +0100
-@@ -3253,7 +3253,7 @@ presetting ac_cv_c_bigendian=no (or yes)
- esac
- 
- 
--CFLAGS="$CFLAGS -D_BSD_SOURCE"
-+CFLAGS="$CFLAGS"
- 
- for ac_func in gettimeofday
- do
-@@ -3489,17 +3489,21 @@ if test "${with_libpcap+set}" = set; the
- echo "${ECHO_T}no" >&6
-      ;;
-   *)
--     echo "$as_me:$LINENO: result: $withval" >&5
--echo "${ECHO_T}$withval" >&6
-+     echo "$ac_t""$withval" 1>&6
-      if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
--	PCAP_CFLAGS="-I$withval -I$withval/bpf"
-+	PCAPINC="-I$withval -I$withval/bpf"
- 	PCAPLIB="-L$withval -lpcap"
-+     elif test -f $withval/include/pcap.h -a \
-+	       -f $withval/include/pcap-bpf.h -a \
-+	       -f $withval/lib/libpcap.a; then
-+	owd=`pwd`
-+	if cd $withval; then withval=`pwd`; cd $owd; fi
-+	PCAPINC="-I$withval/include"
-+	PCAPLIB="-L$withval/lib -lpcap"
-      else
--        { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5
--echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;}
--   { (exit 1); exit 1; }; }
-+        { echo "configure: error: pcap.h" 1>&2; exit 1; }
-      fi
-      ;;
-   esac
-@@ -3605,18 +3609,18 @@ echo "${ECHO_T}no" >&6
-   *)
-      echo "$as_me:$LINENO: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--     if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
-+     if test -f $withval/include/libnet.h -a -f $withval/bin/libnet-config ; then
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
--	LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
-+	LNET_CFLAGS="-I$withval/include `$withval/bin/libnet-config --defines`"
- 	LNETLIB="-L$withval/lib -lnet"
--     elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
-+     elif test -f $withval/include/libnet.h; 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/lib -lnet"
-      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 libnet.h and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
-         { { echo "$as_me:$LINENO: error: libnet" >&5
- echo "$as_me: error: libnet" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -3861,7 +3865,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--HAVE_BSD_UDPHDR=0
-+HAVE_BSD_UDPHDR=1
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
diff --git a/package/libnids/patches/patch-src_killtcp_c b/package/libnids/patches/patch-src_killtcp_c
index ddf0beb5a..3afb22d8d 100644
--- a/package/libnids/patches/patch-src_killtcp_c
+++ b/package/libnids/patches/patch-src_killtcp_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnids-1.18.orig/src/killtcp.c	2002-08-21 18:19:40.000000000 +0200
-+++ libnids-1.18/src/killtcp.c	2009-05-21 21:18:44.000000000 +0200
-@@ -100,6 +100,6 @@ void nids_killtcp(struct tcp_stream *a_t
+--- libnids-1.23.orig/src/killtcp.c	2006-05-08 22:05:51.000000000 +0200
++++ libnids-1.23/src/killtcp.c	2009-05-31 03:41:51.000000000 +0200
+@@ -118,6 +118,6 @@ void nids_killtcp(struct tcp_stream *a_t
      if (initialized)
  	abort();
  }