From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/snort/Makefile              | 10 +++++-----
 package/snort/files/snort.conffiles |  2 ++
 package/snort/files/snort.init      |  4 +++-
 package/snort/files/snort.postinst  |  4 ++++
 package/snort/ipkg/snort.conffiles  |  2 --
 package/snort/ipkg/snort.control    |  6 ------
 package/snort/ipkg/snort.postinst   |  4 ----
 7 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 package/snort/files/snort.conffiles
 create mode 100644 package/snort/files/snort.postinst
 delete mode 100644 package/snort/ipkg/snort.conffiles
 delete mode 100644 package/snort/ipkg/snort.control
 delete mode 100644 package/snort/ipkg/snort.postinst

(limited to 'package/snort')

diff --git a/package/snort/Makefile b/package/snort/Makefile
index bf1aee963..081229029 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		snort
 PKG_VERSION:=		2.6.1.2
 PKG_RELEASE:=		8
 PKG_MD5SUM:=		22c448e25538cdf74c62abe586aeac0a
-MASTER_SITES:=		http://www.snort.org/dl/current/
+PKG_DESCR:=		a flexible Network Intrusion Detection System (NIDS)
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libnet libpcap libpcre
+PKG_SITES:=		http://www.snort.org/dl/current/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SNORT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-flexresp \
@@ -31,10 +34,7 @@ INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SNORT}/usr/bin
-	${INSTALL_DIR} ${IDIR_SNORT}/etc/init.d
 	${INSTALL_DIR} ${IDIR_SNORT}/etc/snort
-	${INSTALL_BIN} ./files/snort.init \
-		${IDIR_SNORT}/etc/init.d/snort
 	${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT}/etc/snort/
 	${INSTALL_DATA} ${WRKBUILD}/etc/classification.config \
 		${IDIR_SNORT}/etc/snort/
diff --git a/package/snort/files/snort.conffiles b/package/snort/files/snort.conffiles
new file mode 100644
index 000000000..a224c4c1d
--- /dev/null
+++ b/package/snort/files/snort.conffiles
@@ -0,0 +1,2 @@
+/etc/snort/snort.conf
+/etc/snort/threshold.conf
diff --git a/package/snort/files/snort.init b/package/snort/files/snort.init
index 4880fd549..6228cc13e 100644
--- a/package/snort/files/snort.init
+++ b/package/snort/files/snort.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG snort
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/snort/files/snort.postinst b/package/snort/files/snort.postinst
new file mode 100644
index 000000000..c491d1c5b
--- /dev/null
+++ b/package/snort/files/snort.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf snort snort NO
+add_rcconf snort_flags snort_flags "-i eth0.0 -c /etc/snort/snort.conf -D -N -q -s"
diff --git a/package/snort/ipkg/snort.conffiles b/package/snort/ipkg/snort.conffiles
deleted file mode 100644
index a224c4c1d..000000000
--- a/package/snort/ipkg/snort.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/snort/snort.conf
-/etc/snort/threshold.conf
diff --git a/package/snort/ipkg/snort.control b/package/snort/ipkg/snort.control
deleted file mode 100644
index 23ed58724..000000000
--- a/package/snort/ipkg/snort.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: snort
-Priority: optional
-Section: net
-Description: a flexible Network Intrusion Detection System (NIDS),
- built without database logging support
-Depends: libnet, libpcap, libpcre
diff --git a/package/snort/ipkg/snort.postinst b/package/snort/ipkg/snort.postinst
deleted file mode 100644
index c491d1c5b..000000000
--- a/package/snort/ipkg/snort.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf snort snort NO
-add_rcconf snort_flags snort_flags "-i eth0.0 -c /etc/snort/snort.conf -D -N -q -s"
-- 
cgit v1.2.3