diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/ca-certificates | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/ca-certificates')
| -rw-r--r-- | package/ca-certificates/Config.in | 17 | ||||
| -rw-r--r-- | package/ca-certificates/Makefile | 15 | ||||
| -rw-r--r-- | package/ca-certificates/src/update-ca-certificates (renamed from package/ca-certificates/extra/update-ca-certificates) | 0 |
3 files changed, 8 insertions, 24 deletions
diff --git a/package/ca-certificates/Config.in b/package/ca-certificates/Config.in deleted file mode 100644 index bb9c6d3fe..000000000 --- a/package/ca-certificates/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config ADK_PACKAGE_CA_CERTS - prompt "ca-certificates................... Collection of common CA certificates" - tristate - default n - select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_LIBOPENSSL_UTIL - help - Collection of CA certificates to validate internet certificates against. - - http://packages.debian.org/sid/ca-certificates - -config ADK_DO_MINIMAL_CA_CERTS - prompt "save space........................ Install only a very minimal version" - boolean - default n - depends on ADK_PACKAGE_CA_CERTS - diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile index 020e0dfc7..90754fbc7 100644 --- a/package/ca-certificates/Makefile +++ b/package/ca-certificates/Makefile @@ -5,36 +5,37 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ca-certificates PKG_VERSION:= 20090814 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779 PKG_DESCR:= Collection of common CA certificates PKG_SECTION:= shells +PKG_DEPENDS:= openssl-util libopenssl PKG_URL:= http://packages.debian.org/sid/ca-certificates PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz +PKG_FLAVOURS:= SMALL +PKGFD_SMALL:= Minimal set of CA certificates + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CA_CERTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -BUILD_STYLE= auto -INSTALL_STYLE= auto - +CONFIG_STYLE:= manual post-install: -ifeq (${ADK_DO_MINIMAL_CA_CERTS},n) +ifeq (${ADK_PACKAGE_CA_CERTS_SMALL},n) $(INSTALL_DIR) $(IDIR_CA_CERTS)/{etc/ssl/certs,usr/share,usr/sbin} $(CP) $(WRKINST)/usr/share/ca-certificates $(IDIR_CA_CERTS)/usr/share/ ( cd ${IDIR_CA_CERTS}/usr/share/ca-certificates && \ ls */*.crt >${IDIR_CA_CERTS}/etc/ca-certificates.conf \ ) ${INSTALL_BIN} ./extra/update-ca-certificates ${IDIR_CA_CERTS}/usr/sbin/ - -DESTDIR=${IDIR_CA_CERTS} sh ./extra/update-ca-certificates + -DESTDIR=${IDIR_CA_CERTS} ${BASH} ./extra/update-ca-certificates else ${INSTALL_DIR} ${IDIR_CA_CERTS}/etc/ssl ${INSTALL_DATA} ./cert.pem ${IDIR_CA_CERTS}/etc/ssl/ endif - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ca-certificates/extra/update-ca-certificates b/package/ca-certificates/src/update-ca-certificates index c86f7676f..c86f7676f 100644 --- a/package/ca-certificates/extra/update-ca-certificates +++ b/package/ca-certificates/src/update-ca-certificates |