Hello community,
here is the log from the commit of package ecryptfs-utils for openSUSE:Factory
checked in at 2020-12-01 14:22:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ecryptfs-utils (Old)
and /work/SRC/openSUSE:Factory/.ecryptfs-utils.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ecryptfs-utils"
Tue Dec 1 14:22:22 2020 rev:52 rq:851796 version:111
Changes:
--------
--- /work/SRC/openSUSE:Factory/ecryptfs-utils/ecryptfs-utils.changes
2020-08-20 22:35:49.416177447 +0200
+++ /work/SRC/openSUSE:Factory/.ecryptfs-utils.new.5913/ecryptfs-utils.changes
2020-12-01 14:22:23.869568082 +0100
@@ -1,0 +2,6 @@
+Tue Nov 17 16:13:17 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+ - added: ecryptfs-usrmerge.diff
+
+-------------------------------------------------------------------
New:
----
ecryptfs-usrmerge.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ecryptfs-utils.spec ++++++
--- /var/tmp/diff_new_pack.wMpr4H/_old 2020-12-01 14:22:24.485568747 +0100
+++ /var/tmp/diff_new_pack.wMpr4H/_new 2020-12-01 14:22:24.485568747 +0100
@@ -16,6 +16,12 @@
#
+%if !0%{?usrmerged}
+%define sbindir /sbin
+%else
+%define sbindir %{_sbindir}
+%endif
+
%define lname libecryptfs1
Name: ecryptfs-utils
Version: 111
@@ -32,6 +38,7 @@
# PATCH-FIX-OPENSUSE build with -fpie/-pie
Patch1: ecryptfs-utils-src-utils-Makefile.patch
Patch2: ecryptfs-utils-openssl11.patch
+Patch3: ecryptfs-usrmerge.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
@@ -78,11 +85,13 @@
%patch0 -p1
%patch1 -p1
%patch2 -p0
+%patch3 -p1
%build
export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
autoreconf -fiv
%configure \
+ rootsbindir=%{sbindir} \
--docdir=%{_defaultdocdir}/%{name} \
--disable-static \
--disable-pywrap \
@@ -118,10 +127,10 @@
echo -e "# ecryptfs module is needed before ecryptfs mount, so mount helper
can \n# check for file name encryption support\necryptfs"
>%{buildroot}%{_prefix}/lib/modules-load.d/ecryptfs.conf
%verifyscript
-%verify_permissions -e /sbin/mount.ecryptfs_private
+%verify_permissions -e %{sbindir}/mount.ecryptfs_private
%post
-%set_permissions /sbin/mount.ecryptfs_private
+%set_permissions %{sbindir}/mount.ecryptfs_private
%{_sbindir}/pam-config -a --ecryptfs
%desktop_database_post
@@ -140,10 +149,10 @@
%doc COPYING NEWS README THANKS doc/ecryptfs-faq.html
%{_docdir}/%{name}
%{_bindir}/*
-/sbin/mount.ecryptfs
-/sbin/umount.ecryptfs
-/sbin/umount.ecryptfs_private
-%verify(not mode) /sbin/mount.ecryptfs_private
+%{sbindir}/mount.ecryptfs
+%{sbindir}/umount.ecryptfs
+%{sbindir}/umount.ecryptfs_private
+%verify(not mode) %{sbindir}/mount.ecryptfs_private
%{_mandir}/man1/*ecryptfs*
%{_mandir}/man7/ecryptfs*
%{_mandir}/man8/*ecryptfs*
++++++ ecryptfs-usrmerge.diff ++++++
Index: ecryptfs-utils-111/configure.ac
===================================================================
--- ecryptfs-utils-111.orig/configure.ac
+++ ecryptfs-utils-111/configure.ac
@@ -358,11 +358,17 @@ if test "${enable_gui}" = "yes"; then
fi
pkgconfigdir="\$(libdir)/pkgconfig"
-if test "${prefix}" = "/usr"; then
- rootsbindir="/sbin"
-else
- rootsbindir="\$(sbindir)"
+# check for rootsbindir environment var
+if test -z $rootsbindir; then
+ if test "${prefix}" = "/usr"; then
+ rootsbindir="/sbin"
+ else
+ rootsbindir="\$(sbindir)"
+ fi
+ export rootsbindir
fi
+AC_ARG_VAR(rootsbindir, [Location of /sbin @<:@default=/sbin@:>@])
+
GETTEXT_PACKAGE=ecryptfs-utils
AC_SUBST(GETTEXT_PACKAGE)
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
