From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb 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/siproxd/Makefile | 19 ++++++++++--------- package/siproxd/files/siproxd.conffiles | 2 ++ package/siproxd/files/siproxd.init | 4 +++- package/siproxd/files/siproxd.postinst | 3 +++ package/siproxd/ipkg/siproxd.conffiles | 2 -- package/siproxd/ipkg/siproxd.control | 5 ----- package/siproxd/ipkg/siproxd.postinst | 3 --- package/siproxd/patches/patch-configure | 18 ------------------ 8 files changed, 18 insertions(+), 38 deletions(-) create mode 100644 package/siproxd/files/siproxd.conffiles create mode 100644 package/siproxd/files/siproxd.postinst delete mode 100644 package/siproxd/ipkg/siproxd.conffiles delete mode 100644 package/siproxd/ipkg/siproxd.control delete mode 100644 package/siproxd/ipkg/siproxd.postinst delete mode 100644 package/siproxd/patches/patch-configure (limited to 'package/siproxd') diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index 425bfd493..f2fe5c3f2 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -6,26 +6,27 @@ include ${TOPDIR}/rules.mk PKG_NAME:= siproxd -PKG_VERSION:= 0.5.12 -PKG_RELEASE:= 8 -PKG_MD5SUM:= 2fa02bd6f83070593bfc2d383ce614fa -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=siproxd/} +PKG_VERSION:= 0.7.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 45e5a44803181e2bf3361d562060c904 +PKG_DESCR:= a SIP (Session Initiation Protocol) proxy +PKG_SECTION:= net +PKG_DEPENDS:= libosip2 libpthread +PKG_URL:= http://siproxd.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=siproxd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SIPROXD,siproxd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SIPROXD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_SIPROXD}/etc/init.d - ${INSTALL_DIR} ${IDIR_SIPROXD}/usr/sbin + ${INSTALL_DIR} ${IDIR_SIPROXD}/usr/sbin ${IDIR_SIPROXD}/etc ${INSTALL_DATA} ${WRKINST}/etc/siproxd.conf.example ${IDIR_SIPROXD}/etc/siproxd.conf ${INSTALL_DATA} ${WRKINST}/etc/siproxd_passwd.cfg ${IDIR_SIPROXD}/etc/ - ${INSTALL_BIN} files/siproxd.init \ - ${IDIR_SIPROXD}/etc/init.d/siproxd ${INSTALL_BIN} ${WRKINST}/usr/sbin/siproxd ${IDIR_SIPROXD}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/siproxd/files/siproxd.conffiles b/package/siproxd/files/siproxd.conffiles new file mode 100644 index 000000000..abb4ba5a1 --- /dev/null +++ b/package/siproxd/files/siproxd.conffiles @@ -0,0 +1,2 @@ +/etc/siproxd.conf +/etc/siproxd_passwd.cfg diff --git a/package/siproxd/files/siproxd.init b/package/siproxd/files/siproxd.init index e936aab2f..f29921f52 100644 --- a/package/siproxd/files/siproxd.init +++ b/package/siproxd/files/siproxd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG siproxd +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/siproxd/files/siproxd.postinst b/package/siproxd/files/siproxd.postinst new file mode 100644 index 000000000..bf72a7a06 --- /dev/null +++ b/package/siproxd/files/siproxd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf siproxd siproxd NO diff --git a/package/siproxd/ipkg/siproxd.conffiles b/package/siproxd/ipkg/siproxd.conffiles deleted file mode 100644 index abb4ba5a1..000000000 --- a/package/siproxd/ipkg/siproxd.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/siproxd.conf -/etc/siproxd_passwd.cfg diff --git a/package/siproxd/ipkg/siproxd.control b/package/siproxd/ipkg/siproxd.control deleted file mode 100644 index 96f73e21c..000000000 --- a/package/siproxd/ipkg/siproxd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: siproxd -Priority: optional -Section: net -Description: a SIP (Session Initiation Protocol) proxy -Depends: libosip2, libpthread diff --git a/package/siproxd/ipkg/siproxd.postinst b/package/siproxd/ipkg/siproxd.postinst deleted file mode 100644 index bf72a7a06..000000000 --- a/package/siproxd/ipkg/siproxd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf siproxd siproxd NO diff --git a/package/siproxd/patches/patch-configure b/package/siproxd/patches/patch-configure deleted file mode 100644 index 364bc3b20..000000000 --- a/package/siproxd/patches/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ -$Id$ ---- siproxd-0.5.12.orig/configure 2006-01-01 20:34:27.000000000 +0000 -+++ siproxd-0.5.12/configure 2007-02-17 19:09:07.000000000 +0000 -@@ -3381,9 +3381,14 @@ echo $ECHO_N "checking build statically - # Check whether --enable-static or --disable-static was given. - if test "${enable_static+set}" = set; then - enableval="$enable_static" -+ if test x"yes" = x"$enable_static"; then - LDFLAGS="$LDFLAGS -static"; - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ fi - else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 -- cgit v1.2.3