diff options
Diffstat (limited to 'mail/vpopmail/files')
| -rw-r--r-- | mail/vpopmail/files/patch-configure | 59 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-vpopmail.c | 45 |
2 files changed, 37 insertions, 67 deletions
diff --git a/mail/vpopmail/files/patch-configure b/mail/vpopmail/files/patch-configure index 4d86e9470569..4807bc29f55f 100644 --- a/mail/vpopmail/files/patch-configure +++ b/mail/vpopmail/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Feb 2 06:24:19 2004 -+++ configure Wed Feb 11 09:16:18 2004 -@@ -846,6 +846,8 @@ +--- configure.old Wed Aug 25 09:34:22 2004 ++++ configure Wed Aug 25 09:41:18 2004 +@@ -838,6 +838,8 @@ --enable-qmail-newu=PATH Full path to qmail-newu program. --enable-qmail-inject=PATH Full path to qmail-inject program. --enable-qmail-newmrh=PATH Full path to qmail-newmrh program. @@ -9,7 +9,7 @@ --enable-vpopuser=USER User name allocated to vpopmail vpopmail. --enable-vpopgroup=GROUP Group name allocated to vpopmail vchkpw. --enable-roaming-users Enable POP-before-SMTP functionality. -@@ -5097,7 +5099,7 @@ +@@ -4694,7 +4696,7 @@ #---------------------------------------------------------------------- @@ -18,7 +18,7 @@ then { echo "$as_me:$LINENO: WARNING: === vpopmail must be configured as root. ===" >&5 echo "$as_me: WARNING: === vpopmail must be configured as root. ===" >&2;} -@@ -5227,19 +5229,50 @@ +@@ -4824,6 +4826,46 @@ ;; esac @@ -26,8 +26,7 @@ +if test "${enable_spamassassin+set}" = set; then + enableval="$enable_spamassassin" + spamc="$enableval" - --#---------------------------------------------------------------------- ++ + case $spamc in + 1*|y*|Y*) + spamc="/usr/local/bin/spamc" @@ -48,19 +47,8 @@ + enableval="$enable_spam_threshold" + ENABLE_SPAM_THRESHOLD=$enableval +else -+ -+ ENABLE_SPAM_THRESHOLD=0 - --if test ! -d $vpopmaildir/etc --then -- mkdir $vpopmaildir/etc -- chown $vpopmailuid "$vpopmaildir"/etc -- chgrp $vpopmailgid "$vpopmaildir"/etc -- chmod 755 "$vpopmaildir"/etc -- { echo "$as_me:$LINENO: WARNING: making a vpopmail etc directory " >&5 --echo "$as_me: WARNING: making a vpopmail etc directory " >&2;} - fi - ++ ENABLE_SPAM_THRESHOLD=0 ++fi + +case $ENABLE_SPAM_THRESHOLD in +0*|n*|N*) @@ -74,11 +62,38 @@ +esac +fi + -+ #---------------------------------------------------------------------- echo "$as_me:$LINENO: checking whether we can locate the qmail directory" >&5 -@@ -5705,28 +5738,8 @@ +@@ -5202,27 +5244,6 @@ + + #---------------------------------------------------------------------- + +-if test ! -d $vpopmaildir/etc +-then +- if test ! -d $vpopmaildir +- then +- { echo "$as_me:$LINENO: WARNING: creating $vpopmaildir " >&5 +-echo "$as_me: WARNING: creating $vpopmaildir " >&2;} +- mkdir -p $vpopmaildir +- chown $vpopmailuid $vpopmaildir +- chgrp $vpopmailgid $vpopmaildir +- chmod 755 $vpopmaildir +- fi +- { echo "$as_me:$LINENO: WARNING: making a vpopmail etc directory " >&5 +-echo "$as_me: WARNING: making a vpopmail etc directory " >&2;} +- mkdir $vpopmaildir/etc +- chown $vpopmailuid "$vpopmaildir"/etc +- chgrp $vpopmailgid "$vpopmaildir"/etc +- chmod 755 "$vpopmaildir"/etc +-fi +- +-#---------------------------------------------------------------------- +- + echo "$as_me:$LINENO: checking whether roaming-users has been enabled" >&5 + echo $ECHO_N "checking whether roaming-users has been enabled... $ECHO_C" >&6 + # Check whether --enable-roaming-users or --disable-roaming-users was given. +@@ -5310,28 +5331,8 @@ if test "${enable_tcpserver_file+set}" = set; then enableval="$enable_tcpserver_file" tcpserver_file="$enableval" diff --git a/mail/vpopmail/files/patch-vpopmail.c b/mail/vpopmail/files/patch-vpopmail.c deleted file mode 100644 index 71c6d5e4bed1..000000000000 --- a/mail/vpopmail/files/patch-vpopmail.c +++ /dev/null @@ -1,45 +0,0 @@ ---- vpopmail.c.orig Mon Mar 1 16:33:32 2004 -+++ vpopmail.c Sun Apr 18 01:11:37 2004 -@@ -2462,6 +2462,11 @@ - - mytime = time(NULL); - -+ ipaddr = get_remote_ip(); -+ if ( ipaddr == NULL ) { -+ return 0; -+ } -+ - #ifdef FILE_LOCKING - /* by default the OPEN_SMTP_LOK_FILE is ~vpopmail/etc/open-smtp.lock */ - if ( (fs_lok_file=fopen(OPEN_SMTP_LOK_FILE, "w+")) == NULL) return(-1); -@@ -2481,10 +2486,10 @@ - } - } - -- /* by default the OPEN_SMTP_TMP_FILE is ~vpopmail/etc/open-smtp.tmp */ -+ /* by default the OPEN_SMTP_TMP_FILE is ~vpopmail/etc/open-smtp.tmp.pid */ - snprintf(open_smtp_tmp_filename, sizeof(open_smtp_tmp_filename), - "%s.%lu", OPEN_SMTP_TMP_FILE, (long unsigned)getpid()); -- /* create the tmp file as open-smtp.tmp.pid */ -+ /* create the tmp file */ - fs_tmp_file = fopen(open_smtp_tmp_filename, "w+"); - - if ( fs_tmp_file == NULL ) { -@@ -2493,17 +2498,6 @@ - fclose(fs_lok_file); - #endif /* FILE_LOCKING */ - /* failed to create the tmp file */ -- return(-1); -- } -- -- ipaddr = get_remote_ip(); -- -- if ( ipaddr == NULL ) { --#ifdef FILE_LOCKING -- unlock_lock(fileno(fs_lok_file), 0, SEEK_SET, 0); -- fclose(fs_lok_file); --#endif /* FILE_LOCKING */ -- /* failed to get user's ip address */ - return(-1); - } - |