+++ /dev/null
-diff -up ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
---- ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror 2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2011-02-01 11:12:14.813646937 +0100
-@@ -86,7 +86,7 @@ static int ecryptfs_pkcs11h_deserialize(
- pkcs11h_data->serialized_id = NULL;
- }
- else {
-- pkcs11h_data->serialized_id = blob + i;
-+ pkcs11h_data->serialized_id = (char *)blob + i;
- i += serialized_id_length;
- }
- pkcs11h_data->certificate_blob_size = blob[i++] % 256;
-@@ -104,12 +104,11 @@ static int ecryptfs_pkcs11h_deserialize(
- pkcs11h_data->passphrase = NULL;
- }
- else {
-- pkcs11h_data->passphrase = blob + i;
-+ pkcs11h_data->passphrase = (char *)blob + i;
- i += passphrase_length;
- }
-
- rc = 0;
--out:
- return rc;
- }
-
-@@ -346,14 +345,14 @@ static int ecryptfs_pkcs11h_get_key_sig(
- data[i++] = '\02';
- data[i++] = (char)(nbits >> 8);
- data[i++] = (char)nbits;
-- BN_bn2bin(rsa->n, &(data[i]));
-+ BN_bn2bin(rsa->n, (unsigned char *)&(data[i]));
- i += nbytes;
- data[i++] = (char)(ebits >> 8);
- data[i++] = (char)ebits;
-- BN_bn2bin(rsa->e, &(data[i]));
-+ BN_bn2bin(rsa->e, (unsigned char *)&(data[i]));
- i += ebytes;
-- SHA1(data, len + 3, hash);
-- to_hex(sig, hash, ECRYPTFS_SIG_SIZE);
-+ SHA1((unsigned char *)data, len + 3, (unsigned char *)hash);
-+ to_hex((char *)sig, hash, ECRYPTFS_SIG_SIZE);
- sig[ECRYPTFS_SIG_SIZE_HEX] = '\0';
-
- rc = 0;
-@@ -411,8 +410,8 @@ static int ecryptfs_pkcs11h_encrypt(char
- if (
- (rc = RSA_public_encrypt(
- from_size,
-- from,
-- to,
-+ (unsigned char *)from,
-+ (unsigned char *)to,
- rsa,
- RSA_PKCS1_PADDING
- )) == -1
-@@ -506,9 +505,9 @@ static int ecryptfs_pkcs11h_decrypt(char
- (rv = pkcs11h_certificate_decryptAny (
- certificate,
- CKM_RSA_PKCS,
-- from,
-+ (unsigned char *)from,
- from_size,
-- to,
-+ (unsigned char *)to,
- to_size
- )) != CKR_OK
- ) {
-@@ -534,9 +533,9 @@ static int ecryptfs_pkcs11h_decrypt(char
- pkcs11h_certificate_decryptAny (
- certificate,
- CKM_RSA_PKCS,
-- from,
-+ (unsigned char *)from,
- from_size,
-- tmp,
-+ (unsigned char *)tmp,
- to_size
- );
-
-@@ -851,7 +850,7 @@ static int ecryptfs_pkcs11h_process_key(
- rc = MOUNT_ERROR;
- goto out;
- }
-- if ((rc = ecryptfs_pkcs11h_serialize(subgraph_key_ctx->key_mod->blob,
-+ if ((rc = ecryptfs_pkcs11h_serialize((unsigned char *)subgraph_key_ctx->key_mod->blob,
- &subgraph_key_ctx->key_mod->blob_size,
- pkcs11h_data))) {
- syslog(LOG_ERR, "PKCS#11: Error serializing pkcs11; rc=[%d]\n", rc);
-@@ -930,7 +929,7 @@ static int tf_pkcs11h_global_loglevel(st
-
- rc = DEFAULT_TOK;
- node->val = NULL;
--out:
-+// out:
- return rc;
- }
-
-@@ -943,7 +942,7 @@ static int tf_pkcs11h_global_pincache(st
-
- rc = DEFAULT_TOK;
- node->val = NULL;
--out:
-+// out:
- return rc;
- }
-
-@@ -1013,7 +1012,7 @@ static int tf_pkcs11h_provider_prot_auth
- sscanf (node->val, "%x", &subgraph_provider_ctx->allow_protected_authentication);
- rc = DEFAULT_TOK;
- node->val = NULL;
--out:
-+
- return rc;
- }
-
-@@ -1027,7 +1026,7 @@ static int tf_pkcs11h_provider_cert_priv
- sscanf (node->val, "%x", &subgraph_provider_ctx->certificate_is_private);
- rc = DEFAULT_TOK;
- node->val = NULL;
--out:
-+
- return rc;
- }
-
-@@ -1042,7 +1041,7 @@ static int tf_pkcs11h_provider_private_m
-
- rc = DEFAULT_TOK;
- node->val = NULL;
--out:
-+
- return rc;
- }
-
-@@ -1073,7 +1072,7 @@ static int tf_pkcs11h_provider_end(struc
- free(subgraph_provider_ctx);
- *foo = NULL;
- rc = DEFAULT_TOK;
--out:
-+
- return rc;
- }
-
-@@ -1120,7 +1119,7 @@ static int tf_pkcs11h_key_x509file(struc
- X509 *x509 = NULL;
- unsigned char *p = NULL;
- FILE *fp = NULL;
-- int rc;
-+ int rc = 0;
-
- subgraph_key_ctx = (struct pkcs11h_subgraph_key_ctx *)(*foo);
-
-diff -up ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c
---- ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c.werror 2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c 2011-02-01 11:12:14.813646937 +0100
-@@ -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-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c
---- ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror 2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c 2011-02-01 11:12:18.061664154 +0100
-@@ -43,31 +43,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)
- {
-@@ -87,7 +62,7 @@ out:
- return rc;
- }
-
--static int wrap_passphrase_if_necessary(char *username, uid_t uid, char *wrapped_pw_filename, char *passphrase, char *salt)
-+static int wrap_passphrase_if_necessary(const char *username, uid_t uid, char *wrapped_pw_filename, char *passphrase, char *salt)
- {
- char *unwrapped_pw_filename = NULL;
- struct stat s;
-@@ -198,8 +173,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h
- if ((argc == 1)
- && (memcmp(argv[0], "unwrap\0", 7) == 0)) {
- char *wrapped_pw_filename;
-- char *unwrapped_pw_filename;
-- struct stat s;
-
- rc = asprintf(
- &wrapped_pw_filename, "%s/.ecryptfs/%s",
-@@ -291,8 +264,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 */
-@@ -339,7 +310,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);
- }
-@@ -410,7 +381,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
- char *old_passphrase = NULL;
- char *new_passphrase = NULL;
- char *wrapped_pw_filename;
-- char *name = NULL;
-+// char *name = NULL;
- char salt[ECRYPTFS_SALT_SIZE];
- char salt_hex[ECRYPTFS_SALT_SIZE_HEX];
- pid_t child_pid, tmp_pid;
-@@ -424,11 +395,11 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
- if (pwd) {
- uid = pwd->pw_uid;
- homedir = pwd->pw_dir;
-- name = pwd->pw_name;
-+// name = pwd->pw_name;
- }
- } 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-85/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-85/src/utils/mount.ecryptfs.c
---- ecryptfs-utils-85/src/utils/mount.ecryptfs.c.werror 2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-85/src/utils/mount.ecryptfs.c 2011-02-01 11:12:14.818646964 +0100
-@@ -461,7 +461,7 @@ static int ecryptfs_do_mount(int argc, c
- {
- int rc;
- int flags = 0;
-- int num_opts = 0;
-+// int num_opts = 0;
- char *src = NULL, *targ = NULL, *opts = NULL, *new_opts = NULL, *temp;
- char *val;
-
-@@ -472,7 +472,7 @@ static int ecryptfs_do_mount(int argc, c
- rc = strip_userland_opts(opts);
- if (rc)
- goto out;
-- num_opts = ecryptfs_generate_mount_flags(opts, &flags);
-+ ecryptfs_generate_mount_flags(opts, &flags);
- if (!(temp = strdup("ecryptfs_unlink_sigs"))) {
- rc = -ENOMEM;
- goto out;
-diff -up ecryptfs-utils-85/src/utils/test.c.werror ecryptfs-utils-85/src/utils/test.c
---- ecryptfs-utils-85/src/utils/test.c.werror 2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-85/src/utils/test.c 2011-02-01 11:12:14.818646964 +0100
-@@ -281,7 +281,7 @@ int ecryptfs_encrypt_page(int page_cache
- struct inode *lower_inode;
- struct ecryptfs_crypt_stat *crypt_stat;
- int rc = 0;
-- int lower_byte_offset;
-+ int lower_byte_offset = 0;
- int orig_byte_offset = 0;
- int num_extents_per_page;
- #define ECRYPTFS_PAGE_STATE_UNREAD 0
+#
+# Conditional build:
+%bcond_with gui # GTK+ GUI components (non-existing as of 104)
+#
Summary: The eCryptfs mount helper and support libraries
Summary(pl.UTF-8): Narzędzie pomocnicze i biblioteki do montowania eCryptfs
Name: ecryptfs-utils
-Version: 85
-Release: 4
+Version: 104
+Release: 1
License: GPL v2+
Group: Base
-Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz
-# Source0-md5: eacf9488681d99651da544a4c261f784
+#Source0Download: https://launchpad.net/ecryptfs/+download
+Source0: https://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz
+# Source0-md5: 6ae93822bcf0d15470516c30a3deee32
Patch0: %{name}-sh.patch
Patch1: %{name}-83-fixsalt.patch
Patch2: %{name}-83-splitnss.patch
-Patch3: %{name}-84-fgetc.patch
-Patch4: %{name}-84-fixsigness.patch
-Patch5: %{name}-75-werror.patch
-URL: http://ecryptfs.sourceforge.net/
+Patch3: %{name}-84-fixsigness.patch
+URL: http://ecryptfs.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: gettext-devel
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 2.0
BuildRequires: gpgme-devel
+%{?with_gui:BuildRequires: gtk+2-devel >= 2.0}
BuildRequires: intltool >= 0.41.0
BuildRequires: keyutils-devel >= 1.0
BuildRequires: libtool
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: swig >= 1.3.31
+BuildRequires: swig-python >= 1.3.31
BuildRequires: trousers-devel
Requires: uname(release) >= 2.6.19
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
%{__libtoolize}
%{__automake}
%configure \
--enable-gpg \
+ %{?with_gui:--enable-gui} \
--enable-nss \
--enable-openssl \
--enable-pam \
%attr(755,root,root) %{_bindir}/ecryptfs-*
%attr(755,root,root) %{_bindir}/ecryptfsd
%attr(755,root,root) %{_libdir}/libecryptfs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libecryptfs.so.0
+%attr(755,root,root) %ghost %{_libdir}/libecryptfs.so.1
%dir %{_libdir}/ecryptfs
%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_gpg.so
%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_openssl.so
%files -n pam-pam_ecryptfs
%defattr(644,root,root,755)
-%doc doc/ecryptfs-pam-doc.txt
%attr(755,root,root) /%{_lib}/security/pam_ecryptfs.so
%{_mandir}/man8/pam_ecryptfs.8*
projects / packages / ecryptfs-utils.git / commitdiff