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/knock/Makefile                   | 12 +++++++++---
 package/knock/files/knockd.conffiles     |  1 +
 package/knock/ipkg/knock.control         |  5 -----
 package/knock/ipkg/knockd.conffiles      |  1 -
 package/knock/ipkg/knockd.control        |  5 -----
 package/knock/patches/patch-src_knockd_c | 12 ++++++++++++
 6 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 package/knock/files/knockd.conffiles
 delete mode 100644 package/knock/ipkg/knock.control
 delete mode 100644 package/knock/ipkg/knockd.conffiles
 delete mode 100644 package/knock/ipkg/knockd.control
 create mode 100644 package/knock/patches/patch-src_knockd_c

(limited to 'package/knock')

diff --git a/package/knock/Makefile b/package/knock/Makefile
index 349e78794..384c82ed3 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -9,12 +9,18 @@ PKG_NAME:=		knock
 PKG_VERSION:=		0.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ca09d61458974cff90a700aba6120891
-MASTER_SITES:=		http://www.zeroflux.org/proj/knock/files/
+PKG_DESCR:=		A port-knocking client
+PKG_SECTION:=		net
+PKG_URL:=		http://www.zeroflux.org/projects/knock
+PKG_SITES:=		http://www.zeroflux.org/proj/knock/files/
+
+PKG_DESCR_1:=		A port-knocking server
+PKG_DEPENDS_1:=		libpcap
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
 TCXXFLAGS+=		${TCPPFLAGS} ${TCFLAGS}
 CONFIGURE_STYLE=	gnu
diff --git a/package/knock/files/knockd.conffiles b/package/knock/files/knockd.conffiles
new file mode 100644
index 000000000..e191bfd70
--- /dev/null
+++ b/package/knock/files/knockd.conffiles
@@ -0,0 +1 @@
+/etc/knockd.conf
\ No newline at end of file
diff --git a/package/knock/ipkg/knock.control b/package/knock/ipkg/knock.control
deleted file mode 100644
index 72e635ff4..000000000
--- a/package/knock/ipkg/knock.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: knock
-Priority: optional
-Section: net
-Depends:
-Description: A port-knocking client
diff --git a/package/knock/ipkg/knockd.conffiles b/package/knock/ipkg/knockd.conffiles
deleted file mode 100644
index e191bfd70..000000000
--- a/package/knock/ipkg/knockd.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/knockd.conf
\ No newline at end of file
diff --git a/package/knock/ipkg/knockd.control b/package/knock/ipkg/knockd.control
deleted file mode 100644
index e0c943915..000000000
--- a/package/knock/ipkg/knockd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: knockd
-Priority: optional
-Section: net
-Depends: libpcap
-Description: A port-knocking server
diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c
new file mode 100644
index 000000000..d9f399bd6
--- /dev/null
+++ b/package/knock/patches/patch-src_knockd_c
@@ -0,0 +1,12 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- knock-0.5.orig/src/knockd.c	2005-06-27 07:11:34.000000000 +0200
++++ knock-0.5/src/knockd.c	2009-05-29 17:03:55.776378324 +0200
+@@ -1064,7 +1064,7 @@ char* get_ip(const char* iface, char *bu
+ 		return(NULL);
+ 	}
+ 
+-	bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name));
++	memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name));
+ 	strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1);
+ 	ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
+ 	if(ioctl(s, SIOCGIFADDR, &ifr)) {
-- 
cgit v1.2.3