From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/openssl/Makefile | 20 +++++++++++++++----- package/openssl/files/ca-certificates.conffiles | 1 + package/openssl/files/openssl-util.conffiles | 1 + package/openssl/ipkg/ca-certificates.conffiles | 1 - package/openssl/ipkg/ca-certificates.control | 4 ---- package/openssl/ipkg/libopenssl.control | 5 ----- package/openssl/ipkg/openssl-util.conffiles | 1 - package/openssl/ipkg/openssl-util.control | 5 ----- 8 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 package/openssl/files/ca-certificates.conffiles create mode 100644 package/openssl/files/openssl-util.conffiles delete mode 100644 package/openssl/ipkg/ca-certificates.conffiles delete mode 100644 package/openssl/ipkg/ca-certificates.control delete mode 100644 package/openssl/ipkg/libopenssl.control delete mode 100644 package/openssl/ipkg/openssl-util.conffiles delete mode 100644 package/openssl/ipkg/openssl-util.control (limited to 'package/openssl') diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 868daa61a..bc5a9a2f2 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -10,17 +10,27 @@ PKG_VERSION:= 0.9.8k PKG_RELEASE:= 2 CACERT_VER:= 12 PKG_MD5SUM:= e555c6d58d276aec7fdc53363e338ab3 - -MASTER_SITES:= http://www.openssl.org/source/ \ +PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries +PKG_SECTION:= libs +PKG_DEPENDS:= zlib +PKG_URL:= http://www.openssl.org +PKG_SITES:= http://www.openssl.org/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \ ftp://ftp.webmonster.de/pub/openssl/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ +PKG_DESCR_1:= OpenSSL (Secure Socket Layer) command line tool +PKG_SECTION_1:= admin +PKG_DEPENDS_1:= libopenssl + +PKG_DESCR_2:= X.509v3 Root CA Certificates +PKG_SECTION_2:= base + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,CA_CERTS,ca-certificates,${PKG_VERSION}-${CACERT_VER})) +$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,CA_CERTS,ca-certificates,${PKG_VERSION}-${CACERT_VER},,${PKG_DESCR_2},${PKG_SECTION_2})) BUILD_STYLE:= manual INSTALL_STYLE:= auto confprog diff --git a/package/openssl/files/ca-certificates.conffiles b/package/openssl/files/ca-certificates.conffiles new file mode 100644 index 000000000..8121eba55 --- /dev/null +++ b/package/openssl/files/ca-certificates.conffiles @@ -0,0 +1 @@ +/etc/ssl/cert.pem diff --git a/package/openssl/files/openssl-util.conffiles b/package/openssl/files/openssl-util.conffiles new file mode 100644 index 000000000..6d068e66c --- /dev/null +++ b/package/openssl/files/openssl-util.conffiles @@ -0,0 +1 @@ +/etc/ssl/openssl.cnf diff --git a/package/openssl/ipkg/ca-certificates.conffiles b/package/openssl/ipkg/ca-certificates.conffiles deleted file mode 100644 index 8121eba55..000000000 --- a/package/openssl/ipkg/ca-certificates.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ssl/cert.pem diff --git a/package/openssl/ipkg/ca-certificates.control b/package/openssl/ipkg/ca-certificates.control deleted file mode 100644 index 41a077de4..000000000 --- a/package/openssl/ipkg/ca-certificates.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ca-certificates -Priority: optional -Section: base -Description: X.509v3 Root CA Certificates diff --git a/package/openssl/ipkg/libopenssl.control b/package/openssl/ipkg/libopenssl.control deleted file mode 100644 index 6e5cd6749..000000000 --- a/package/openssl/ipkg/libopenssl.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libopenssl -Priority: optional -Section: libs -Description: OpenSSL (Secure Socket Layer) libraries -Depends: zlib diff --git a/package/openssl/ipkg/openssl-util.conffiles b/package/openssl/ipkg/openssl-util.conffiles deleted file mode 100644 index 6d068e66c..000000000 --- a/package/openssl/ipkg/openssl-util.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ssl/openssl.cnf diff --git a/package/openssl/ipkg/openssl-util.control b/package/openssl/ipkg/openssl-util.control deleted file mode 100644 index 4c14ab1aa..000000000 --- a/package/openssl/ipkg/openssl-util.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: openssl-util -Priority: optionnal -Section: admin -Description: OpenSSL (Secure Socket Layer) command line tool -Depends: libopenssl -- cgit v1.2.3