summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/ca-certificates/Makefile2
-rw-r--r--package/ca-certificates/extra/update-ca-certificates2
-rw-r--r--package/curl/Makefile34
-rw-r--r--package/libnettle/Makefile4
-rw-r--r--package/wget/Makefile4
5 files changed, 35 insertions, 11 deletions
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index 8c327aabd..bbb8a84da 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= ca-certificates
PKG_VERSION:= 20090814
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779
PKG_DESCR:= Collection of common CA certificates
PKG_SECTION:= net/security
diff --git a/package/ca-certificates/extra/update-ca-certificates b/package/ca-certificates/extra/update-ca-certificates
index c86f7676f..f564c54b8 100644
--- a/package/ca-certificates/extra/update-ca-certificates
+++ b/package/ca-certificates/extra/update-ca-certificates
@@ -77,4 +77,6 @@ cat ${DESTDIR}$CRTCONF | while read crt; do
ln -s ${CRTDIR}/$crt ${DESTDIR}${LNKDIR}/${hsh}.${pfx}${idx}
done
+cat /etc/ssl/certs/*.0 > /etc/ssl/cert.pem
+
exit 0
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 7d058fcf1..276f832c2 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,32 +4,54 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= curl
-PKG_VERSION:= 7.22.0
+PKG_VERSION:= 7.24.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= e8c36126d21c893f085aca233906b5cc
+PKG_MD5SUM:= b93420f80a2baaa61a0f45214eddc2ba
PKG_DESCR:= a client-side URL transfer tool
PKG_SECTION:= www
PKG_DEPENDS:= libcurl
-PKG_BUILDDEP:= openssl zlib
+PKG_BUILDDEP:= zlib
PKG_URL:= http://curl.haxx.se/
PKG_SITES:= http://curl.haxx.se/download/
PKG_SUBPKGS:= CURL LIBCURL LIBCURL_DEV
PKGSD_LIBCURL:= a client-side URL transfer library
PKGSC_LIBCURL:= libs
-PKGSS_LIBCURL:= libopenssl zlib
+PKGSS_LIBCURL:= zlib
PKGSD_LIBCURL_DEV:= development files for libcurl
PKGSC_LIBCURL_DEV:= devel
PKG_FLAVOURS_CURL:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
+PKG_CHOICES_CURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
+PKGCD_WITHOUT_SSL:= use no SSL
+PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
+PKGCS_WITH_OPENSSL:= libopenssl ca-certificates
+PKGCB_WITH_OPENSSL:= openssl
+PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
+PKGCS_WITH_GNUTLS:= libgnutls ca-certificates
+PKGCB_WITH_GNUTLS:= gnutls
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL}))
$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV}))
+ifeq (${ADK_PACKAGE_CURL_WITHOUT_SSL},y)
+CONFIGURE_ARGS+= --without-ssl \
+ --without-gnutls
+endif
+ifeq (${ADK_PACKAGE_CURL_WITH_OPENSSL},y)
+CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \
+ --without-gnutls
+endif
+ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y)
+CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \
+ --without-ssl
+endif
+
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t
CONFIGURE_ARGS+= --disable-thread \
@@ -48,9 +70,7 @@ CONFIGURE_ARGS+= --disable-thread \
--disable-telnet \
--disable-verbose \
--with-random="/dev/urandom" \
- --with-ssl="${STAGING_TARGET_DIR}/usr" \
- --without-ca-bundle \
- --without-gnutls \
+ --with-ca-bundle="/etc/ssl/cert.pem" \
--without-libidn
ifneq (${ADK_PACKAGE_CURL_WITH_IPV6},)
diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile
index bca923419..0f9c26122 100644
--- a/package/libnettle/Makefile
+++ b/package/libnettle/Makefile
@@ -21,7 +21,9 @@ $(eval $(call PKG_template,LIBNETTLE,libnettle,$(PKG_VERSION)-${PKG_RELEASE},${P
libnettle-install:
$(INSTALL_DIR) $(IDIR_LIBNETTLE)/usr/lib
- $(INSTALL_BIN) $(WRKINST)/usr/lib/libnettle*.so* \
+ $(CP) $(WRKINST)/usr/lib/libnettle*.so* \
+ $(IDIR_LIBNETTLE)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libhogweed.so* \
$(IDIR_LIBNETTLE)/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wget/Makefile b/package/wget/Makefile
index d2125f619..33e1d5094 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -15,10 +15,10 @@ PKG_SITES:= ${MASTER_SITE_GNU:=wget/}
PKG_CHOICES_WGET:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
PKGCD_WITHOUT_SSL:= use no SSL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
-PKGCS_WITH_OPENSSL:= libopenssl
+PKGCS_WITH_OPENSSL:= libopenssl ca-certificates
PKGCB_WITH_OPENSSL:= openssl
PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
-PKGCS_WITH_GNUTLS:= libgnutls
+PKGCS_WITH_GNUTLS:= libgnutls ca-certificates
PKGCB_WITH_GNUTLS:= gnutls
include ${TOPDIR}/mk/package.mk