kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2.3.7.

Browse source 
PASS8BITHACK was deprecated, since munge8bit option was added
for this purpose.
This commit is contained in:
Hajimu UMEMOTO 2006-07-11 12:19:32 +00:00
parent 45e671eb26
commit 235d0abd69
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=167467
6 changed files with 8 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mail/cyrus-imapd23/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.3.6
PORTVERSION= 2.3.7
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -99,7 +99,6 @@ OPTIONS+= NNTP "Enable NNTP support" off
OPTIONS+= REPLICATION "Enable replication" off
OPTIONS+= SNMP_4 "Enable SNMP support using net-snmp v4" off \
SNMP_5 "Enable SNMP support using net-snmp v5" off
OPTIONS+= PASS8BITHACK "Add pass8bit option (not recommended)" off
BDB_VERS= 3 4 41 42 43 44
@ -209,10 +208,6 @@ PLIST_SUB+= LDAP_PTLOADER=""
PLIST_SUB+= LDAP_PTLOADER="@comment "
.endif
.if defined(WITH_PASS8BITHACK)
EXTRA_PATCHES+= ${FILESDIR}/pass8bit.diff
.endif
.if (!defined(MAKE_KERBEROS5) && ${OSVERSION} <= 500105) || \
!exists(/usr/lib/libkrb5.a)
CONFIGURE_ARGS+=--disable-gssapi

6
mail/cyrus-imapd23/distinfo
View file

@ -1,3 +1,3 @@
MD5 (cyrus-imapd-2.3.6.tar.gz) = 5c1d6250747a7a09c8095972043cec01
SHA256 (cyrus-imapd-2.3.6.tar.gz) = 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd
SIZE (cyrus-imapd-2.3.6.tar.gz) = 2250241
MD5 (cyrus-imapd-2.3.7.tar.gz) = 07990f3a78a3a9d728cae627e31a9caf
SHA256 (cyrus-imapd-2.3.7.tar.gz) = ff58c60999f2c6495e218b81a25b6f5ef1805e4a160122db2744a6645a753b6d
SIZE (cyrus-imapd-2.3.7.tar.gz) = 2254961

59
mail/cyrus-imapd23/files/pass8bit.diff
View file

@ -1,59 +0,0 @@
Index: imap/message.c
diff -u -p imap/message.c.orig imap/message.c
--- imap/message.c.orig Sat Feb 28 02:44:55 2004
+++ imap/message.c Thu Oct 7 20:21:04 2004
@@ -227,6 +227,7 @@ unsigned size;
int n;
int sawcr = 0, sawnl;
int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
int inheader = 1, blankline = 1;
while (size) {
@@ -262,7 +263,7 @@ unsigned size;
/* We have been configured to reject all mail of this
form. */
if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
- } else {
+ } else if (!pass8bit) {
/* We have been configured to munge all mail of this
form. */
*p = 'X';
Index: imap/spool.c
diff -u -p imap/spool.c.orig imap/spool.c
--- imap/spool.c.orig Fri Mar 5 01:09:34 2004
+++ imap/spool.c Thu Oct 7 20:20:57 2004
@@ -140,6 +140,7 @@ static int parseheader(struct protstream
state s = NAME_START;
int r = 0;
int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
const char **skip = NULL;
if (namelen == 0) {
@@ -266,7 +267,7 @@ static int parseheader(struct protstream
form. */
r = IMAP_MESSAGE_CONTAINS8BIT;
goto ph_error;
- } else {
+ } else if (!pass8bit) {
/* We have been configured to munge all mail of this
form. */
c = 'X';
Index: lib/imapoptions
diff -u lib/imapoptions.orig lib/imapoptions
--- lib/imapoptions.orig Thu Jul 22 04:07:45 2004
+++ lib/imapoptions Thu Oct 7 20:00:04 2004
@@ -95,6 +95,12 @@
{ "afspts_mycell", NULL, STRING }
/* Cell to use for AFS PTS lookups. Defaults to the local cell. */
+{ "pass8bit", 0, SWITCH }
+/* If enabled, lmtpd accepts messages with 8-bit characters in the
+ headers without changing to `X'. This option is strongly not
+ recommended. (A proper soultion to non-ASCII characters in headers
+ is offered by RFC 2047 and its predecessors.) */
+
{ "allowallsubscribe", 0, SWITCH }
/* Allow subscription to nonexistent mailboxes. This option is
typically used on backend servers in a Murder so that users can

7
mail/cyrus-imapd24/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.3.6
PORTVERSION= 2.3.7
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -99,7 +99,6 @@ OPTIONS+= NNTP "Enable NNTP support" off
OPTIONS+= REPLICATION "Enable replication" off
OPTIONS+= SNMP_4 "Enable SNMP support using net-snmp v4" off \
SNMP_5 "Enable SNMP support using net-snmp v5" off
OPTIONS+= PASS8BITHACK "Add pass8bit option (not recommended)" off
BDB_VERS= 3 4 41 42 43 44
@ -209,10 +208,6 @@ PLIST_SUB+= LDAP_PTLOADER=""
PLIST_SUB+= LDAP_PTLOADER="@comment "
.endif
.if defined(WITH_PASS8BITHACK)
EXTRA_PATCHES+= ${FILESDIR}/pass8bit.diff
.endif
.if (!defined(MAKE_KERBEROS5) && ${OSVERSION} <= 500105) || \
!exists(/usr/lib/libkrb5.a)
CONFIGURE_ARGS+=--disable-gssapi

6
mail/cyrus-imapd24/distinfo
View file

@ -1,3 +1,3 @@
MD5 (cyrus-imapd-2.3.6.tar.gz) = 5c1d6250747a7a09c8095972043cec01
SHA256 (cyrus-imapd-2.3.6.tar.gz) = 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd
SIZE (cyrus-imapd-2.3.6.tar.gz) = 2250241
MD5 (cyrus-imapd-2.3.7.tar.gz) = 07990f3a78a3a9d728cae627e31a9caf
SHA256 (cyrus-imapd-2.3.7.tar.gz) = ff58c60999f2c6495e218b81a25b6f5ef1805e4a160122db2744a6645a753b6d
SIZE (cyrus-imapd-2.3.7.tar.gz) = 2254961

59
mail/cyrus-imapd24/files/pass8bit.diff
View file

@ -1,59 +0,0 @@
Index: imap/message.c
diff -u -p imap/message.c.orig imap/message.c
--- imap/message.c.orig Sat Feb 28 02:44:55 2004
+++ imap/message.c Thu Oct 7 20:21:04 2004
@@ -227,6 +227,7 @@ unsigned size;
int n;
int sawcr = 0, sawnl;
int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
int inheader = 1, blankline = 1;
while (size) {
@@ -262,7 +263,7 @@ unsigned size;
/* We have been configured to reject all mail of this
form. */
if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
- } else {
+ } else if (!pass8bit) {
/* We have been configured to munge all mail of this
form. */
*p = 'X';
Index: imap/spool.c
diff -u -p imap/spool.c.orig imap/spool.c
--- imap/spool.c.orig Fri Mar 5 01:09:34 2004
+++ imap/spool.c Thu Oct 7 20:20:57 2004
@@ -140,6 +140,7 @@ static int parseheader(struct protstream
state s = NAME_START;
int r = 0;
int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT);
const char **skip = NULL;
if (namelen == 0) {
@@ -266,7 +267,7 @@ static int parseheader(struct protstream
form. */
r = IMAP_MESSAGE_CONTAINS8BIT;
goto ph_error;
- } else {
+ } else if (!pass8bit) {
/* We have been configured to munge all mail of this
form. */
c = 'X';
Index: lib/imapoptions
diff -u lib/imapoptions.orig lib/imapoptions
--- lib/imapoptions.orig Thu Jul 22 04:07:45 2004
+++ lib/imapoptions Thu Oct 7 20:00:04 2004
@@ -95,6 +95,12 @@
{ "afspts_mycell", NULL, STRING }
/* Cell to use for AFS PTS lookups. Defaults to the local cell. */
+{ "pass8bit", 0, SWITCH }
+/* If enabled, lmtpd accepts messages with 8-bit characters in the
+ headers without changing to `X'. This option is strongly not
+ recommended. (A proper soultion to non-ASCII characters in headers
+ is offered by RFC 2047 and its predecessors.) */
+
{ "allowallsubscribe", 0, SWITCH }
/* Allow subscription to nonexistent mailboxes. This option is
typically used on backend servers in a Murder so that users can