fix display of uninitialized ports

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index a1a1976..1b7ead8 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl

-PKG_VERSION:=0.9.8a
-PKG_RELEASE:=3
-PKG_MD5SUM:=1d16c727c10185e4d694f87f5e424ee1
+PKG_VERSION:=0.9.8b
+PKG_RELEASE:=1
+PKG_MD5SUM:=12cedbeb6813a0d7919dbf1f82134b86

 
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
 
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \


@@ -22,10 +22,7 @@ OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dyna
 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 

-$(eval $(call PKG_template,LIBOPENSSL,libopenssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure

        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
        $(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure
        (cd $(PKG_BUILD_DIR); \
        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
        $(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure
        (cd $(PKG_BUILD_DIR); \


@@ -39,9 +36,9 @@ $(PKG_BUILD_DIR)/.configured:
                  $(OPENSSL_NO_CIPHERS) \
                  $(OPENSSL_OPTIONS) \
        )
                  $(OPENSSL_NO_CIPHERS) \
                  $(OPENSSL_OPTIONS) \
        )

-       touch $@
+endef

 
 

-$(PKG_BUILD_DIR)/.built:
+define Build/Compile

        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \


@@ -61,39 +58,54 @@ $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                install
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                install

-       touch $@
-
-$(IPKG_LIBOPENSSL):
-       install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/
-       chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/*
-       $(RSTRIP) $(IDIR_LIBOPENSSL)
-       $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR)
-
-$(IPKG_OPENSSL_UTIL):
-       install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl
-       $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/
-       install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs
-       install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/private
-       chmod 0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private
-       install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/
-       $(RSTRIP) $(IDIR_OPENSSL_UTIL)
-       $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR)
-
-$(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built
+endef
+
+define Build/InstallDev

        mkdir -p $(STAGING_DIR)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/

-       touch $@
+endef

        
        

-install-dev: $(STAGING_DIR)/usr/lib/libssl.so
-
-uninstall-dev:
+define Build/UninstallDev

        rm -rf \
                $(STAGING_DIR)/usr/include/openssl \
        rm -rf \
                $(STAGING_DIR)/usr/include/openssl \

-               $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} \
+               $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
+endef
+
+
+define Package/libopenssl
+ SECTION:=base
+ CATEGORY:=Libraries
+ TITLE:=Open source SSL libraries
+ DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
+ URL:=http://www.openssl.org/
+endef
+
+define Package/openssl-util
+ $(call Package/libopenssl)
+ DEPENDS:=libopenssl
+ TITLE:=OpenSSL command line utilities
+ DESCRIPTION:=OpenSSL command line utilities
+endef
+
+
+define Package/libopenssl/install
+       install -d -m0755 $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/
+       chmod 0644 $(1)/usr/lib/*
+endef
+
+define Package/openssl-util/install
+       install -d -m0755 $(1)/etc/ssl
+       $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/
+       install -d -m0755 $(1)/etc/ssl/certs
+       install -d -m0755 $(1)/etc/ssl/private
+       chmod 0700 $(1)/etc/ssl/private
+       install -d -m0755 $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
+endef
+

 
 

-compile-targets: install-dev
-clean-targets: uninstall-dev
+$(eval $(call BuildPackage,libopenssl))
+$(eval $(call BuildPackage,openssl-util))