From e52488488d0a79f1e2d0a77be99c67dcf1106d356916972582b89203914339ad Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 26 Feb 2008 00:55:06 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ecryptfs-utils?expand=0&rev=8 --- ecryptfs-utils-18.tar.bz2 | 3 --- ecryptfs-utils-40.tar.bz2 | 3 +++ ecryptfs-utils-fixes.patch | 20 +++++++--------- ecryptfs-utils.changes | 8 +++++++ ecryptfs-utils.spec | 49 ++++++++++++++++++++++---------------- ia64.patch | 11 --------- 6 files changed, 49 insertions(+), 45 deletions(-) delete mode 100644 ecryptfs-utils-18.tar.bz2 create mode 100644 ecryptfs-utils-40.tar.bz2 delete mode 100644 ia64.patch diff --git a/ecryptfs-utils-18.tar.bz2 b/ecryptfs-utils-18.tar.bz2 deleted file mode 100644 index 46c5296..0000000 --- a/ecryptfs-utils-18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9844231a34fcefefbfe979f2def063ae2641850ee45d7c7984d32edd1023a08e -size 1165890 diff --git a/ecryptfs-utils-40.tar.bz2 b/ecryptfs-utils-40.tar.bz2 new file mode 100644 index 0000000..911c67f --- /dev/null +++ b/ecryptfs-utils-40.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:976d0c543b37eb93b096558b803e38e983aedd89aea8b696bb209eef3b18f29c +size 550380 diff --git a/ecryptfs-utils-fixes.patch b/ecryptfs-utils-fixes.patch index a9b0dcd..3adf4ef 100644 --- a/ecryptfs-utils-fixes.patch +++ b/ecryptfs-utils-fixes.patch @@ -1,12 +1,10 @@ ---- ecryptfs-utils-10/src/utils/io.c.xx 2007-03-20 15:18:40.000000000 +0100 -+++ ecryptfs-utils-10/src/utils/io.c 2007-03-20 15:18:52.000000000 +0100 -@@ -211,8 +211,7 @@ +--- src/key_mod/ecryptfs_key_mod_openssl.c ++++ src/key_mod/ecryptfs_key_mod_openssl.c +@@ -659,6 +659,7 @@ + static int tf_ssl_passwd_fd(struct ecryptfs_ctx *ctx, struct param_node *node, + struct val_node **mnt_params, void **foo) + { ++ return -1; + } - if (!(nvp->next)) { - printf("No PKI parameters required\n"); -- rc = 0; -- goto out; -+ return 0; - } - val_input = malloc(MAX_PKI_VALUE_SIZE + 1); - if (!val_input) { + static int tf_ecryptfs_openssl_gen_key_param_node_keyfile( diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes index ab5349e..a9889a0 100644 --- a/ecryptfs-utils.changes +++ b/ecryptfs-utils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 25 22:25:31 CET 2008 - meissner@suse.de + +- Upgraded to version 40 + - more manpages + - some new features + - lots of bugfixes + ------------------------------------------------------------------- Fri Aug 3 10:51:14 CEST 2007 - meissner@suse.de diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 9ae246b..4bfbf8b 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -1,7 +1,7 @@ # -# spec file for package ecryptfs-utils (Version 18) +# spec file for package ecryptfs-utils (Version 40) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,17 +10,17 @@ # norootforbuild + Name: ecryptfs-utils -URL: http://ecryptfs.sourceforge.net/ +Url: http://ecryptfs.sourceforge.net/ License: GPL v2 or later Group: Productivity/Security -Autoreqprov: on -Summary: Userspace utilities for ecryptfs -Version: 18 -Release: 4 +AutoReqProv: on +Summary: Userspace Utilities for ecryptfs +Version: 40 +Release: 1 Source0: http://downloads.sourceforge.net/ecryptfs/%{name}-%{version}.tar.bz2 -Patch0: ia64.patch -Patch1: ecryptfs-utils-fixes.patch +Patch0: ecryptfs-utils-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel keyutils-devel keyutils-libs libgcrypt-devel openssl-devel pam-devel @@ -39,14 +39,16 @@ Authors: %prep %setup -q -%patch0 -%patch1 -p1 +%patch0 -p0 %build export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" autoreconf -i -f %configure \ + --docdir=%_defaultdocdir/%{name} \ --with-pamdir=/%_lib/security + +%check make make check @@ -64,35 +66,42 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc COPYING NEWS README THANKS +%doc COPYING NEWS README THANKS doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt /usr/include/ecryptfs.h %{_prefix}/bin/* /sbin/* %{_libdir}/libecryptfs* +%{_libdir}/pkgconfig/libecryptfs.pc %{_mandir}/man7/ecryptfs* +%{_mandir}/man8/*ecryptfs* %{_libdir}/ecryptfs* /%_lib/security/pam_ecryptfs.so %changelog -* Fri Aug 03 2007 - meissner@suse.de +* Mon Feb 25 2008 meissner@suse.de +- Upgraded to version 40 + - more manpages + - some new features + - lots of bugfixes +* Fri Aug 03 2007 meissner@suse.de - fixed pam module path for ia64 and s390x too. -* Sun Jul 29 2007 - meissner@suse.de +* Sun Jul 29 2007 meissner@suse.de - fixed pam module path -* Fri Jul 27 2007 - meissner@suse.de +* Fri Jul 27 2007 meissner@suse.de - uphgraded to version 18. - TPM support (not yet enabled) - added PAM module -* Tue Mar 20 2007 - meissner@suse.de +* Tue Mar 20 2007 meissner@suse.de - build on IA64 - fixed compiler warnings -* Tue Mar 06 2007 - meissner@suse.de +* Tue Mar 06 2007 meissner@suse.de - fixed build on lib64 -* Mon Mar 05 2007 - meissner@suse.de +* Mon Mar 05 2007 meissner@suse.de - upgraded to version 10. - unlisted enhancements and bugfixes. -* Thu Dec 14 2006 - meissner@suse.de +* Thu Dec 14 2006 meissner@suse.de - use lib64 correctly. - fixed "is used uninitialized" warnings. -* Tue Dec 05 2006 - meissner@suse.de +* Tue Dec 05 2006 meissner@suse.de - initial checkin of version 5. - userland utilities to control ecryptfs filesystems diff --git a/ia64.patch b/ia64.patch deleted file mode 100644 index 765880d..0000000 --- a/ia64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in -+++ configure.in -@@ -170,7 +170,7 @@ - AC_PROG_RANLIB - - case $target in -- *64* | *s390x) -+ *x86_64* | *power64* | *ppc64* | *s390x) - CFLAGS="$CFLAGS -m64 -DECRYPTFS_DEFAULT_PKI_DIR=\\\"$prefix/lib64/ecryptfs\\\"" - LDFLAGS="$LDFLAGS -m64" ;; - *)