[ptxdist] [PATCH 1/2] opensc: version bump 0.15.0 → 0.19.0

[ptxdist] [PATCH 1/2] opensc: version bump 0.15.0 → 0.19.0

[Rouven Czerwinski]

Signed-off-by: Rouven Czerwinki <r.czerwinski@pengutronix.de>
---
 rules/opensc.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/opensc.make b/rules/opensc.make
index 21465b19f..1eaa1cccd 100644
--- a/rules/opensc.make
+++ b/rules/opensc.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_OPENSC) += opensc
 #
 # Paths and names
 #
-OPENSC_VERSION	:= 0.15.0
-OPENSC_MD5	:= f266024e5a9630821ffa0ac14f72e369
+OPENSC_VERSION	:= 0.19.0
+OPENSC_MD5	:= 40734b2343cf83c62c4c403f8a37475e
 OPENSC		:= OpenSC-$(OPENSC_VERSION)
 OPENSC_SUFFIX	:= tar.gz
-OPENSC_URL	:= https://github.com/OpenSC/OpenSC/archive/$(OPENSC_VERSION).$(OPENSC_SUFFIX)
+OPENSC_URL	:= https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION)/$(OPENSC).$(OPENSC_SUFFIX)
 OPENSC_SOURCE	:= $(SRCDIR)/$(OPENSC).$(OPENSC_SUFFIX)
 OPENSC_DIR	:= $(BUILDDIR)/$(OPENSC)
 OPENSC_LICENSE	:= LGPL-2.1-or-later AND Expat AND ISC
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] opensc: add optional openssl support

[Rouven Czerwinski]

Add optional openssl support for X.509 certificate imports.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/opensc.in   | 7 +++++++
 rules/opensc.make | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/rules/opensc.in b/rules/opensc.in
index e42d79259..499f28d3c 100644
--- a/rules/opensc.in
+++ b/rules/opensc.in
@@ -6,6 +6,7 @@ menuconfig OPENSC
 	select READLINE		if OPENSC_READLINE
 	select OPENCT		if OPENSC_OPENCT
 	select PCSC_LITE	if OPENSC_PCSC
+	select OPENSSL		if OPENSC_OPENSSL
 	help
 	  Smart card utilities with support for PKCS#15 compatible cards
 
@@ -33,6 +34,12 @@ endchoice
 config OPENSC_READLINE
 	bool "readline support"
 
+config OPENSC_OPENSSL
+	bool "openssl support"
+	help
+	  Enable OpenSSL support for opensc and tools.
+	  This allows the import of X.509 certificates with pkcs11-tool.
+
 config OPENSC_TOOLS
 	bool "install tools"
 
diff --git a/rules/opensc.make b/rules/opensc.make
index 1eaa1cccd..7682e5ca4 100644
--- a/rules/opensc.make
+++ b/rules/opensc.make
@@ -39,7 +39,7 @@ OPENSC_CONF_OPT := \
 	--sysconfdir=/etc/opensc \
 	--enable-zlib \
 	--$(call ptx/endis,PTXCONF_OPENSC_READLINE)-readline \
-	--disable-openssl \
+	--$(call ptx/endis,PTXCONF_OPENSC_OPENSSL)-openssl \
 	--$(call ptx/endis,PTXCONF_OPENSC_OPENCT)-openct \
 	--$(call ptx/endis,PTXCONF_OPENSC_PCSC)-pcsc \
 	--disable-ctapi \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] opensc: version bump 0.15.0 → 0.19.0

[Michael Olbrich]

On Thu, May 02, 2019 at 11:20:21AM +0200, Rouven Czerwinski wrote:
> Signed-off-by: Rouven Czerwinki <r.czerwinski@pengutronix.de>

Remove the old patches. And targetinstall fails if PTXCONF_OPENSC_TESTSUITE
is enabled. OPENSC_TESTS must be updated.

Michael

> ---
>  rules/opensc.make | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/opensc.make b/rules/opensc.make
> index 21465b19f..1eaa1cccd 100644
> --- a/rules/opensc.make
> +++ b/rules/opensc.make
> @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_OPENSC) += opensc
>  #
>  # Paths and names
>  #
> -OPENSC_VERSION	:= 0.15.0
> -OPENSC_MD5	:= f266024e5a9630821ffa0ac14f72e369
> +OPENSC_VERSION	:= 0.19.0
> +OPENSC_MD5	:= 40734b2343cf83c62c4c403f8a37475e
>  OPENSC		:= OpenSC-$(OPENSC_VERSION)
>  OPENSC_SUFFIX	:= tar.gz
> -OPENSC_URL	:= https://github.com/OpenSC/OpenSC/archive/$(OPENSC_VERSION).$(OPENSC_SUFFIX)
> +OPENSC_URL	:= https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION)/$(OPENSC).$(OPENSC_SUFFIX)
>  OPENSC_SOURCE	:= $(SRCDIR)/$(OPENSC).$(OPENSC_SUFFIX)
>  OPENSC_DIR	:= $(BUILDDIR)/$(OPENSC)
>  OPENSC_LICENSE	:= LGPL-2.1-or-later AND Expat AND ISC
> -- 
> 2.20.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

Re: [ptxdist] [PATCH 2/2] opensc: add optional openssl support

[Michael Olbrich]

On Thu, May 02, 2019 at 11:20:22AM +0200, Rouven Czerwinski wrote:
> Add optional openssl support for X.509 certificate imports.
> 
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  rules/opensc.in   | 7 +++++++
>  rules/opensc.make | 2 +-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/opensc.in b/rules/opensc.in
> index e42d79259..499f28d3c 100644
> --- a/rules/opensc.in
> +++ b/rules/opensc.in
> @@ -6,6 +6,7 @@ menuconfig OPENSC
>  	select READLINE		if OPENSC_READLINE
>  	select OPENCT		if OPENSC_OPENCT
>  	select PCSC_LITE	if OPENSC_PCSC
> +	select OPENSSL		if OPENSC_OPENSSL
>  	help
>  	  Smart card utilities with support for PKCS#15 compatible cards
>  
> @@ -33,6 +34,12 @@ endchoice
>  config OPENSC_READLINE
>  	bool "readline support"
>  
> +config OPENSC_OPENSSL
> +	bool "openssl support"
> +	help
> +	  Enable OpenSSL support for opensc and tools.
> +	  This allows the import of X.509 certificates with pkcs11-tool.
> +
>  config OPENSC_TOOLS
>  	bool "install tools"
>  
> diff --git a/rules/opensc.make b/rules/opensc.make
> index 1eaa1cccd..7682e5ca4 100644
> --- a/rules/opensc.make
> +++ b/rules/opensc.make
> @@ -39,7 +39,7 @@ OPENSC_CONF_OPT := \
>  	--sysconfdir=/etc/opensc \
>  	--enable-zlib \
>  	--$(call ptx/endis,PTXCONF_OPENSC_READLINE)-readline \
> -	--disable-openssl \
> +	--$(call ptx/endis,PTXCONF_OPENSC_OPENSSL)-openssl \
>  	--$(call ptx/endis,PTXCONF_OPENSC_OPENCT)-openct \
>  	--$(call ptx/endis,PTXCONF_OPENSC_PCSC)-pcsc \
>  	--disable-ctapi \

ifdef PTXCONF_OPENSC_OPENSSL
OPENSC_CFLAGS := -Wno-implicit-fallthrough
endif

Otherwise building fails with a modern compiler. This is independent of
icecc related implicit-fallthrough issues.

Michael

> -- 
> 2.20.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