diff options
author | Tobias Scherbaum <dertobi123@gentoo.org> | 2007-07-28 15:25:39 +0000 |
---|---|---|
committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2007-07-28 15:25:39 +0000 |
commit | 0a7e0f39c9fe603ff69100d27c75cded3f46449f (patch) | |
tree | f74814633c5c336e34a727f1d160d6dbfd7e2775 /net-mail/cyrus-imapd | |
parent | Remove pulseaudio patch, being developed upstream, add warning on old version (diff) | |
download | gentoo-2-0a7e0f39c9fe603ff69100d27c75cded3f46449f.tar.gz gentoo-2-0a7e0f39c9fe603ff69100d27c75cded3f46449f.tar.bz2 gentoo-2-0a7e0f39c9fe603ff69100d27c75cded3f46449f.zip |
Clean up
(Portage version: 2.1.3_rc9)
Diffstat (limited to 'net-mail/cyrus-imapd')
5 files changed, 0 insertions, 230 deletions
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.1-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.1-drac.patch deleted file mode 100644 index 33383f2aff1f..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.1-drac.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- contrib/drac_auth.patch.org 2005-12-19 07:57:59.000000000 -0800 -+++ contrib/drac_auth.patch 2005-12-29 22:54:33.000000000 -0800 -@@ -71,7 +71,7 @@ - diff -u -r1.268.2.23 configure.in - --- configure.in 12 Apr 2005 20:05:20 -0000 1.268.2.23 - +++ configure.in 19 Dec 2005 15:54:30 -0000 --@@ -1003,6 +1003,19 @@ -+@@ -1003,6 +1003,20 @@ - SNMP_SUBDIRS="" - AC_SUBST(SNMP_SUBDIRS) - -@@ -80,12 +80,13 @@ - +dnl - +DRACLIBS= - +AC_ARG_WITH(drac, [ --with-drac=DIR use DRAC library in <DIR> [no] ], --+ if test -d "$withval"; then --+ LDFLAGS="$LDFLAGS -L${withval}" --+ AC_CHECK_LIB(drac, dracauth, --+ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) --+ DRACLIBS="-ldrac") --+ fi) -++ drac="$withval", -++ drac="no") -++if test "$drac" != "no"; then -++ AC_CHECK_LIB(drac, dracauth, -++ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) -++ DRACLIBS="-ldrac") -++fi - +AC_SUBST(DRACLIBS) - + - CMU_LIBWRAP diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-drac.patch deleted file mode 100644 index 1ca22b85dba3..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-drac.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- contrib/drac_auth.patch.orig 2006-06-09 18:34:58.000000000 -0700 -+++ contrib/drac_auth.patch 2006-06-09 18:35:54.000000000 -0700 -@@ -71,7 +71,7 @@ - diff -u -r1.268.2.23 configure.in - --- configure.in 12 Apr 2005 20:05:20 -0000 1.268.2.23 - +++ configure.in 23 May 2006 13:42:06 -0000 --@@ -1003,6 +1003,19 @@ -+@@ -1003,6 +1003,20 @@ - SNMP_SUBDIRS="" - AC_SUBST(SNMP_SUBDIRS) - -@@ -80,12 +80,13 @@ - +dnl - +DRACLIBS= - +AC_ARG_WITH(drac, [ --with-drac=DIR use DRAC library in <DIR> [no] ], --+ if test -d "$withval"; then --+ LDFLAGS="$LDFLAGS -L${withval}" --+ AC_CHECK_LIB(drac, dracauth, --+ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) --+ DRACLIBS="-ldrac") --+ fi) -++ drac="$withval", -++ drac="no") -++if test "$drac" != "no"; then -++ AC_CHECK_LIB(drac, dracauth, -++ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) -++ DRACLIBS="-ldrac") -++fi - +AC_SUBST(DRACLIBS) - + - CMU_LIBWRAP diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-unsupported-8bit.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-unsupported-8bit.patch deleted file mode 100644 index 6fd1cf4afc06..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-unsupported-8bit.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- cyrus-imapd-2.2.10/imap/message.c.munge8bit 2004-02-27 18:44:55.000000000 +0100 -+++ cyrus-imapd-2.2.10/imap/message.c 2004-07-27 18:20:13.725563440 +0200 -@@ -227,6 +227,7 @@ - int n; - int sawcr = 0, sawnl; - int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); -+ int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); - int inheader = 1, blankline = 1; - - while (size) { -@@ -262,7 +263,7 @@ - /* We have been configured to reject all mail of this - form. */ - if (!r) r = IMAP_MESSAGE_CONTAINS8BIT; -- } else { -+ } else if (munge8bit) { - /* We have been configured to munge all mail of this - form. */ - *p = 'X'; ---- cyrus-imapd-2.2.10/imap/spool.c.munge8bit 2004-03-04 17:09:34.000000000 +0100 -+++ cyrus-imapd-2.2.10/imap/spool.c 2004-07-27 18:20:13.726563149 +0200 -@@ -140,6 +140,7 @@ - state s = NAME_START; - int r = 0; - int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); -+ int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); - const char **skip = NULL; - - if (namelen == 0) { -@@ -266,7 +267,7 @@ - form. */ - r = IMAP_MESSAGE_CONTAINS8BIT; - goto ph_error; -- } else { -+ } else if (munge8bit) { - /* We have been configured to munge all mail of this - form. */ - c = 'X'; ---- cyrus-imapd-2.2.10/lib/imapoptions.munge8bit 2004-07-21 21:07:45.000000000 +0200 -+++ cyrus-imapd-2.2.10/lib/imapoptions 2004-07-27 18:20:13.722564314 +0200 -@@ -458,6 +458,12 @@ - { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")} - /* The cyrusdb backend to use for the mailbox list. */ - -+{ "munge8bit", 1, SWITCH } -+/* If enabled, lmtpd munges messages with 8-bit characters. These characters -+ are changed to . If \fBreject8bit\fR is enabled, setting \fBmunge8bit\fR -+ has no effect. (A proper soultion to non-ASCII characters in headers is -+ offered by RFC 2047 and its predecessors.) */ -+ - # xxx badly worded - { "mupdate_connections_max", 128, INT } - /* The max number of connections that a mupdate process will allow, this -@@ -670,9 +676,7 @@ - - { "reject8bit", 0, SWITCH } - /* If enabled, lmtpd rejects messages with 8-bit characters in the -- headers. Otherwise, 8-bit characters are changed to `X'. (A -- proper solution to non-ASCII characters in headers is offered by -- RFC 2047 and its predecessors.) */ -+ headers. */ - - { "rfc2046_strict", 0, SWITCH } - /* If enabled, imapd will be strict (per RFC 2046) when matching MIME ---- cyrus-imapd-2.2.10/man/deliver.8.munge8bit 2004-06-21 20:40:10.000000000 +0200 -+++ cyrus-imapd-2.2.10/man/deliver.8 2004-07-27 18:20:13.719565188 +0200 -@@ -147,8 +147,10 @@ - Accept messages using the LMTP protocol. - .SH NOTES - Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, deliver --either rejects messages with 8-bit-set characters in the headers or --changes these characters to `X'. -+either rejects/accepts messages with 8-bit-set characters in the headers. -+If we accept messages with 8-bit-set characters in the headers, then depending -+on the setting of \fBmunge8bit\fR, these characters are either left un-touched -+or changed to . - This is because such characters can't be interpreted since the - character set is not known, although some communities not well-served by - US-ASCII assume that those characters can be used to represent characters not diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-drac.patch deleted file mode 100644 index 1ca22b85dba3..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-drac.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- contrib/drac_auth.patch.orig 2006-06-09 18:34:58.000000000 -0700 -+++ contrib/drac_auth.patch 2006-06-09 18:35:54.000000000 -0700 -@@ -71,7 +71,7 @@ - diff -u -r1.268.2.23 configure.in - --- configure.in 12 Apr 2005 20:05:20 -0000 1.268.2.23 - +++ configure.in 23 May 2006 13:42:06 -0000 --@@ -1003,6 +1003,19 @@ -+@@ -1003,6 +1003,20 @@ - SNMP_SUBDIRS="" - AC_SUBST(SNMP_SUBDIRS) - -@@ -80,12 +80,13 @@ - +dnl - +DRACLIBS= - +AC_ARG_WITH(drac, [ --with-drac=DIR use DRAC library in <DIR> [no] ], --+ if test -d "$withval"; then --+ LDFLAGS="$LDFLAGS -L${withval}" --+ AC_CHECK_LIB(drac, dracauth, --+ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) --+ DRACLIBS="-ldrac") --+ fi) -++ drac="$withval", -++ drac="no") -++if test "$drac" != "no"; then -++ AC_CHECK_LIB(drac, dracauth, -++ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) -++ DRACLIBS="-ldrac") -++fi - +AC_SUBST(DRACLIBS) - + - CMU_LIBWRAP diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-drac_with_autocreate.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-drac_with_autocreate.patch deleted file mode 100644 index 0bfc8b15dd5e..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-drac_with_autocreate.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- contrib/drac_auth.patch.orig 2006-06-09 18:34:58.000000000 -0700 -+++ contrib/drac_auth.patch 2006-06-09 18:35:54.000000000 -0700 -@@ -71,7 +71,7 @@ - diff -u -r1.268.2.23 configure.in - --- configure.in 12 Apr 2005 20:05:20 -0000 1.268.2.23 - +++ configure.in 23 May 2006 13:42:06 -0000 --@@ -1003,6 +1003,19 @@ -+@@ -1003,6 +1003,20 @@ - SNMP_SUBDIRS="" - AC_SUBST(SNMP_SUBDIRS) - -@@ -80,12 +80,13 @@ - +dnl - +DRACLIBS= - +AC_ARG_WITH(drac, [ --with-drac=DIR use DRAC library in <DIR> [no] ], --+ if test -d "$withval"; then --+ LDFLAGS="$LDFLAGS -L${withval}" --+ AC_CHECK_LIB(drac, dracauth, --+ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) --+ DRACLIBS="-ldrac") --+ fi) -++ drac="$withval", -++ drac="no") -++if test "$drac" != "no"; then -++ AC_CHECK_LIB(drac, dracauth, -++ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?]) -++ DRACLIBS="-ldrac") -++fi - +AC_SUBST(DRACLIBS) - + - CMU_LIBWRAP ---- contrib/drac_auth.patch.new 2006-07-11 16:50:55.000000000 -0700 -+++ contrib/drac_auth.patch 2006-07-11 16:58:36.000000000 -0700 -@@ -111,8 +111,8 @@ - imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o imapd \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ --- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) --+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) -+- libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) - - imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ -@@ -130,10 +130,10 @@ - libimap.a $(DEPLIBS) - @@ -230,7 +231,7 @@ - pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(SERVICE) -+ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ --- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) --+ mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) -+- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -++ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) - - nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ - mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) |