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

upgrade to 2.30

Browse Source
This commit is contained in:
kevlo 2004-03-04 06:34:09 +00:00
parent ee1de00fc1
commit 649570e074
19 changed files with 451 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/openwebmail/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.18 2004/02/02 17:45:23 sturm Exp $
# $OpenBSD: Makefile,v 1.19 2004/03/04 06:34:09 kevlo Exp $
COMMENT= "highly configurable webmail client"
DISTNAME= openwebmail-2.21
DISTNAME= openwebmail-2.30
CATEGORIES= mail www
HOMEPAGE= http://www.openwebmail.org/
@ -41,13 +41,15 @@ SCRIPTFILES= openwebmail-abook.pl openwebmail-advsearch.pl \
openwebmail-read.pl openwebmail-send.pl \
openwebmail-spell.pl openwebmail-tool.pl \
openwebmail-vdomain.pl openwebmail-viewatt.pl \
openwebmail-webdisk.pl openwebmail.pl ow-shared.pl
openwebmail-webdisk.pl openwebmail.pl
do-configure:
.for file in ${SCRIPTFILES}
@perl -pi -e 's@%%SYSCONFDIR%%@${CONFDIR}@g' \
${WRKSRC}/cgi-bin/openwebmail/${file}
.endfor
@perl -pi -e 's@%%SYSCONFDIR%%@${CONFDIR}@g' \
${WRKSRC}/cgi-bin/openwebmail/shares/ow-shared.pl
@cd ${WRKSRC} && cp -Rp data htdocs
@find ${WRKSRC}/cgi-bin -name '*.orig' |xargs rm
@cd ${WRKSRC} && mkdir -p conf/openwebmail && \

6
mail/openwebmail/distinfo
View File

@ -1,3 +1,3 @@
MD5 (openwebmail-2.21.tgz) = a7bf580b0e6a2f1cd896a4ca6a55355c
RMD160 (openwebmail-2.21.tgz) = ec10568868e13b4e599c9557f08edb3099cb9564
SHA1 (openwebmail-2.21.tgz) = 8926806c9034f1f5dcd1d28ced3907d1b9c8aa98
MD5 (openwebmail-2.30.tgz) = 585a19c3192065be279f22c947a48e83
RMD160 (openwebmail-2.30.tgz) = 4d53242a21b5876a5df1ce8e047082f153e33d91
SHA1 (openwebmail-2.30.tgz) = 1a3a22a8dfeb22bb37117d417f17c8d5301a3989

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

@ -1,18 +1,22 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-abook_pl,v 1.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-abook.pl.orig Sat Nov 1 11:11:40 2003
+++ cgi-bin/openwebmail/openwebmail-abook.pl Sat Nov 1 11:12:39 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-abook_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-abook.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-abook.pl Thu Mar 4 11:13:30 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
#
# openwebmail-abook.pl - address book program
#
@@ -5,7 +5,7 @@
@@ -5,10 +5,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { 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(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # 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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-advsearch.pl.orig Sat Nov 1 11:12:55 2003
+++ cgi-bin/openwebmail/openwebmail-advsearch.pl Sat Nov 1 11:13:58 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-advsearch.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-advsearch.pl Thu Mar 4 11:37:00 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.3 2003/11/03 06
@@ -7,10 +7,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV

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

@ -1,18 +1,22 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.2 2003/04/14 08:26:20 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-cal.pl.orig Mon Nov 18 12:28:23 2002
+++ cgi-bin/openwebmail/openwebmail-cal.pl Thu Jan 30 14:45:07 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.3 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-cal.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-cal.pl Thu Mar 4 11:37:48 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
#
# openwebmail-cal.pl - calendar program
#
@@ -11,7 +11,7 @@
@@ -19,10 +19,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(.*?)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(.*?)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^([^\s]*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^([^\s]*)/) { $SCRIPT_DIR=$1 }
}
if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { 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(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # 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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-folder.pl.orig Sat Nov 1 11:14:21 2003
+++ cgi-bin/openwebmail/openwebmail-folder.pl Sat Nov 1 11:15:00 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-folder_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-folder.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-folder.pl Thu Mar 4 11:38:25 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-folder_pl,v 1.3 2003/11/03 06:15
@@ -5,10 +5,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV

12
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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-main.pl.orig Sat Nov 1 11:15:14 2003
+++ cgi-bin/openwebmail/openwebmail-main.pl Sat Nov 1 11:16:16 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-main_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-main.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-main.pl Thu Mar 4 11:39:02 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-main_pl,v 1.3 2003/11/03 06:15:1
@@ -5,10 +5,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV

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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-prefs.pl.orig Sat Nov 1 11:17:22 2003
+++ cgi-bin/openwebmail/openwebmail-prefs.pl Sat Nov 1 11:17:57 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-prefs_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-prefs.pl.orig Thu Mar 4 12:50:00 2004
+++ cgi-bin/openwebmail/openwebmail-prefs.pl Thu Mar 4 12:50:38 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-prefs_pl,v 1.3 2003/11/03 06:15:
@@ -5,10 +5,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # 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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-read.pl.orig Sat Nov 1 11:18:27 2003
+++ cgi-bin/openwebmail/openwebmail-read.pl Sat Nov 1 11:19:01 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-read_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-read.pl.orig Thu Mar 4 12:33:40 2004
+++ cgi-bin/openwebmail/openwebmail-read.pl Thu Mar 4 12:34:32 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-read_pl,v 1.3 2003/11/03 06:15:1
@@ -5,10 +5,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # 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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-send.pl.orig Sat Nov 1 11:19:12 2003
+++ cgi-bin/openwebmail/openwebmail-send.pl Sat Nov 1 11:19:44 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-send_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-send.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-send.pl Thu Mar 4 11:40:02 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-send_pl,v 1.3 2003/11/03 06:15:1
@@ -5,10 +5,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # 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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-spell.pl.orig Sat Nov 1 11:19:58 2003
+++ cgi-bin/openwebmail/openwebmail-spell.pl Sat Nov 1 11:20:40 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-spell_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-spell.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-spell.pl Thu Mar 4 11:41:00 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
#
# openwebmail-spell.pl - spell check program
#
@@ -33,10 +33,10 @@
@@ -57,10 +57,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV

129
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.5 2003/11/13 05:55:56 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-tool.pl.orig Mon Nov 10 13:39:19 2003
+++ cgi-bin/openwebmail/openwebmail-tool.pl Thu Nov 13 10:37:19 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-tool.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-tool.pl Thu Mar 4 11:45:57 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl
@ -10,10 +10,10 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.5 2003/11/13 05:55:5
@@ -7,17 +7,17 @@
#
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
if (!$SCRIPT_DIR) {
print qq|\nOpen WebMail is unable to locate itself on this system,\n|.
@ -22,81 +22,102 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.5 2003/11/13 05:55:5
+ qq|the first line of file %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf\n\n|.
qq|For example, if the script is\n\n|.
- qq|/usr/local/www/cgi-bin/openwebmail/openwebmail-tool.pl,\n\n|.
- qq|then the content of /etc/openwebmail_path.conf should be:\n\n|.
- qq|/usr/local/www/cgi-bin/openwebmail/\n\n|;
+ qq|/var/www/cgi-bin/openwebmail/openwebmail-tool.pl,\n\n|.
+ qq|then the content of %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf should be:\n\n|.
qq|then the content of /etc/openwebmail_path.conf should be:\n\n|.
- qq|/usr/local/www/cgi-bin/openwebmail/\n\n|;
+ qq|/var/www/cgi-bin/openwebmail/\n\n|;
exit 0;
}
push (@INC, $SCRIPT_DIR);
@@ -214,8 +214,8 @@
@@ -307,10 +307,10 @@
my $err=0;
print "\n";
- load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
+ load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
$logindomain=$default_logindomain||hostname();
$logindomain=lc(safedomainname($logindomain));
@@ -235,7 +235,7 @@
$err++ if (check_dbm_option(0, $dbm_ext, $dbmopen_ext, $dbmopen_haslock, %config)<0);
$err++ if (check_savedsuid_support()<0);
if ($err>0) {
- print qq|And execute '$SCRIPT_DIR/openwebmail-tool.pl --init' again!.\n\n|;
+ print qq|And execute '%%SYSCONFDIR%%/openwebmail/openwebmail-tool.pl --init' again!.\n\n|;
return -1;
- load_owconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- 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/openwebmail.conf.default");
+ 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'});
}
@@ -313,8 +313,8 @@
my $err=0;
print "\n";
$logindomain=$default_logindomain||ow::tool::hostname();
@@ -469,7 +469,7 @@
}
- load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
+ load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
$logindomain=$default_logindomain||hostname();
$logindomain=lc(safedomainname($logindomain));
@@ -575,9 +575,9 @@
if ($in_init && $err) {
- print qq|Please change '$SCRIPT_DIR/etc/dbm.conf' from\n\n|.
+ print qq|Please change '%%SYSCONFDIR%%/openwebmail/dbm.conf' from\n\n|.
qq|dbm_ext \t$str{conf_dbm_ext}\n|.
qq|dbmopen_ext \t$str{conf_dbmopen_ext}\n|.
qq|dbmopen_haslock \t$str{conf_dbmopen_haslock}\n|.
@@ -479,7 +479,7 @@
qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|;
}
if (!$in_init) {
- print qq|'$SCRIPT_DIR/etc/dbm.conf' should be set as follows:\n\n|.
+ print qq|'%%SYSCONFDIR%%/openwebmail/dbm.conf' should be set as follows:\n\n|.
qq|dbm_ext \t$str{dbm_ext}\n|.
qq|dbmopen_ext \t$str{dbmopen_ext}\n|.
qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|;
@@ -496,7 +496,7 @@
$>=0;
if ($>!=0) {
print qq|Your system didn't have saved suid support,\n|.
- qq|please set the following option in $SCRIPT_DIR/etc/openwebmail.conf\n\n|.
+ qq|please set the following option in %%SYSCONFDIR%%/openwebmail/openwebmail.conf\n\n|.
qq|\thas_savedsuid_support no\n\n\n|;
return -1;
}
@@ -580,10 +580,10 @@
my $loaded_domain=0;
my %userhash=();
- load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
- print "D readconf $SCRIPT_DIR/etc/openwebmail.conf\n" if ($opt{'debug'});
+ load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
+ print "D readconf %%SYSCONFDIR%%/openwebmail/openwebmail.conf\n" if ($opt{'debug'});
- load_owconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- 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/openwebmail.conf.default");
+ 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'});
}
# trap this once now. Let usertool() test it at the domain level later
if ( $>!=0 && # setuid is required if spool is located in system dir
@@ -608,8 +608,8 @@
@@ -615,10 +615,10 @@
foreach $logindomain (@domains) {
%config_raw=();
- load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
+ load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
- load_owconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- 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/openwebmail.conf.default");
+ 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'});
}
if ( -f "$config{'ow_sitesconfdir'}/$logindomain") {
readconf(\%config, \%config_raw, "$config{'ow_sitesconfdir'}/$logindomain");
@@ -680,13 +680,13 @@
@@ -690,16 +690,16 @@
$>=$euid_to_use;
%config_raw=();
- load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
+ load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
- load_owconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- 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/openwebmail.conf.default");
+ 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'});
}
if ($config{'smtpauth'}) { # load smtp auth user/pass
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/smtpauth.conf");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/smtpauth.conf");
- read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/smtpauth.conf");
+ read_owconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/smtpauth.conf");
if ($config{'smtpauth_username'} eq "" || $config{'smtpauth_password'} eq "") {
- die "Invalid username/password in $SCRIPT_DIR/etc/smtpauth.conf!";
+ die "Invalid username/password in %%SYSCONFDIR%%/openwebmail/smtpauth.conf!";

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.2 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-vdomain.pl.orig Sat Nov 1 11:27:27 2003
+++ cgi-bin/openwebmail/openwebmail-vdomain.pl Sat Nov 1 11:28:10 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.3 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-vdomain.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-vdomain.pl Thu Mar 4 11:46:36 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.2 2003/11/03 06:1
@@ -102,10 +102,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # 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.3 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-viewatt.pl.orig Sat Nov 1 11:28:31 2003
+++ cgi-bin/openwebmail/openwebmail-viewatt.pl Sat Nov 1 11:29:11 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-viewatt_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-viewatt.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-viewatt.pl Thu Mar 4 11:47:31 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-viewatt_pl,v 1.3 2003/11/03 06:1
@@ -5,10 +5,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV

12
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.2 2003/11/03 06:15:15 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-webdisk.pl.orig Sat Nov 1 11:29:17 2003
+++ cgi-bin/openwebmail/openwebmail-webdisk.pl Sat Nov 1 11:29:59 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.3 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail-webdisk.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail-webdisk.pl Thu Mar 4 11:48:22 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl -T
@ -10,13 +10,13 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.2 2003/11/03 06:1
@@ -18,10 +18,10 @@
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV

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

@ -1,6 +1,6 @@
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.5 2003/11/13 05:55:56 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail.pl.orig Mon Nov 10 13:39:19 2003
+++ cgi-bin/openwebmail/openwebmail.pl Thu Nov 13 13:30:21 2003
$OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.6 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/openwebmail.pl.orig Sat Jan 3 04:16:50 2004
+++ cgi-bin/openwebmail/openwebmail.pl Thu Mar 4 11:49:36 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/suidperl -T
+#!/usr/bin/perl
@ -10,42 +10,24 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.5 2003/11/13 05:55:56 kev
@@ -18,10 +18,10 @@
#
use vars qw($SCRIPT_DIR);
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1; }
if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
-if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1; }
$_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
}
-if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
push (@INC, $SCRIPT_DIR);
$ENV{PATH} = ""; # no PATH should be needed
@@ -56,8 +56,8 @@
foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' } # secure ENV
@@ -60,8 +60,8 @@
$SIG{PIPE}=\&openwebmail_exit; # for user stop
$SIG{TERM}=\&openwebmail_exit; # for user stop
-load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
-readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
+load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
readlang($config{'default_language'}); # so %lang... can be used in error msg
-load_owconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
-read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf") if (-f "$SCRIPT_DIR/etc/openwebmail.conf");
+load_owconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+read_owconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf") if (-f "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
loadlang($config{'default_language'}); # so %lang... can be used in error msg
# check & create mapping table for solar/lunar, b2g, g2b convertion
@@ -70,7 +70,7 @@
}
if ($config{'logfile'}) {
- my $mailgid=getgrnam('mail');
+ my $mailgid=getgrnam('_mail');
my ($fmode, $fuid, $fgid) = (stat($config{'logfile'}))[2,4,5];
if ( !($fmode & 0100000) ) {
open (LOGFILE,">>$config{'logfile'}") or
@@ -224,7 +224,7 @@
# create domain logfile
if ($config{'logfile'}) {
- my $mailgid=getgrnam('mail');
+ my $mailgid=getgrnam('_mail');
my ($fmode, $fuid, $fgid) = (stat($config{'logfile'}))[2,4,5];
if ( !($fmode & 0100000) ) {
open (LOGFILE,">>$config{'logfile'}") or

22
mail/openwebmail/patches/patch-cgi-bin_openwebmail_ow-shared_pl
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-cgi-bin_openwebmail_ow-shared_pl,v 1.5 2003/11/13 05:55:56 kevlo Exp $
--- cgi-bin/openwebmail/ow-shared.pl.orig Sun Nov 9 10:06:44 2003
+++ cgi-bin/openwebmail/ow-shared.pl Thu Nov 13 10:40:47 2003
@@ -368,14 +368,14 @@
###################### USERENV_INIT ###################
# init user globals, switch euid
sub userenv_init {
- load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
+ load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
readlang($config{'default_language'}); # so %lang... can be used in error msg
if ($config{'smtpauth'}) { # load smtp auth user/pass
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/smtpauth.conf");
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/smtpauth.conf");
if ($config{'smtpauth_username'} eq "" || $config{'smtpauth_password'} eq "") {
- openwebmailerror(__FILE__, __LINE__, "$SCRIPT_DIR/etc/smtpauth.conf $lang_err{'param_fmterr'}");
+ openwebmailerror(__FILE__, __LINE__, "%%SYSCONFDIR%%/openwebmail/smtpauth.conf $lang_err{'param_fmterr'}");
}
}

22
mail/openwebmail/patches/patch-cgi-bin_openwebmail_shares_ow-shared_pl Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-cgi-bin_openwebmail_shares_ow-shared_pl,v 1.1 2004/03/04 06:34:11 kevlo Exp $
--- cgi-bin/openwebmail/shares/ow-shared.pl.orig Thu Mar 4 12:37:54 2004
+++ cgi-bin/openwebmail/shares/ow-shared.pl Thu Mar 4 12:38:50 2004
@@ -222,14 +222,14 @@
########## USERENV_INIT ##########################################
# init user globals, switch euid
sub userenv_init {
- load_owconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
- read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf") if (-f "$SCRIPT_DIR/etc/openwebmail.conf");
+ load_owconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
+ read_owconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf") if (-f "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
loadlang($config{'default_language'}); # so %lang... can be used in error msg
if ($config{'smtpauth'}) { # load smtp auth user/pass
- read_owconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/smtpauth.conf");
+ read_owconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/smtpauth.conf");
if ($config{'smtpauth_username'} eq "" || $config{'smtpauth_password'} eq "") {
- openwebmailerror(__FILE__, __LINE__, "$SCRIPT_DIR/etc/smtpauth.conf $lang_err{'param_fmterr'}");
+ openwebmailerror(__FILE__, __LINE__, "%%SYSCONFDIR%%/openwebmail/smtpauth.conf $lang_err{'param_fmterr'}");
}
}

426
mail/openwebmail/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff