Ignore:
Timestamp:
2011-06-02T16:24:20+02:00 (5 years ago)
Author:
florian
Message:

[package] update strongswan4 to 4.5.2

Update version of strongswan4 package from 4.5.1 to 4.5.2.

Add new strongswan4 plugins: coupling, duplicheck, whitelist.

Add strongswan4-libfast package and make build dependencies on
clearsilver and fcgi conditional. Previously libfast was being built,
but not packaged. Now libfast will only be built when the it's package
is selected.

Remove ipsec.conf and strongswan.conf and use configuration files from
upstream instead. The previously provided strongswan.conf was not
functional.

Omit strongswan4-mod-kernel-klips from strongswan4-full meta package in
favor of strongswan4-mod-kernel-netlink. Only one of these two kernel
interfaces should be installed.

Omit strongswan4-mod-socket-default from strongswan4-full meta package
in favor of strongswan4-mod-socket-raw. Only the raw socket allows
charon to run while pluto is also running.

Make all build dependencies on libraries required by strongswan4 plugins
conditional.

Signed-off-by: Lars Hjersted <lars@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/strongswan4/Makefile

    r26789 r27092  
    99 
    1010PKG_NAME:=strongswan 
    11 PKG_VERSION:=4.5.1 
     11PKG_VERSION:=4.5.2 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://download.strongswan.org/ 
    16 PKG_MD5SUM:=81a4a699c4a1a49b74061dfa47b5a033 
     16PKG_MD5SUM:=ac33b8f849a274127f84df0838cae953 
    1717 
    1818PKG_MOD_AVAILABLE:= \ 
     
    2323        blowfish \ 
    2424        constraints \ 
     25        coupling \ 
    2526        curl \ 
    2627        des \ 
    2728        dhcp \ 
    2829        dnskey \ 
     30        duplicheck \ 
    2931        eap-md5 \ 
    3032        eap-mschapv2 \ 
     
    6365        uci \ 
    6466        updown \ 
     67        whitelist \ 
    6568        x509 \ 
    6669        xauth \ 
     
    6871 
    6972PKG_BUILD_DEPENDS:= \ 
    70         clearsilver \ 
    71         fcgi \ 
     73        PACKAGE_strongswan4-libfast:clearsilver \ 
     74        PACKAGE_strongswan4-libfast:fcgi \ 
    7275 
    7376PKG_CONFIG_DEPENDS:= \ 
     
    129132        +strongswan4-app-charon \ 
    130133        +strongswan4-app-pluto \ 
     134        +strongswan4-libfast \ 
    131135        +strongswan4-mod-aes \ 
    132136        +strongswan4-mod-agent \ 
     
    135139        +strongswan4-mod-blowfish \ 
    136140        +strongswan4-mod-constraints \ 
     141        +strongswan4-mod-coupling \ 
    137142        +strongswan4-mod-curl \ 
    138143        +strongswan4-mod-des \ 
    139144        +strongswan4-mod-dhcp \ 
    140145        +strongswan4-mod-dnskey \ 
     146        +strongswan4-mod-duplicheck \ 
    141147        +strongswan4-mod-eap-md5 \ 
    142148        +strongswan4-mod-eap-mschapv2 \ 
     
    147153        +strongswan4-mod-gmp \ 
    148154        +strongswan4-mod-hmac \ 
    149         +strongswan4-mod-kernel-klips \ 
    150155        +strongswan4-mod-kernel-netlink \ 
    151156        +strongswan4-mod-kernel-pfkey \ 
     
    168173        +strongswan4-mod-sha2 \ 
    169174        +strongswan4-mod-smp \ 
    170         +strongswan4-mod-socket-default \ 
    171175        +strongswan4-mod-socket-raw \ 
    172176        +strongswan4-mod-sql \ 
     
    175179        +strongswan4-mod-uci \ 
    176180        +strongswan4-mod-updown \ 
     181        +strongswan4-mod-whitelist \ 
    177182        +strongswan4-mod-x509 \ 
    178183        +strongswan4-mod-xauth \ 
     
    184189$(call Package/strongswan4/description/Default) 
    185190 . 
    186  This meta-package contains only dependencies for a complete setup. 
     191 This meta-package contains dependencies for all of the strongswan4  
     192 plugins except kernel-klips and socket-default which are ommitted in  
     193 favor of the kernel-netlink and socket-raw plugins. 
    187194endef 
    188195 
     
    282289 
    283290 
     291define Package/strongswan4-libfast 
     292$(call Package/strongswan4/Default) 
     293  TITLE+= libfast 
     294  DEPENDS:= strongswan4 
     295endef 
     296 
     297define Package/strongswan4-libfast/description 
     298$(call Package/strongswan4/description/Default) 
     299 . 
     300 This package contains libfast, a lightweight framework to build native  
     301 web applications using ClearSilver and FastCGI. 
     302endef 
     303 
     304 
    284305define Package/strongswan4-utils 
    285306$(call Package/strongswan4/Default) 
     
    324345        --disable-scripts \ 
    325346        --disable-static \ 
     347        $(if $(CONFIG_PACKAGE_strongswan4-libfast),--enable-fast,--disable-fast) \ 
    326348        $(if $(CONFIG_PACKAGE_strongswan4-utils),--enable-tools,--disable-tools) \ 
    327349        --with-random-device="$(call qstrip,$(CONFIG_STRONGSWAN4_DEVICE_RANDOM))" \ 
     
    333355        ) \ 
    334356 
    335 EXTRA_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/ClearSilver 
     357ifneq ($(CONFIG_PACKAGE_strongswan4-libfast),) 
     358  EXTRA_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/ClearSilver 
     359endif 
    336360 
    337361EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib 
     
    347371        $(INSTALL_DIR) $(1)/etc 
    348372        $(CP) -R $(PKG_INSTALL_DIR)/etc/ipsec.d $(1)/etc/ 
     373        $(CP) $(PKG_INSTALL_DIR)/etc/{ipsec.conf,strongswan.conf} $(1)/etc/ 
    349374        $(INSTALL_DIR) $(1)/usr/lib 
    350         $(CP) \ 
    351                 $(PKG_INSTALL_DIR)/usr/lib/libstrongswan.so.* \ 
    352                 $(PKG_INSTALL_DIR)/usr/lib/libhydra.so.* \ 
    353                 $(1)/usr/lib/ 
     375        $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ 
    354376        $(INSTALL_DIR) $(1)/usr/sbin 
    355         $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/ 
    356         $(INSTALL_DIR) $(1)/usr/lib/ipsec 
    357         $(CP) \ 
    358                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/_copyright \ 
    359                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/starter \ 
    360                 $(1)/usr/lib/ipsec/ 
    361         $(INSTALL_CONF) \ 
    362                 ./files/ipsec.conf \ 
    363                 ./files/ipsec.secrets \ 
    364                 ./files/strongswan.conf \ 
    365                 $(1)/etc/ 
     377        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/ 
     378        $(INSTALL_DIR) $(1)/usr/lib/ipsec 
     379        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{_copyright,starter} $(1)/usr/lib/ipsec/ 
     380        $(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/ 
    366381endef 
    367382 
     
    386401        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharon.so.* $(1)/usr/lib/ 
    387402        $(INSTALL_DIR) $(1)/usr/lib/ipsec 
    388         $(CP) \ 
    389                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/charon \ 
    390                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/stroke \ 
    391                 $(1)/usr/lib/ipsec/ 
     403        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{charon,stroke} $(1)/usr/lib/ipsec/ 
    392404endef 
    393405 
     
    395407define Package/strongswan4-app-pluto/install 
    396408        $(INSTALL_DIR) $(1)/usr/lib/ipsec 
    397         $(CP) \ 
    398                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/pluto \ 
    399                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/_pluto_adns \ 
    400                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/whack \ 
    401                 $(1)/usr/lib/ipsec/ 
     409        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{pluto,_pluto_adns,whack} $(1)/usr/lib/ipsec/ 
     410endef 
     411 
     412 
     413define Package/strongswan4-libfast/install 
     414        $(INSTALL_DIR) $(1)/usr/lib 
     415        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfast.so.* $(1)/usr/lib/ 
    402416endef 
    403417 
     
    405419define Package/strongswan4-utils/install 
    406420        $(INSTALL_DIR) $(1)/usr/lib/ipsec 
    407         $(CP) \ 
    408                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/openac \ 
    409                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/pki \ 
    410                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/scepclient \ 
    411                 $(1)/usr/lib/ipsec/ 
     421        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{openac,pki,scepclient} $(1)/usr/lib/ipsec/ 
    412422endef 
    413423 
     
    415425define Plugin/attr-sql/install 
    416426        $(INSTALL_DIR) $(1)/usr/lib/ipsec 
    417         $(CP) \ 
    418                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/pool \ 
    419                 $(1)/usr/lib/ipsec/ 
     427        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/pool $(1)/usr/lib/ipsec/ 
    420428endef 
    421429 
    422430define Plugin/updown/install 
    423431        $(INSTALL_DIR) $(1)/usr/lib/ipsec 
    424         $(CP) \ 
    425                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/_updown \ 
    426                 $(PKG_INSTALL_DIR)/usr/lib/ipsec/_updown_espmark \ 
    427                 $(1)/usr/lib/ipsec/ 
     432        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{_updown,_updown_espmark} $(1)/usr/lib/ipsec/ 
    428433endef 
    429434 
     
    435440$(eval $(call BuildPackage,strongswan4-app-charon)) 
    436441$(eval $(call BuildPackage,strongswan4-app-pluto)) 
     442$(eval $(call BuildPackage,strongswan4-libfast)) 
    437443$(eval $(call BuildPackage,strongswan4-utils)) 
    438444 
     
    443449$(eval $(call BuildPlugin,blowfish,Blowfish crypto,)) 
    444450$(eval $(call BuildPlugin,constraints,X.509 constraint checking,)) 
    445 $(eval $(call BuildPlugin,curl,cURL,+libcurl)) 
     451$(eval $(call BuildPlugin,coupling,Peer certificate coupling,)) 
     452$(eval $(call BuildPlugin,curl,cURL,+PACKAGE_strongswan4-mod-curl:libcurl)) 
    446453$(eval $(call BuildPlugin,des,DES crypto,)) 
    447454$(eval $(call BuildPlugin,dhcp,DHCP-based IP and DNS,)) 
    448455$(eval $(call BuildPlugin,dnskey,DNS RR key decoding,)) 
     456$(eval $(call BuildPlugin,duplicheck,Duplicate checking,)) 
    449457$(eval $(call BuildPlugin,eap-md5,MD5 EAP (CHAP) auth,)) 
    450458$(eval $(call BuildPlugin,eap-mschapv2,MS-CHAPv2 EAP auth,)) 
     
    452460$(eval $(call BuildPlugin,farp,Fake arp respsonses,)) 
    453461$(eval $(call BuildPlugin,fips-prf,FIPS PRF crypto,)) 
    454 $(eval $(call BuildPlugin,gcrypt,libgcrypt,+libgcrypt)) 
    455 $(eval $(call BuildPlugin,gmp,libgmp,+libgmp)) 
     462$(eval $(call BuildPlugin,gcrypt,libgcrypt,+PACKAGE_strongswan4-mod-gcrypt:libgcrypt)) 
     463$(eval $(call BuildPlugin,gmp,libgmp,+PACKAGE_strongswan4-mod-gmp:libgmp)) 
    456464$(eval $(call BuildPlugin,hmac,HMAC crypto,)) 
    457465$(eval $(call BuildPlugin,kernel-klips,KLIPS kernel interface,)) 
    458466$(eval $(call BuildPlugin,kernel-netlink,netlink kernel interface,)) 
    459467$(eval $(call BuildPlugin,kernel-pfkey,PK_KEY kernel interface,)) 
    460 $(eval $(call BuildPlugin,ldap,LDAP,+libopenldap)) 
     468$(eval $(call BuildPlugin,ldap,LDAP,+PACKAGE_strongswan4-mod-ldap:libopenldap)) 
    461469$(eval $(call BuildPlugin,led,LED blink on IKE activity,)) 
    462470$(eval $(call BuildPlugin,load-tester,load testing,)) 
     
    481489$(eval $(call BuildPlugin,sqlite,SQLite database interface,+strongswan4-mod-sql +PACKAGE_strongswan4-mod-sqlite:libsqlite3)) 
    482490$(eval $(call BuildPlugin,stroke,Stroke,)) 
    483 $(eval $(call BuildPlugin,uci,UCI config interface,+libuci)) 
     491$(eval $(call BuildPlugin,uci,UCI config interface,+PACKAGE_strongswan4-mod-uci:libuci)) 
    484492$(eval $(call BuildPlugin,updown,updown firewall,)) 
     493$(eval $(call BuildPlugin,whitelist,Peer identity whitelisting,)) 
    485494$(eval $(call BuildPlugin,x509,x509 certificate,)) 
    486495$(eval $(call BuildPlugin,xauth,XAUTH authentication,)) 
Note: See TracChangeset for help on using the changeset viewer.