[SVN] r334 - /trunk/cyrus-imapd-2.2/debian/patches/40-rehash_fix_pathes.dpatch

[debian at incase.de]

Author: sven
Date: Fri Mar 31 21:29:00 2006
New Revision: 334

URL: https://mail.incase.de/viewcvs?rev=334&root=cyrus22&view=rev
Log:
update 40-rehash_fix_pathes.dpatch for v2.2.13

Modified:
    trunk/cyrus-imapd-2.2/debian/patches/40-rehash_fix_pathes.dpatch

Modified: trunk/cyrus-imapd-2.2/debian/patches/40-rehash_fix_pathes.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/debian/patches/40-rehash_fix_pathes.dpatch?rev=334&root=cyrus22&r1=333&r2=334&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/debian/patches/40-rehash_fix_pathes.dpatch (original)
+++ trunk/cyrus-imapd-2.2/debian/patches/40-rehash_fix_pathes.dpatch Fri Mar 31 21:29:00 2006
@@ -8,7 +8,7 @@
 diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash
 --- cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:56:53.000000000 +0200
 +++ /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:57:53.429121575 +0200
-@@ -130,7 +130,7 @@
+@@ -170,7 +170,7 @@
  $imapdconf = shift || "/etc/imapd.conf";
  
  $yn = "y";
@@ -17,16 +17,16 @@
  $nosievedir = 0;
  $hashispool = 0;
  $virtdomains = 0;
-@@ -165,7 +165,7 @@
+@@ -181,7 +181,7 @@
+     read_conf($conf);
  }
- close CONF;
  
--if (! $conf) { $conf = "/var/imap"; }
-+if (! $conf) { $conf = "/var/lib/cyrus"; }
+-if (! $confdir) { $confdir = "/var/imap"; }
++if (! $confdir) { $confdir = "/var/lib/cyrus"; }
  
  if ($interactive) {
-     print "upgrade $conf? ";
-@@ -539,6 +539,7 @@
+     print "upgrade $confdir? ";
+@@ -555,6 +555,7 @@
  	      or die "couldn't rename .$i/$s/$t to $s/$t";
  	  }
  	  closedir MV;