[ptxdist] [PATCH 1/3] libgcrypt: version bump to 1.8 stable release

[ptxdist] [PATCH 1/3] libgcrypt: version bump to 1.8 stable release

[Juergen Borleis]

From the announcement:
"This is a new stable version of Libgcrypt with full API
and ABI compatibility to the 1.7 series.  Its main features are support
Blake-2, XTS mode, an improved RNG, and performance improvements for the
ARM architecture."

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 rules/libgcrypt.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 3fff3f379..43c8f3a7e 100644
--- a/rules/libgcrypt.make
+++ b/rules/libgcrypt.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt
 #
 # Paths and names
 #
-LIBGCRYPT_VERSION	:= 1.7.8
-LIBGCRYPT_MD5		:= 34fd2e6d230cbe56799cdf7df05f56c5
+LIBGCRYPT_VERSION	:= 1.8.0
+LIBGCRYPT_MD5		:= 530db74602b558209f9ad7356a680971
 LIBGCRYPT		:= libgcrypt-$(LIBGCRYPT_VERSION)
 LIBGCRYPT_SUFFIX	:= tar.bz2
 LIBGCRYPT_URL		:= http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
@@ -59,6 +59,7 @@ LIBGCRYPT_AUTOCONF := \
 	--disable-m-guard \
 	--disable-large-data-tests \
 	--disable-hmac-binary-check \
+	--enable-jent-support \
 	--enable-padlock-support \
 	--enable-aesni-support \
 	--enable-pclmul-support \
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] which: version bump and large file awareness

[Juergen Borleis]

'which' fails on filesystems with inodes wider than 32 bit. Add large
file support to make it work as intended.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 ...uildsystem-using-macros-this-way-is-bogus.patch | 52 ++++++++++++++++++++++
 .../0002-buildsystem-add-large-file-support.patch  | 22 +++++++++
 patches/which-2.21/autogen.sh                      |  1 +
 patches/which-2.21/series                          |  5 +++
 rules/which.make                                   |  4 +-
 5 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch
 create mode 100644 patches/which-2.21/0002-buildsystem-add-large-file-support.patch
 create mode 120000 patches/which-2.21/autogen.sh
 create mode 100644 patches/which-2.21/series

diff --git a/patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch b/patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch
new file mode 100644
index 000000000..8e6e14272
--- /dev/null
+++ b/patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch
@@ -0,0 +1,52 @@
+From: Juergen Borleis <jbe@pengutronix.de>
+Date: Fri, 25 Aug 2017 15:14:32 +0200
+Subject: [PATCH] buildsystem: using macros this way is bogus
+
+'cwautomacros' is a nice, but broken way to use autotools. Remove the
+dependency to this external package.
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ ChangeLog         | 0
+ Makefile.am       | 1 -
+ configure.ac      | 3 ---
+ tilde/Makefile.am | 1 -
+ 4 files changed, 5 deletions(-)
+ create mode 100644 ChangeLog
+
+diff --git a/ChangeLog b/ChangeLog
+new file mode 100644
+index 000000000000..e69de29bb2d1
+diff --git a/Makefile.am b/Makefile.am
+index 84176c3f45ef..d9d8115a6758 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,4 @@
+ AUTOMAKE_OPTIONS = no-texinfo.tex
+-ACLOCAL_AMFLAGS=@ACLOCAL_CWFLAGS@
+ 
+ SUBDIRS = tilde .
+ 
+diff --git a/configure.ac b/configure.ac
+index 172e3453a553..0c782b45455d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,9 +5,6 @@ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ 
+-dnl Because we use cwautomacros.
+-CW_AUTOMACROS
+-
+ which_cv_iberty=yes
+ AC_ARG_ENABLE(iberty,
+   [  --disable-iberty        do not try to find and use the iberty library],
+diff --git a/tilde/Makefile.am b/tilde/Makefile.am
+index 4947448e00d5..1a72615bafc6 100644
+--- a/tilde/Makefile.am
++++ b/tilde/Makefile.am
+@@ -1,4 +1,3 @@
+-ACLOCAL_AMFLAGS=@ACLOCAL_CWFLAGS@
+ AUTOMAKE_OPTIONS = foreign
+ noinst_LIBRARIES = libtilde.a
+ libtilde_a_SOURCES = tilde.c shell.c tilde.h ansi_stdlib.h bashansi.h xmalloc.h
diff --git a/patches/which-2.21/0002-buildsystem-add-large-file-support.patch b/patches/which-2.21/0002-buildsystem-add-large-file-support.patch
new file mode 100644
index 000000000..07785ed8b
--- /dev/null
+++ b/patches/which-2.21/0002-buildsystem-add-large-file-support.patch
@@ -0,0 +1,22 @@
+From: Juergen Borleis <jbe@pengutronix.de>
+Date: Fri, 25 Aug 2017 14:49:05 +0200
+Subject: [PATCH] buildsystem: add large file support
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0c782b45455d..06e509fb97ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,8 @@ AC_PROG_INSTALL
+ AC_LANG_C
+ AC_MINIX
+ 
++AC_SYS_LARGEFILE
++
+ dnl Checks for libraries.
+ if test "$which_cv_iberty" = yes ; then
+   AC_CHECK_STATICLIB(libiberty.a, xmalloc)
diff --git a/patches/which-2.21/autogen.sh b/patches/which-2.21/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/which-2.21/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/which-2.21/series b/patches/which-2.21/series
new file mode 100644
index 000000000..68cbdeed2
--- /dev/null
+++ b/patches/which-2.21/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-buildsystem-using-macros-this-way-is-bogus.patch
+0002-buildsystem-add-large-file-support.patch
+# f3beee1b6d41d7424e3f37436cab395e  - git-ptx-patches magic
diff --git a/rules/which.make b/rules/which.make
index e5b3c6b23..f5bd76b67 100644
--- a/rules/which.make
+++ b/rules/which.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WHICH) += which
 #
 # Paths and names
 #
-WHICH_VERSION	:= 2.20
-WHICH_MD5	:= 95be0501a466e515422cde4af46b2744
+WHICH_VERSION	:= 2.21
+WHICH_MD5	:= 097ff1a324ae02e0a3b0369f07a7544a
 WHICH		:= which-$(WHICH_VERSION)
 WHICH_SUFFIX	:= tar.gz
 WHICH_URL	:= $(call ptx/mirror, GNU, which/$(WHICH).$(WHICH_SUFFIX))
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] libseccomp: install some useful development tools on demand

[Juergen Borleis]

These tools are intended for development and thus required on demand only.
'scmp_app_inspector' is a shell script which requires some additional
tools from Busybox or Coreutils at run-time. Since both variants work,
it up to the user to select one variant. Which tools are required and
must be enabled in the menu is mentioned in the help text.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 ...-run-time-use-a-supported-shell-interpreter.patch | 19 +++++++++++++++++++
 patches/libseccomp-2.3.2/series                      |  4 ++++
 rules/libseccomp.in                                  | 20 ++++++++++++++++++--
 rules/libseccomp.make                                |  4 ++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 patches/libseccomp-2.3.2/0001-run-time-use-a-supported-shell-interpreter.patch
 create mode 100644 patches/libseccomp-2.3.2/series

diff --git a/patches/libseccomp-2.3.2/0001-run-time-use-a-supported-shell-interpreter.patch b/patches/libseccomp-2.3.2/0001-run-time-use-a-supported-shell-interpreter.patch
new file mode 100644
index 000000000..9e4b6d350
--- /dev/null
+++ b/patches/libseccomp-2.3.2/0001-run-time-use-a-supported-shell-interpreter.patch
@@ -0,0 +1,19 @@
+From: Juergen Borleis <jbe@pengutronix.de>
+Date: Fri, 25 Aug 2017 16:03:15 +0200
+Subject: [PATCH] run-time: use a broadly supported shell interpreter
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ tools/scmp_app_inspector | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/scmp_app_inspector b/tools/scmp_app_inspector
+index 45b86b2ca0c5..14f3dfc07387 100755
+--- a/tools/scmp_app_inspector
++++ b/tools/scmp_app_inspector
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ #
+ # Runtime syscall inspector
diff --git a/patches/libseccomp-2.3.2/series b/patches/libseccomp-2.3.2/series
new file mode 100644
index 000000000..522fa2141
--- /dev/null
+++ b/patches/libseccomp-2.3.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-run-time-use-a-supported-shell-interpreter.patch
+# a24fa8dfff373b7689e92bc6cfdbb0cd  - git-ptx-patches magic
diff --git a/rules/libseccomp.in b/rules/libseccomp.in
index ece48a2eb..d3708c952 100644
--- a/rules/libseccomp.in
+++ b/rules/libseccomp.in
@@ -1,8 +1,11 @@
 ## SECTION=system_libraries
 
-config LIBSECCOMP
+menuconfig LIBSECCOMP
 	bool
-	prompt "libseccomp"
+	prompt "libseccomp                    "
+	select SED if LIBSECCOMP_UTILS && RUNTIME
+	select STRACE if LIBSECCOMP_UTILS && RUNTIME
+	select WHICH if LIBSECCOMP_UTILS && RUNTIME
 	help
 	  An Enhanced Seccomp (mode 2) Helper Library
 
@@ -11,3 +14,16 @@ config LIBSECCOMP
 	  designed to abstract away the underlying BPF based syscall filter language and
 	  present a more conventional function-call based filtering interface that should
 	  be familiar to, and easily adopted by, application developers.
+
+if LIBSECCOMP
+
+config LIBSECCOMP_UTILS
+	bool
+	prompt "install utils"
+	help
+	  Install some utils, useful for development.
+	  Note: in order to run some of these utils the tools 'uniq', 'sort',
+	  'expr' and 'mktemp' from the 'Busybox' *or* 'Coreutils' package is
+	  required.
+
+endif
diff --git a/rules/libseccomp.make b/rules/libseccomp.make
index 4b9e953dc..108969b81 100644
--- a/rules/libseccomp.make
+++ b/rules/libseccomp.make
@@ -53,6 +53,10 @@ $(STATEDIR)/libseccomp.targetinstall:
 
 	@$(call install_lib, libseccomp, 0, 0, 0644, libseccomp)
 
+ifdef PTXCONF_LIBSECCOMP_UTILS
+	@$(call install_copy, libseccomp, 0, 0, 0755, -, /usr/bin/scmp_sys_resolver)
+	@$(call install_copy, libseccomp, 0, 0, 0755, $(LIBSECCOMP_DIR)/tools/scmp_app_inspector, /usr/bin/scmp_app_inspector)
+endif
 	@$(call install_finish, libseccomp)
 
 	@$(call touch)
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de