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/scanlogd/Makefile                | 11 +++++-----
 package/scanlogd/files/scanlogd.init     |  4 +++-
 package/scanlogd/files/scanlogd.postinst | 36 ++++++++++++++++++++++++++++++++
 package/scanlogd/ipkg/scanlogd.control   |  5 -----
 package/scanlogd/ipkg/scanlogd.postinst  | 36 --------------------------------
 5 files changed, 45 insertions(+), 47 deletions(-)
 create mode 100644 package/scanlogd/files/scanlogd.postinst
 delete mode 100644 package/scanlogd/ipkg/scanlogd.control
 delete mode 100644 package/scanlogd/ipkg/scanlogd.postinst

(limited to 'package/scanlogd')

diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index 4963d4590..1b7db8704 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -9,13 +9,17 @@ PKG_NAME:=		scanlogd
 PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		8
 PKG_MD5SUM:=		7b8187ea718ebe47f22805b921b909ab
-MASTER_SITES:=		http://www.openwall.com/scanlogd/ \
+PKG_DESCR:=		Portscan logger
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcap libnet libnids
+PKG_URL:=		http://www.openwall.com/scanlogd
+PKG_SITES:=		http://www.openwall.com/scanlogd/ \
 			ftp://ftp.wiretapped.net/pub/openwall/ \
 			http://distro.ibiblio.org/pub/linux/distributions/openwall/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SCANLOGD,scanlogd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SCANLOGD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		auto
 MAKE_FLAGS+=		CC="${TARGET_CC}" LD="${TARGET_CC}" CFLAGS="-c ${TARGET_CFLAGS}" \
@@ -30,10 +34,7 @@ do-configure:
 	${SED} "s,#undef SCANLOGD_DEVICE,#define SCANLOGD_DEVICE \"all\"," ${WRKBUILD}/params.h
 
 do-install:
-	${INSTALL_DIR} ${IDIR_SCANLOGD}/etc/init.d
 	${INSTALL_DIR} ${IDIR_SCANLOGD}/usr/sbin
-	${INSTALL_BIN} ./files/scanlogd.init \
-		${IDIR_SCANLOGD}/etc/init.d/${PKG_NAME}
 	${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_SCANLOGD}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/scanlogd/files/scanlogd.init b/package/scanlogd/files/scanlogd.init
index 37285b348..cd4279e4c 100644
--- a/package/scanlogd/files/scanlogd.init
+++ b/package/scanlogd/files/scanlogd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG scanlogd
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/scanlogd/files/scanlogd.postinst b/package/scanlogd/files/scanlogd.postinst
new file mode 100644
index 000000000..60b036da4
--- /dev/null
+++ b/package/scanlogd/files/scanlogd.postinst
@@ -0,0 +1,36 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf scanlogd scanlogd NO
+
+
+name=scanlogd
+id=53
+
+# do not change below
+# check if we are on real system
+if [ -z "${IPKG_INSTROOT}" ]; then
+	# create copies of passwd and group, if we use squashfs
+	rootfs=`mount |awk '/root/ { print $5 }'`
+	if [ "$rootfs" = "squashfs" ]; then
+		if [ -h /etc/group ]; then
+			rm /etc/group
+			cp /rom/etc/group /etc/group
+		fi
+		if [ -h /etc/passwd ]; then
+			rm /etc/passwd
+			cp /rom/etc/passwd /etc/passwd
+		fi
+	fi
+fi
+
+echo ""
+if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/group)" ]; then 
+	echo "adding group $name to /etc/group"
+	echo "${name}:x:${id}:" >> ${IPKG_INSTROOT}/etc/group  
+fi
+
+if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/passwd)" ]; then 
+	echo "adding user $name to /etc/passwd"
+	echo "${name}:x:${id}:${id}:${name}:/tmp/.${name}:/bin/false" >> ${IPKG_INSTROOT}/etc/passwd
+fi
+
diff --git a/package/scanlogd/ipkg/scanlogd.control b/package/scanlogd/ipkg/scanlogd.control
deleted file mode 100644
index 4156ff55c..000000000
--- a/package/scanlogd/ipkg/scanlogd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: scanlogd
-Priority: optional
-Section: net
-Description: Port scan logger.
-Depends: libpcap, libnet, libnids
diff --git a/package/scanlogd/ipkg/scanlogd.postinst b/package/scanlogd/ipkg/scanlogd.postinst
deleted file mode 100644
index 60b036da4..000000000
--- a/package/scanlogd/ipkg/scanlogd.postinst
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf scanlogd scanlogd NO
-
-
-name=scanlogd
-id=53
-
-# do not change below
-# check if we are on real system
-if [ -z "${IPKG_INSTROOT}" ]; then
-	# create copies of passwd and group, if we use squashfs
-	rootfs=`mount |awk '/root/ { print $5 }'`
-	if [ "$rootfs" = "squashfs" ]; then
-		if [ -h /etc/group ]; then
-			rm /etc/group
-			cp /rom/etc/group /etc/group
-		fi
-		if [ -h /etc/passwd ]; then
-			rm /etc/passwd
-			cp /rom/etc/passwd /etc/passwd
-		fi
-	fi
-fi
-
-echo ""
-if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/group)" ]; then 
-	echo "adding group $name to /etc/group"
-	echo "${name}:x:${id}:" >> ${IPKG_INSTROOT}/etc/group  
-fi
-
-if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/passwd)" ]; then 
-	echo "adding user $name to /etc/passwd"
-	echo "${name}:x:${id}:${id}:${name}:/tmp/.${name}:/bin/false" >> ${IPKG_INSTROOT}/etc/passwd
-fi
-
-- 
cgit v1.2.3