diff options
author | koitsu <koitsu@FreeBSD.org> | 2008-11-16 12:51:41 +0800 |
---|---|---|
committer | koitsu <koitsu@FreeBSD.org> | 2008-11-16 12:51:41 +0800 |
commit | abdfd011d2db47c040632c8de9a6116f9a174f4b (patch) | |
tree | 1895bcbf003ae1df95851ab1b2c4098166f4b3f0 | |
parent | 2d683f11d956d7d42129fd769adbd97d86695cf0 (diff) | |
download | freebsd-ports-gnome-abdfd011d2db47c040632c8de9a6116f9a174f4b.tar.gz freebsd-ports-gnome-abdfd011d2db47c040632c8de9a6116f9a174f4b.tar.zst freebsd-ports-gnome-abdfd011d2db47c040632c8de9a6116f9a174f4b.zip |
Removal of carriage returns (0x0D) from numerous files. QAT caught
this, as did our user community.
Reported by: QAT, andrew clarke <mail@ozzmosis.com>
-rw-r--r-- | mail/dovecot/Makefile | 5 | ||||
-rw-r--r-- | mail/dovecot/distinfo | 12 | ||||
-rw-r--r-- | mail/dovecot/files/dovecot.sh.in | 4 | ||||
-rw-r--r-- | mail/dovecot/files/patch-dovecot-example.conf | 6 |
4 files changed, 14 insertions, 13 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 56986ed63bc4..0fe6ebd5b288 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -6,11 +6,12 @@ # PORTNAME= dovecot -PORTVERSION= 1.1.6
+PORTVERSION= 1.1.6 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/1.1/ -MAINTAINER= yds@CoolRat.org
+MAINTAINER= yds@CoolRat.org COMMENT= Secure and compact IMAP and POP3 servers USE_ICONV= yes diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index eed933d21ccb..ba9a3e6150bf 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,6 +1,6 @@ -MD5 (dovecot-1.1.6.tar.gz) = ccbfcfcb5e6d19a3228885a2f7eae2dd
-SHA256 (dovecot-1.1.6.tar.gz) = 91ab9b78e2ed4230d96faa89aecde3e6c42ad7e2ef4858c292c5988b195cbbec
-SIZE (dovecot-1.1.6.tar.gz) = 2320875
-MD5 (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 0450151b4515afb036b4c94ac9e912fc
-SHA256 (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 4a9612f788796d1c18653bc0aa5cc9269b3365d4a0358b3f6bf05cda206c139f
-SIZE (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 5912
+MD5 (dovecot-1.1.6.tar.gz) = ccbfcfcb5e6d19a3228885a2f7eae2dd +SHA256 (dovecot-1.1.6.tar.gz) = 91ab9b78e2ed4230d96faa89aecde3e6c42ad7e2ef4858c292c5988b195cbbec +SIZE (dovecot-1.1.6.tar.gz) = 2320875 +MD5 (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 0450151b4515afb036b4c94ac9e912fc +SHA256 (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 4a9612f788796d1c18653bc0aa5cc9269b3365d4a0358b3f6bf05cda206c139f +SIZE (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 5912 diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.sh.in index 3db31630ed93..57a8dabd5f4a 100644 --- a/mail/dovecot/files/dovecot.sh.in +++ b/mail/dovecot/files/dovecot.sh.in @@ -30,8 +30,8 @@ dovecot_prestart() { # Ensure runtime directories exist with correct permissions local base user gid base=/var/run/${name} - user=$(/usr/bin/awk -F '[[:space:]]*=[[:space:]]*' '/^[[:space:]]*login_user[[:space:]]*=/ { print $2 }' ${required_files})
- gid=$(/usr/sbin/pw usershow -n "${user:-${name}}" 2>/dev/null | /usr/bin/cut -d: -f4)
+ user=$(/usr/bin/awk -F '[[:space:]]*=[[:space:]]*' '/^[[:space:]]*login_user[[:space:]]*=/ { print $2 }' ${required_files}) + gid=$(/usr/sbin/pw usershow -n "${user:-${name}}" 2>/dev/null | /usr/bin/cut -d: -f4) /usr/bin/install -o root -g wheel -m 0755 -d ${base} /usr/bin/install -o root -g ${gid} -m 0750 -d ${base}/login } diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf index e6b5d4421dc0..ec434b3af8ec 100644 --- a/mail/dovecot/files/patch-dovecot-example.conf +++ b/mail/dovecot/files/patch-dovecot-example.conf @@ -1,5 +1,5 @@ ---- dovecot-example.conf.orig 2008-10-26 11:00:45.000000000 -0400
-+++ dovecot-example.conf 2008-10-26 11:00:45.000000000 -0400
+--- dovecot-example.conf.orig 2008-10-26 11:00:45.000000000 -0400 ++++ dovecot-example.conf 2008-10-26 11:00:45.000000000 -0400 @@ -20,7 +20,7 @@ # Protocols we want to be serving: imap imaps pop3 pop3s @@ -119,7 +119,7 @@ # drop away the domain if it was given, or "%n-AT-%d" would change the '@' into # "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = -+auth_username_format = %Lu
++auth_username_format = %Lu # If you want to allow master users to log in by specifying the master # username within the normal username string (ie. not using SASL mechanism's |