pool/ecryptfs-utils
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 243960 from home:fcrozat:branches:security

Browse Source 
- 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
This commit is contained in:
Marcus Meissner 2014-08-12 11:22:51 +00:00 committed by Git OBS Bridge
parent d32c68b2d6
commit c931edc11b
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ecryptfs-correct-desktop.patch
View File

@ -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

3
ecryptfs-mount-private.png Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b102262bdee0a2733b8a3f6161c30a3e297d74f36375f0312422ecd68a60f705
size 3713

13
ecryptfs-utils.changes
View File

@ -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

27
ecryptfs-utils.spec
View File

@ -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