diff --git a/ecryptfs-utils-10.tar.bz2 b/ecryptfs-utils-10.tar.bz2 new file mode 100644 index 0000000..dbda22d --- /dev/null +++ b/ecryptfs-utils-10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00d11e625e668036af61f3b5e98e286aec607060618997666af3b76deb85c191 +size 1106189 diff --git a/ecryptfs-utils-5.tar.bz2 b/ecryptfs-utils-5.tar.bz2 deleted file mode 100644 index 4028955..0000000 --- a/ecryptfs-utils-5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31123772602ec1e389c3eeeaf7cf91e42d5582dfe874500e3933c0f17c1f1330 -size 1159582 diff --git a/ecryptfs-utils-fixes.patch b/ecryptfs-utils-fixes.patch deleted file mode 100644 index 774e039..0000000 --- a/ecryptfs-utils-fixes.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- ecryptfs-utils-5/src/libecryptfs/decision_graph.c.xx 2006-12-05 13:33:31.000000000 +0100 -+++ ecryptfs-utils-5/src/libecryptfs/decision_graph.c 2006-12-05 13:33:55.000000000 +0100 -@@ -70,7 +70,7 @@ - return -1; - } - --int free_name_val_pairs(struct ecryptfs_name_val_pair *pair) -+void free_name_val_pairs(struct ecryptfs_name_val_pair *pair) - { - struct ecryptfs_name_val_pair *next; - ---- ecryptfs-utils-5/src/pki/ecryptfs_pki_openssl.c.xx 2006-12-05 13:35:01.000000000 +0100 -+++ ecryptfs-utils-5/src/pki/ecryptfs_pki_openssl.c 2006-12-05 13:35:21.000000000 +0100 -@@ -455,7 +455,7 @@ - * This really should be implemented in libecryptfs since it would be - * redundant to define this inside of every library. - */ --int free_name_val_pairs(struct ecryptfs_name_val_pair *pair) -+void free_name_val_pairs(struct ecryptfs_name_val_pair *pair) - { - struct ecryptfs_name_val_pair *next; - ---- ecryptfs-utils-5/src/utils/test.c.xx 2006-12-05 13:40:33.000000000 +0100 -+++ ecryptfs-utils-5/src/utils/test.c 2006-12-05 13:40:40.000000000 +0100 -@@ -292,6 +292,7 @@ - " * src_page->index = [%lu]\n * src_offset = [%d]\n", - __FUNCTION__, dst_page->index, dst_offset, src_page->index, - src_offset); -+ return 0; - } - - #define ECRYPTFS_MAX_IV_BYTES 16 ---- ecryptfs-utils-5/src/utils/mount.ecryptfs.c.xx 2006-12-14 16:44:57.000000000 +0100 -+++ ecryptfs-utils-5/src/utils/mount.ecryptfs.c 2006-12-14 16:45:22.000000000 +0100 -@@ -535,7 +535,6 @@ - uint32_t version; - int non_interactive = 0; - char auth_tok_sig[ECRYPTFS_SIG_SIZE_HEX+1]; -- struct ecryptfs_name_val_pair *nvp_head; - char *opts_str; - struct param_node *plaintext_node; - struct val_node *head; /* Will contain final mount options */ -@@ -575,7 +574,7 @@ - } - if (!opts_str_contains_option(opts_str, "remount")) { - rc = ecryptfs_process_decision_graph(&ctx, &head, version, -- nvp_head,opts_str); -+ NULL,opts_str); - if (rc) { - printf("Error attempting to evaluate mount options; " - "rc = [%d]. Try updating/reinstalling your " ---- ecryptfs-utils-5/src/utils/initialization_io.c.xx 2006-12-14 16:45:36.000000000 +0100 -+++ ecryptfs-utils-5/src/utils/initialization_io.c 2006-12-14 16:45:57.000000000 +0100 -@@ -207,7 +207,7 @@ - - int ecryptfs_set_name_value_pairs(struct ecryptfs_name_val_pair *nvp) - { -- char *val_input; -+ char *val_input = NULL; - int rc = 0; - - if (!(nvp->next)) { diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes index 10b30b1..c8827de 100644 --- a/ecryptfs-utils.changes +++ b/ecryptfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 5 12:31:00 CET 2007 - meissner@suse.de + +- upgraded to version 10. + - unlisted enhancements and bugfixes. + ------------------------------------------------------------------- Thu Dec 14 16:17:01 CET 2006 - meissner@suse.de diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index ad9b572..04d9ec4 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -1,7 +1,7 @@ # -# spec file for package ecryptfs-utils (Version 5) +# spec file for package ecryptfs-utils (Version 10) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -16,10 +16,9 @@ License: GNU General Public License (GPL) Group: Productivity/Security Autoreqprov: on Summary: Userspace utilities for ecryptfs -Version: 5 -Release: 2 +Version: 10 +Release: 1 Source0: http://downloads.sourceforge.net/ecryptfs/%{name}-%{version}.tar.bz2 -Patch: ecryptfs-utils-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel keyutils-devel keyutils-libs libgcrypt-devel openssl-devel @@ -38,17 +37,14 @@ Authors: %prep %setup -q -%patch0 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} +%configure make make check %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %clean rm -rf $RPM_BUILD_ROOT @@ -56,12 +52,17 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc COPYING NEWS README THANKS +/usr/include/ecryptfs.h %{_prefix}/bin/* /sbin/* %{_libdir}/libecryptfs* +%{_mandir}/man7/ecryptfs* /usr/lib/ecryptfs* -%changelog -n ecryptfs-utils +%changelog +* Mon Mar 05 2007 - meissner@suse.de +- upgraded to version 10. + - unlisted enhancements and bugfixes. * Thu Dec 14 2006 - meissner@suse.de - use lib64 correctly. - fixed "is used uninitialized" warnings.