From 4da80757bc827fde4c5822d8386ef2e1275791c1 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Nov 11 2009 07:55:23 +0000 Subject: - updated to 82 --- diff --git a/.cvsignore b/.cvsignore index f2e28ac..ff73dc7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -ecryptfs-mount-private.png -ecryptfs-utils_81.orig.tar.gz +ecryptfs-utils_82.orig.tar.gz diff --git a/ecryptfs-utils-81-getext.patch b/ecryptfs-utils-81-getext.patch deleted file mode 100644 index 173ec54..0000000 --- a/ecryptfs-utils-81-getext.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-private.getext ecryptfs-utils-81/src/utils/ecryptfs-setup-private ---- ecryptfs-utils-81/src/utils/ecryptfs-setup-private.getext 2009-09-18 23:48:39.000000000 +0200 -+++ ecryptfs-utils-81/src/utils/ecryptfs-setup-private 2009-11-09 16:48:52.361430492 +0100 -@@ -171,7 +171,7 @@ done - # Prompt for the USER name, if not on the command line and not in the env - if [ -z "$USER" ]; then - while [ true ]; do -- echo -n gettext `"Enter the username: "` -+ echo -n `gettext "Enter the username: "` - USER=`head -n1` - echo - if [ -z "$USER" ]; then -@@ -279,7 +279,7 @@ if [ -z "$LOGINPASS" ] && [ "$BOOTSTRAP" - if printf "%s\0" "$LOGINPASS" | /sbin/unix_chkpwd "$USER" nullok; then - break - else -- echo `gettext "ERROR:"` `getext "Your login passphrase is incorrect"` -+ echo `gettext "ERROR:"` `gettext "Your login passphrase is incorrect"` - tries=$(($tries + 1)) - fi - fi diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index bcefacd..3f21ba3 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -2,8 +2,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: ecryptfs-utils -Version: 81 -Release: 2%{?dist} +Version: 82 +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -21,9 +21,6 @@ Patch4: ecryptfs-utils-75-werror.patch # rhbz#500829 Patch6: ecryptfs-utils-75-nocryptdisks.patch -# required for ecryptfs-utils <= 81, rhbz#532732 -Patch7: ecryptfs-utils-81-getext.patch - BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils, cryptsetup-luks, e2fsprogs BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel @@ -62,7 +59,6 @@ the interface supplied by the ecryptfs-utils library. %patch2 -p1 -b .build %patch4 -p1 -b .werror %patch6 -p1 -b .nocryptdisks -%patch7 -p1 -b .getext %build export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror" @@ -177,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Wed Nov 11 2009 Michal Hlavinka - 82-1 +- updated to 82 + * Mon Nov 09 2009 Michal Hlavinka - 81-2 - fix getext typos (#532732) diff --git a/sources b/sources index ea60aac..bbb7cc8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png -7a8cf5c1cc638bb21036c2088806fc9d ecryptfs-utils_81.orig.tar.gz +3f07853dac0cb97b56d6dcb11280b785 ecryptfs-utils_82.orig.tar.gz