Attachment 408446 Details for Bug 553820 – courier-imap-4.16.0-unicode.patch

[patch] courier-imap-4.16.0-unicode.patch

courier-imap-4.16.0-unicode.patch (text/plain), 14.70 KB, created by Yixun Lan on 2015-08-07 07:49:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yixun Lan

Created: 2015-08-07 07:49:59 UTC

Size: 14.70 KB

patch

obsolete

>diff --git a/configure b/configure
>index e0c5e42..9ce35d1 100755
>--- a/configure
>+++ b/configure
>@@ -11770,7 +11770,7 @@ courierlogger=$authsbindir/courierlogger$EXEEXT
> 
> 
> save_LIBS="$LIBS"
>-LIBS="-lunicode"
>+LIBS="-lcourier-unicode"
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h.  */
> 
>diff --git a/configure.ac b/configure.ac
>index fab260f..01b66f2 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -111,10 +111,10 @@ courierlogger=$authsbindir/courierlogger$EXEEXT
> AC_SUBST(courierlogger)
> 
> save_LIBS="$LIBS"
>-LIBS="-lunicode"
>+LIBS="-lcourier-unicode"
> AC_LINK_IFELSE(
> [AC_LANG_PROGRAM([
>-#include <unicode.h>
>+#include <courier-unicode.h>
> ],[
> 	unicode_default_chset();
> ])],[:],[AC_MSG_ERROR([The Courier Unicode Library appears not to be installed. You may need to install a separate development subpackage, in addition to the main package])])
>diff --git a/libs/imap/Makefile.am b/libs/imap/Makefile.am
>index 4510f36..84be0b8 100644
>--- a/libs/imap/Makefile.am
>+++ b/libs/imap/Makefile.am
>@@ -53,7 +53,7 @@ libimapd_la_SOURCES=mainloop.c imaptoken.c imaptoken.h imapwrite.c \
> 	imapwrite.h capability.c externalauth.c smap.c smapsnapshot.c
> libimapd_la_LIBADD= ../rfc2045/librfc2045.la ../maildir/libmaildir.la \
> 	../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \
>-	-lunicode
>+	-lcourier-unicode
> libimapd_la_LDFLAGS=-static
> 
> imaplogin_SOURCES=imaplogin.c authenticate_auth.c proxy.c proxy.h
>diff --git a/libs/imap/Makefile.in b/libs/imap/Makefile.in
>index 7d61e18..93c50c2 100644
>--- a/libs/imap/Makefile.in
>+++ b/libs/imap/Makefile.in
>@@ -423,7 +423,7 @@ libimapd_la_SOURCES = mainloop.c imaptoken.c imaptoken.h imapwrite.c \
> 
> libimapd_la_LIBADD = ../rfc2045/librfc2045.la ../maildir/libmaildir.la \
> 	../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \
>-	-lunicode
>+	-lcourier-unicode
> 
> libimapd_la_LDFLAGS = -static
> imaplogin_SOURCES = imaplogin.c authenticate_auth.c proxy.c proxy.h
>diff --git a/libs/imap/imapd.c b/libs/imap/imapd.c
>index ad9f455..1396429 100644
>--- a/libs/imap/imapd.c
>+++ b/libs/imap/imapd.c
>@@ -85,7 +85,7 @@
> #include	"maildir/maildirinfo.h"
> #include	"maildir/loginexec.h"
> 
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	"maildir/maildirkeywords.h"
> #include	"courierauth.h"
> 
>diff --git a/libs/imap/mailboxlist.c b/libs/imap/mailboxlist.c
>index f65fa31..9bcfd7c 100644
>--- a/libs/imap/mailboxlist.c
>+++ b/libs/imap/mailboxlist.c
>@@ -64,7 +64,7 @@
> #include	"maildir/maildiraclt.h"
> #include	"maildir/maildirnewshared.h"
> #include	"maildir/maildirinfo.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	"courierauth.h"
> 
> 
>diff --git a/libs/imap/search.c b/libs/imap/search.c
>index e14e5a9..1aa0007 100644
>--- a/libs/imap/search.c
>+++ b/libs/imap/search.c
>@@ -22,7 +22,7 @@
> #include	"rfc822/rfc822hdr.h"
> #include	"rfc822/rfc2047.h"
> #include	"rfc2045/rfc2045.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	"numlib/numlib.h"
> #include	"searchinfo.h"
> #include	"imapwrite.h"
>diff --git a/libs/imap/searchinfo.c b/libs/imap/searchinfo.c
>index c96d16b..c84a2c4 100644
>--- a/libs/imap/searchinfo.c
>+++ b/libs/imap/searchinfo.c
>@@ -11,7 +11,7 @@
> #include	<string.h>
> #include	<ctype.h>
> #include	<errno.h>
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	"searchinfo.h"
> #include	"imapwrite.h"
> #include	"imaptoken.h"
>diff --git a/libs/imap/smap.c b/libs/imap/smap.c
>index 9fe3253..b9cd97f 100644
>--- a/libs/imap/smap.c
>+++ b/libs/imap/smap.c
>@@ -59,7 +59,7 @@
> #include	"maildir/maildiraclt.h"
> #include	"maildir/maildirnewshared.h"
> #include	"maildir/maildirinfo.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> #include	"rfc2045/rfc2045.h"
> #include	"rfc822/rfc822.h"
>diff --git a/libs/imap/thread.c b/libs/imap/thread.c
>index 81cd15a..791a7a8 100644
>--- a/libs/imap/thread.c
>+++ b/libs/imap/thread.c
>@@ -17,7 +17,7 @@
> #include	"rfc822/rfc822.h"
> #include	"rfc822/rfc2047.h"
> #include	"rfc822/imaprefs.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> static void thread_os_callback(struct searchinfo *, struct searchinfo *, int,
> 	unsigned long, void *);
>diff --git a/libs/maildir/Makefile.am b/libs/maildir/Makefile.am
>index fe8e575..b177e3f 100644
>--- a/libs/maildir/Makefile.am
>+++ b/libs/maildir/Makefile.am
>@@ -62,12 +62,12 @@ maildirmake_DEPENDENCIES=libmaildir.la \
> 			../rfc822/librfc822.la
> maildirmake_LDADD=libmaildir.la \
> 			../numlib/libnumlib.la \
>-			../rfc822/librfc822.la -lunicode
>+			../rfc822/librfc822.la -lcourier-unicode
> maildirmake_LDFLAGS=-static
> 
> testmaildirfilter_SOURCES=maildirfiltertypelist.h testmaildirfilter.c
> testmaildirfilter_DEPENDENCIES=libmaildir.la ../numlib/libnumlib.la
>-testmaildirfilter_LDADD=libmaildir.la ../numlib/libnumlib.la -lunicode @LIBPCRE@
>+testmaildirfilter_LDADD=libmaildir.la ../numlib/libnumlib.la -lcourier-unicode @LIBPCRE@
> testmaildirfilter_LDFLAGS=-static
> 
> maildirkwtest_SOURCES=maildirkwtest.c
>@@ -97,7 +97,7 @@ maildiraclttest_DEPENDENCIES=libmaildir.la ../liblock/liblock.la \
> maildiraclttest_LDFLAGS=-static
> 
> testmaildirsearch_SOURCES=testmaildirsearch.c
>-testmaildirsearch_LDADD=libmaildir.la -lunicode
>+testmaildirsearch_LDADD=libmaildir.la -lcourier-unicode
> testmaildirsearch_DEPENDENCIES=libmaildir.la
> 
> EXTRA_DIST=README.maildirquota.html README.maildirquota.txt \
>diff --git a/libs/maildir/Makefile.in b/libs/maildir/Makefile.in
>index 1a01144..7fb4fc2 100644
>--- a/libs/maildir/Makefile.in
>+++ b/libs/maildir/Makefile.in
>@@ -455,12 +455,12 @@ maildirmake_DEPENDENCIES = libmaildir.la \
> 
> maildirmake_LDADD = libmaildir.la \
> 			../numlib/libnumlib.la \
>-			../rfc822/librfc822.la -lunicode
>+			../rfc822/librfc822.la -lcourier-unicode
> 
> maildirmake_LDFLAGS = -static
> testmaildirfilter_SOURCES = maildirfiltertypelist.h testmaildirfilter.c
> testmaildirfilter_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la
>-testmaildirfilter_LDADD = libmaildir.la ../numlib/libnumlib.la -lunicode @LIBPCRE@
>+testmaildirfilter_LDADD = libmaildir.la ../numlib/libnumlib.la -lcourier-unicode @LIBPCRE@
> testmaildirfilter_LDFLAGS = -static
> maildirkwtest_SOURCES = maildirkwtest.c
> maildirkwtest_LDADD = libmaildir.la
>@@ -491,7 +491,7 @@ maildiraclttest_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \
> 
> maildiraclttest_LDFLAGS = -static
> testmaildirsearch_SOURCES = testmaildirsearch.c
>-testmaildirsearch_LDADD = libmaildir.la -lunicode
>+testmaildirsearch_LDADD = libmaildir.la -lcourier-unicode
> testmaildirsearch_DEPENDENCIES = libmaildir.la
> EXTRA_DIST = README.maildirquota.html README.maildirquota.txt \
> 	README.imapkeywords.html \
>diff --git a/libs/maildir/maildirfilter.c b/libs/maildir/maildirfilter.c
>index 96b2b80..a04ba0d 100644
>--- a/libs/maildir/maildirfilter.c
>+++ b/libs/maildir/maildirfilter.c
>@@ -11,7 +11,7 @@
> 
> #include	"autoresponse.h"
> #include	"numlib/numlib.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	<stdlib.h>
> #include	<string.h>
> #include	<stdio.h>
>diff --git a/libs/maildir/maildirinfo.c b/libs/maildir/maildirinfo.c
>index 3762cb6..95f3837 100644
>--- a/libs/maildir/maildirinfo.c
>+++ b/libs/maildir/maildirinfo.c
>@@ -37,7 +37,7 @@
> 
> #include	"maildirmisc.h"
> #include	"maildirnewshared.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> void maildir_info_destroy(struct maildir_info *info)
> {
>diff --git a/libs/maildir/maildirmake.c b/libs/maildir/maildirmake.c
>index 5173e25..a106894 100644
>--- a/libs/maildir/maildirmake.c
>+++ b/libs/maildir/maildirmake.c
>@@ -27,7 +27,7 @@
> #include	"maildirmisc.h"
> #include	"maildirsharedrc.h"
> #include	"maildirquota.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> static void usage()
> {
>diff --git a/libs/maildir/maildirsearch.h b/libs/maildir/maildirsearch.h
>index cb50a14..b134c6d 100644
>--- a/libs/maildir/maildirsearch.h
>+++ b/libs/maildir/maildirsearch.h
>@@ -36,7 +36,7 @@
> 
> #include "config.h"
> 
>-#include <unicode.h>
>+#include <courier-unicode.h>
> 
> #include <string.h>
> #include <stdlib.h>
>diff --git a/libs/rfc2045/Makefile.am b/libs/rfc2045/Makefile.am
>index bb17b4c..22b15a3 100644
>--- a/libs/rfc2045/Makefile.am
>+++ b/libs/rfc2045/Makefile.am
>@@ -32,22 +32,22 @@ librfc2045_la_SOURCES=rfc2045.c rfc2045.h rfc2045src.h \
> reformime_SOURCES=reformime.c
> reformime_DEPENDENCIES =  librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \
> 		../numlib/libnumlib.la
>-reformime_LDADD = $(reformime_DEPENDENCIES) -lunicode
>+reformime_LDADD = $(reformime_DEPENDENCIES) -lcourier-unicode
> reformime_LDFLAGS=-static
> 
> makemime_SOURCES=makemime.c
> makemime_DEPENDENCIES= ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la
>-makemime_LDADD = $(makemime_DEPENDENCIES) -lunicode
>+makemime_LDADD = $(makemime_DEPENDENCIES) -lcourier-unicode
> makemime_LDFLAGS=-static
> 
> headercheck_SOURCES=headercheck.c
> headercheck_DEPENDENCIES=librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la
>-headercheck_LDADD=$(headercheck_DEPENDENCIES) -lunicode
>+headercheck_LDADD=$(headercheck_DEPENDENCIES) -lcourier-unicode
> headercheck_LDFLAGS=-static
> 
> testrfc3676parser_SOURCES=testrfc3676parser.c
> testrfc3676parser_DEPENDENCIES=librfc2045.la
>-testrfc3676parser_LDADD=$(testrfc3676parser_DEPENDENCIES) -lunicode
>+testrfc3676parser_LDADD=$(testrfc3676parser_DEPENDENCIES) -lcourier-unicode
> 
> if HAVE_SGML
> reformime.html: reformime.sgml ../docbook/sgml2html
>diff --git a/libs/rfc2045/Makefile.in b/libs/rfc2045/Makefile.in
>index 56623a3..304498b 100644
>--- a/libs/rfc2045/Makefile.in
>+++ b/libs/rfc2045/Makefile.in
>@@ -393,19 +393,19 @@ reformime_SOURCES = reformime.c
> reformime_DEPENDENCIES = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \
> 		../numlib/libnumlib.la
> 
>-reformime_LDADD = $(reformime_DEPENDENCIES) -lunicode
>+reformime_LDADD = $(reformime_DEPENDENCIES) -lcourier-unicode
> reformime_LDFLAGS = -static
> makemime_SOURCES = makemime.c
> makemime_DEPENDENCIES = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la
>-makemime_LDADD = $(makemime_DEPENDENCIES) -lunicode
>+makemime_LDADD = $(makemime_DEPENDENCIES) -lcourier-unicode
> makemime_LDFLAGS = -static
> headercheck_SOURCES = headercheck.c
> headercheck_DEPENDENCIES = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la
>-headercheck_LDADD = $(headercheck_DEPENDENCIES) -lunicode
>+headercheck_LDADD = $(headercheck_DEPENDENCIES) -lcourier-unicode
> headercheck_LDFLAGS = -static
> testrfc3676parser_SOURCES = testrfc3676parser.c
> testrfc3676parser_DEPENDENCIES = librfc2045.la
>-testrfc3676parser_LDADD = $(testrfc3676parser_DEPENDENCIES) -lunicode
>+testrfc3676parser_LDADD = $(testrfc3676parser_DEPENDENCIES) -lcourier-unicode
> @HAVE_LIBIDN_FALSE@TESTSUITE = testsuite.txt.noidn
> @HAVE_LIBIDN_TRUE@TESTSUITE = testsuite.txt.idn
> all: $(BUILT_SOURCES) rfc2045_config.h
>diff --git a/libs/rfc2045/reformime.c b/libs/rfc2045/reformime.c
>index b5ed474..8fb311c 100644
>--- a/libs/rfc2045/reformime.c
>+++ b/libs/rfc2045/reformime.c
>@@ -31,7 +31,7 @@
> #include	"rfc822/rfc822.h"
> #include	"rfc822/rfc2047.h"
> #include	"rfc2045charset.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> #if HAVE_UNISTD_H
> #include	<unistd.h>
>diff --git a/libs/rfc2045/rfc2045decodemimesectionu.c b/libs/rfc2045/rfc2045decodemimesectionu.c
>index 1fc9e74..e94188f 100644
>--- a/libs/rfc2045/rfc2045decodemimesectionu.c
>+++ b/libs/rfc2045/rfc2045decodemimesectionu.c
>@@ -5,7 +5,7 @@
> 
> #include "rfc2045_config.h"
> #include	"rfc2045.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	<stdio.h>
> #include	<unistd.h>
> #include	<iconv.h>
>diff --git a/libs/rfc2045/rfc2045reply.c b/libs/rfc2045/rfc2045reply.c
>index 28726dc..52d7b71 100644
>--- a/libs/rfc2045/rfc2045reply.c
>+++ b/libs/rfc2045/rfc2045reply.c
>@@ -10,7 +10,7 @@
> #include	"rfc822/rfc2047.h"
> #include	"rfc2045charset.h"
> #include	"rfc822/rfc822.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	<stdio.h>
> #include	<unistd.h>
> #include	<stdlib.h>
>diff --git a/libs/rfc2045/rfc2231.c b/libs/rfc2045/rfc2231.c
>index 22c0c50..c3aefcb 100644
>--- a/libs/rfc2045/rfc2231.c
>+++ b/libs/rfc2045/rfc2231.c
>@@ -15,7 +15,7 @@
> #include	<ctype.h>
> #include	"rfc2045.h"
> #include	"rfc822/rfc822.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> /*
> ** Deallocate a link list of rfc2231param structures.
>diff --git a/libs/rfc2045/rfc3676parser.h b/libs/rfc2045/rfc3676parser.h
>index 95811b5..3890983 100644
>--- a/libs/rfc2045/rfc3676parser.h
>+++ b/libs/rfc2045/rfc3676parser.h
>@@ -9,7 +9,7 @@
> */
> 
> #include	"rfc2045/rfc2045_config.h"
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> #include	<stdlib.h>
> #include	<string.h>
> 
>diff --git a/libs/rfc822/Makefile.am b/libs/rfc822/Makefile.am
>index ec41e4c..931c3c9 100644
>--- a/libs/rfc822/Makefile.am
>+++ b/libs/rfc822/Makefile.am
>@@ -24,12 +24,12 @@ noinst_DATA=$(BUILT_SOURCES)
> noinst_PROGRAMS=testsuite reftest
> testsuite_SOURCES=testsuite.c
> testsuite_DEPENDENCIES=librfc822.la
>-testsuite_LDADD=librfc822.la -lunicode
>+testsuite_LDADD=librfc822.la -lcourier-unicode
> testsuite_LDFLAGS=-static
> 
> reftest_SOURCES=reftest.c imaprefs.h
> reftest_DEPENDENCIES=librfc822.la
>-reftest_LDADD=librfc822.la -lunicode
>+reftest_LDADD=librfc822.la -lcourier-unicode
> reftest_LDFLAGS=-static
> 
> EXTRA_DIST=testsuite.txt reftest.txt $(BUILT_SOURCES)
>diff --git a/libs/rfc822/Makefile.in b/libs/rfc822/Makefile.in
>index 28758f3..f67affc 100644
>--- a/libs/rfc822/Makefile.in
>+++ b/libs/rfc822/Makefile.in
>@@ -349,11 +349,11 @@ BUILT_SOURCES = rfc822.3 rfc822.html
> noinst_DATA = $(BUILT_SOURCES)
> testsuite_SOURCES = testsuite.c
> testsuite_DEPENDENCIES = librfc822.la
>-testsuite_LDADD = librfc822.la -lunicode
>+testsuite_LDADD = librfc822.la -lcourier-unicode
> testsuite_LDFLAGS = -static
> reftest_SOURCES = reftest.c imaprefs.h
> reftest_DEPENDENCIES = librfc822.la
>-reftest_LDADD = librfc822.la -lunicode
>+reftest_LDADD = librfc822.la -lcourier-unicode
> reftest_LDFLAGS = -static
> EXTRA_DIST = testsuite.txt reftest.txt $(BUILT_SOURCES)
> all: $(BUILT_SOURCES) config.h
>diff --git a/libs/rfc822/encodeautodetect.c b/libs/rfc822/encodeautodetect.c
>index 194c91b..86cffaa 100644
>--- a/libs/rfc822/encodeautodetect.c
>+++ b/libs/rfc822/encodeautodetect.c
>@@ -8,7 +8,7 @@
> #include	"encode.h"
> #include	<string.h>
> #include	<stdlib.h>
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> static const char *libmail_encode_autodetect(int use7bit,
> 					     int (*func)(void *), void *arg,
>diff --git a/libs/rfc822/rfc2047.c b/libs/rfc822/rfc2047.c
>index 872c557..2c18c50 100644
>--- a/libs/rfc822/rfc2047.c
>+++ b/libs/rfc822/rfc2047.c
>@@ -9,7 +9,7 @@
> #include	<string.h>
> #include	<stdlib.h>
> #include	<errno.h>
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> #include	"rfc822hdr.h"
> #include	"rfc2047.h"
>diff --git a/libs/rfc822/rfc2047u.c b/libs/rfc822/rfc2047u.c
>index dc2244e..9966faf 100644
>--- a/libs/rfc822/rfc2047u.c
>+++ b/libs/rfc822/rfc2047u.c
>@@ -9,7 +9,7 @@
> #include	<string.h>
> #include	<stdlib.h>
> #include	<errno.h>
>-#include	<unicode.h>
>+#include	<courier-unicode.h>
> 
> #include	"rfc822hdr.h"
> #include	"rfc2047.h"

Actions: View | Diff

Attachments on bug 553820: 406098 | 406100 | 408446