[Pkg-loop-aes-commits] r1390 - in /trunk/loop-aes-utils: ./ debian/
debian/patches/
xam at users.alioth.debian.org
xam at users.alioth.debian.org
Sun Apr 22 16:05:13 UTC 2007
Author: xam
Date: Sun Apr 22 16:05:11 2007
New Revision: 1390
URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1390
Log:
* UNRELEASED
* Sync with util-linux 2.12r-19
- patches/30nfs4: Update
- patches/30nfs4-setclientid: Add
- patches/30nfs4-intr-default: Add
- patches/30swsusp-resume: Update and enable in 00list
Added:
trunk/loop-aes-utils/debian/patches/30nfs4-intr-default.dpatch
trunk/loop-aes-utils/debian/patches/30nfs4-setclientid.dpatch
Modified:
trunk/loop-aes-utils/ (props changed)
trunk/loop-aes-utils/debian/changelog
trunk/loop-aes-utils/debian/patches/00list
trunk/loop-aes-utils/debian/patches/10fstab.dpatch
trunk/loop-aes-utils/debian/patches/20guesshelper.dpatch
trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch
trunk/loop-aes-utils/debian/patches/30nfs4.dpatch
trunk/loop-aes-utils/debian/patches/30swapfile.dpatch
trunk/loop-aes-utils/debian/patches/40page_size.dpatch
Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sun Apr 22 16:05:11 2007
@@ -1,0 +1,1 @@
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9888
Modified: trunk/loop-aes-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/changelog?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/changelog (original)
+++ trunk/loop-aes-utils/debian/changelog Sun Apr 22 16:05:11 2007
@@ -1,3 +1,14 @@
+loop-aes-utils (2.12r-16) unstable; urgency=low
+
+ * UNRELEASED
+ * Sync with util-linux 2.12r-19
+ - patches/30nfs4: Update
+ - patches/30nfs4-setclientid: Add
+ - patches/30nfs4-intr-default: Add
+ - patches/30swsusp-resume: Update and enable in 00list
+
+ -- Max Vozeler <xam at debian.org> Sun, 22 Apr 2007 17:40:47 +0200
+
loop-aes-utils (2.12r-15) unstable; urgency=medium
* Set maintainer to Debian Loop-AES Team
Modified: trunk/loop-aes-utils/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/00list?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/00list (original)
+++ trunk/loop-aes-utils/debian/patches/00list Sun Apr 22 16:05:11 2007
@@ -6,5 +6,7 @@
30swapfile
30nfs4
30nfs4-fix
-#30swsusp-resume
+30nfs4-intr-default
+30nfs4-setclientid
+30swsusp-resume
40page_size
Modified: trunk/loop-aes-utils/debian/patches/10fstab.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/10fstab.dpatch?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/10fstab.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/10fstab.dpatch Sun Apr 22 16:05:11 2007
@@ -5,10 +5,10 @@
## DP: create /etc/mtab with mode 0600
@DPATCH@
-diff -urNad util-linux/mount/fstab.c /tmp/dpep.pHan4D/util-linux/mount/fstab.c
---- util-linux/mount/fstab.c 2004-12-04 16:20:19.000000000 -0700
-+++ /tmp/dpep.pHan4D/util-linux/mount/fstab.c 2004-12-15 07:42:42.193006107 -0700
-@@ -462,7 +462,7 @@
+diff -urNad trunk~/mount/fstab.c trunk/mount/fstab.c
+--- trunk~/mount/fstab.c 2007-04-22 17:58:33.000000000 +0200
++++ trunk/mount/fstab.c 2007-04-22 17:58:36.000000000 +0200
+@@ -474,7 +474,7 @@
struct flock flock;
int errsv, fd, i, j;
Modified: trunk/loop-aes-utils/debian/patches/20guesshelper.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/20guesshelper.dpatch?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/20guesshelper.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/20guesshelper.dpatch Sun Apr 22 16:05:11 2007
@@ -8,9 +8,9 @@
## DP: Rediff against 20_loop-AES, Max Vozeler <xam at debian.org>
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./mount/mount.c /tmp/dpep-work.Tr0iaL/trunk/mount/mount.c
---- ./mount/mount.c 2005-08-18 18:27:06.000000000 +0200
-+++ /tmp/dpep-work.Tr0iaL/trunk/mount/mount.c 2005-08-18 18:29:42.000000000 +0200
+diff -urNad trunk~/mount/mount.c trunk/mount/mount.c
+--- trunk~/mount/mount.c 2007-04-22 17:58:59.000000000 +0200
++++ trunk/mount/mount.c 2007-04-22 17:59:00.000000000 +0200
@@ -465,6 +465,61 @@
}
@@ -108,7 +108,7 @@
}
}
-@@ -707,61 +770,6 @@
+@@ -711,61 +774,6 @@
}
/*
@@ -170,7 +170,7 @@
* try_mount_one()
* Try to mount one file system. When "bg" is 1, this is a retry
* in the background. One additional exit code EX_BG is used here.
-@@ -773,7 +781,7 @@
+@@ -777,7 +785,7 @@
static int
try_mount_one (const char *spec0, const char *node0, const char *types0,
const char *opts0, int freq, int pass, int bg, int ro) {
@@ -179,7 +179,7 @@
int mnt5_res = 0; /* only for gcc */
int mnt_err;
int flags;
-@@ -852,7 +860,7 @@
+@@ -856,7 +864,7 @@
if (!fake) {
mnt5_res = guess_fstype_and_mount (spec, node, &types, flags & ~MS_NOSYS,
@@ -188,7 +188,7 @@
if(!mnt5_res && LoopMountAutomaticChmod && (getuid() == 0)) {
/*
* If loop was set up using random keys and new file system
-@@ -863,6 +871,11 @@
+@@ -867,6 +875,11 @@
error (_("Error: encrypted file system chmod() failed"));
}
}
Modified: trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/30nfs4-fix.dpatch Sun Apr 22 16:05:11 2007
@@ -5,10 +5,21 @@
## DP: No description.
@DPATCH@
-diff -urNad 2.12r-11~/mount/nfs4mount.c 2.12r-11/mount/nfs4mount.c
---- 2.12r-11~/mount/nfs4mount.c 2006-09-19 09:29:41.000000000 -0600
-+++ 2.12r-11/mount/nfs4mount.c 2006-09-19 09:32:58.000000000 -0600
-@@ -367,7 +367,10 @@
+diff -urNad 2.12r-18~/mount/nfs4mount.c 2.12r-18/mount/nfs4mount.c
+--- 2.12r-18~/mount/nfs4mount.c 2007-02-05 13:55:33.000000000 -0700
++++ 2.12r-18/mount/nfs4mount.c 2007-02-05 13:56:06.000000000 -0700
+@@ -358,8 +358,9 @@
+
+ /*
+ * Give a warning if the rpc.idmapd daemon is not running
++ * The latest nfs-common doesn't create pid files at all.
+ */
+- idmapd_check();
++ /* idmapd_check(); */
+
+ if (num_flavour == 0)
+ pseudoflavour[num_flavour++] = AUTH_UNIX;
+@@ -367,7 +368,10 @@
/*
* ditto with rpc.gssd daemon
*/
@@ -20,9 +31,9 @@
}
data.auth_flavourlen = num_flavour;
data.auth_flavours = pseudoflavour;
-diff -urNad 2.12r-11~/mount/nfsmount.c 2.12r-11/mount/nfsmount.c
---- 2.12r-11~/mount/nfsmount.c 2006-09-19 09:29:41.000000000 -0600
-+++ 2.12r-11/mount/nfsmount.c 2006-09-19 09:29:42.000000000 -0600
+diff -urNad 2.12r-18~/mount/nfsmount.c 2.12r-18/mount/nfsmount.c
+--- 2.12r-18~/mount/nfsmount.c 2007-02-05 13:55:33.000000000 -0700
++++ 2.12r-18/mount/nfsmount.c 2007-02-05 13:55:33.000000000 -0700
@@ -301,6 +301,7 @@
(xdrproc_t)xdr_void, (caddr_t)NULL,
(xdrproc_t)xdr_void, (caddr_t)&clnt_res,
Added: trunk/loop-aes-utils/debian/patches/30nfs4-intr-default.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/30nfs4-intr-default.dpatch?rev=1390&op=file
==============================================================================
--- trunk/loop-aes-utils/debian/patches/30nfs4-intr-default.dpatch (added)
+++ trunk/loop-aes-utils/debian/patches/30nfs4-intr-default.dpatch Sun Apr 22 16:05:11 2007
@@ -1,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30nfs4-intr-default.dpatch by <lamont at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/mount/nfs.5 trunk/mount/nfs.5
+--- trunk~/mount/nfs.5 2007-04-22 17:59:40.000000000 +0200
++++ trunk/mount/nfs.5 2007-04-22 17:59:40.000000000 +0200
+@@ -214,7 +214,7 @@
+ .I intr
+ If an NFS file operation has a major timeout and it is hard mounted,
+ then allow signals to interupt the file operation and cause it to
+-return EINTR to the calling program. The default is to not
++return EINTR to the calling program. The default is to
+ allow file operations to be interrupted.
+ .TP 1.5i
+ .I posix
+@@ -395,7 +395,7 @@
+ .I intr
+ If an NFS file operation has a major timeout and it is hard mounted,
+ then allow signals to interupt the file operation and cause it to
+-return EINTR to the calling program. The default is to not
++return EINTR to the calling program. The default is to
+ allow file operations to be interrupted.
+ .TP 1.5i
+ .I nocto
+diff -urNad trunk~/mount/nfsmount.c trunk/mount/nfsmount.c
+--- trunk~/mount/nfsmount.c 2007-04-22 17:59:40.000000000 +0200
++++ trunk/mount/nfsmount.c 2007-04-22 17:59:40.000000000 +0200
+@@ -563,7 +563,7 @@
+ char *mounthost = NULL;
+ char cbuf[128];
+
+- data->flags = 0;
++ data->flags = NFS_MOUNT_INTR;
+ *bg = 0;
+
+ len = strlen(new_opts);
Added: trunk/loop-aes-utils/debian/patches/30nfs4-setclientid.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/30nfs4-setclientid.dpatch?rev=1390&op=file
==============================================================================
--- trunk/loop-aes-utils/debian/patches/30nfs4-setclientid.dpatch (added)
+++ trunk/loop-aes-utils/debian/patches/30nfs4-setclientid.dpatch Sun Apr 22 16:05:11 2007
@@ -1,0 +1,107 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30nfs4-setclientid.dpatch by Steinar H. Gunderson <sesse at debian.org>,
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Get a more sensible client ID; based on a patch by Neil
+## DP: Brown <neilb at suse.de> found at:
+## DP: http://linux-nfs.org/pipermail/nfsv4/2006-June/004462.html
+
+ at DPATCH@
+diff -urNad trunk~/mount/nfs4mount.c trunk/mount/nfs4mount.c
+--- trunk~/mount/nfs4mount.c 2007-04-22 18:00:04.000000000 +0200
++++ trunk/mount/nfs4mount.c 2007-04-22 18:00:05.000000000 +0200
+@@ -76,7 +76,7 @@
+ #define NFS_PORT 2049
+ #endif
+
+-extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
++extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int, struct sockaddr_in *caddr);
+ extern void rpc_strerror(void);
+
+ struct {
+@@ -198,9 +198,10 @@
+ static struct nfs4_mount_data data;
+ static char hostdir[1024];
+ static char ip_addr[16] = "127.0.0.1";
+- static struct sockaddr_in server_addr;
++ static struct sockaddr_in server_addr, client_addr;
+ static int pseudoflavour[MAX_USER_FLAVOUR];
+ int num_flavour = 0;
++ int ip_addr_in_opts = 0;
+
+ char *hostname, *dirname, *old_opts;
+ char new_opts[1024];
+@@ -310,6 +311,7 @@
+ opteq+1);
+ strncpy(ip_addr,opteq+1, sizeof(ip_addr));
+ ip_addr[sizeof(ip_addr)-1] = '\0';
++ ip_addr_in_opts = 1;
+ } else if (!strcmp(opt, "sec")) {
+ num_flavour = parse_sec(opteq+1, pseudoflavour);
+ if (!num_flavour)
+@@ -419,7 +421,18 @@
+
+ data.version = NFS4_MOUNT_VERSION;
+
+- clnt_ping(&server_addr, NFS_PROGRAM, 4, data.proto);
++ client_addr.sin_family = 0;
++ client_addr.sin_addr.s_addr = 0;
++ clnt_ping(&server_addr, NFS_PROGRAM, 4, data.proto, &client_addr);
++ if (rpc_createerr.cf_stat == RPC_SUCCESS) {
++ if (!ip_addr_in_opts &&
++ client_addr.sin_family != 0 &&
++ client_addr.sin_addr.s_addr != 0) {
++ snprintf(ip_addr, sizeof(ip_addr), "%s",
++ inet_ntoa(client_addr.sin_addr));
++ data.client_addr.len = strlen(ip_addr);
++ }
++ }
+ if (rpc_createerr.cf_stat) {
+ fprintf(stderr, "mount to NFS server '%s' failed.\n", data.hostname.data);
+ goto fail;
+diff -urNad trunk~/mount/nfsmount.c trunk/mount/nfsmount.c
+--- trunk~/mount/nfsmount.c 2007-04-22 18:00:04.000000000 +0200
++++ trunk/mount/nfsmount.c 2007-04-22 18:00:05.000000000 +0200
+@@ -111,7 +111,7 @@
+
+ static int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp);
+
+-int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
++int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int, struct sockaddr_in *caddr);
+
+ /* Convert RPC errors into strings */
+ void rpc_strerror(void)
+@@ -273,7 +273,7 @@
+ */
+ int
+ clnt_ping(struct sockaddr_in *saddr, const u_long prog, const u_long vers,
+- const u_int prot)
++ const u_int prot, struct sockaddr_in *caddr)
+ {
+ CLIENT *clnt=NULL;
+ int sock, stat;
+@@ -304,6 +304,15 @@
+ rpc_createerr.cf_stat = stat;
+ clnt_destroy(clnt);
+ close(sock);
++ if (sock != -1) {
++ if (caddr) {
++ /* Get the address of our end of this connection */
++ int len = sizeof(*caddr);
++ if (getsockname(sock, caddr, &len) != 0)
++ caddr->sin_family = 0;
++ }
++ close(sock);
++ }
+ if (stat != RPC_PROGVERSMISMATCH)
+ return 1;
+
+@@ -342,7 +351,7 @@
+ break;
+ }
+ saddr->sin_port = htons(p_port);
+- if (clnt_ping(saddr, prog, *p_vers, *p_prot))
++ if (clnt_ping(saddr, prog, *p_vers, *p_prot, NULL))
+ goto out_ok;
+ if (!prot) {
+ if (*++p_prot)
Modified: trunk/loop-aes-utils/debian/patches/30nfs4.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/30nfs4.dpatch?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/30nfs4.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/30nfs4.dpatch Sun Apr 22 16:05:11 2007
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad trunk~/mount/Makefile trunk/mount/Makefile
---- trunk~/mount/Makefile 2006-05-11 16:24:59.000000000 +0200
-+++ trunk/mount/Makefile 2006-05-11 16:26:01.000000000 +0200
+--- trunk~/mount/Makefile 2007-04-22 17:45:58.000000000 +0200
++++ trunk/mount/Makefile 2007-04-22 17:48:03.000000000 +0200
@@ -29,7 +29,7 @@
MAYBE = pivot_root swapoff
@@ -28,8 +28,8 @@
swapon: swapon.o version.o xmalloc.o \
diff -urNad trunk~/mount/mount.8 trunk/mount/mount.8
---- trunk~/mount/mount.8 2006-05-11 16:24:59.000000000 +0200
-+++ trunk/mount/mount.8 2006-05-11 16:25:00.000000000 +0200
+--- trunk~/mount/mount.8 2007-04-22 17:45:58.000000000 +0200
++++ trunk/mount/mount.8 2007-04-22 17:47:05.000000000 +0200
@@ -387,6 +387,7 @@
.IR msdos ,
.IR ncpfs ,
@@ -135,8 +135,8 @@
.TP
.BI iocharset= name
diff -urNad trunk~/mount/mount.c trunk/mount/mount.c
---- trunk~/mount/mount.c 2006-05-11 16:24:59.000000000 +0200
-+++ trunk/mount/mount.c 2006-05-11 16:25:00.000000000 +0200
+--- trunk~/mount/mount.c 2007-04-22 17:45:58.000000000 +0200
++++ trunk/mount/mount.c 2007-04-22 17:47:05.000000000 +0200
@@ -859,8 +859,23 @@
"without support for the type `nfs'"));
#endif
@@ -162,8 +162,8 @@
if (!fake) {
mnt5_res = guess_fstype_and_mount (spec, node, &types, flags & ~MS_NOSYS,
diff -urNad trunk~/mount/nfs.5 trunk/mount/nfs.5
---- trunk~/mount/nfs.5 2006-01-29 19:00:03.000000000 +0100
-+++ trunk/mount/nfs.5 2006-05-11 16:25:00.000000000 +0200
+--- trunk~/mount/nfs.5 2007-04-21 21:56:32.000000000 +0200
++++ trunk/mount/nfs.5 2007-04-22 17:47:05.000000000 +0200
@@ -3,7 +3,7 @@
.\" patches. "
.TH NFS 5 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
@@ -433,7 +433,7 @@
.SH "SEE ALSO"
diff -urNad trunk~/mount/nfs4_mount.h trunk/mount/nfs4_mount.h
--- trunk~/mount/nfs4_mount.h 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/mount/nfs4_mount.h 2006-05-11 16:25:00.000000000 +0200
++++ trunk/mount/nfs4_mount.h 2007-04-22 17:47:05.000000000 +0200
@@ -0,0 +1,82 @@
+#ifndef _LINUX_NFS4_MOUNT_H
+#define _LINUX_NFS4_MOUNT_H
@@ -519,7 +519,7 @@
+#endif
diff -urNad trunk~/mount/nfs4mount.c trunk/mount/nfs4mount.c
--- trunk~/mount/nfs4mount.c 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/mount/nfs4mount.c 2006-05-11 16:25:00.000000000 +0200
++++ trunk/mount/nfs4mount.c 2007-04-22 17:47:05.000000000 +0200
@@ -0,0 +1,433 @@
+/*
+ * nfs4mount.c -- Linux NFS mount
@@ -588,7 +588,7 @@
+ } \
+} while(0);
+
-+char *GSSDLCK = DEFAULT_DIR "/rpc.gssd";
++char *GSSDLCK = DEFAULT_DIR "/rpc.gssd.pid";
+#define gssd_check() do { \
+ if (access(GSSDLCK, F_OK)) { \
+ printf(_("Warning: rpc.gssd appears not to be running.\n")); \
@@ -955,8 +955,8 @@
+ return retval;
+}
diff -urNad trunk~/mount/nfs_mount4.h trunk/mount/nfs_mount4.h
---- trunk~/mount/nfs_mount4.h 2006-01-29 19:00:03.000000000 +0100
-+++ trunk/mount/nfs_mount4.h 2006-05-11 16:25:00.000000000 +0200
+--- trunk~/mount/nfs_mount4.h 2007-04-21 21:56:31.000000000 +0200
++++ trunk/mount/nfs_mount4.h 2007-04-22 17:47:05.000000000 +0200
@@ -8,7 +8,9 @@
* so it is easiest to ignore the kernel altogether (at compile time).
*/
@@ -999,8 +999,8 @@
+#endif
diff -urNad trunk~/mount/nfsmount.c trunk/mount/nfsmount.c
---- trunk~/mount/nfsmount.c 2006-01-29 19:00:06.000000000 +0100
-+++ trunk/mount/nfsmount.c 2006-05-11 16:25:00.000000000 +0200
+--- trunk~/mount/nfsmount.c 2007-04-21 21:56:31.000000000 +0200
++++ trunk/mount/nfsmount.c 2007-04-22 17:47:05.000000000 +0200
@@ -34,6 +34,7 @@
#include "../defines.h" /* for HAVE_rpcsvc_nfs_prot_h and HAVE_inet_aton */
@@ -2565,8 +2565,8 @@
/*
* We need to translate between nfs status return values and
diff -urNad trunk~/mount/sundries.h trunk/mount/sundries.h
---- trunk~/mount/sundries.h 2006-01-29 19:00:03.000000000 +0100
-+++ trunk/mount/sundries.h 2006-05-11 16:25:00.000000000 +0200
+--- trunk~/mount/sundries.h 2007-04-21 21:56:31.000000000 +0200
++++ trunk/mount/sundries.h 2007-04-22 17:47:05.000000000 +0200
@@ -37,6 +37,9 @@
#ifdef HAVE_NFS
int nfsmount (const char *spec, const char *node, int *flags,
@@ -2578,8 +2578,8 @@
/* exit status - bits below are ORed */
diff -urNad trunk~/mount/umount.c trunk/mount/umount.c
---- trunk~/mount/umount.c 2006-05-11 16:24:59.000000000 +0200
-+++ trunk/mount/umount.c 2006-05-11 16:25:00.000000000 +0200
+--- trunk~/mount/umount.c 2007-04-22 17:45:58.000000000 +0200
++++ trunk/mount/umount.c 2007-04-22 17:47:05.000000000 +0200
@@ -90,6 +90,11 @@
/* True if ruid != euid. */
int suid = 0;
Modified: trunk/loop-aes-utils/debian/patches/30swapfile.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/30swapfile.dpatch?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/30swapfile.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/30swapfile.dpatch Sun Apr 22 16:05:11 2007
@@ -4,10 +4,10 @@
## DP: Always warn about insecure swapfile permissions
@DPATCH@
-diff -urNad trunk/mount/swapon.c /tmp/dpep.Dh87Eo/trunk/mount/swapon.c
---- trunk/mount/swapon.c 2004-12-20 01:25:52.000000000 +0100
-+++ /tmp/dpep.Dh87Eo/trunk/mount/swapon.c 2004-12-20 01:25:56.000000000 +0100
-@@ -199,7 +199,8 @@
+diff -urNad trunk~/mount/swapon.c trunk/mount/swapon.c
+--- trunk~/mount/swapon.c 2007-04-22 17:59:22.000000000 +0200
++++ trunk/mount/swapon.c 2007-04-22 17:59:22.000000000 +0200
+@@ -212,7 +212,8 @@
/* people generally dislike this warning - now it is printed
only when `verbose' is set */
Modified: trunk/loop-aes-utils/debian/patches/40page_size.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/40page_size.dpatch?rev=1390&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/40page_size.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/40page_size.dpatch Sun Apr 22 16:05:11 2007
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/mount/swapon.c trunk/mount/swapon.c
---- trunk~/mount/swapon.c 2006-07-18 21:25:51.000000000 +0200
-+++ trunk/mount/swapon.c 2006-07-18 21:25:57.000000000 +0200
-@@ -324,6 +324,7 @@
+--- trunk~/mount/swapon.c 2007-04-22 18:00:23.000000000 +0200
++++ trunk/mount/swapon.c 2007-04-22 18:00:23.000000000 +0200
+@@ -415,6 +415,7 @@
prepare_encrypted_swap(const char *partition, char *loop, char *encryption)
{
int x, y, fd, ffd;
@@ -16,7 +16,7 @@
sha512_context s;
unsigned char b[4096], multiKeyBits[65][32];
char *a[10], *apiName;
-@@ -367,7 +368,9 @@
+@@ -458,7 +459,9 @@
fprintf(stderr, _("swapon: unable to open swap device %s\n"), partition);
goto errout0;
}
@@ -27,7 +27,7 @@
sha512_init(&s);
for(x = 0; x < 10; x++) {
if(fread(&b[0], sizeof(b), 1, f) != 1) break;
-@@ -386,7 +389,7 @@
+@@ -477,7 +480,7 @@
unsigned char h[64];
int x,y,z;
} j;
@@ -36,7 +36,7 @@
memcpy(&j.h[0], &s.sha_out[0], 64);
gettimeofday(&j.tv, NULL);
j.y = y;
-@@ -445,7 +448,7 @@
+@@ -536,7 +539,7 @@
memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
return 0;
}
More information about the Pkg-loop-aes-commits
mailing list