[SVN] r332 - /trunk/cyrus-imapd-2.2/debian/patches/30-update_perlcalling.sh.dpatch

[debian at incase.de]

Author: sven
Date: Fri Mar 31 21:20:47 2006
New Revision: 332

URL: https://mail.incase.de/viewcvs?rev=332&root=cyrus22&view=rev
Log:
update debian/patches/30-update_perlcalling.sh.dpatch for v2.2.13

Modified:
    trunk/cyrus-imapd-2.2/debian/patches/30-update_perlcalling.sh.dpatch

Modified: trunk/cyrus-imapd-2.2/debian/patches/30-update_perlcalling.sh.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/debian/patches/30-update_perlcalling.sh.dpatch?rev=332&root=cyrus22&r1=331&r2=332&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/debian/patches/30-update_perlcalling.sh.dpatch (original)
+++ trunk/cyrus-imapd-2.2/debian/patches/30-update_perlcalling.sh.dpatch Fri Mar 31 21:20:47 2006
@@ -118,7 +118,7 @@
  #
 -exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
 -#!perl -w
- # $Id: snmpgen,v 1.17 2004/11/19 17:05:48 shadow Exp $
+ # $Id: snmpgen,v 1.18 2005/04/11 06:08:58 shadow Exp $
  
 -if ($] !~ /^5\..*/) {
 -  # uh-oh. this isn't perl 5.
@@ -154,7 +154,7 @@
 -#!/bin/sh
 +#!/usr/bin/perl -w
 +#
- # $Id: config2header,v 1.9 2004/06/22 19:02:31 rjs3 Exp $
+ # $Id: config2header,v 1.12 2005/04/19 18:54:32 shadow Exp $
  #
  # Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
 @@ -39,24 +40,6 @@
@@ -226,7 +226,7 @@
  # 
  # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
  #
-@@ -38,27 +38,11 @@
+@@ -38,27 +38,10 @@
  # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  #
@@ -234,8 +234,7 @@
 -#!perl -w
  # script to upgrade from versions of imapd previous to 1.6.2
  # make sure you run it as the cyrus user
- # $Id: dohash,v 1.10 2001/02/23 04:43:01 leg Exp $
-+#
+ # $Id: dohash,v 1.11 2005/12/01 22:01:12 murch Exp $
  
 -if ($] !~ /^5\..*/) {
 -  # uh-oh. this isn't perl 5.
@@ -266,17 +265,17 @@
  # 
  # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
  #
-@@ -38,28 +40,6 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
--exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
--#!perl -w
--#
--# Script for mass compilation of sieve scripts.
--#
--# $Id: masssievec,v 1.4 2004/06/21 18:44:11 rjs3 Exp $
--
+@@ -38,28 +40,11 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ #
+ # Script for mass compilation of sieve scripts.
+ #
+ # $Id: masssievec,v 1.5 2005/12/01 22:01:12 murch Exp $
+ 
 -if ($] !~ /^5\..*/) {
 -  # uh-oh. this isn't perl 5.
 -  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
@@ -310,26 +309,26 @@
  #
 -exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
 -#!perl -w
- # $Id: mkimap,v 1.16 2004/06/29 18:16:54 rjs3 Exp $
- 
--if ($] !~ /^5\..*/) {
--  # uh-oh. this isn't perl 5.
--  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
--    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
--  }
--  # we failed. bail.
--  die "Your perl is too old; I need perl 5.\n";
--}
--
--# load the real script. this is isolated in an 'eval' so perl4 won't
--# choke on the perl5-isms.
--eval join("\n", <DATA>);
--if ($@) { die "$@"; }
--
--__END__
- require 5;
- 
- $imapdconf = shift || "/etc/imapd.conf";
+ # $Id: mkimap,v 1.17 2005/12/01 19:12:34 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ sub read_conf {
 diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups
 --- cyrus-imapd-2.2.12/tools/mknewsgroups	2005-05-24 22:13:04.000000000 +0200
 +++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups	2005-05-24 22:44:39.022569368 +0200
@@ -397,7 +396,7 @@
  #
 @@ -47,21 +49,6 @@
  #
- # $Id: rehash,v 1.7 2003/10/22 18:50:32 rjs3 Exp $
+ # $Id: rehash,v 1.8 2005/12/01 22:01:12 murch Exp $
  
 -if ($] !~ /^5\..*/) {
 -  # uh-oh. this isn't perl 5.
@@ -458,7 +457,7 @@
 +#!/usr/bin/perl -w
  # script to downgrade from cyrus imapd 1.6.2+ to earlier.
  # do NOT run this script while imapd's are running
- # $Id: undohash,v 1.7 2002/05/25 19:57:53 leg Exp $
+ # $Id: undohash,v 1.8 2005/12/01 22:01:13 murch Exp $
 diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve
 --- cyrus-imapd-2.2.12/tools/upgradesieve	2005-05-24 22:13:04.000000000 +0200
 +++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve	2005-05-24 22:44:39.021569278 +0200