cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to openwebmail 2.50

Browse Source
This commit is contained in:
kevlo 2005-01-27 06:01:16 +00:00
parent ff66c39369
commit ee04f4a674
18 changed files with 1979 additions and 876 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mail/openwebmail/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.21 2004/11/21 17:01:45 naddy Exp $ # $OpenBSD: Makefile,v 1.22 2005/01/27 06:01:16 kevlo Exp $
COMMENT= "highly configurable webmail client" COMMENT= "highly configurable webmail client"
DISTNAME= openwebmail-2.41 DISTNAME= openwebmail-2.50
CATEGORIES= mail www CATEGORIES= mail www
HOMEPAGE= http://www.openwebmail.org/ HOMEPAGE= http://www.openwebmail.org/
@ -22,7 +22,8 @@ RUN_DEPENDS= ::textproc/ispell \
:p5-Text-Iconv->=1.2:converters/p5-Text-Iconv \ :p5-Text-Iconv->=1.2:converters/p5-Text-Iconv \
:p5-CGI-SpeedyCGI->=2.21:www/p5-CGI-SpeedyCGI \ :p5-CGI-SpeedyCGI->=2.21:www/p5-CGI-SpeedyCGI \
:p5-Compress-Zlib->=1.22:archivers/p5-Compress-Zlib \ :p5-Compress-Zlib->=1.22:archivers/p5-Compress-Zlib \
:p5-Quota->=1.4.6:sysutils/p5-Quota :p5-Quota->=1.4.6:sysutils/p5-Quota \
:p5-IO-Socket-SSL->=0.96:security/p5-IO-Socket-SSL
NO_BUILD= Yes NO_BUILD= Yes
NO_REGRESS= Yes NO_REGRESS= Yes
@ -37,10 +38,11 @@ SUBST_VARS= CONFDIR
SCRIPTFILES= openwebmail-abook.pl openwebmail-advsearch.pl \ SCRIPTFILES= openwebmail-abook.pl openwebmail-advsearch.pl \
openwebmail-cal.pl openwebmail-folder.pl \ openwebmail-cal.pl openwebmail-folder.pl \
openwebmail-main.pl openwebmail-prefs.pl \ openwebmail-main.pl openwebmail-prefs.pl \
openwebmail-read.pl openwebmail-send.pl \ openwebmail-read.pl openwebmail-saprefs.pl \
openwebmail-spell.pl openwebmail-tool.pl \ openwebmail-send.pl openwebmail-spell.pl \
openwebmail-vdomain.pl openwebmail-viewatt.pl \ openwebmail-tool.pl openwebmail-vdomain.pl \
openwebmail-webdisk.pl openwebmail.pl openwebmail-viewatt.pl openwebmail-webdisk.pl \
openwebmail.pl
do-configure: do-configure:
.for file in ${SCRIPTFILES} .for file in ${SCRIPTFILES}

8
mail/openwebmail/distinfo
View File

@ -1,4 +1,4 @@
MD5 (openwebmail-2.41.tar.gz) = f3df360acfeb693d648b38c55656f03f MD5 (openwebmail-2.50.tar.gz) = 889bddb68ad2ba81ee1d00ecaf2ba2e2
RMD160 (openwebmail-2.41.tar.gz) = 0caca36b55d49e296c066f98545db896deda4b35 RMD160 (openwebmail-2.50.tar.gz) = 1a8e0eff04ecf4367c94b1fc319c4b4fc9f506ff
SHA1 (openwebmail-2.41.tar.gz) = 064e8ab692435d6ab6109470808ad9ca02121aeb SHA1 (openwebmail-2.50.tar.gz) = b32aa79b2fbf0c9cf761faf4b89f0a12046f6db6
SIZE (openwebmail-2.41.tar.gz) = 6300044 SIZE (openwebmail-2.50.tar.gz) = 6888576

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-abook_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-abook_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-abook_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-abook.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-abook.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-abook.pl Mon Jul 12 10:51:17 2004 +++ cgi-bin/openwebmail/openwebmail-abook.pl Thu Jan 27 10:31:48 2005
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -9,13 +9,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-abook_pl,v 1.5 2004/07/12 05:54:
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-advsearch_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-advsearch.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-advsearch.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-advsearch.pl Mon Jul 12 10:52:11 2004 +++ cgi-bin/openwebmail/openwebmail-advsearch.pl Thu Jan 27 10:32:44 2005
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.5 2004/07/12 05
@@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-cal_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.4 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.5 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-cal.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-cal.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-cal.pl Mon Jul 12 10:53:08 2004 +++ cgi-bin/openwebmail/openwebmail-cal.pl Thu Jan 27 10:39:23 2005
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.4 2004/07/12 05:54:53
@@ -19,10 +19,10 @@ @@ -19,10 +19,10 @@
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(.*?)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(.*?)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^([^\s]*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^([^\s]*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-folder_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-folder_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-folder_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-folder.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-folder.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-folder.pl Mon Jul 12 10:53:48 2004 +++ cgi-bin/openwebmail/openwebmail-folder.pl Thu Jan 27 10:40:20 2005
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -9,13 +9,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-folder_pl,v 1.5 2004/07/12 05:54
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

10
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-main_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-main_pl,v 1.6 2004/11/21 17:01:45 naddy Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-main_pl,v 1.7 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-main.pl.orig Fri Nov 12 10:37:28 2004 --- cgi-bin/openwebmail/openwebmail-main.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-main.pl Fri Nov 12 10:39:57 2004 +++ cgi-bin/openwebmail/openwebmail-main.pl Thu Jan 27 10:41:39 2005
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -9,10 +9,10 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-main_pl,v 1.6 2004/11/21 17:01:4
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-prefs_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-prefs_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-prefs_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-prefs.pl.orig Mon Jul 12 11:03:22 2004 --- cgi-bin/openwebmail/openwebmail-prefs.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-prefs.pl Mon Jul 12 11:03:49 2004 +++ cgi-bin/openwebmail/openwebmail-prefs.pl Thu Jan 27 10:42:54 2005
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -9,13 +9,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-prefs_pl,v 1.5 2004/07/12 05:54:
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-read_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-read_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-read_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-read.pl.orig Mon Jul 12 11:00:19 2004 --- cgi-bin/openwebmail/openwebmail-read.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-read.pl Mon Jul 12 11:01:15 2004 +++ cgi-bin/openwebmail/openwebmail-read.pl Thu Jan 27 10:44:31 2005
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -9,13 +9,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-read_pl,v 1.5 2004/07/12 05:54:5
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

21
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-saprefs_pl Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-saprefs_pl,v 1.1 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-saprefs.pl.orig Thu Jan 27 11:33:17 2005
+++ cgi-bin/openwebmail/openwebmail-saprefs.pl Thu Jan 27 11:34:21 2005
@@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl
#
# openwebmail-saprefs.pl - spamassassin user_prefs file config
#
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-send_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-send_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-send_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-send.pl.orig Mon Jul 12 11:42:56 2004 --- cgi-bin/openwebmail/openwebmail-send.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-send.pl Mon Jul 12 11:43:37 2004 +++ cgi-bin/openwebmail/openwebmail-send.pl Thu Jan 27 10:45:15 2005
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -9,13 +9,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-send_pl,v 1.5 2004/07/12 05:54:5
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

14
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-spell_pl
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-spell_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-spell_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-spell.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-spell.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-spell.pl Mon Jul 12 10:32:57 2004 +++ cgi-bin/openwebmail/openwebmail-spell.pl Thu Jan 27 10:46:03 2005
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
# #
# openwebmail-spell.pl - spell check program # openwebmail-spell.pl - spell check program
# #
@@ -57,10 +57,10 @@ @@ -58,10 +58,10 @@
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

56
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-tool_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:46 naddy Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.9 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-tool.pl.orig Fri Nov 12 10:37:33 2004 --- cgi-bin/openwebmail/openwebmail-tool.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-tool.pl Fri Nov 12 10:56:16 2004 +++ cgi-bin/openwebmail/openwebmail-tool.pl Thu Jan 27 10:52:44 2005
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -10,10 +10,10 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
@@ -7,17 +7,17 @@ @@ -7,17 +7,17 @@
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
if ($SCRIPT_DIR eq '') { if ($SCRIPT_DIR eq '') {
print qq|\nOpen WebMail is unable to locate itself on this system,\n|. print qq|\nOpen WebMail is unable to locate itself on this system,\n|.
@ -29,7 +29,22 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
exit 0; exit 0;
} }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
@@ -228,7 +228,7 @@ @@ -177,10 +177,10 @@
$retval=makethumbnail(\@list);
} else {
if ($opt{'convert_addressbooks'} && $>==0) { # only allow root to convert globalbook
- load_owconf(\%config_raw, "$SCRIPT_DIR/etc/defaults/openwebmail.conf");
- if ( -f "$SCRIPT_DIR/etc/openwebmail.conf") {
- read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
- print "D readconf $SCRIPT_DIR/etc/openwebmail.conf\n" if ($opt{'debug'});
+ load_owconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/defaults/openwebmail.conf");
+ if ( -f "%%SYSCONFDIR%%/openwebmail/openwebmail.conf") {
+ read_owconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
+ print "D readconf %%SYSCONFDIR%%/openwebmail/openwebmail.conf\n" if ($opt{'debug'});
}
my %prefs = readprefs();
@@ -261,7 +261,7 @@
my $err=do_test(1); my $err=do_test(1);
if ($err<0) { if ($err<0) {
@ -38,7 +53,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
qq|ps: If you are running openwebmail in persistent mode,\n|. qq|ps: If you are running openwebmail in persistent mode,\n|.
qq| don't forget to 'touch openwebmail*.pl', so speedycgi\n|. qq| don't forget to 'touch openwebmail*.pl', so speedycgi\n|.
qq| will reload all scripts, modules and conf files in --init.\n\n|; qq| will reload all scripts, modules and conf files in --init.\n\n|;
@@ -309,10 +309,10 @@ @@ -342,10 +342,10 @@
my $err=0; my $err=0;
print "\n"; print "\n";
@ -53,7 +68,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
} }
$logindomain=$default_logindomain||ow::tool::hostname(); $logindomain=$default_logindomain||ow::tool::hostname();
@@ -412,7 +412,7 @@ @@ -445,7 +445,7 @@
} }
if ($in_init && $err) { if ($in_init && $err) {
@ -62,7 +77,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
qq|dbm_ext \t$str{conf_dbm_ext}\n|. qq|dbm_ext \t$str{conf_dbm_ext}\n|.
qq|dbmopen_ext \t$str{conf_dbmopen_ext}\n|. qq|dbmopen_ext \t$str{conf_dbmopen_ext}\n|.
qq|dbmopen_haslock \t$str{conf_dbmopen_haslock}\n|. qq|dbmopen_haslock \t$str{conf_dbmopen_haslock}\n|.
@@ -422,7 +422,7 @@ @@ -455,7 +455,7 @@
qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|; qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|;
} }
if (!$in_init) { if (!$in_init) {
@ -71,7 +86,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
qq|dbm_ext \t$str{dbm_ext}\n|. qq|dbm_ext \t$str{dbm_ext}\n|.
qq|dbmopen_ext \t$str{dbmopen_ext}\n|. qq|dbmopen_ext \t$str{dbmopen_ext}\n|.
qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|; qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|;
@@ -439,7 +439,7 @@ @@ -472,7 +472,7 @@
$>=0; $>=0;
if ($>!=0) { if ($>!=0) {
print qq|Your system didn't have saved suid support,\n|. print qq|Your system didn't have saved suid support,\n|.
@ -80,7 +95,22 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
qq|\thas_savedsuid_support no\n\n\n|; qq|\thas_savedsuid_support no\n\n\n|;
return -1; return -1;
} }
@@ -523,10 +523,10 @@ @@ -483,10 +483,10 @@
sub do_langconv {
my ($srclang, $dstlang)=@_;
- load_owconf(\%config_raw, "$SCRIPT_DIR/etc/defaults/openwebmail.conf");
- if ( -f "$SCRIPT_DIR/etc/openwebmail.conf") {
- read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
- print "D readconf $SCRIPT_DIR/etc/openwebmail.conf\n" if ($opt{'debug'});
+ load_owconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/defaults/openwebmail.conf");
+ if ( -f "%%SYSCONFDIR%%/openwebmail/openwebmail.conf") {
+ read_owconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
+ print "D readconf %%SYSCONFDIR%%/openwebmail/openwebmail.conf\n" if ($opt{'debug'});
}
langconv($srclang, $dstlang);
@@ -669,10 +669,10 @@
my $loaded_domain=0; my $loaded_domain=0;
my %userhash=(); my %userhash=();
@ -95,7 +125,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
} }
# trap this once now. Let usertool() test it at the domain level later # trap this once now. Let usertool() test it at the domain level later
@@ -558,10 +558,10 @@ @@ -704,10 +704,10 @@
foreach $logindomain (@domains) { foreach $logindomain (@domains) {
%config_raw=(); %config_raw=();
@ -110,7 +140,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.8 2004/11/21 17:01:4
} }
if ( -f "$config{'ow_sitesconfdir'}/$logindomain") { if ( -f "$config{'ow_sitesconfdir'}/$logindomain") {
@@ -633,16 +633,16 @@ @@ -779,16 +779,16 @@
$>=$euid_to_use; $>=$euid_to_use;
%config_raw=(); %config_raw=();

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-vdomain_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.4 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.5 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-vdomain.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-vdomain.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-vdomain.pl Mon Jul 12 10:40:12 2004 +++ cgi-bin/openwebmail/openwebmail-vdomain.pl Thu Jan 27 10:53:55 2005
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.4 2004/07/12 05:5
@@ -102,10 +102,10 @@ @@ -102,10 +102,10 @@
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

12
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-viewatt_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-viewatt_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-viewatt_pl,v 1.6 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-viewatt.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-viewatt.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-viewatt.pl Mon Jul 12 10:41:12 2004 +++ cgi-bin/openwebmail/openwebmail-viewatt.pl Thu Jan 27 10:54:48 2005
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -9,13 +9,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-viewatt_pl,v 1.5 2004/07/12 05:5
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

14
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-webdisk_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.4 2004/07/12 05:54:53 kevlo Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.5 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-webdisk.pl.orig Tue May 25 17:53:48 2004 --- cgi-bin/openwebmail/openwebmail-webdisk.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail-webdisk.pl Mon Jul 12 10:42:25 2004 +++ cgi-bin/openwebmail/openwebmail-webdisk.pl Thu Jan 27 10:55:44 2005
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.4 2004/07/12 05:5
@@ -18,10 +18,10 @@ @@ -18,10 +18,10 @@
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail//openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV

26
mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.9 2004/11/21 17:01:46 naddy Exp $ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.10 2005/01/27 06:01:17 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail.pl.orig Fri Nov 12 10:37:38 2004 --- cgi-bin/openwebmail/openwebmail.pl.orig Wed Jan 5 18:26:24 2005
+++ cgi-bin/openwebmail/openwebmail.pl Fri Nov 12 14:11:33 2004 +++ cgi-bin/openwebmail/openwebmail.pl Thu Jan 27 10:59:17 2005
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T -#!/usr/bin/suidperl -T
+#!/usr/bin/perl +#!/usr/bin/perl
@ -10,19 +10,19 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.9 2004/11/21 17:01:46 nad
@@ -18,10 +18,10 @@ @@ -18,10 +18,10 @@
# #
use vars qw($SCRIPT_DIR); use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 } if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { local $1; $SCRIPT_DIR=$1 }
-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) { -if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
+if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) { +if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 } $_=<F>; close(F); if ( $_=~/^(\S*)/) { local $1; $SCRIPT_DIR=$1 }
} }
-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; } -if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; } +if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR); push (@INC, $SCRIPT_DIR);
foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV foreach (qw(ENV BASH_ENV CDPATH IFS TERM)) {delete $ENV{$_}}; $ENV{PATH}='/bin:/usr/bin'; # secure ENV
@@ -63,8 +63,8 @@ @@ -76,8 +76,8 @@
$SIG{PIPE}=\&openwebmail_exit; # for user stop ########## MAIN ##################################################
$SIG{TERM}=\&openwebmail_exit; # for user stop openwebmail_requestbegin();
-load_owconf(\%config_raw, "$SCRIPT_DIR/etc/defaults/openwebmail.conf"); -load_owconf(\%config_raw, "$SCRIPT_DIR/etc/defaults/openwebmail.conf");
-read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf") if (-f "$SCRIPT_DIR/etc/openwebmail.conf"); -read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf") if (-f "$SCRIPT_DIR/etc/openwebmail.conf");
@ -31,7 +31,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.9 2004/11/21 17:01:46 nad
loadlang($config{'default_language'}); # so %lang... can be used in error msg loadlang($config{'default_language'}); # so %lang... can be used in error msg
# check & create mapping table for solar/lunar, b2g, g2b convertion # check & create mapping table for solar/lunar, b2g, g2b convertion
@@ -77,7 +77,7 @@ @@ -90,7 +90,7 @@
} }
if ($config{'logfile'}) { if ($config{'logfile'}) {
@ -40,7 +40,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.9 2004/11/21 17:01:46 nad
my ($fmode, $fuid, $fgid) = (stat($config{'logfile'}))[2,4,5]; my ($fmode, $fuid, $fgid) = (stat($config{'logfile'}))[2,4,5];
if ( !($fmode & 0100000) ) { if ( !($fmode & 0100000) ) {
open (LOGFILE,">>$config{'logfile'}") or open (LOGFILE,">>$config{'logfile'}") or
@@ -251,7 +251,7 @@ @@ -273,7 +273,7 @@
# create domain logfile # create domain logfile
if ($config{'logfile'}) { if ($config{'logfile'}) {
@ -49,7 +49,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.9 2004/11/21 17:01:46 nad
my ($fmode, $fuid, $fgid) = (stat($config{'logfile'}))[2,4,5]; my ($fmode, $fuid, $fgid) = (stat($config{'logfile'}))[2,4,5];
if ( !($fmode & 0100000) ) { if ( !($fmode & 0100000) ) {
open (LOGFILE,">>$config{'logfile'}") or open (LOGFILE,">>$config{'logfile'}") or
@@ -322,7 +322,7 @@ @@ -345,7 +345,7 @@
if (!-d $domainhome) { if (!-d $domainhome) {
mkdir($domainhome, 0750); mkdir($domainhome, 0750);
openwebmailerror(__FILE__, __LINE__, "Couldn't create domain homedir $domainhome") if (! -d $domainhome); openwebmailerror(__FILE__, __LINE__, "Couldn't create domain homedir $domainhome") if (! -d $domainhome);
@ -58,7 +58,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.9 2004/11/21 17:01:46 nad
chown($uuid, $mailgid, $domainhome); chown($uuid, $mailgid, $domainhome);
} }
} }
@@ -383,7 +383,7 @@ @@ -408,7 +408,7 @@
umask(0077); umask(0077);
if ( $>==0 ) { # switch to uuid:mailgid if script is setuid root. if ( $>==0 ) { # switch to uuid:mailgid if script is setuid root.
@ -67,7 +67,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.9 2004/11/21 17:01:46 nad
ow::suid::set_euid_egids($uuid, $mailgid, split(/\s+/,$ugid)); ow::suid::set_euid_egids($uuid, $mailgid, split(/\s+/,$ugid));
if ( $)!~/\b$mailgid\b/) { # group mail doesn't exist? if ( $)!~/\b$mailgid\b/) { # group mail doesn't exist?
openwebmailerror(__FILE__, __LINE__, "Set effective gid to mail($mailgid) failed!"); openwebmailerror(__FILE__, __LINE__, "Set effective gid to mail($mailgid) failed!");
@@ -595,7 +595,7 @@ @@ -623,7 +623,7 @@
writelog("login error - $config{'auth_module'}, ret $errorcode, $errormsg"); writelog("login error - $config{'auth_module'}, ret $errorcode, $errormsg");
umask(0077); umask(0077);
if ( $>==0 ) { # switch to uuid:mailgid if script is setuid root. if ( $>==0 ) { # switch to uuid:mailgid if script is setuid root.

2582
mail/openwebmail/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff