diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/xinetd | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/xinetd')
| -rw-r--r-- | package/xinetd/Makefile | 14 | ||||
| -rw-r--r-- | package/xinetd/files/xinetd.conffiles (renamed from package/xinetd/ipkg/xinetd.conffiles) | 0 | ||||
| -rw-r--r-- | package/xinetd/files/xinetd.init | 4 | ||||
| -rw-r--r-- | package/xinetd/files/xinetd.postinst (renamed from package/xinetd/ipkg/xinetd.postinst) | 0 | ||||
| -rw-r--r-- | package/xinetd/ipkg/xinetd.control | 4 |
5 files changed, 9 insertions, 13 deletions
diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index 349d194fd..2e92a4e7e 100644 --- a/package/xinetd/Makefile +++ b/package/xinetd/Makefile @@ -9,12 +9,14 @@ PKG_NAME:= xinetd PKG_VERSION:= 2.3.13 PKG_RELEASE:= 9 PKG_MD5SUM:= 4295b5fe12350f09b5892b363348ac8b - -MASTER_SITES:= http://www.xinetd.org/ +PKG_DESCR:= a powerful and secure superserver +PKG_SECTION:= net +PKG_URL:= http://www.xinetd.org +PKG_SITES:= http://www.xinetd.org/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,XINETD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-libwrap \ @@ -24,12 +26,8 @@ ALL_TARGET:= build INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_XINETD}/etc + ${INSTALL_DIR} ${IDIR_XINETD}/etc/xinetd.d ${IDIR_XINETD}/usr/sbin ${INSTALL_DATA} ./files/xinetd.conf ${IDIR_XINETD}/etc/xinetd.conf - ${INSTALL_DIR} ${IDIR_XINETD}/etc/xinetd.d - ${INSTALL_DIR} ${IDIR_XINETD}/etc/init.d - ${INSTALL_BIN} ./files/xinetd.init ${IDIR_XINETD}/etc/init.d/xinetd - ${INSTALL_DIR} ${IDIR_XINETD}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/xinetd ${IDIR_XINETD}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xinetd/ipkg/xinetd.conffiles b/package/xinetd/files/xinetd.conffiles index f49d840c4..f49d840c4 100644 --- a/package/xinetd/ipkg/xinetd.conffiles +++ b/package/xinetd/files/xinetd.conffiles diff --git a/package/xinetd/files/xinetd.init b/package/xinetd/files/xinetd.init index 8c909d278..d0b8c0517 100644 --- a/package/xinetd/files/xinetd.init +++ b/package/xinetd/files/xinetd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 50 +#PKG xinetd +#INIT 50 + . /etc/rc.conf case $1 in diff --git a/package/xinetd/ipkg/xinetd.postinst b/package/xinetd/files/xinetd.postinst index c9869d167..c9869d167 100644 --- a/package/xinetd/ipkg/xinetd.postinst +++ b/package/xinetd/files/xinetd.postinst diff --git a/package/xinetd/ipkg/xinetd.control b/package/xinetd/ipkg/xinetd.control deleted file mode 100644 index 34cefb59a..000000000 --- a/package/xinetd/ipkg/xinetd.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: xinetd -Priority: optional -Section: net -Description: a powerful and secure superserver |