diff options
| author | Felippe de Meirelles Motta <lippe@FreeBSD.org> | 2012-05-25 22:35:28 +0000 |
|---|---|---|
| committer | Felippe de Meirelles Motta <lippe@FreeBSD.org> | 2012-05-25 22:35:28 +0000 |
| commit | d86286b13182f7e3923e030ddcc69f93e307aa5c (patch) | |
| tree | c61bb262627fe09ede070bfbfaad1c97be98ec4c /mail/qmail-scanner/files | |
| parent | 582a95ec1049fa26233101f5731d70dfecb65418 (diff) | |
| download | ports-d86286b13182f7e3923e030ddcc69f93e307aa5c.tar.gz ports-d86286b13182f7e3923e030ddcc69f93e307aa5c.zip | |
Notes
Diffstat (limited to 'mail/qmail-scanner/files')
| -rw-r--r-- | mail/qmail-scanner/files/patch-configure | 45 | ||||
| -rw-r--r-- | mail/qmail-scanner/files/pkg-install.in | 2 |
2 files changed, 12 insertions, 35 deletions
diff --git a/mail/qmail-scanner/files/patch-configure b/mail/qmail-scanner/files/patch-configure index 29cddeb0f2ca..74c008ec5038 100644 --- a/mail/qmail-scanner/files/patch-configure +++ b/mail/qmail-scanner/files/patch-configure @@ -1,34 +1,11 @@ ---- configure.orig 2006-04-04 21:37:03.000000000 +0000 -+++ configure 2009-07-04 12:37:16.225280000 +0000 -@@ -1,13 +1,6 @@ - #!/bin/sh - # - --#Pipe into bash if it's present -- --if [ "`bash --version 2>&1|grep 'GNU bash'`" != "" -a "$BASH_VERSION" = "" ]; then -- exec bash $0 $* -- exit --fi -- - umask 007 - - OLD_LANG="$LANG" -@@ -73,7 +66,7 @@ - LANGUAGES="`ls -d locale/[a-z]*|sed 's?^locale\/??g'`" - LANGUAGES=`echo $LANGUAGES` - --SPOOLDIR="/var/spool/qscan" -+SPOOLDIR="/var/spool/qscand" - QMAILDIR="/var/qmail" - - BINDIR="$QMAILDIR/bin" -@@ -1276,7 +1269,7 @@ - if [ "$MIME_UNPACKER" = "reformime" ]; then - #Check version of maildrop to ensure it's not the buggy version - --DD="`$MAILDROP_BINARY -v 2>&1|grep '^maildrop'|grep '1\.0'`" -+DD="`$MAILDROP_BINARY -v 2>&1|grep '^maildrop 1\.0'`" - if [ "$DD" != "" ]; then - cat<<EOF - +--- configure.old 2012-05-25 16:16:34.000000000 -0300 ++++ configure 2012-05-25 16:16:51.000000000 -0300 +@@ -817,7 +817,7 @@ + UNZIP_OPTIONS="" + fi + #Now check we can get filesizes out +- EE=`unzip -Ptest -lv contrib/test_password.zip 2>&1|egrep '80688.*test/ls'` ++ EE=`unzip -lv contrib/test_password.zip 2>&1|egrep '80688.*test/ls'` + if [ "$EE" = "" ]; then + echo "**FATAL ERROR ***" + echo "" diff --git a/mail/qmail-scanner/files/pkg-install.in b/mail/qmail-scanner/files/pkg-install.in index 87500dd3a1d1..6452fc0ffc5d 100644 --- a/mail/qmail-scanner/files/pkg-install.in +++ b/mail/qmail-scanner/files/pkg-install.in @@ -18,7 +18,7 @@ PRE-INSTALL) ${PW} groupshow -n ${QS_USER} >/dev/null 2>&1 \ || ${PW} groupadd -n ${QS_USER} -g ${QS_ID} ${PW} usershow -n ${QS_USER} >/dev/null 2>&1 \ - || ${PW} useradd ${QS_USER} -g ${QS_USER} -u ${QS_ID} -s ${NOLOGIN} + || ${PW} useradd ${QS_USER} -g ${QS_USER} -u ${QS_ID} -s ${NOLOGIN} -d ${SPOOLDIR} ;; POST-INSTALL) # Directories |