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/pptpd | |
| 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/pptpd')
| -rw-r--r-- | package/pptpd/Makefile | 11 | ||||
| -rw-r--r-- | package/pptpd/files/pptpd.conffiles (renamed from package/pptpd/ipkg/pptpd.conffiles) | 0 | ||||
| -rw-r--r-- | package/pptpd/files/pptpd.init | 7 | ||||
| -rw-r--r-- | package/pptpd/files/pptpd.postinst (renamed from package/pptpd/ipkg/pptpd.postinst) | 0 | ||||
| -rw-r--r-- | package/pptpd/ipkg/pptpd.control | 5 |
5 files changed, 9 insertions, 14 deletions
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 095f37048..b47443718 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= pptpd PKG_VERSION:= 1.3.0 PKG_RELEASE:= 9 PKG_MD5SUM:= 75d494e881f7027f4e60b114163f6b67 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} +PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) server +PKG_SECTION:= net +PKG_DEPENDS:= ppp kmod-crypto kmod-mppe kmod-ppp +PKG_URL:= http://www.poptop.org +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto @@ -23,12 +27,9 @@ FAKE_FLAGS+= INSTALL="install" post-install: ${INSTALL_DIR} ${IDIR_PPTPD}/etc - ${INSTALL_DIR} ${IDIR_PPTPD}/etc/init.d ${INSTALL_DIR} ${IDIR_PPTPD}/etc/ppp ${INSTALL_DIR} ${IDIR_PPTPD}/usr/sbin ${INSTALL_DATA} ./files/pptpd.conf ${IDIR_PPTPD}/etc/ - ${INSTALL_BIN} ./files/pptpd.init \ - ${IDIR_PPTPD}/etc/init.d/pptpd ${INSTALL_DATA} ./files/options.pptpd ${IDIR_PPTPD}/etc/ppp/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/pptpd \ ${WRKINST}/usr/sbin/pptpctrl ${IDIR_PPTPD}/usr/sbin/ diff --git a/package/pptpd/ipkg/pptpd.conffiles b/package/pptpd/files/pptpd.conffiles index c5afda91f..c5afda91f 100644 --- a/package/pptpd/ipkg/pptpd.conffiles +++ b/package/pptpd/files/pptpd.conffiles diff --git a/package/pptpd/files/pptpd.init b/package/pptpd/files/pptpd.init index c2b8ac032..f4f37613f 100644 --- a/package/pptpd/files/pptpd.init +++ b/package/pptpd/files/pptpd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG pptpd +#INIT 60 + . /etc/rc.conf case $1 in @@ -9,9 +11,6 @@ autostart) exec sh $0 start ;; start) - for m in arc4 sha1 slhc crc-ccitt ppp_generic ppp_async ppp_mppe_mppc; do - insmod $m >/dev/null 2>&1 - done pptpd ;; stop) diff --git a/package/pptpd/ipkg/pptpd.postinst b/package/pptpd/files/pptpd.postinst index 05b1af001..05b1af001 100644 --- a/package/pptpd/ipkg/pptpd.postinst +++ b/package/pptpd/files/pptpd.postinst diff --git a/package/pptpd/ipkg/pptpd.control b/package/pptpd/ipkg/pptpd.control deleted file mode 100644 index 135fa944c..000000000 --- a/package/pptpd/ipkg/pptpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pptpd -Priority: optional -Section: net -Description: a Point-to-Point Tunneling Protocol (PPTP) server -Depends: ppp, kmod-crypto, kmod-mppe, kmod-ppp |