- update to apply correctly

[packages/cvs.git] / cvs-debian-perms.patch

diff --git a/cvs-debian-perms.patch b/cvs-debian-perms.patch
index d7f7e1074be73ddac6c18b7178dea2a30a80be27..8c982d445775bdd975c557acad9c6d69e2d10d52 100644 (file)
--- a/cvs-debian-perms.patch
+++ b/cvs-debian-perms.patch
@@ -1,34 +1,31 @@
---- cvs-1.12.13.orig/debian/patches/89_history_val-tag_world_writeable
-+++ cvs-1.12.13/debian/patches/89_history_val-tag_world_writeable
-@@ -0,0 +1,31 @@
-+# Don't make history and val-tags files world-writable when creating a
-+# new repository. (Closes: #125892)
-+#
-+# Author unknown, probably Eric Gillespie, Jr. <epg@debian.org>
-+diff -ruN cvs-1.12.13-old/src/mkmodules.c cvs-1.12.13/src/mkmodules.c
-+--- cvs-1.12.13-old/src/mkmodules.c   2005-05-25 04:59:01.000000000 +0800
-++++ cvs-1.12.13/src/mkmodules.c       2006-02-26 22:27:55.000000000 +0800
-+@@ -1249,11 +1249,6 @@
-+      fp = xfopen (info, "w");
-+      if (fclose (fp) < 0)
-+          error (1, errno, "cannot close %s", info);
-+- 
-+-        /* Make the new history file world-writeable, since every CVS
-+-           user will need to be able to write to it.  We use chmod()
-+-           because xchmod() is too shy. */
-+-        chmod (info, 0666);
-+     }
-+ 
-+     /* Make an empty val-tags file to prevent problems creating it later.  */
-+@@ -1267,11 +1262,6 @@
-+      fp = xfopen (info, "w");
-+      if (fclose (fp) < 0)
-+          error (1, errno, "cannot close %s", info);
-+- 
-+-        /* Make the new val-tags file world-writeable, since every CVS
-+-           user will need to be able to write to it.  We use chmod()
-+-           because xchmod() is too shy. */
-+-        chmod (info, 0666);
-+     }
-+ 
-+     free (info);
+# Don't make history and val-tags files world-writable when creating a
+# new repository. (Closes: #125892)
+#
+# Author unknown, probably Eric Gillespie, Jr. <epg@debian.org>
+diff -ruN cvs-1.12.13-old/src/mkmodules.c cvs-1.12.13/src/mkmodules.c
+--- cvs-1.12.13-old/src/mkmodules.c    2005-05-25 04:59:01.000000000 +0800
++++ cvs-1.12.13/src/mkmodules.c        2006-02-26 22:27:55.000000000 +0800
+@@ -1249,11 +1249,6 @@
+       fp = xfopen (info, "w");
+       if (fclose (fp) < 0)
+           error (1, errno, "cannot close %s", info);
+- 
+-        /* Make the new history file world-writeable, since every CVS
+-           user will need to be able to write to it.  We use chmod()
+-           because xchmod() is too shy. */
+-        chmod (info, 0666);
+     }
+ 
+     /* Make an empty val-tags file to prevent problems creating it later.  */
+@@ -1267,11 +1262,6 @@
+       fp = xfopen (info, "w");
+       if (fclose (fp) < 0)
+           error (1, errno, "cannot close %s", info);
+- 
+-        /* Make the new val-tags file world-writeable, since every CVS
+-           user will need to be able to write to it.  We use chmod()
+-           because xchmod() is too shy. */
+-        chmod (info, 0666);
+     }
+ 
+     free (info);