From c931edc11bd5198791ba5948b64af0045cd602009ddb4255633f03989fbf815d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 12 Aug 2014 11:22:51 +0000 Subject: [PATCH] Accepting request 243960 from home:fcrozat:branches:security - Drop ecryptfs-correct-desktop.patch and ensure ecryptfs-mount-private.desktop is properly generated and installed in a program specific location (ecryptfs-setup-private will take care of creating the right symlink) and not in /usr/share/applications by default. - Add ecryptfs-mount-private.png (from Fedora) - Create tmpfiles.d to ensure ecryptfs module is autoloaded at start. - Fix category on ecryptfs-setup-private.desktop. OBS-URL: https://build.opensuse.org/request/show/243960 OBS-URL: https://build.opensuse.org/package/show/security/ecryptfs-utils?expand=0&rev=51 --- ecryptfs-correct-desktop.patch | 13 ------------- ecryptfs-mount-private.png | 3 +++ ecryptfs-utils.changes | 13 +++++++++++++ ecryptfs-utils.spec | 27 +++++++++++++++++++-------- 4 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 ecryptfs-correct-desktop.patch create mode 100644 ecryptfs-mount-private.png diff --git a/ecryptfs-correct-desktop.patch b/ecryptfs-correct-desktop.patch deleted file mode 100644 index 5f2075f..0000000 --- a/ecryptfs-correct-desktop.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ecryptfs-utils-96/src/utils/ecryptfs-setup-private -=================================================================== ---- ecryptfs-utils-96.orig/src/utils/ecryptfs-setup-private -+++ ecryptfs-utils-96/src/utils/ecryptfs-setup-private -@@ -340,7 +340,7 @@ echo - mkdir -m 700 -p "$CRYPTDIR" || error "$(gettext 'Could not create crypt directory')" "[$CRYPTDIR]" - mkdir -m 700 -p "$MOUNTPOINT" || error "$(gettext 'Could not create mount directory')" "[$MOUNTPOINT]" - ln -sf /usr/share/ecryptfs-utils/ecryptfs-mount-private.txt "$MOUNTPOINT"/README.txt --ln -sf /usr/share/ecryptfs-utils/ecryptfs-mount-private.desktop "$MOUNTPOINT"/Access-Your-Private-Data.desktop -+ln -sf /usr/share/applications/ecryptfs-mount-private.desktop "$MOUNTPOINT"/Access-Your-Private-Data.desktop - chmod 500 "$MOUNTPOINT" - - # Setup ~/.ecryptfs directory diff --git a/ecryptfs-mount-private.png b/ecryptfs-mount-private.png new file mode 100644 index 0000000..7ba176c --- /dev/null +++ b/ecryptfs-mount-private.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b102262bdee0a2733b8a3f6161c30a3e297d74f36375f0312422ecd68a60f705 +size 3713 diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes index 6bf8974..7a2c519 100644 --- a/ecryptfs-utils.changes +++ b/ecryptfs-utils.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Aug 8 10:56:20 UTC 2014 - fcrozat@suse.com + +- Drop ecryptfs-correct-desktop.patch and ensure + ecryptfs-mount-private.desktop is properly generated and + installed in a program specific location (ecryptfs-setup-private + will take care of creating the right symlink) and not in + /usr/share/applications by default. +- Add ecryptfs-mount-private.png (from Fedora) +- Create tmpfiles.d to ensure ecryptfs module is autoloaded at + start. +- Fix category on ecryptfs-setup-private.desktop. + ------------------------------------------------------------------- Thu Aug 15 19:41:04 UTC 2013 - darin@darins.net diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index d279c6a..9235580 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -1,7 +1,7 @@ # # spec file for package ecryptfs-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,11 +25,11 @@ Version: 103 Release: 0 Source0: http://launchpad.net/ecryptfs/trunk/%version/+download/ecryptfs-utils_%version.orig.tar.gz Source1: baselibs.conf +Source2: ecryptfs-mount-private.png # PATCH-FIX-OPENSUSE fix for systemd and no UUID in fstab Patch0: ecryptfs-setup-swap-SuSE.patch # PATCH-FIX-OPENSUSE build with -fpie/-pie Patch1: ecryptfs-utils-src-utils-Makefile.patch -Patch2: ecryptfs-correct-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel BuildRequires: intltool @@ -56,7 +56,6 @@ A stacked cryptographic filesystem for Linux. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -74,12 +73,23 @@ make check %install %makeinstall -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ -mv $RPM_BUILD_ROOT/%{_datadir}/ecryptfs-utils/*desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -%suse_update_desktop_file ecryptfs-mount-private -%suse_update_desktop_file ecryptfs-setup-private +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.png +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +sed -i 's|^_||' $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +sed -i 's|^_||' $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop $RPM_BUILD_ROOT/%{_datadir}/applications +%suse_update_desktop_file $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +%suse_update_desktop_file -r ecryptfs-setup-private System Security %find_lang %{name} +#we need ecryptfs kernel module +mkdir -p $RPM_BUILD_ROOT/usr/lib/modules-load.d/ +echo -e "# ecryptfs module is needed before ecryptfs mount, so mount helper can \n# check for file name encryption support\necryptfs" >$RPM_BUILD_ROOT/usr/lib/modules-load.d/ecryptfs.conf + %verifyscript %verify_permissions -e /sbin/mount.ecryptfs_private @@ -113,6 +123,7 @@ fi /%_lib/security/pam_ecryptfs.so %{python_sitelib}/ecryptfs-utils %{python_sitearch}/ecryptfs-utils -%{_datadir}/applications/ecryptfs-* +%{_datadir}/applications/*.desktop +/usr/lib/modules-load.d %changelog