[Pkg-Cyrus-imapd-Debian-devel] [SVN] r149 - in trunk/cyrus-imapd-2.2.12: contrib contrib/cyrus-graphtools.1.0/cgi-bin perl/imap/examples perl/sieve/scripts snmp tools
pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org
pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org
Wed, 25 May 2005 01:02:47 +0200
Author: sven
Date: 2005-05-25 01:02:44 +0200 (Wed, 25 May 2005)
New Revision: 149
Modified:
trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_ma=
ster.pl
trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cy=
rus_db-sum.pl
trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cy=
rus_db.pl
trunk/cyrus-imapd-2.2.12/contrib/mupdate-test.pl
trunk/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl
trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl
trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl
trunk/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl
trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl
trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
trunk/cyrus-imapd-2.2.12/snmp/snmpgen
trunk/cyrus-imapd-2.2.12/tools/arbitronsort.pl
trunk/cyrus-imapd-2.2.12/tools/config2header
trunk/cyrus-imapd-2.2.12/tools/config2man
trunk/cyrus-imapd-2.2.12/tools/dohash
trunk/cyrus-imapd-2.2.12/tools/masssievec
trunk/cyrus-imapd-2.2.12/tools/mkimap
trunk/cyrus-imapd-2.2.12/tools/mknewsgroups
trunk/cyrus-imapd-2.2.12/tools/rehash
trunk/cyrus-imapd-2.2.12/tools/translatesieve
trunk/cyrus-imapd-2.2.12/tools/undohash
trunk/cyrus-imapd-2.2.12/tools/upgradesieve
Log:
Bring source in shape so that all dpatches should apply cleanly
Modified: trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/c=
yrus_master.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_m=
aster.pl 2005-05-24 22:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_m=
aster.pl 2005-05-24 23:02:44 UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl5
=20
#
# Created by Alison Greenwald <alison@andrew.cmu.edu> 21 Sep 2000
Modified: trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/g=
raph_cyrus_db-sum.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_c=
yrus_db-sum.pl 2005-05-24 22:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_c=
yrus_db-sum.pl 2005-05-24 23:02:44 UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl5
=20
#
# Created by Alison Greenwald 21 Sep 2000
Modified: trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/g=
raph_cyrus_db.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_c=
yrus_db.pl 2005-05-24 22:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_c=
yrus_db.pl 2005-05-24 23:02:44 UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl=20
+#!/usr/local/bin/perl5=20
=20
#
# Created by Alison Greenwald <alison@andrew.cmu.edu> 21 Sep 2000
Modified: trunk/cyrus-imapd-2.2.12/contrib/mupdate-test.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/contrib/mupdate-test.pl 2005-05-24 22:58:58 =
UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/contrib/mupdate-test.pl 2005-05-24 23:02:44 =
UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
=20
# Create a workload against a murder frontend
# that will give the MUPDATE server a workout.
Modified: trunk/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 2005-05-24 2=
2:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 2005-05-24 2=
3:02:44 UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#! /usr/bin/perl -w
#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
Modified: trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 2005-05-24=
22:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 2005-05-24=
23:02:44 UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#! /usr/bin/perl -w
#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
Modified: trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 2005-05-24 22:5=
8:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 2005-05-24 23:0=
2:44 UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#! /usr/local/bin/perl -w
#
# $Id: imapdu.pl,v 1.8 2001/11/30 19:30:45 leg Exp $
#=20
Modified: trunk/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 2005-05-24 2=
2:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 2005-05-24 2=
3:02:44 UTC (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
=20
# test-imsp.pl
#
Modified: trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 2005-05-2=
4 22:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 2005-05-2=
4 23:02:44 UTC (rev 149)
@@ -1,4 +1,6 @@
-#!/usr/bin/perl -w
+#! /bin/sh
+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+#!perl -w
#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
Modified: trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-05-24 =
22:58:58 UTC (rev 148)
+++ trunk/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-05-24 =
23:02:44 UTC (rev 149)
@@ -1,4 +1,6 @@
-#!/usr/bin/perl -w
+#! /bin/sh
+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+#!perl -w
#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
Modified: trunk/cyrus-imapd-2.2.12/snmp/snmpgen
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 22:58:58 UTC (rev 14=
8)
+++ trunk/cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 23:02:44 UTC (rev 14=
9)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/sh
#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
@@ -38,8 +38,25 @@
# 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
# $Id: snmpgen,v 1.17 2004/11/19 17:05:48 shadow Exp $
=20
+if ($] !~ /^5\..*/) {
+ # uh-oh. this isn't perl 5.
+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+ exec("$_/perl5", "-w", "-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;
=20
#Tim Martin
Modified: trunk/cyrus-imapd-2.2.12/tools/arbitronsort.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 22:58:58 UT=
C (rev 148)
+++ trunk/cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 23:02:44 UT=
C (rev 149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
=20
#
# This script takes the output of arbitron (run without the -o option)
Modified: trunk/cyrus-imapd-2.2.12/tools/config2header
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/config2header 2005-05-24 22:58:58 UTC =
(rev 148)
+++ trunk/cyrus-imapd-2.2.12/tools/config2header 2005-05-24 23:02:44 UTC =
(rev 149)
@@ -1,5 +1,4 @@
-#!/usr/bin/perl -w
-#
+#!/bin/sh
# $Id: config2header,v 1.9 2004/06/22 19:02:31 rjs3 Exp $
#
# Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
@@ -40,6 +39,24 @@
# 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
+
+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;
=20
use strict;
Modified: trunk/cyrus-imapd-2.2.12/tools/config2man
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/config2man 2005-05-24 22:58:58 UTC (re=
v 148)
+++ trunk/cyrus-imapd-2.2.12/tools/config2man 2005-05-24 23:02:44 UTC (re=
v 149)
@@ -1,5 +1,4 @@
-#!/usr/bin/perl -w
-#
+#!/bin/sh
# $Id: config2man,v 1.3 2003/12/09 18:33:52 ken3 Exp $
#
# Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
@@ -40,6 +39,24 @@
# 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
+
+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;
=20
use strict;
Modified: trunk/cyrus-imapd-2.2.12/tools/dohash
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/dohash 2005-05-24 22:58:58 UTC (rev 14=
8)
+++ trunk/cyrus-imapd-2.2.12/tools/dohash 2005-05-24 23:02:44 UTC (rev 14=
9)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/sh
#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
@@ -38,11 +38,27 @@
# 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 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 $
-#
=20
+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;
=20
$| =3D 1;
Modified: trunk/cyrus-imapd-2.2.12/tools/masssievec
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:58:58 UTC (re=
v 148)
+++ trunk/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 23:02:44 UTC (re=
v 149)
@@ -1,7 +1,5 @@
-#!/usr/bin/perl -w
+#!/bin/sh
#=20
-# Script for mass compilation of sieve scripts.
-#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -40,6 +38,28 @@
# 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 $
+
+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;
=20
$| =3D 1;
@@ -72,6 +92,7 @@
open CONF, $imapdconf or die "can't open $imapdconf";
while (<CONF>) {
if (/^sieveusehomedir:\s+(1|t|yes|on)/) {
+ $nosievedir =3D 1;
print "you are storing sieve scripts in user's home directories, this s=
cript cannot deal with that\n";
exit;
}
Modified: trunk/cyrus-imapd-2.2.12/tools/mkimap
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 22:58:58 UTC (rev 14=
8)
+++ trunk/cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 23:02:44 UTC (rev 14=
9)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/bin/sh
#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
@@ -38,8 +38,25 @@
# 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
# $Id: mkimap,v 1.16 2004/06/29 18:16:54 rjs3 Exp $
=20
+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;
=20
$imapdconf =3D shift || "/etc/imapd.conf";
Modified: trunk/cyrus-imapd-2.2.12/tools/mknewsgroups
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 22:58:58 UTC (=
rev 148)
+++ trunk/cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 23:02:44 UTC (=
rev 149)
@@ -1,8 +1,5 @@
-#!/usr/bin/perl -w
+#!/bin/sh
#=20
-# Create newsgroups on imap server
-# Based on the make_fromactive.pl script by Tim Martin
-#
# Copyright (c) 2003 Carnegie Mellon University. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -41,6 +38,29 @@
# 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
+#
+# Create newsgroups on imap server
+# Based on the make_fromactive.pl script by Tim Martin
+#
+# $Id: mknewsgroups,v 1.2 2003/10/22 18:03:47 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;
=20
use Getopt::Long;
Modified: trunk/cyrus-imapd-2.2.12/tools/rehash
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:58:58 UTC (rev 14=
8)
+++ trunk/cyrus-imapd-2.2.12/tools/rehash 2005-05-24 23:02:44 UTC (rev 14=
9)
@@ -1,9 +1,5 @@
-#!/usr/bin/perl
-# script to upgrade from simple hashing scheme to full hashing scheme
-# make sure you run it as the cyrus user
+#!/bin/sh
#=20
-# Written by Gary Mills <mills@cc.UManitoba.CA>
-#=20
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -42,6 +38,8 @@
# 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 to upgrade from simple hashing scheme to full hashing scheme
# make sure you run it as the cyrus user
#
@@ -49,6 +47,21 @@
#
# $Id: rehash,v 1.7 2003/10/22 18:50:32 rjs3 Exp $
=20
+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;
=20
$| =3D 1;
Modified: trunk/cyrus-imapd-2.2.12/tools/translatesieve
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 22:58:58 UTC=
(rev 148)
+++ trunk/cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 23:02:44 UTC=
(rev 149)
@@ -1,4 +1,6 @@
-#!/usr/bin/perl
+#!/bin/sh
+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+#!perl -w
# script to translate sieve scripts to use unixhierarchysep and/or altna=
mespace
# make sure you run it as the cyrus user
#!/usr/bin/perl
@@ -43,6 +45,21 @@
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
=20
+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;
=20
$| =3D 1;
Modified: trunk/cyrus-imapd-2.2.12/tools/undohash
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/undohash 2005-05-24 22:58:58 UTC (rev =
148)
+++ trunk/cyrus-imapd-2.2.12/tools/undohash 2005-05-24 23:02:44 UTC (rev =
149)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
# 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 $
Modified: trunk/cyrus-imapd-2.2.12/tools/upgradesieve
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 22:58:58 UTC (=
rev 148)
+++ trunk/cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 23:02:44 UTC (=
rev 149)
@@ -1,4 +1,6 @@
-#!/usr/bin/perl -w
+#!/bin/sh
+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+#!perl -w
# script to upgrade sievedir from imapd 1.6.13
# make sure you run it as the cyrus user
#!/usr/bin/perl
@@ -43,6 +45,21 @@
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
=20
+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;
=20
$| =3D 1;