Re: [ptxdist] [PATCH] sscep: add sscep to ptxdist

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, Dec 10, 2015 at 09:43:21AM +0100, Oliver Graute wrote:
> SSCEP is a client-only implementation of the SCEP (Cisco System's Simple
> Certificate Enrollment Protocol).
> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  .../0001-sscep-changed-openssl-path.patch          |   22 +++++
>  patches/sscep-0.6.1/series                         |    4 +
>  rules/sscep.in                                     |   10 +++
>  rules/sscep.make                                   |   92 ++++++++++++++++++++
>  4 files changed, 128 insertions(+)
>  create mode 100644 patches/sscep-0.6.1/0001-sscep-changed-openssl-path.patch
>  create mode 100644 patches/sscep-0.6.1/series
>  create mode 100644 rules/sscep.in
>  create mode 100644 rules/sscep.make
> 
> diff --git a/patches/sscep-0.6.1/0001-sscep-changed-openssl-path.patch b/patches/sscep-0.6.1/0001-sscep-changed-openssl-path.patch
> new file mode 100644
> index 0000000..b21bcf1
> --- /dev/null
> +++ b/patches/sscep-0.6.1/0001-sscep-changed-openssl-path.patch
> @@ -0,0 +1,22 @@
> +From: Oliver Graute <oliver.graute@neuhaus.de>
> +Date: Thu, 25 Jun 2015 09:30:08 +0200
> +Subject: [PATCH] sscep: Changed openssl path
> +
> +	modified:   Linux/Makefile
> +---
> + Linux/Makefile |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Linux/Makefile b/Linux/Makefile
> +index 63b1341..ded478a 100644
> +--- a/Linux/Makefile
> ++++ b/Linux/Makefile
> +@@ -7,7 +7,7 @@ MANDIR = /usr/local/man/man8
> + 
> + CC	= gcc
> + #WITH_DEBUG   = -g
> +-OPENSSL = ../openssl
> ++OPENSSL = ../openssl-1.0.1m

This patch makes no sense. Never use the openssl source tree.



> + CFLAGS	= -Wall -O $(WITH_DEBUG) -I $(OPENSSL)/include 
> + 
> + LDFLAGS = -L$(OPENSSL)
> diff --git a/patches/sscep-0.6.1/series b/patches/sscep-0.6.1/series
> new file mode 100644
> index 0000000..986db87
> --- /dev/null
> +++ b/patches/sscep-0.6.1/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-sscep-changed-openssl-path.patch
> +# 541a0bfbd2374c387a63b1ef61cd9880  - git-ptx-patches magic
> diff --git a/rules/sscep.in b/rules/sscep.in
> new file mode 100644
> index 0000000..c9790bd
> --- /dev/null
> +++ b/rules/sscep.in
> @@ -0,0 +1,10 @@
> +## SECTION=networking
> +
> +config SSCEP
> +	tristate
> +	prompt "sscep"
> +	help
> +	  SSCEP is a client-only implementation of the SCEP (Cisco System's Simple
> +	  Certificate Enrollment Protocol). SSCEP is designed for OpenBSD's isakmpd,
> +	  but it will propably work with any Unix system with a recent compiler and
> +	  OpenSSL toolkit libraries installed.
> diff --git a/rules/sscep.make b/rules/sscep.make
> new file mode 100644
> index 0000000..6d22730
> --- /dev/null
> +++ b/rules/sscep.make
> @@ -0,0 +1,92 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@neuhaus.de>
> +#
> +# 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
> +#
> +PACKAGES-$(PTXCONF_SSCEP) += sscep
> +
> +#
> +# Paths and names
> +#
> +SSCEP_VERSION	:= 0.6.1
> +SSCEP_MD5	:= b1cf90e2cb0b01cfacf721796daf2159
> +SSCEP		:= sscep-$(SSCEP_VERSION)
> +SSCEP_SUFFIX	:= tar.gz
> +SSCEP_URL	:= https://github.com/certnanny/sscep/archive/v$(SSCEP_VERSION).$(SSCEP_SUFFIX)
> +SSCEP_SOURCE	:= $(SRCDIR)/$(SSCEP).$(SSCEP_SUFFIX)
> +SSCEP_DIR	:= $(BUILDDIR)/$(SSCEP)
> +SSCEP_LICENSE	:= OpenSSL License, SSLeay, OpenOSP
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +SSCEP_CONF_ENV	:= $(CROSS_ENV)

remove

> +
> +SSCEP_CONF_TOOL	:= NO
> +
> +SSCEP_MAKE_OPT    := \
> +	$(CROSS_ENV_CC) \
> +	PREFIX=/usr

PREFIX is not used, or am I missing something.

And add 'sscep_dyn'. This way no patch is needed.

> +SSCEP_INSTALL_OPT := \
> +	$(SSCEP_HELPER_MAKE_OPT) \
> +	install
> +
> +SSCEP_CONF_OPT	:= $(CROSS_AUTOCONF_USR)
> +
> +$(STATEDIR)/sscep.prepare:
> +	@$(call targetinfo)
> +	@$(call clean, $(SSCEP_DIR)/config.cache)
> +	cd $(SSCEP_DIR) && \
> +		$(SSCEP_PATH) $(SSCEP_ENV) \
> +		./Configure $(SSCEP_CONF_OPT)

Just create the symlink manually. PTXdist supports !Linux build hosts.

> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/sscep.compile:
> +	@$(call targetinfo)
> +	@$(call world/compile, SSCEP)
> +	@$(call touch)
> +

remove

> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/sscep.install:
> +	@$(call targetinfo)
> +	@$(call world/install, SSCEP)
> +	@$(call touch)
> +

install sscep_dyn to $(SSCEP_PKGDIR)/usr/bin/sscep manually. Check other
rules to see how this is done.

> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/sscep.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, sscep)
> +	@$(call install_fixup, sscep,PRIORITY,optional)
> +	@$(call install_fixup, sscep,SECTION,base)
> +	@$(call install_fixup, sscep,AUTHOR,"<oliver.graute@neuhaus.de>")
> +	@$(call install_fixup, sscep,DESCRIPTION,missing)
> +
> +	@$(call install_copy, sscep, 0, 0, 0755, $(SSCEP_DIR)/sscep_dyn, /usr/bin/sscep_dyn)
> +	@$(call install_copy, sscep, 0, 0, 0755, $(SSCEP_DIR)/sscep_static, /usr/bin/sscep)

Don't install the statically linked binary.

Michael

> +
> +	@$(call install_finish, sscep)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> 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