Skip to contentSkip to conversation

ecryptfs-utils: remove openssl PACKAGECONFIG

PATCH New Chen Qi 1 participant 2 messages Aug 28, 2019

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/2 ecryptfs-utils: remove openssl PACKAGECONFIG

ecryptfs-utils does not build with openssl1.1.

Previously this openssl PACKAGECONFIG is disabled by default, so we are not getting build failures by default. But if we enable it, we get do_compile failure.

This package is from ubuntu source, and the one ubuntu ships does not depend on openssl. The development of this package has stopped for about 3 years. I don't see it will fix the build offically.

So remove this PACKAGECONFIG and use '--disable-openssl' directly.

---
 recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb +1 -1
index 1f780f9..8e498c9 100644
@@ -30,13 +30,13 @@ EXTRA_OECONF = "\
     --disable-pywrap \
     --disable-nls \
     --with-pamdir=${base_libdir}/security \
+    --disable-openssl \
     "
 
 PACKAGECONFIG ??= "nss \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
     "
 PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss,"
-PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,"
 PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,"
 
 do_configure_prepend() {
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 ecryptfs-utils: fix race condition in do_install

The rootsbindir is a self-defined directory. The install-rootsbinPROGRAMS is actually treated as part of install-data instead of install-exec.

Do making install-exec-am depend on it actually results in the following Makefile contents.

  install-data-am: install-rootsbinPROGRAMS
  install-exec-am: install-binPROGRAMS install-binSCRIPTS
          @$(NORMAL_INSTALL)
          $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  install-exec-hook:      install-rootsbinPROGRAMS

And this results in race condition as two install commands of the same file running at the same time. Error message is like below.

TOPDIR/tmp-glibc/hosttools/install: cannot create regular file 'TOPDIR/tmp-glibc/work/aarch64-wrs-linux/ecryptfs-utils/111-r0/image/sbin/mount.ecryptfs': File exists

---
 .../ecryptfs-utils/ecryptfs-utils_111.bb      |  1 +
 .../files/0001-avoid-race-condition.patch     | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 recipes-security/ecryptfs-utils/files/0001-avoid-race-condition.patch
recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb +1 -0
index 8e498c9..e45ee0b 100644
@@ -14,6 +14,7 @@ DEPENDS = "keyutils libgcrypt intltool-native glib-2.0-native"
 SRC_URI = "\
     https://launchpad.net/ecryptfs/trunk/${PV}/+download/${BPN}_${PV}.orig.tar.gz \
     file://ecryptfs-utils-CVE-2016-6224.patch \
+    file://0001-avoid-race-condition.patch \
     file://ecryptfs.service \
     "
 
recipes-security/ecryptfs-utils/files/0001-avoid-race-condition.patch new file +32 -0
new file mode 100644
index 0000000..af28d58
@@ -0,0 +1,32 @@
+From ab671b02e3aaf65dd1fd279789ea933b8140fe52 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 27 Aug 2019 16:08:00 +0800
+Subject: [PATCH] avoid race condition
+
+The rootsbin directory is self defined. The install-rootsbinPROGRAMS
+is actually treated as part of install-data.
+
+This would avoid race condition which causes install failure.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ src/utils/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
+index 83cf851..344883a 100644
+--- a/src/utils/Makefile.am
++++ b/src/utils/Makefile.am
+@@ -67,6 +67,6 @@ ecryptfs_stat_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ test_SOURCES = test.c io.c
+ test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ 
+-install-exec-hook:	install-rootsbinPROGRAMS
++install-data-hook:	install-rootsbinPROGRAMS
+ 	-rm -f "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
+ 	$(LN_S) "mount.ecryptfs_private" "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
+-- 
+2.17.1
+
Signature · 1 line
2.17.1