rpms/ecryptfs-utils/F-10 ecryptfs-utils-74-build.patch, NONE, 1.1 ecryptfs-utils-75-werror.patch, NONE, 1.1 ecryptfs-utils.spec, 1.33, 1.34 sources, 1.21, 1.22

Tue May 5 14:02:06 UTC 2009

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5180

Modified Files:
	ecryptfs-utils.spec sources 
Added Files:
	ecryptfs-utils-74-build.patch ecryptfs-utils-75-werror.patch 
Log Message:
update to v. 75


ecryptfs-utils-74-build.patch:

--- NEW FILE ecryptfs-utils-74-build.patch ---
diff -up ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 ecryptfs-utils-74/src/libecryptfs/Makefile.am
--- ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139	2009-04-20 11:03:03.000000000 +0200
+++ ecryptfs-utils-74/src/libecryptfs/Makefile.am	2009-04-23 17:03:16.178703120 +0200
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
 
 lib_LTLIBRARIES = libecryptfs.la
 
+noinst_LIBRARIES = libecryptfs.a
+
 pkgconfig_DATA = libecryptfs.pc
 
 libecryptfs_la_SOURCES = \
@@ -20,10 +22,13 @@ libecryptfs_la_SOURCES = \
 	ecryptfs-stat.c \
 	$(top_srcdir)/src/key_mod/ecryptfs_key_mod_passphrase.c
 
+libecryptfs_a_SOURCES = $(libecryptfs_la_SOURCES)
+
 libecryptfs_la_LDFLAGS = \
 	-version-info @LIBECRYPTFS_LT_CURRENT@:@LIBECRYPTFS_LT_REVISION@:@LIBECRYPTFS_LT_AGE@ \
 	-no-undefined
 libecryptfs_la_CFLAGS = $(AM_CFLAGS) $(CRYPTO_CFLAGS) $(KEYUTILS_CFLAGS)
+libecryptfs_a_CFLAGS = $(libecryptfs_la_CFLAGS)
 libecryptfs_la_LIBADD = $(CRYPTO_LIBS) $(KEYUTILS_LIBS)
 
 splint:
diff -up ecryptfs-utils-74/src/utils/Makefile.am.486139 ecryptfs-utils-74/src/utils/Makefile.am
--- ecryptfs-utils-74/src/utils/Makefile.am.486139	2009-04-20 11:03:03.000000000 +0200
+++ ecryptfs-utils-74/src/utils/Makefile.am	2009-04-23 17:12:38.297756365 +0200
@@ -35,12 +35,12 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K
 mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
 umount_ecryptfs_SOURCES = umount.ecryptfs.c
 umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS)
-umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.a $(KEYUTILS_LIBS) $(CRYPTO_LIBS)
 ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c
 ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
 ecryptfs_wrap_passphrase_SOURCES = ecryptfs_wrap_passphrase.c
-ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la 
 ecryptfs_unwrap_passphrase_SOURCES = ecryptfs_unwrap_passphrase.c
 ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
 ecryptfs_insert_wrapped_passphrase_into_keyring_SOURCES = ecryptfs_insert_wrapped_passphrase_into_keyring.c

ecryptfs-utils-75-werror.patch:

--- NEW FILE ecryptfs-utils-75-werror.patch ---
diff -up ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c
--- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror	2009-03-05 22:17:36.000000000 +0100
+++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c	2009-05-05 14:16:47.965159244 +0200
@@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_
 	if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES
 			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
 			+ 4)) {
-		printf("%s: Invalid metadata size; must have at least [%lu] "
+		printf("%s: Invalid metadata size; must have at least [%zu] "
 		       "bytes; there are only [%zu] bytes\n", __FUNCTION__,
 		       (ECRYPTFS_FILE_SIZE_BYTES
 			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c
--- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror	2009-05-01 00:53:13.000000000 +0200
+++ ecryptfs-utils-75/src/libecryptfs/key_management.c	2009-05-05 13:57:18.142095484 +0200
@@ -18,6 +18,7 @@
  * 02111-1307, USA.
  */
 
+#include "config.h"
 #include <errno.h>
 #ifdef ENABLE_NSS
 #include <nss.h>
@@ -39,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pwd.h>
-#include "config.h"
 #include "../include/ecryptfs.h"
 
 #ifndef ENOKEY
diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c
--- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror	2009-04-30 23:40:12.000000000 +0200
+++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c	2009-05-05 13:57:18.142095484 +0200
@@ -42,31 +42,6 @@
 
 #define PRIVATE_DIR "Private"
 
-static void error(const char *msg)
-{
-	syslog(LOG_ERR, "errno = [%i]; strerror = [%m]\n", errno);
-	switch (errno) {
-	case ENOKEY:
-		syslog(LOG_ERR, "%s: Requested key not available\n", msg);
-		return;
-
-	case EKEYEXPIRED:
-		syslog(LOG_ERR, "%s: Key has expired\n", msg);
-		return;
-
-	case EKEYREVOKED:
-		syslog(LOG_ERR, "%s: Key has been revoked\n", msg);
-		return;
-
-	case EKEYREJECTED:
-		syslog(LOG_ERR, "%s: Key was rejected by service\n", msg);
-		return;
-	default:
-		syslog(LOG_ERR, "%s: Unknown key error\n", msg);
-		return;
-	}
-}
-
 /* returns: 0 for pam automounting not set, 1 for set, <0 for error */
 static int ecryptfs_pam_automount_set(const char *homedir)
 {
@@ -249,8 +224,6 @@ static int private_dir(pam_handle_t *pam
 	char *autoumount = "auto-umount";
 	struct stat s;
 	pid_t pid;
-	struct utmp *u;
-	int count = 0;
 
 	if ((pwd = fetch_pwd(pamh)) == NULL) {
 		/* fetch_pwd() logged a message */
@@ -297,7 +270,7 @@ static int private_dir(pam_handle_t *pam
 			if (stat(recorded, &s) != 0 && stat("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", &s) == 0) {
 				/* User has not recorded their passphrase */
 				unlink("/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
-				symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
+				rc = symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
 				fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666);
 				close(fd);
 			}
@@ -390,7 +363,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
 		}
 	} else {
 		syslog(LOG_ERR, "Error getting passwd info for user [%s]; "
-		       "rc = [%ld]\n", username, rc);
+		       "rc = [%d]\n", username, rc);
 		goto out;
 	}
 	saved_uid = geteuid();
diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c
--- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror	2009-05-01 01:04:38.000000000 +0200
+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c	2009-05-05 13:57:18.142095484 +0200
@@ -42,7 +42,6 @@ int main(int argc, char *argv[])
 	char *wrapping_passphrase;
 	char salt[ECRYPTFS_SALT_SIZE];
 	char salt_hex[ECRYPTFS_SALT_SIZE_HEX];
-	struct passwd *pwd;
 	int rc = 0;
 
 	if (argc == 1) {


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ecryptfs-utils.spec	21 Mar 2009 07:30:45 -0000	1.33
+++ ecryptfs-utils.spec	5 May 2009 14:01:36 -0000	1.34
@@ -2,19 +2,25 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 73
+Version: 75
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
 URL: https://launchpad.net/ecryptfs
-Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz
-Source1: http://bazaar.launchpad.net/%7Eecryptfs/ecryptfs/ecryptfs-utils/annotate/head%3A/src/desktop/ecryptfs-mount-private.desktop
+Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz
+
+#fix wrong Makefile for umount.ecryptfs
+Patch2: ecryptfs-utils-74-build.patch
+
+#allow building with -Werror
+#required for ecryptfs-utils <= 75
+Patch4: ecryptfs-utils-75-werror.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
-BuildRequires: trousers-devel python python-devel nss-devel desktop-file-utils
-Conflicts: kernel < 2.6.19
+BuildRequires: trousers-devel nss-devel desktop-file-utils
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -28,6 +34,7 @@ Install ecryptfs-utils if you would like
 Summary: The eCryptfs userspace development package
 Group: System Environment/Base
 Requires: keyutils-libs-devel %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 Userspace development files for eCryptfs.
@@ -36,6 +43,7 @@ Userspace development files for eCryptfs
 Summary: Python bindings for the eCryptfs utils
 Group: System Environment/Base
 Requires: ecryptfs-utils %{name} = %{version}-%{release}
+BuildRequires: python python-devel swig >= 1.3.31
 
 %description python
 The ecryptfs-utils-python package contains a module that permits 
@@ -44,23 +52,37 @@ the interface supplied by the ecryptfs-u
 
 %prep
 %setup -q
+%patch2 -p1 -b .build
+%patch4 -p1 -b .werror
 
 %build
-%configure --disable-rpath --enable-tspi --enable-nss
+export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
+%configure --disable-rpath --enable-tspi --enable-nss --enable-static
+make clean
 #disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+#remove -Werror flag for swig temporarily (swig is nasty #496613)
+sed -i 's|-Werror||' src/libecryptfs-swig/Makefile
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+find $RPM_BUILD_ROOT%{_libdir}/ -name '*.a' | xargs rm -f
 find $RPM_BUILD_ROOT%{_libdir}/ -name '*.la' | xargs rm -f
-mv $RPM_BUILD_ROOT/%{_libdir}/libecryptfs.so* $RPM_BUILD_ROOT/%{_lib}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -D -m 644 doc/ecryptfs-mount-private.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.txt
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/%{name} %{SOURCE1}
+#install files Makefile forgot install
+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
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-setup-private.desktop
+touch -r src/desktop/ecryptfs-mount-private.desktop \
+     $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop
+touch -r src/desktop/ecryptfs-setup-private.desktop \
+     $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop
+rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase
 
 %post -p /sbin/ldconfig
 
@@ -74,10 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING AUTHORS NEWS THANKS
 %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt
 %doc doc/ecryptfs-pkcs11-helper-doc.txt
-%attr(4755,root,root) /sbin/mount.ecryptfs
-%attr(4755,root,root) /sbin/umount.ecryptfs
+/sbin/mount.ecryptfs
+/sbin/umount.ecryptfs
 %attr(4755,root,root) /sbin/mount.ecryptfs_private
-%attr(4755,root,root) /sbin/umount.ecryptfs_private
+/sbin/umount.ecryptfs_private
 %{_bindir}/ecryptfs-manager
 %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring
 %{_bindir}/ecryptfs-rewrap-passphrase
@@ -92,13 +114,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-umount-private
 %{_bindir}/ecryptfs-stat
 %{_bindir}/ecryptfsd
-/%{_lib}/libecryptfs.so.0.0.0
-/%{_lib}/libecryptfs.so.0
+%{_bindir}/ecryptfs-dot-private
 %{_libdir}/ecryptfs
+%{_libdir}/libecryptfs.so.0
+%{_libdir}/libecryptfs.so.0.0.0
 /%{_lib}/security/pam_ecryptfs.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/ecryptfs-mount-private.txt
 %{_datadir}/%{name}/ecryptfs-mount-private.desktop
+%{_datadir}/%{name}/ecryptfs-setup-private.desktop
 %{_mandir}/man1/ecryptfs-add-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-generate-tpm-key.1.gz
 %{_mandir}/man1/ecryptfs-insert-wrapped-passphrase-into-keyring.1.gz
@@ -119,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-/%{_lib}/libecryptfs.so
+%{_libdir}/libecryptfs.so
 %{_libdir}/pkgconfig/libecryptfs.pc
 %{_includedir}/ecryptfs.h
 
@@ -135,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue May 05 2009 Michal Hlavinka <mhlavink at redhat.com> 75-1
+- updated to 75
+
 * Sat Mar 21 2009 Michal Hlavinka <mhlavink at redhat.com> 73-1
 - updated to 73
 - move libs from /usr/lib to /lib (#486139)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	21 Mar 2009 07:30:45 -0000	1.21
+++ sources	5 May 2009 14:01:36 -0000	1.22
@@ -1 +1 @@
-8e651749b9d75ee9a4d4894483022857  ecryptfs-utils_73.orig.tar.gz
+2c4e8be38d1ea8cadd9f870f15430f07  ecryptfs-utils_75.orig.tar.gz


