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/openswan | |
| 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/openswan')
| -rw-r--r-- | package/openswan/Makefile | 14 | ||||
| -rw-r--r-- | package/openswan/files/openswan.conffiles (renamed from package/openswan/ipkg/openswan.conffiles) | 0 | ||||
| -rw-r--r-- | package/openswan/files/openswan.init | 4 | ||||
| -rw-r--r-- | package/openswan/files/openswan.postinst (renamed from package/openswan/ipkg/openswan.postinst) | 0 | ||||
| -rw-r--r-- | package/openswan/ipkg/openswan.control | 5 |
5 files changed, 9 insertions, 14 deletions
diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 4758e85a1..7fea6fdd9 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= openswan PKG_VERSION:= 2.6.21 PKG_RELEASE:= 1 PKG_MD5SUM:= ba9da6c90e0f5fe856767d7510ce371f -MASTER_SITES:= http://www.openswan.org/download/ \ +PKG_DESCR:= IPSec software +PKG_SECTION:= net +PKG_DEPENDS:= ip libgmp +PKG_URL:= http://www.openswan.org +PKG_SITES:= http://www.openswan.org/download/ \ ftp://ftp.openswan.org/openswan/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) FLAGS:= ${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS} @@ -42,8 +46,6 @@ do-install: INC_USRLOCAL="/usr" \ MODPROBE="insmod" \ install - -post-install: rm -rf ${IDIR_OPENSWAN}/usr/share rm -rf ${IDIR_OPENSWAN}/usr/man rm -rf ${IDIR_OPENSWAN}/var @@ -51,9 +53,5 @@ post-install: ${IDIR_OPENSWAN}/usr/libexec/ipsec/setup rm -rf ${IDIR_OPENSWAN}/etc/rc*.d find ${IDIR_OPENSWAN} -name \*.old -print0 | xargs -0 rm -rf - mkdir -p ${IDIR_OPENSWAN}/etc/init.d - ${INSTALL_BIN} ./files/openswan.init \ - ${IDIR_OPENSWAN}/etc/init.d/ipsec - #${IPKG_BUILD} ${IDIR_OPENSWAN} ${PACKAGE_DIR} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openswan/ipkg/openswan.conffiles b/package/openswan/files/openswan.conffiles index ff0851c29..ff0851c29 100644 --- a/package/openswan/ipkg/openswan.conffiles +++ b/package/openswan/files/openswan.conffiles diff --git a/package/openswan/files/openswan.init b/package/openswan/files/openswan.init index 04ac52052..fb43619d1 100644 --- a/package/openswan/files/openswan.init +++ b/package/openswan/files/openswan.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG openswan +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/openswan/ipkg/openswan.postinst b/package/openswan/files/openswan.postinst index a5f8e11b2..a5f8e11b2 100644 --- a/package/openswan/ipkg/openswan.postinst +++ b/package/openswan/files/openswan.postinst diff --git a/package/openswan/ipkg/openswan.control b/package/openswan/ipkg/openswan.control deleted file mode 100644 index 5ff4bfe0c..000000000 --- a/package/openswan/ipkg/openswan.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: openswan -Section: base -Priority: optional -Depends: libgmp, ip -Description: Openswan IPSec software |