[PC-BSD Commits] r7568 - pcbsd/current/build-files/src-patches

[svn at pcbsd.org]

Author: kris
Date: 2010-09-16 05:14:10 -0700 (Thu, 16 Sep 2010)
New Revision: 7568

Modified:
   pcbsd/current/build-files/src-patches/sbin-geom-class-eli-geom_eli.c
Log:

Updated geom_eli.c patch, make it apply cleanly again



Modified: pcbsd/current/build-files/src-patches/sbin-geom-class-eli-geom_eli.c
===================================================================
--- pcbsd/current/build-files/src-patches/sbin-geom-class-eli-geom_eli.c	2010-09-15 21:11:43 UTC (rev 7567)
+++ pcbsd/current/build-files/src-patches/sbin-geom-class-eli-geom_eli.c	2010-09-16 12:14:10 UTC (rev 7568)
@@ -1,6 +1,6 @@
---- sbin/geom/class/eli/geom_eli.c.o	2010-03-30 14:24:40.318372303 +0000
-+++ sbin/geom/class/eli/geom_eli.c	2010-03-30 14:32:17.311798842 +0000
-@@ -83,14 +83,14 @@
+--- sbin/geom/class/eli/geom_eli.c.orig	2010-09-16 04:51:33.000000000 -0700
++++ sbin/geom/class/eli/geom_eli.c	2010-09-16 05:09:29.000000000 -0700
+@@ -75,14 +75,14 @@
  /*
   * Available commands:
   *
@@ -18,51 +18,52 @@
   * delkey [-afv] [-n keyno] prov
   * kill [-av] [prov ...]
   * backup [-v] prov file
-@@ -110,9 +110,10 @@
- 		{ 'l', "keylen", &keylen, G_TYPE_NUMBER },
+@@ -101,10 +101,11 @@
+ 		{ 'K', "newkeyfile", "", G_TYPE_STRING },
+ 		{ 'l', "keylen", "0", G_TYPE_NUMBER },
  		{ 'P', "nonewpassphrase", NULL, G_TYPE_BOOL },
- 		{ 's', "sectorsize", &sectorsize, G_TYPE_NUMBER },
 +		{ 'S', "readphrasestdin", NULL, G_TYPE_BOOL },
+ 		{ 's', "sectorsize", "0", G_TYPE_NUMBER },
  		G_OPT_SENTINEL
  	    },
--	    NULL, "[-bPv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov"
-+	    NULL, "[-bPvS] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov"
+-	    "[-bPv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov"
++	    "[-bPSv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov"
  	},
  	{ "label", G_FLAG_VERBOSE, eli_main,
  	    {
-@@ -125,6 +126,7 @@
- 		{ 'l', "keylen", &keylen, G_TYPE_NUMBER },
+@@ -117,6 +118,7 @@
+ 		{ 'l', "keylen", "0", G_TYPE_NUMBER },
  		{ 'P', "nonewpassphrase", NULL, G_TYPE_BOOL },
- 		{ 's', "sectorsize", &sectorsize, G_TYPE_NUMBER },
+ 		{ 's', "sectorsize", "0", G_TYPE_NUMBER },
 +		{ 'S', "readphrasestdin", NULL, G_TYPE_BOOL },
  		G_OPT_SENTINEL
  	    },
- 	    NULL, "- an alias for 'init'"
-@@ -135,9 +137,10 @@
- 		{ 'k', "keyfile", keyfile, G_TYPE_STRING },
+ 	    "- an alias for 'init'"
+@@ -127,9 +129,10 @@
+ 		{ 'k', "keyfile", "", G_TYPE_STRING },
  		{ 'p', "nopassphrase", NULL, G_TYPE_BOOL },
  		{ 'r', "readonly", NULL, G_TYPE_BOOL },
 +		{ 'S', "readphrasestdin", NULL, G_TYPE_BOOL },
  		G_OPT_SENTINEL
  	    },
--	    NULL, "[-dprv] [-k keyfile] prov"
-+	    NULL, "[-dprSv] [-k keyfile] prov"
+-	    "[-dprv] [-k keyfile] prov"
++	    "[-dprSv] [-k keyfile] prov"
  	},
  	{ "detach", 0, NULL,
  	    {
-@@ -182,9 +185,10 @@
- 		{ 'n', "keyno", &keyno, G_TYPE_NUMBER },
+@@ -174,9 +177,10 @@
+ 		{ 'n', "keyno", "-1", G_TYPE_NUMBER },
  		{ 'p', "nopassphrase", NULL, G_TYPE_BOOL },
  		{ 'P', "nonewpassphrase", NULL, G_TYPE_BOOL },
 +		{ 'S', "readphrasestdin", NULL, G_TYPE_BOOL },
  		G_OPT_SENTINEL
  	    },
--	    NULL, "[-pPv] [-n keyno] [-i iterations] [-k keyfile] [-K newkeyfile] prov"
-+	    NULL, "[-pPvS] [-n keyno] [-i iterations] [-k keyfile] [-K newkeyfile] prov"
+-	    "[-pPv] [-n keyno] [-i iterations] [-k keyfile] [-K newkeyfile] prov"
++	    "[-pPSv] [-n keyno] [-i iterations] [-k keyfile] [-K newkeyfile] prov"
  	},
  	{ "delkey", G_FLAG_VERBOSE, eli_main,
  	    {
-@@ -320,11 +324,14 @@
+@@ -312,11 +316,14 @@
  {
  	struct hmac_ctx ctx;
  	const char *str;
@@ -78,7 +79,7 @@
  	g_eli_crypto_hmac_init(&ctx, NULL, 0);
  
  	str = gctl_get_ascii(req, new ? "newkeyfile" : "keyfile");
-@@ -336,9 +343,13 @@
+@@ -328,9 +335,13 @@
  		ssize_t done;
  		int fd;
  
@@ -94,7 +95,7 @@
  			fd = open(str, O_RDONLY);
  			if (fd == -1) {
  				gctl_error(req, "Cannot open keyfile %s: %s.",
-@@ -367,36 +378,71 @@
+@@ -359,36 +370,71 @@
  			return (NULL);
  		}
  		for (;;) {