[ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader
@ 2015-01-16 11:58 Bruno Thomsen
  2015-01-16 11:58 ` [ptxdist] [PATCH 2/2] curl: install root CA certificates option Bruno Thomsen
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Bruno Thomsen @ 2015-01-16 11:58 UTC (permalink / raw)
  To: m.olbrich; +Cc: ptxdist, bth

From: Bruno Thomsen <bth@kamstrup.com>

Added a new host dummy package that download a specific firefox bundle
of root CA certificates. This functionality is used by libcurl package.

Signed-off-by: Bruno Thomsen <bth@kamstrup.com>
---
 rules/host-certdata.in   |  5 +++++
 rules/host-certdata.make | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 rules/host-certdata.in
 create mode 100644 rules/host-certdata.make

diff --git a/rules/host-certdata.in b/rules/host-certdata.in
new file mode 100644
index 0000000..087f34c
--- /dev/null
+++ b/rules/host-certdata.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_CERTDATA
+	tristate
+
diff --git a/rules/host-certdata.make b/rules/host-certdata.make
new file mode 100644
index 0000000..0bdccc4
--- /dev/null
+++ b/rules/host-certdata.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 by Bruno Thomsen <bth@kamstrup.com>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_CERTDATA) += host-certdata
+
+#
+# Paths and names
+#
+FIREFOX_MAJOR_VERSION	:= 33
+FIREFOX_MINOR_VERSION	:= 0
+HOST_CERTDATA_VERSION	:= $(FIREFOX_MAJOR_VERSION)_$(FIREFOX_MINOR_VERSION)
+HOST_CERTDATA_MD5	:= c9a187ce3bcd6d5ee1f8f5f531cf97f9
+HOST_CERTDATA		:= certdata
+HOST_CERTDATA_SUFFIX	:= txt
+HOST_CERTDATA_URL	:= \
+	http://hg.mozilla.org/releases/mozilla-release/raw-file/FIREFOX_$(HOST_CERTDATA_VERSION)_RELEASE/security/nss/lib/ckfw/builtins/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX)
+HOST_CERTDATA_SOURCE	:= $(SRCDIR)/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX)
+HOST_CERTDATA_DIR	:= $(HOST_BUILDDIR)/$(HOST_CERTDATA)-$(HOST_CERTDATA_VERSION)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-certdata.extract:
+	@$(call targetinfo)
+	@$(call clean, $(HOST_CERTDATA_DIR))
+	@mkdir -p $(HOST_CERTDATA_DIR)
+	@cp $(HOST_CERTDATA_SOURCE) $(HOST_CERTDATA_DIR)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-certdata.compile:
+	@$(call targetinfo)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-certdata.install:
+	@$(call targetinfo)
+	@$(call touch)
+
+# vim: syntax=make
-- 
1.9.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [ptxdist] [PATCH 2/2] curl: install root CA certificates option
  2015-01-16 11:58 [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
@ 2015-01-16 11:58 ` Bruno Thomsen
  2015-03-26 10:06   ` Michael Olbrich
  2015-03-18 11:56 ` [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
  2015-03-26 10:00 ` Michael Olbrich
  2 siblings, 1 reply; 6+ messages in thread
From: Bruno Thomsen @ 2015-01-16 11:58 UTC (permalink / raw)
  To: m.olbrich; +Cc: ptxdist, bth

From: Bruno Thomsen <bth@kamstrup.com>

Install a bundle of X.509 certificates of public Certificate Authorities (CA) in PEM format.
The bundle is extracted from Mozilla's release tree by a host package called certdata.

Test case 1:
openssl s_client -connect www.google.com:443 -CAfile /usr/share/ca-certificates/curl/ca-bundle.crt

Result:
Verify return code: 0 (ok)

Test case 2:
openssl s_client -connect www.google.com:443

Result:
Verify return code: 20 (unable to get local issuer certificate)

Test case 3:
curl https://www.google.com

Result:
<HTML><HEAD>...

Test case 4:
rm /usr/share/ca-certificates/curl/ca-bundle.crt
curl https://www.google.com

Result:
curl: (77) error setting certificate verify locations:
  CAfile: /usr/share/ca-certificates/curl/ca-bundle.crt
  CApath: none

Signed-off-by: Bruno Thomsen <bth@kamstrup.com>
---
 rules/libcurl.in   | 18 ++++++++++++++++--
 rules/libcurl.make | 23 ++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/rules/libcurl.in b/rules/libcurl.in
index 0ad7fb4..11c3698 100644
--- a/rules/libcurl.in
+++ b/rules/libcurl.in
@@ -5,8 +5,10 @@ menuconfig LIBCURL
 	prompt "libcurl                       "
 	select LIBC_RT
 	select ZLIB
-	select OPENSSL	if LIBCURL_SSL
-	select LIBSSH2	if LIBCURL_LIBSSH2
+	select HOST_SYSTEM_PERL	if LIBCURL_CA_BUNDLE
+	select HOST_CERTDATA	if LIBCURL_CA_BUNDLE
+	select OPENSSL		if LIBCURL_SSL
+	select LIBSSH2		if LIBCURL_LIBSSH2
 	help
 	curl is a command line tool for transferring files with URL syntax, supporting
 	FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE.
@@ -20,6 +22,18 @@ if LIBCURL
 config LIBCURL_CURL
        bool "install curl program"
 
+config LIBCURL_CA_BUNDLE
+	bool "install root CA certificates"
+	help
+	  Bundle of Root CA Certificates.
+
+	  This is a bundle of X.509 certificates of public Certificate Authorities (CA).
+	  These were automatically extracted from Mozilla's root certificates
+	  file (certdata.txt).
+
+	  It contains the certificates in PEM format and therefore
+	  can be directly used with curl / libcurl / php_curl / strongswan.
+
 config LIBCURL_HTTP
        bool "http"
        default y
diff --git a/rules/libcurl.make b/rules/libcurl.make
index 5babcb0..7f83ca4 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -62,7 +62,6 @@ LIBCURL_AUTOCONF := \
 	--without-gssapi \
 	--without-gnutls \
 	--without-nss \
-	--without-ca-bundle \
 	--without-ca-path \
 	--without-libidn \
 	--without-axtls \
@@ -82,6 +81,25 @@ else
 LIBCURL_AUTOCONF += --without-ssl
 endif
 
+ifdef PTXCONF_LIBCURL_CA_BUNDLE
+LIBCURL_AUTOCONF += --with-ca-bundle=/usr/share/ca-certificates/curl/ca-bundle.crt
+else
+LIBCURL_AUTOCONF += --without-ca-bundle
+endif
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libcurl.compile:
+	@$(call targetinfo)
+
+ifdef PTXCONF_LIBCURL_CA_BUNDLE
+	@cd $(HOST_CERTDATA_DIR)
+	@$(LIBCURL_DIR)/lib/mk-ca-bundle.pl -i -n -v $(LIBCURL_DIR)/ca-bundle.crt
+endif
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -99,6 +117,9 @@ ifdef PTXCONF_LIBCURL_CURL
 	@$(call install_copy, libcurl, 0, 0, 0755, -, /usr/bin/curl)
 endif
 	@$(call install_lib, libcurl, 0, 0, 0644, libcurl)
+ifdef PTXCONF_LIBCURL_CA_BUNDLE
+	@$(call install_copy, libcurl, 0, 0, 0444, $(LIBCURL_DIR)/ca-bundle.crt, /usr/share/ca-certificates/curl/ca-bundle.crt)
+endif
 
 	@$(call install_finish, libcurl)
 
-- 
1.9.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 2/2] curl: install root CA certificates option
  2015-01-16 11:58 ` [ptxdist] [PATCH 2/2] curl: install root CA certificates option Bruno Thomsen
@ 2015-03-26 10:06   ` Michael Olbrich
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2015-03-26 10:06 UTC (permalink / raw)
  To: ptxdist

On Fri, Jan 16, 2015 at 12:58:45PM +0100, Bruno Thomsen wrote:
> From: Bruno Thomsen <bth@kamstrup.com>
> 
> Install a bundle of X.509 certificates of public Certificate Authorities (CA) in PEM format.
> The bundle is extracted from Mozilla's release tree by a host package called certdata.
> 
> Test case 1:
> openssl s_client -connect www.google.com:443 -CAfile /usr/share/ca-certificates/curl/ca-bundle.crt
> 
> Result:
> Verify return code: 0 (ok)
> 
> Test case 2:
> openssl s_client -connect www.google.com:443
> 
> Result:
> Verify return code: 20 (unable to get local issuer certificate)
> 
> Test case 3:
> curl https://www.google.com
> 
> Result:
> <HTML><HEAD>...
> 
> Test case 4:
> rm /usr/share/ca-certificates/curl/ca-bundle.crt
> curl https://www.google.com
> 
> Result:
> curl: (77) error setting certificate verify locations:
>   CAfile: /usr/share/ca-certificates/curl/ca-bundle.crt
>   CApath: none
> 
> Signed-off-by: Bruno Thomsen <bth@kamstrup.com>
> ---
>  rules/libcurl.in   | 18 ++++++++++++++++--
>  rules/libcurl.make | 23 ++++++++++++++++++++++-
>  2 files changed, 38 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/libcurl.in b/rules/libcurl.in
> index 0ad7fb4..11c3698 100644
> --- a/rules/libcurl.in
> +++ b/rules/libcurl.in
> @@ -5,8 +5,10 @@ menuconfig LIBCURL
>  	prompt "libcurl                       "
>  	select LIBC_RT
>  	select ZLIB
> -	select OPENSSL	if LIBCURL_SSL
> -	select LIBSSH2	if LIBCURL_LIBSSH2
> +	select HOST_SYSTEM_PERL	if LIBCURL_CA_BUNDLE
> +	select HOST_CERTDATA	if LIBCURL_CA_BUNDLE
> +	select OPENSSL		if LIBCURL_SSL
> +	select LIBSSH2		if LIBCURL_LIBSSH2
>  	help
>  	curl is a command line tool for transferring files with URL syntax, supporting
>  	FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE.
> @@ -20,6 +22,18 @@ if LIBCURL
>  config LIBCURL_CURL
>         bool "install curl program"
>  
> +config LIBCURL_CA_BUNDLE
> +	bool "install root CA certificates"
> +	help
> +	  Bundle of Root CA Certificates.
> +
> +	  This is a bundle of X.509 certificates of public Certificate Authorities (CA).
> +	  These were automatically extracted from Mozilla's root certificates
> +	  file (certdata.txt).
> +
> +	  It contains the certificates in PEM format and therefore
> +	  can be directly used with curl / libcurl / php_curl / strongswan.
> +
>  config LIBCURL_HTTP
>         bool "http"
>         default y
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index 5babcb0..7f83ca4 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -62,7 +62,6 @@ LIBCURL_AUTOCONF := \
>  	--without-gssapi \
>  	--without-gnutls \
>  	--without-nss \
> -	--without-ca-bundle \
>  	--without-ca-path \
>  	--without-libidn \
>  	--without-axtls \
> @@ -82,6 +81,25 @@ else
>  LIBCURL_AUTOCONF += --without-ssl
>  endif
>  
> +ifdef PTXCONF_LIBCURL_CA_BUNDLE
> +LIBCURL_AUTOCONF += --with-ca-bundle=/usr/share/ca-certificates/curl/ca-bundle.crt
> +else
> +LIBCURL_AUTOCONF += --without-ca-bundle
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libcurl.compile:
> +	@$(call targetinfo)
> +
> +ifdef PTXCONF_LIBCURL_CA_BUNDLE
> +	@cd $(HOST_CERTDATA_DIR)
> +	@$(LIBCURL_DIR)/lib/mk-ca-bundle.pl -i -n -v $(LIBCURL_DIR)/ca-bundle.crt
> +endif

This cannot work:
1. you removed the real compile, so nothing will be built
2. each line is separate, so the 'cd ...' is ignored.
Also, do this in 'install' to avoid referencing  LIBCURL_DIR in targetinstall:

	$(call world/install, LIBCURL)
	@cd $(PTXCONF_SYSROOT_HOST)/share/certdata &&
		$(LIBCURL_DIR)/lib/mk-ca-bundle.pl -i -n -v $(LIBCURL_PKGDIR)/usr/share/ca-certificates/curl/ca-bundle.crt

Untested. You might need to create
$(LIBCURL_PKGDIR)/usr/share/ca-certificates/curl/ first.

> +	@$(call touch)
> +
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> @@ -99,6 +117,9 @@ ifdef PTXCONF_LIBCURL_CURL
>  	@$(call install_copy, libcurl, 0, 0, 0755, -, /usr/bin/curl)
>  endif
>  	@$(call install_lib, libcurl, 0, 0, 0644, libcurl)
> +ifdef PTXCONF_LIBCURL_CA_BUNDLE
> +	@$(call install_copy, libcurl, 0, 0, 0444, $(LIBCURL_DIR)/ca-bundle.crt, /usr/share/ca-certificates/curl/ca-bundle.crt)

	@$(call install_copy, libcurl, 0, 0, 0444, -, \
		/usr/share/ca-certificates/curl/ca-bundle.crt)

Michael

> +endif
>  
>  	@$(call install_finish, libcurl)
>  
> -- 
> 1.9.1
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader
  2015-01-16 11:58 [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
  2015-01-16 11:58 ` [ptxdist] [PATCH 2/2] curl: install root CA certificates option Bruno Thomsen
@ 2015-03-18 11:56 ` Bruno Thomsen
  2015-03-26 10:06   ` Michael Olbrich
  2015-03-26 10:00 ` Michael Olbrich
  2 siblings, 1 reply; 6+ messages in thread
From: Bruno Thomsen @ 2015-03-18 11:56 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen


Ping..

Are there any outstanding issues with this patch series?

/Bruno


-----Original Message-----
From: Bruno Thomsen 
Sent: 16. januar 2015 12:59
To: m.olbrich@pengutronix.de
Cc: ptxdist@pengutronix.de; Bruno Thomsen
Subject: [PATCH 1/2] host-certdata: root CA certificate bundle downloader

From: Bruno Thomsen <bth@kamstrup.com>

Added a new host dummy package that download a specific firefox bundle
of root CA certificates. This functionality is used by libcurl package.

Signed-off-by: Bruno Thomsen <bth@kamstrup.com>
---
 rules/host-certdata.in   |  5 +++++
 rules/host-certdata.make | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 rules/host-certdata.in
 create mode 100644 rules/host-certdata.make

diff --git a/rules/host-certdata.in b/rules/host-certdata.in
new file mode 100644
index 0000000..087f34c
--- /dev/null
+++ b/rules/host-certdata.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_CERTDATA
+	tristate
+
diff --git a/rules/host-certdata.make b/rules/host-certdata.make
new file mode 100644
index 0000000..0bdccc4
--- /dev/null
+++ b/rules/host-certdata.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 by Bruno Thomsen <bth@kamstrup.com>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_CERTDATA) += host-certdata
+
+#
+# Paths and names
+#
+FIREFOX_MAJOR_VERSION	:= 33
+FIREFOX_MINOR_VERSION	:= 0
+HOST_CERTDATA_VERSION	:= $(FIREFOX_MAJOR_VERSION)_$(FIREFOX_MINOR_VERSION)
+HOST_CERTDATA_MD5	:= c9a187ce3bcd6d5ee1f8f5f531cf97f9
+HOST_CERTDATA		:= certdata
+HOST_CERTDATA_SUFFIX	:= txt
+HOST_CERTDATA_URL	:= \
+	http://hg.mozilla.org/releases/mozilla-release/raw-file/FIREFOX_$(HOST_CERTDATA_VERSION)_RELEASE/security/nss/lib/ckfw/builtins/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX)
+HOST_CERTDATA_SOURCE	:= $(SRCDIR)/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX)
+HOST_CERTDATA_DIR	:= $(HOST_BUILDDIR)/$(HOST_CERTDATA)-$(HOST_CERTDATA_VERSION)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-certdata.extract:
+	@$(call targetinfo)
+	@$(call clean, $(HOST_CERTDATA_DIR))
+	@mkdir -p $(HOST_CERTDATA_DIR)
+	@cp $(HOST_CERTDATA_SOURCE) $(HOST_CERTDATA_DIR)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-certdata.compile:
+	@$(call targetinfo)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-certdata.install:
+	@$(call targetinfo)
+	@$(call touch)
+
+# vim: syntax=make
-- 
1.9.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader
  2015-03-18 11:56 ` [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
@ 2015-03-26 10:06   ` Michael Olbrich
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2015-03-26 10:06 UTC (permalink / raw)
  To: ptxdist

On Wed, Mar 18, 2015 at 11:56:33AM +0000, Bruno Thomsen wrote:
> 
> Ping..
> 
> Are there any outstanding issues with this patch series?

Sorry, it got lost. I've replied now.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader
  2015-01-16 11:58 [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
  2015-01-16 11:58 ` [ptxdist] [PATCH 2/2] curl: install root CA certificates option Bruno Thomsen
  2015-03-18 11:56 ` [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
@ 2015-03-26 10:00 ` Michael Olbrich
  2 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2015-03-26 10:00 UTC (permalink / raw)
  To: ptxdist


Hi,

sorry for the late reply.

On Fri, Jan 16, 2015 at 12:58:44PM +0100, Bruno Thomsen wrote:
> From: Bruno Thomsen <bth@kamstrup.com>
> 
> Added a new host dummy package that download a specific firefox bundle
> of root CA certificates. This functionality is used by libcurl package.
> 
> Signed-off-by: Bruno Thomsen <bth@kamstrup.com>
> ---
>  rules/host-certdata.in   |  5 +++++
>  rules/host-certdata.make | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 62 insertions(+)
>  create mode 100644 rules/host-certdata.in
>  create mode 100644 rules/host-certdata.make
> 
> diff --git a/rules/host-certdata.in b/rules/host-certdata.in
> new file mode 100644
> index 0000000..087f34c
> --- /dev/null
> +++ b/rules/host-certdata.in
> @@ -0,0 +1,5 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_CERTDATA
> +	tristate
> +
> diff --git a/rules/host-certdata.make b/rules/host-certdata.make
> new file mode 100644
> index 0000000..0bdccc4
> --- /dev/null
> +++ b/rules/host-certdata.make
> @@ -0,0 +1,57 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2015 by Bruno Thomsen <bth@kamstrup.com>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_CERTDATA) += host-certdata
> +
> +#
> +# Paths and names
> +#
> +FIREFOX_MAJOR_VERSION	:= 33
> +FIREFOX_MINOR_VERSION	:= 0
> +HOST_CERTDATA_VERSION	:= $(FIREFOX_MAJOR_VERSION)_$(FIREFOX_MINOR_VERSION)
> +HOST_CERTDATA_MD5	:= c9a187ce3bcd6d5ee1f8f5f531cf97f9
> +HOST_CERTDATA		:= certdata
> +HOST_CERTDATA_SUFFIX	:= txt
> +HOST_CERTDATA_URL	:= \
> +	http://hg.mozilla.org/releases/mozilla-release/raw-file/FIREFOX_$(HOST_CERTDATA_VERSION)_RELEASE/security/nss/lib/ckfw/builtins/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX)
> +HOST_CERTDATA_SOURCE	:= $(SRCDIR)/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX)

> +HOST_CERTDATA_DIR	:= $(HOST_BUILDDIR)/$(HOST_CERTDATA)-$(HOST_CERTDATA_VERSION)

Remove this line.

> +
> +# ----------------------------------------------------------------------------
> +# Extract
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/host-certdata.extract:
> +	@$(call targetinfo)

> +	@$(call clean, $(HOST_CERTDATA_DIR))

Remove this line.

> +	@mkdir -p $(HOST_CERTDATA_DIR)
> +	@cp $(HOST_CERTDATA_SOURCE) $(HOST_CERTDATA_DIR)

Move this to host-certdata.install and use $(HOST_CERTDATA_PKGDIR)/share/certdata/
We prefer to avoid referencing <PKG>_DIRs from other packages.

> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/host-certdata.compile:
> +	@$(call targetinfo)
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/host-certdata.install:
> +	@$(call targetinfo)
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.9.1
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-03-26 10:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-16 11:58 [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
2015-01-16 11:58 ` [ptxdist] [PATCH 2/2] curl: install root CA certificates option Bruno Thomsen
2015-03-26 10:06   ` Michael Olbrich
2015-03-18 11:56 ` [ptxdist] [PATCH 1/2] host-certdata: root CA certificate bundle downloader Bruno Thomsen
2015-03-26 10:06   ` Michael Olbrich
2015-03-26 10:00 ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox