[3/4] p11-kit: New program required for python3 compatibility of ca-certificates

Message ID 20210820200428.3535766-3-adolf.belka@ipfire.org
State Accepted
Commit fbd7a03e78e2ce227cbfdc433ea818e5e7d8d116
Headers show
Series [1/4] ca-certificates: Update to work with python3 version of certdata2pem.py | expand

Commit Message

Adolf Belka Aug. 20, 2021, 8:04 p.m. UTC
- creation of lfs and rootfile for implementation of p11-kit

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/p11-kit | 74 +++++++++++++++++++++++++++++
 lfs/p11-kit                     | 82 +++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)
 create mode 100644 config/rootfiles/common/p11-kit
 create mode 100644 lfs/p11-kit

Comments

Michael Tremer Aug. 23, 2021, 10:34 a.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 20 Aug 2021, at 21:04, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - creation of lfs and rootfile for implementation of p11-kit
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> config/rootfiles/common/p11-kit | 74 +++++++++++++++++++++++++++++
> lfs/p11-kit                     | 82 +++++++++++++++++++++++++++++++++
> 2 files changed, 156 insertions(+)
> create mode 100644 config/rootfiles/common/p11-kit
> create mode 100644 lfs/p11-kit
> 
> diff --git a/config/rootfiles/common/p11-kit b/config/rootfiles/common/p11-kit
> new file mode 100644
> index 000000000..df9001e27
> --- /dev/null
> +++ b/config/rootfiles/common/p11-kit
> @@ -0,0 +1,74 @@
> +usr/bin/p11-kit
> +usr/bin/trust
> +#usr/etc/pkcs11
> +#usr/etc/pkcs11/pkcs11.conf.example
> +#usr/include/p11-kit-1
> +#usr/include/p11-kit-1/p11-kit
> +#usr/include/p11-kit-1/p11-kit/deprecated.h
> +#usr/include/p11-kit-1/p11-kit/iter.h
> +#usr/include/p11-kit-1/p11-kit/p11-kit.h
> +#usr/include/p11-kit-1/p11-kit/pin.h
> +#usr/include/p11-kit-1/p11-kit/pkcs11.h
> +#usr/include/p11-kit-1/p11-kit/pkcs11x.h
> +#usr/include/p11-kit-1/p11-kit/remote.h
> +#usr/include/p11-kit-1/p11-kit/uri.h
> +#usr/lib/libp11-kit.la
> +#usr/lib/libp11-kit.so
> +usr/lib/libp11-kit.so.0
> +usr/lib/libp11-kit.so.0.3.0
> +usr/lib/p11-kit-proxy.so
> +#usr/lib/pkcs11
> +#usr/lib/pkcs11/p11-kit-client.la
> +usr/lib/pkcs11/p11-kit-client.so
> +#usr/lib/pkcs11/p11-kit-trust.la
> +usr/lib/pkcs11/p11-kit-trust.so
> +#usr/lib/pkgconfig/p11-kit-1.pc
> +#usr/libexec/p11-kit
> +#usr/libexec/p11-kit/p11-kit-remote
> +#usr/libexec/p11-kit/p11-kit-server
> +#usr/libexec/p11-kit/trust-extract-compat
> +#usr/share/gtk-doc
> +#usr/share/gtk-doc/html
> +#usr/share/gtk-doc/html/p11-kit
> +#usr/share/gtk-doc/html/p11-kit/config-example.html
> +#usr/share/gtk-doc/html/p11-kit/config-files.html
> +#usr/share/gtk-doc/html/p11-kit/config.html
> +#usr/share/gtk-doc/html/p11-kit/devel-building-style.html
> +#usr/share/gtk-doc/html/p11-kit/devel-building.html
> +#usr/share/gtk-doc/html/p11-kit/devel-commands.html
> +#usr/share/gtk-doc/html/p11-kit/devel-debugging.html
> +#usr/share/gtk-doc/html/p11-kit/devel-paths.html
> +#usr/share/gtk-doc/html/p11-kit/devel-testing.html
> +#usr/share/gtk-doc/html/p11-kit/devel.html
> +#usr/share/gtk-doc/html/p11-kit/gtk-doc.css
> +#usr/share/gtk-doc/html/p11-kit/home.png
> +#usr/share/gtk-doc/html/p11-kit/index.html
> +#usr/share/gtk-doc/html/p11-kit/left-insensitive.png
> +#usr/share/gtk-doc/html/p11-kit/left.png
> +#usr/share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
> +#usr/share/gtk-doc/html/p11-kit/p11-kit-Future.html
> +#usr/share/gtk-doc/html/p11-kit/p11-kit-Modules.html
> +#usr/share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
> +#usr/share/gtk-doc/html/p11-kit/p11-kit-URIs.html
> +#usr/share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
> +#usr/share/gtk-doc/html/p11-kit/p11-kit.devhelp2
> +#usr/share/gtk-doc/html/p11-kit/p11-kit.html
> +#usr/share/gtk-doc/html/p11-kit/pkcs11-conf.html
> +#usr/share/gtk-doc/html/p11-kit/reference.html
> +#usr/share/gtk-doc/html/p11-kit/remoting.html
> +#usr/share/gtk-doc/html/p11-kit/right-insensitive.png
> +#usr/share/gtk-doc/html/p11-kit/right.png
> +#usr/share/gtk-doc/html/p11-kit/sharing-managed.html
> +#usr/share/gtk-doc/html/p11-kit/sharing.html
> +#usr/share/gtk-doc/html/p11-kit/style.css
> +#usr/share/gtk-doc/html/p11-kit/tools.html
> +#usr/share/gtk-doc/html/p11-kit/trust-disable.html
> +#usr/share/gtk-doc/html/p11-kit/trust-glib-networking.html
> +#usr/share/gtk-doc/html/p11-kit/trust-module.html
> +#usr/share/gtk-doc/html/p11-kit/trust-nss.html
> +#usr/share/gtk-doc/html/p11-kit/trust.html
> +#usr/share/gtk-doc/html/p11-kit/up-insensitive.png
> +#usr/share/gtk-doc/html/p11-kit/up.png
> +#usr/share/p11-kit
> +#usr/share/p11-kit/modules
> +#usr/share/p11-kit/modules/p11-kit-trust.module
> diff --git a/lfs/p11-kit b/lfs/p11-kit
> new file mode 100644
> index 000000000..df3f51df1
> --- /dev/null
> +++ b/lfs/p11-kit
> @@ -0,0 +1,82 @@
> +###############################################################################
> +#                                                                             #
> +# IPFire.org - A linux based firewall                                         #
> +# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
> +#                                                                             #
> +# This program is free software: you can redistribute it and/or modify        #
> +# it under the terms of the GNU General Public License as published by        #
> +# the Free Software Foundation, either version 3 of the License, or           #
> +# (at your option) any later version.                                         #
> +#                                                                             #
> +# This program is distributed in the hope that it will be useful,             #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
> +# GNU General Public License for more details.                                #
> +#                                                                             #
> +# You should have received a copy of the GNU General Public License           #
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
> +#                                                                             #
> +###############################################################################
> +
> +###############################################################################
> +# Definitions
> +###############################################################################
> +
> +include Config
> +
> +VER        = 0.24.0
> +
> +THISAPP    = p11-kit-$(VER)
> +DL_FILE    = $(THISAPP).tar.xz
> +DL_FROM    = $(URL_IPFIRE)
> +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> +TARGET     = $(DIR_INFO)/$(THISAPP)
> +
> +CFLAGS    += -fcommon
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_MD5 = 8ccf11c4a2e2e505b8e516d8549e64a5
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +md5 : $(subst %,%_MD5,$(objects))
> +
> +###############################################################################
> +# Downloading, checking, md5sum
> +###############################################################################
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> +	@$(CHECK)
> +
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> +	@$(LOAD)
> +
> +$(subst %,%_MD5,$(objects)) :
> +	@$(MD5)
> +
> +###############################################################################
> +# Installation Details
> +###############################################################################
> +
> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> +	@$(PREBUILD)
> +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> +	$(UPDATE_AUTOMAKE)
> +	cd $(DIR_APP) && ./configure \
> +	                --prefix=/usr \
> +	                --with-trust-paths=/etc/pki/ca-trust/source
> +	cd $(DIR_APP) && make $(MAKETUNING)
> +	cd $(DIR_APP) && make install
> +	@rm -rf $(DIR_APP)
> +	@$(POSTBUILD)
> -- 
> 2.33.0
>

Patch

diff --git a/config/rootfiles/common/p11-kit b/config/rootfiles/common/p11-kit
new file mode 100644
index 000000000..df9001e27
--- /dev/null
+++ b/config/rootfiles/common/p11-kit
@@ -0,0 +1,74 @@ 
+usr/bin/p11-kit
+usr/bin/trust
+#usr/etc/pkcs11
+#usr/etc/pkcs11/pkcs11.conf.example
+#usr/include/p11-kit-1
+#usr/include/p11-kit-1/p11-kit
+#usr/include/p11-kit-1/p11-kit/deprecated.h
+#usr/include/p11-kit-1/p11-kit/iter.h
+#usr/include/p11-kit-1/p11-kit/p11-kit.h
+#usr/include/p11-kit-1/p11-kit/pin.h
+#usr/include/p11-kit-1/p11-kit/pkcs11.h
+#usr/include/p11-kit-1/p11-kit/pkcs11x.h
+#usr/include/p11-kit-1/p11-kit/remote.h
+#usr/include/p11-kit-1/p11-kit/uri.h
+#usr/lib/libp11-kit.la
+#usr/lib/libp11-kit.so
+usr/lib/libp11-kit.so.0
+usr/lib/libp11-kit.so.0.3.0
+usr/lib/p11-kit-proxy.so
+#usr/lib/pkcs11
+#usr/lib/pkcs11/p11-kit-client.la
+usr/lib/pkcs11/p11-kit-client.so
+#usr/lib/pkcs11/p11-kit-trust.la
+usr/lib/pkcs11/p11-kit-trust.so
+#usr/lib/pkgconfig/p11-kit-1.pc
+#usr/libexec/p11-kit
+#usr/libexec/p11-kit/p11-kit-remote
+#usr/libexec/p11-kit/p11-kit-server
+#usr/libexec/p11-kit/trust-extract-compat
+#usr/share/gtk-doc
+#usr/share/gtk-doc/html
+#usr/share/gtk-doc/html/p11-kit
+#usr/share/gtk-doc/html/p11-kit/config-example.html
+#usr/share/gtk-doc/html/p11-kit/config-files.html
+#usr/share/gtk-doc/html/p11-kit/config.html
+#usr/share/gtk-doc/html/p11-kit/devel-building-style.html
+#usr/share/gtk-doc/html/p11-kit/devel-building.html
+#usr/share/gtk-doc/html/p11-kit/devel-commands.html
+#usr/share/gtk-doc/html/p11-kit/devel-debugging.html
+#usr/share/gtk-doc/html/p11-kit/devel-paths.html
+#usr/share/gtk-doc/html/p11-kit/devel-testing.html
+#usr/share/gtk-doc/html/p11-kit/devel.html
+#usr/share/gtk-doc/html/p11-kit/gtk-doc.css
+#usr/share/gtk-doc/html/p11-kit/home.png
+#usr/share/gtk-doc/html/p11-kit/index.html
+#usr/share/gtk-doc/html/p11-kit/left-insensitive.png
+#usr/share/gtk-doc/html/p11-kit/left.png
+#usr/share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
+#usr/share/gtk-doc/html/p11-kit/p11-kit-Future.html
+#usr/share/gtk-doc/html/p11-kit/p11-kit-Modules.html
+#usr/share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
+#usr/share/gtk-doc/html/p11-kit/p11-kit-URIs.html
+#usr/share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
+#usr/share/gtk-doc/html/p11-kit/p11-kit.devhelp2
+#usr/share/gtk-doc/html/p11-kit/p11-kit.html
+#usr/share/gtk-doc/html/p11-kit/pkcs11-conf.html
+#usr/share/gtk-doc/html/p11-kit/reference.html
+#usr/share/gtk-doc/html/p11-kit/remoting.html
+#usr/share/gtk-doc/html/p11-kit/right-insensitive.png
+#usr/share/gtk-doc/html/p11-kit/right.png
+#usr/share/gtk-doc/html/p11-kit/sharing-managed.html
+#usr/share/gtk-doc/html/p11-kit/sharing.html
+#usr/share/gtk-doc/html/p11-kit/style.css
+#usr/share/gtk-doc/html/p11-kit/tools.html
+#usr/share/gtk-doc/html/p11-kit/trust-disable.html
+#usr/share/gtk-doc/html/p11-kit/trust-glib-networking.html
+#usr/share/gtk-doc/html/p11-kit/trust-module.html
+#usr/share/gtk-doc/html/p11-kit/trust-nss.html
+#usr/share/gtk-doc/html/p11-kit/trust.html
+#usr/share/gtk-doc/html/p11-kit/up-insensitive.png
+#usr/share/gtk-doc/html/p11-kit/up.png
+#usr/share/p11-kit
+#usr/share/p11-kit/modules
+#usr/share/p11-kit/modules/p11-kit-trust.module
diff --git a/lfs/p11-kit b/lfs/p11-kit
new file mode 100644
index 000000000..df3f51df1
--- /dev/null
+++ b/lfs/p11-kit
@@ -0,0 +1,82 @@ 
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.24.0
+
+THISAPP    = p11-kit-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+CFLAGS    += -fcommon
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8ccf11c4a2e2e505b8e516d8549e64a5
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	$(UPDATE_AUTOMAKE)
+	cd $(DIR_APP) && ./configure \
+	                --prefix=/usr \
+	                --with-trust-paths=/etc/pki/ca-trust/source
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)