Hello community, here is the log from the commit of package ecryptfs-utils for openSUSE:Factory checked in at 2013-08-06 12:04:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ecryptfs-utils (Old) and /work/SRC/openSUSE:Factory/.ecryptfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ecryptfs-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/ecryptfs-utils/ecryptfs-utils.changes 2012-07-12 14:46:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ecryptfs-utils.new/ecryptfs-utils.changes 2013-08-06 12:41:13.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Aug 5 18:41:01 UTC 2013 - da...@darins.net + +- update to 103 +- move -pie/-fpie into separate patch +- update ecryptfs-setup-swap-SuSE.patch for systmd and fstab + without UUID lables +- remove ecryptfs-utils.security.patch, fixed upstream +- add PreReq: permissions +- removed unpackaged doc + +------------------------------------------------------------------- Old: ---- ecryptfs-utils.security.patch ecryptfs-utils_96.orig.tar.gz New: ---- ecryptfs-utils-src-utils-Makefile.patch ecryptfs-utils_103.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecryptfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.8HsFb0/_old 2013-08-06 12:41:14.000000000 +0200 +++ /var/tmp/diff_new_pack.8HsFb0/_new 2013-08-06 12:41:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ecryptfs-utils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -21,12 +21,14 @@ Summary: Userspace Utilities for ecryptfs License: GPL-2.0+ Group: Productivity/Security -Version: 96 +Version: 103 Release: 0 Source0: http://launchpad.net/ecryptfs/trunk/%version/+download/ecryptfs-utils_%version.orig.tar.gz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE fix for systemd and no UUID in fstab Patch0: ecryptfs-setup-swap-SuSE.patch -Patch1: ecryptfs-utils.security.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 @@ -45,6 +47,7 @@ BuildRequires: trousers-devel BuildRequires: update-desktop-files Requires(pre): pam-config +PreReq: permissions %description A stacked cryptographic filesystem for Linux. @@ -91,7 +94,7 @@ %files -f %{name}.lang %defattr(-, root, root) -%doc COPYING NEWS README THANKS doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt +%doc COPYING NEWS README THANKS doc/ecryptfs-faq.html /usr/include/ecryptfs.h %{_prefix}/bin/* /sbin/mount.ecryptfs ++++++ ecryptfs-setup-swap-SuSE.patch ++++++ --- /var/tmp/diff_new_pack.8HsFb0/_old 2013-08-06 12:41:14.000000000 +0200 +++ /var/tmp/diff_new_pack.8HsFb0/_new 2013-08-06 12:41:14.000000000 +0200 @@ -1,11 +1,51 @@ ---- ecryptfs-utils-96/src/utils/ecryptfs-setup-swap 2011-12-13 18:01:38.000000000 -0500 -+++ ecryptfs-utils-96/src/utils/ecryptfs-setup-swap-mod 2012-04-06 11:24:50.083041485 -0400 -@@ -172,7 +172,7 @@ - swapoff -a +--- ecryptfs-utils-103/src/utils/ecryptfs-setup-swap 2013-08-05 10:44:55.618908888 -0400 ++++ ecryptfs-utils-103/src/utils/ecryptfs-setup-swap.mod 2013-08-05 10:54:16.966419219 -0400 +@@ -37,23 +37,20 @@ + usage() { + echo + echo `gettext "Usage:"` +- echo " $0 [-f|--force] [-n|--no-reload]" ++ echo " $0 [-f|--force]" + echo + exit 1 + } - # Restart cryptdisks -- /etc/init.d/cryptdisks restart -+ /etc/init.d/boot.crypto restart + # Handle command line options + FORCE=0 ++NO_RELOAD=1 + while [ ! -z "$1" ]; do + case "$1" in + -f|--force) + FORCE=1 + shift 1 + ;; +- -n|--no-reload) +- NO_RELOAD=1 +- shift 1 +- ;; + *) + usage + ;; +@@ -149,7 +146,8 @@ + for swap in $swaps; do + info `gettext "Setting up swap:"` "[$swap]" + uuid=$(blkid -o value -s UUID $swap) +- for target in "UUID=$uuid" $swap; do ++ suse_swap=$(grep swap /etc/fstab |cut -d' ' -f1) ++ for target in $suse_swap $swap; do + if [ -n "$target" ] && grep -qs "^$target " /etc/fstab; then + sed -i "s:^$target :\#$target :" /etc/fstab + warn "Commented out your unencrypted swap from /etc/fstab" +@@ -166,7 +164,6 @@ + # Add fstab entry + echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab + done +- + if [ "$NO_RELOAD" != 1 ]; then + # Turn swap off + swapoff -a +@@ -179,3 +176,4 @@ + fi - # Turn the swap on - swapon -a + info `gettext "Successfully setup encrypted swap!"` ++info "This will take effect after reboot" ++++++ ecryptfs-utils-src-utils-Makefile.patch ++++++ Index: ecryptfs-utils-96/src/utils/Makefile.am =================================================================== --- ecryptfs-utils-96.orig/src/utils/Makefile.am +++ ecryptfs-utils-96/src/utils/Makefile.am @@ -58,7 +58,9 @@ ecryptfs_generate_tpm_key_CFLAGS = $(AM_ ecryptfs_generate_tpm_key_LDADD = $(TSPI_LIBS) mount_ecryptfs_private_SOURCES = mount.ecryptfs_private.c +mount_ecryptfs_private_CFLAGS = $(AM_CFLAGS) -fpie mount_ecryptfs_private_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) +mount_ecryptfs_private_LDFLAGS = -pie ecryptfs_stat_SOURCES = ecryptfs-stat.c ecryptfs_stat_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la ++++++ ecryptfs-utils_96.orig.tar.gz -> ecryptfs-utils_103.orig.tar.gz ++++++ ++++ 15498 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
