diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-16 14:31:41 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-16 14:31:41 +0200 |
| commit | f6dd446a3d030a424ff25e1213ab7d55abdcd86d (patch) | |
| tree | 422e912b48fb4518dd6c1d46e2d246d578947e4f /package | |
| parent | 26f4115d3bfad72ab834ae38591ee8542d0f8b89 (diff) | |
| parent | 365066d25eaed1f5e47030d593888b922a84c11c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/pkgmaker | 3 | ||||
| -rw-r--r-- | package/strongswan/Makefile | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/package/pkgmaker b/package/pkgmaker index 2975da22b..34bd129e6 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -336,9 +336,6 @@ done <package_sections >package_section_list # create the Config.in.auto from the sorted list from above cursec="" sort -k 3 -k 1 -f package_section_list | while read name file section; do - pbar="Pass 4: $name ..." - print -nu2 "$pbar\r" - if [[ $cursec != $section ]]; then [[ -n $cursec ]] && print "endmenu\n" diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index b67311e3c..88887d2b3 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -12,9 +12,10 @@ PKG_SECTION:= net/security PKG_DEPENDS:= libgmp ip libpthread kmod-net-key kmod-xfrm-user PKG_DEPENDS+= kmod-inet-ah kmod-inet-esp kmod-inet-ipcomp PKG_DEPENDS+= kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport -PKG_DEPENDS+= kmod-crypto-sha1 kmod-crypto-aes kmod-crypto-md5 -PKG_DEPENDS+= kmod-crypto-des kmod-crypto-hmac -PKG_DEPENDS+= kmod-crypto-null kmod-crypto-cbc +PKG_DEPENDS+= kmod-crypto-sha1 kmod-crypto-sha256 kmod-crypto-md5 +PKG_DEPENDS+= kmod-crypto-null kmod-crypto-des kmod-crypto-aes +PKG_DEPENDS+= kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc +PKG_DEPENDS+= kmod-crypto-deflate PKG_BUILDDEP+= gmp PKG_URL:= http://strongswan.org/index.htm PKG_SITES:= http://download.strongswan.org/ @@ -24,13 +25,16 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,STRONGSWAN,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --disable-tools \ - --disable-sha2 + --disable-fips-prf \ + --enable-kernel-pfkey \ + --disable-xcbc post-install: $(INSTALL_DIR) $(IDIR_STRONGSWAN)/etc $(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/sbin $(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/lib $(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/libexec/ipsec/plugins + touch $(IDIR_STRONGSWAN)/etc/ipsec.secrets $(CP) $(WRKINST)/usr/libexec/ipsec/plugins/*.so \ $(IDIR_STRONGSWAN)/usr/libexec/ipsec/plugins $(CP) $(WRKINST)/etc/* $(IDIR_STRONGSWAN)/etc |