strip stupid dos newlines

Package-Manager: portage-2.0.51.22-r1

2 files changed, 110 insertions, 100 deletions

diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 5436c552f3ea..375077b51c12 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,9 +1,19 @@
-MD5 25fedcce4a5423df4ad2d560a9ecfada ChangeLog 3304
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 564631952eab971c18ab4de2b5b721bd metadata.xml 267
 MD5 bb6867c28b848abb431b7500c4b4e0c2 reiser4progs-1.0.3.ebuild 1521
 MD5 992e0d9b6e37f31e8ecfab7bb286ef5e reiser4progs-1.0.4.ebuild 1800
+MD5 25fedcce4a5423df4ad2d560a9ecfada ChangeLog 3304
+MD5 8a656ab347c811888b5cbc45b09a9d2d files/reiser4progs-1.0.4-gcc4.patch 1612
 MD5 9f7f4fa128d3f50bb4b4918d05c62a60 files/digest-reiser4progs-1.0.3 70
 MD5 07fa3b6440989daa4321554aa71c6d49 files/digest-reiser4progs-1.0.4 70
+MD5 286eb792e1f7965d7e21569f5eff1186 files/reiser4progs-1.0.4.pset.patch 2676
 MD5 b3f5916be6210dc4da7fc0fdb1cd6fe5 files/reiser4progs-1.0.3-gcc4.patch 1632
-MD5 8a656ab347c811888b5cbc45b09a9d2d files/reiser4progs-1.0.4-gcc4.patch 1612
-MD5 fc3668c58a60e50560dfa7b5442ded3f files/reiser4progs-1.0.4.pset.patch 2773
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwIKmgIKl8Uu19MoRArw0AJ4ygXvlIbEYR6ygc3HCtN7r+xVezgCfWG85
+vUJS9mfXKr1pCORz5Z6nKIw=
+=sqQ6
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch
index daaef251328b..45852271fe1f 100644
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch
@@ -1,97 +1,97 @@
-===== include/reiser4/plugin.h 1.739 vs edited =====

---- 1.739/include/reiser4/plugin.h	2005-01-30 15:57:02 +03:00

-+++ edited/include/reiser4/plugin.h	2005-06-18 16:53:14 +04:00

-@@ -285,20 +285,23 @@ enum reiser4_opset_id {

- 	OPSET_DIRITEM		= 0x7,

- 	OPSET_CRYPTO		= 0x8,

- 	OPSET_DIGEST		= 0x9,

--	OPSET_COMPRES		= 0xa,

-+	OPSET_CPRESS		= 0xa,

-+	OPSET_CPRESS_MODE	= 0xb,

-+	OPSET_CLUSTER		= 0xc,

-+	OPSET_REGULAR		= 0xd,

- 	

--	OPSET_STORE_LAST        = (OPSET_COMPRES + 1),

-+	OPSET_STORE_LAST,

- 	

- 	/* These are not stored on disk in the current implementation. */

--	OPSET_CREATE		= 0xb,

--	OPSET_MKDIR		= 0xc,

--	OPSET_SYMLINK		= 0xd,

--	OPSET_MKNODE		= 0xe,

-+	OPSET_CREATE		= OPSET_STORE_LAST + 1,

-+	OPSET_MKDIR		= OPSET_STORE_LAST + 2,

-+	OPSET_SYMLINK		= OPSET_STORE_LAST + 3,

-+	OPSET_MKNODE		= OPSET_STORE_LAST + 4,

- 	

- #ifndef ENABLE_MINIMAL

--	OPSET_TAIL		= 0xf,

--	OPSET_EXTENT		= 0x10,

--	OPSET_ACL		= 0x11,

-+	OPSET_TAIL		= OPSET_STORE_LAST + 5,

-+	OPSET_EXTENT		= OPSET_STORE_LAST + 6,

-+	OPSET_ACL		= OPSET_STORE_LAST + 7,

- #endif

- 	OPSET_LAST

- };

-===== libreiser4/pset.c 1.19 vs edited =====

---- 1.19/libreiser4/pset.c	2004-11-24 12:09:22 +03:00

-+++ edited/libreiser4/pset.c	2005-06-18 17:00:27 +04:00

-@@ -111,7 +111,7 @@ opset_member_t opset_prof[OPSET_LAST] = 

- 		.ess = 1,

- #endif

- 	},

--	[OPSET_COMPRES] = {

-+	[OPSET_CPRESS] = {

- 		.type = INVAL_TYPE,

- #ifndef ENABLE_MINIMAL

- 		.group = INVAL_PID,

-@@ -119,7 +119,31 @@ opset_member_t opset_prof[OPSET_LAST] = 

- 		.ess = 1,

- #endif

- 	},

--	

-+	[OPSET_CPRESS_MODE] = {

-+		.type = INVAL_TYPE,

-+#ifndef ENABLE_MINIMAL

-+		.group = INVAL_PID,

-+		.prof = INVAL_PID,

-+		.ess = 1,

-+#endif

-+	},

-+	[OPSET_CLUSTER] = {

-+		.type = INVAL_TYPE,

-+#ifndef ENABLE_MINIMAL

-+		.group = INVAL_PID,

-+		.prof = INVAL_PID,

-+		.ess = 1,

-+#endif

-+	},

-+	[OPSET_REGULAR] = {

-+		.type = INVAL_TYPE,

-+#ifndef ENABLE_MINIMAL

-+		.group = INVAL_PID,

-+		.prof = INVAL_PID,

-+		.ess = 1,

-+#endif

-+	},

-+

- 	/* Note, plugins below are not stored on-disk. */

- 

- 	/* The 4 plugins below needs to be splited -- for now they are used for

-===== plugin/sdext/sdext_plug/sdext_plug_repair.c 1.10 vs edited =====

---- 1.10/plugin/sdext/sdext_plug/sdext_plug_repair.c	2004-09-22 18:21:08 +04:00

-+++ edited/plugin/sdext/sdext_plug/sdext_plug_repair.c	2005-06-18 17:00:16 +04:00

-@@ -22,7 +22,10 @@ char *opset_name[OPSET_STORE_LAST] = {

- 	[OPSET_DIRITEM] = "diritem",

- 	[OPSET_CRYPTO] =  "crypto",

- 	[OPSET_DIGEST] =  "digest",

--	[OPSET_COMPRES] = "compress"

-+	[OPSET_CPRESS] =  "compress",

-+	[OPSET_CPRESS_MODE] = "compress mode",

-+	[OPSET_CLUSTER] = "cluster",

-+	[OPSET_REGULAR] =  "regular"

- };

- 

- errno_t sdext_plug_check_struct(stat_entity_t *stat, repair_hint_t *hint) {

-

+===== include/reiser4/plugin.h 1.739 vs edited =====
+--- 1.739/include/reiser4/plugin.h	2005-01-30 15:57:02 +03:00
++++ edited/include/reiser4/plugin.h	2005-06-18 16:53:14 +04:00
+@@ -285,20 +285,23 @@ enum reiser4_opset_id {
+ 	OPSET_DIRITEM		= 0x7,
+ 	OPSET_CRYPTO		= 0x8,
+ 	OPSET_DIGEST		= 0x9,
+-	OPSET_COMPRES		= 0xa,
++	OPSET_CPRESS		= 0xa,
++	OPSET_CPRESS_MODE	= 0xb,
++	OPSET_CLUSTER		= 0xc,
++	OPSET_REGULAR		= 0xd,
+ 	
+-	OPSET_STORE_LAST        = (OPSET_COMPRES + 1),
++	OPSET_STORE_LAST,
+ 	
+ 	/* These are not stored on disk in the current implementation. */
+-	OPSET_CREATE		= 0xb,
+-	OPSET_MKDIR		= 0xc,
+-	OPSET_SYMLINK		= 0xd,
+-	OPSET_MKNODE		= 0xe,
++	OPSET_CREATE		= OPSET_STORE_LAST + 1,
++	OPSET_MKDIR		= OPSET_STORE_LAST + 2,
++	OPSET_SYMLINK		= OPSET_STORE_LAST + 3,
++	OPSET_MKNODE		= OPSET_STORE_LAST + 4,
+ 	
+ #ifndef ENABLE_MINIMAL
+-	OPSET_TAIL		= 0xf,
+-	OPSET_EXTENT		= 0x10,
+-	OPSET_ACL		= 0x11,
++	OPSET_TAIL		= OPSET_STORE_LAST + 5,
++	OPSET_EXTENT		= OPSET_STORE_LAST + 6,
++	OPSET_ACL		= OPSET_STORE_LAST + 7,
+ #endif
+ 	OPSET_LAST
+ };
+===== libreiser4/pset.c 1.19 vs edited =====
+--- 1.19/libreiser4/pset.c	2004-11-24 12:09:22 +03:00
++++ edited/libreiser4/pset.c	2005-06-18 17:00:27 +04:00
+@@ -111,7 +111,7 @@ opset_member_t opset_prof[OPSET_LAST] = 
+ 		.ess = 1,
+ #endif
+ 	},
+-	[OPSET_COMPRES] = {
++	[OPSET_CPRESS] = {
+ 		.type = INVAL_TYPE,
+ #ifndef ENABLE_MINIMAL
+ 		.group = INVAL_PID,
+@@ -119,7 +119,31 @@ opset_member_t opset_prof[OPSET_LAST] = 
+ 		.ess = 1,
+ #endif
+ 	},
+-	
++	[OPSET_CPRESS_MODE] = {
++		.type = INVAL_TYPE,
++#ifndef ENABLE_MINIMAL
++		.group = INVAL_PID,
++		.prof = INVAL_PID,
++		.ess = 1,
++#endif
++	},
++	[OPSET_CLUSTER] = {
++		.type = INVAL_TYPE,
++#ifndef ENABLE_MINIMAL
++		.group = INVAL_PID,
++		.prof = INVAL_PID,
++		.ess = 1,
++#endif
++	},
++	[OPSET_REGULAR] = {
++		.type = INVAL_TYPE,
++#ifndef ENABLE_MINIMAL
++		.group = INVAL_PID,
++		.prof = INVAL_PID,
++		.ess = 1,
++#endif
++	},
++
+ 	/* Note, plugins below are not stored on-disk. */
+ 
+ 	/* The 4 plugins below needs to be splited -- for now they are used for
+===== plugin/sdext/sdext_plug/sdext_plug_repair.c 1.10 vs edited =====
+--- 1.10/plugin/sdext/sdext_plug/sdext_plug_repair.c	2004-09-22 18:21:08 +04:00
++++ edited/plugin/sdext/sdext_plug/sdext_plug_repair.c	2005-06-18 17:00:16 +04:00
+@@ -22,7 +22,10 @@ char *opset_name[OPSET_STORE_LAST] = {
+ 	[OPSET_DIRITEM] = "diritem",
+ 	[OPSET_CRYPTO] =  "crypto",
+ 	[OPSET_DIGEST] =  "digest",
+-	[OPSET_COMPRES] = "compress"
++	[OPSET_CPRESS] =  "compress",
++	[OPSET_CPRESS_MODE] = "compress mode",
++	[OPSET_CLUSTER] = "cluster",
++	[OPSET_REGULAR] =  "regular"
+ };
+ 
+ errno_t sdext_plug_check_struct(stat_entity_t *stat, repair_hint_t *hint) {
+