diff options
76 files changed, 137 insertions, 125 deletions
@@ -6,7 +6,7 @@ #if HAVE_CONFIG_H #include "cgi/cgi_config.h" #endif -#include <unicode.h> +#include <courier-unicode.h> #ifdef __cplusplus diff --git a/gpglib/Makefile.am b/gpglib/Makefile.am index a4b59f0..c28c1ba 100644 --- a/gpglib/Makefile.am +++ b/gpglib/Makefile.am @@ -18,13 +18,13 @@ libgpg_la_SOURCES=checksign.c delete.c export.c fork.c genkey.c gpg.c gpglib.h\ testgpg_SOURCES=testgpg.c testgpg_DEPENDENCIES=libgpg.la ../numlib/libnumlib.la -testgpg_LDADD=$(testgpg_DEPENDENCIES) -lunicode +testgpg_LDADD=$(testgpg_DEPENDENCIES) -lcourier-unicode testgpg_LDFLAGS=-static mimegpg_SOURCES=mimegpg.c mimegpg_LDADD=libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \ ../rfc822/libencode.la ../numlib/libnumlib.la \ - -lunicode + -lcourier-unicode mimegpg_DEPENDENCIES=libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la\ ../rfc822/libencode.la ../numlib/libnumlib.la BUILT_SOURCES=gpg.h mimegpg.html mimegpg.1 diff --git a/gpglib/checksign.c b/gpglib/checksign.c index 62143cd..ac1612f 100644 --- a/gpglib/checksign.c +++ b/gpglib/checksign.c @@ -12,7 +12,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> -#include <unicode.h> +#include <courier-unicode.h> #include "gpg.h" #include "gpglib.h" diff --git a/gpglib/delete.c b/gpglib/delete.c index 1ecf66b..596f885 100644 --- a/gpglib/delete.c +++ b/gpglib/delete.c @@ -12,7 +12,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> -#include <unicode.h> +#include <courier-unicode.h> #include "gpg.h" #include "gpglib.h" diff --git a/gpglib/export.c b/gpglib/export.c index c8cf5d7..33d1c92 100644 --- a/gpglib/export.c +++ b/gpglib/export.c @@ -14,7 +14,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> -#include <unicode.h> +#include <courier-unicode.h> #include "gpg.h" #include "gpglib.h" diff --git a/gpglib/genkey.c b/gpglib/genkey.c index 1703e3c..15f7822 100644 --- a/gpglib/genkey.c +++ b/gpglib/genkey.c @@ -14,7 +14,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> -#include <unicode.h> +#include <courier-unicode.h> #include "gpg.h" #include "gpglib.h" diff --git a/gpglib/import.c b/gpglib/import.c index 32de753..ee043ef 100644 --- a/gpglib/import.c +++ b/gpglib/import.c @@ -12,7 +12,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> -#include <unicode.h> +#include <courier-unicode.h> #include "gpg.h" #include "gpglib.h" diff --git a/gpglib/list.c b/gpglib/list.c index 146c05b..a26faec 100644 --- a/gpglib/list.c +++ b/gpglib/list.c @@ -16,7 +16,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> -#include <unicode.h> +#include <courier-unicode.h> #include "gpg.h" #include "gpglib.h" diff --git a/gpglib/sign.c b/gpglib/sign.c index 9bbfec4..37438cd 100644 --- a/gpglib/sign.c +++ b/gpglib/sign.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <unicode.h> +#include <courier-unicode.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> diff --git a/gpglib/testgpg.c b/gpglib/testgpg.c index 942abd4..bc0c5a9 100644 --- a/gpglib/testgpg.c +++ b/gpglib/testgpg.c @@ -8,7 +8,7 @@ #include "config.h" #include "gpglib.h" -#include <unicode.h> +#include <courier-unicode.h> #include "numlib/numlib.h" #include <stdio.h> diff --git a/imap/ChangeLog b/imap/ChangeLog index c65b6f2..66063b3 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1,3 +1,7 @@ +2015-02-28 Sam Varshavchik <mrsam@courier-mta.com> + + * Update to courier-unicode 1.2. + 2015-02-24 Sam Varshavchik <mrsam@courier-mta.com> * Add the makeimapaccess script. diff --git a/imap/Makefile.am b/imap/Makefile.am index 23f4df4..bd68261 100644 --- a/imap/Makefile.am +++ b/imap/Makefile.am @@ -56,7 +56,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/imap/imapd.c b/imap/imapd.c index ad9f455..1396429 100644 --- a/imap/imapd.c +++ b/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/imap/mailboxlist.c b/imap/mailboxlist.c index f65fa31..9bcfd7c 100644 --- a/imap/mailboxlist.c +++ b/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/imap/search.c b/imap/search.c index e14e5a9..1aa0007 100644 --- a/imap/search.c +++ b/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/imap/searchinfo.c b/imap/searchinfo.c index c96d16b..c84a2c4 100644 --- a/imap/searchinfo.c +++ b/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/imap/smap.c b/imap/smap.c index efe88e4..b7669cf 100644 --- a/imap/smap.c +++ b/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/imap/thread.c b/imap/thread.c index 81cd15a..791a7a8 100644 --- a/imap/thread.c +++ b/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/libmail/addressbookadd.C b/libmail/addressbookadd.C index 9110dec..15e13b7 100644 --- a/libmail/addressbookadd.C +++ b/libmail/addressbookadd.C @@ -11,7 +11,7 @@ #include "envelope.H" #include "rfcaddr.H" #include "misc.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include <ctype.h> #include <vector> #include <errno.h> diff --git a/libmail/addressbookget.C b/libmail/addressbookget.C index 32d6335..821496a 100644 --- a/libmail/addressbookget.C +++ b/libmail/addressbookget.C @@ -6,7 +6,7 @@ #include "libmail_config.h" #include "misc.H" #include "addressbookget.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include <ctype.h> #include <sstream> diff --git a/libmail/file.C b/libmail/file.C index 2820a72..f68ae02 100644 --- a/libmail/file.C +++ b/libmail/file.C @@ -5,7 +5,7 @@ */ #include "libmail_config.h" #include "file.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include <ctype.h> using namespace std; diff --git a/libmail/imap.C b/libmail/imap.C index 3d13270..584a5ef 100644 --- a/libmail/imap.C +++ b/libmail/imap.C @@ -17,7 +17,7 @@ #include "misc.H" #include "genericdecode.H" -#include <unicode/unicode.h> +#include <unicode/courier-unicode.h> #include <sstream> #include <iomanip> #include <algorithm> diff --git a/libmail/imap.H b/libmail/imap.H index e305653..29423b4 100644 --- a/libmail/imap.H +++ b/libmail/imap.H @@ -18,7 +18,7 @@ #include <queue> #include "imapfolders.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "maildir/maildirkeywords.h" #include "fd.H" diff --git a/libmail/imapfolders.C b/libmail/imapfolders.C index cdc6031..ac7928a 100644 --- a/libmail/imapfolders.C +++ b/libmail/imapfolders.C @@ -23,7 +23,7 @@ #include <errno.h> #include <ctype.h> #include <sstream> -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "rfc822/rfc822.h" #include "maildir/maildiraclt.h" diff --git a/libmail/imaplisthandler.C b/libmail/imaplisthandler.C index 50de05d..d202297 100644 --- a/libmail/imaplisthandler.C +++ b/libmail/imaplisthandler.C @@ -8,7 +8,7 @@ #include "imapfolders.H" #include "smaplist.H" #include "misc.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include <stdlib.h> #include <string.h> #include <ctype.h> diff --git a/libmail/mail.C b/libmail/mail.C index e70e9a7..8514303 100644 --- a/libmail/mail.C +++ b/libmail/mail.C @@ -18,7 +18,7 @@ #include <pwd.h> #include <arpa/inet.h> #include "rfc822/rfc822.h" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "maildir/maildiraclt.h" #include "misc.H" #include <fstream> diff --git a/libmail/maildir.H b/libmail/maildir.H index 3a7988e..0932e23 100644 --- a/libmail/maildir.H +++ b/libmail/maildir.H @@ -9,7 +9,7 @@ #include "libmail_config.h" #include "mail.H" #include "generic.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "maildir/maildirwatch.h" #include "maildir/maildirkeywords.h" diff --git a/libmail/maildirfolder.C b/libmail/maildirfolder.C index 32f755d..337ee47 100644 --- a/libmail/maildirfolder.C +++ b/libmail/maildirfolder.C @@ -6,7 +6,7 @@ #include "libmail_config.h" #include "maildir/config.h" #include "maildir/maildirmisc.h" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "maildirfolder.H" #include "maildiradd.H" #include "mbox.H" diff --git a/libmail/mbox.H b/libmail/mbox.H index f736503..9096763 100644 --- a/libmail/mbox.H +++ b/libmail/mbox.H @@ -9,7 +9,7 @@ #include "libmail_config.h" #include "mail.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "maildir/maildirkeywords.h" #include <time.h> diff --git a/libmail/mboxfolder.C b/libmail/mboxfolder.C index e78c3f0..af6b65b 100644 --- a/libmail/mboxfolder.C +++ b/libmail/mboxfolder.C @@ -18,7 +18,7 @@ #include <fcntl.h> #include <string.h> #include <errno.h> -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #if HAVE_DIRENT_H # include <dirent.h> diff --git a/libmail/mimetypes.C b/libmail/mimetypes.C index 77800d1..0654343 100644 --- a/libmail/mimetypes.C +++ b/libmail/mimetypes.C @@ -6,7 +6,7 @@ #include "libmail_config.h" #include "mimetypes.H" #include "namespace.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include <fstream> #include <cctype> #include <cstring> diff --git a/libmail/nntp.C b/libmail/nntp.C index 2b86580..3f7d92d 100644 --- a/libmail/nntp.C +++ b/libmail/nntp.C @@ -16,7 +16,7 @@ #include "objectmonitor.H" #include "libcouriertls.h" #include "expungelist.H" -#include <unicode/unicode.h> +#include <unicode/courier-unicode.h> #include <sstream> #include <iostream> #include <iomanip> diff --git a/libmail/rfc2047decode.H b/libmail/rfc2047decode.H index 6b6abb4..1e85036 100644 --- a/libmail/rfc2047decode.H +++ b/libmail/rfc2047decode.H @@ -7,7 +7,7 @@ #define libmail_rfc2047_decode_h #include "libmail_config.h" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "rfcaddr.H" #include <vector> diff --git a/libmail/rfcaddr.C b/libmail/rfcaddr.C index e91cbef..082cccb 100644 --- a/libmail/rfcaddr.C +++ b/libmail/rfcaddr.C @@ -11,7 +11,7 @@ #include "rfc2047encode.H" #include "rfc2047decode.H" #include "rfc822/rfc822.h" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include <iostream> #include <algorithm> diff --git a/libmail/rfcaddr.H b/libmail/rfcaddr.H index 45e2a45..7aae62d 100644 --- a/libmail/rfcaddr.H +++ b/libmail/rfcaddr.H @@ -7,7 +7,7 @@ #define libmail_rfcaddr_h #include "libmail_config.h" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "namespace.H" #include <stdlib.h> diff --git a/libmail/search.C b/libmail/search.C index 42d504b..a22b922 100644 --- a/libmail/search.C +++ b/libmail/search.C @@ -10,7 +10,7 @@ #include "structure.H" #include "rfcaddr.H" #include "rfc2047decode.H" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "rfc822/rfc822.h" #include "rfc822/rfc822hdr.h" diff --git a/libmail/smtp.C b/libmail/smtp.C index e225f8d..cb515c2 100644 --- a/libmail/smtp.C +++ b/libmail/smtp.C @@ -12,7 +12,7 @@ #include "base64.H" #include "smtpfolder.H" #include "tcpd/spipe.h" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include "libcouriertls.h" #include <errno.h> diff --git a/libmail/structure.C b/libmail/structure.C index 5d91df8..ac561ea 100644 --- a/libmail/structure.C +++ b/libmail/structure.C @@ -13,7 +13,7 @@ #include "rfc822/rfc2047.h" #include "rfc2045/rfc2045.h" -#include "unicode/unicode.h" +#include "unicode/courier-unicode.h" #include <errno.h> diff --git a/maildir/Makefile.am b/maildir/Makefile.am index fe8e575..b177e3f 100644 --- a/maildir/Makefile.am +++ b/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/maildir/maildirfilter.c b/maildir/maildirfilter.c index 96b2b80..a04ba0d 100644 --- a/maildir/maildirfilter.c +++ b/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/maildir/maildirinfo.c b/maildir/maildirinfo.c index 3762cb6..95f3837 100644 --- a/maildir/maildirinfo.c +++ b/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/maildir/maildirmake.c b/maildir/maildirmake.c index 5173e25..a106894 100644 --- a/maildir/maildirmake.c +++ b/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/maildir/maildirsearch.h b/maildir/maildirsearch.h index cb50a14..b134c6d 100644 --- a/maildir/maildirsearch.h +++ b/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/maildrop/Makefile.am b/maildrop/Makefile.am index 6486109..cd0434e 100644 --- a/maildrop/Makefile.am +++ b/maildrop/Makefile.am @@ -30,7 +30,7 @@ libmdcommon_la_LIBADD=../maildir/libmaildir.la \ ../rfc2045/librfc2045.la \ ../rfc822/librfc822.la \ ../numlib/libnumlib.la ../liblock/liblock.la \ - $(DBLIB) -lunicode + $(DBLIB) -lcourier-unicode libmdcommon_la_LDFLAGS=-static @@ -62,7 +62,7 @@ mailbot_DEPENDENCIES=../rfc2045/librfc2045.la ../maildir/libmaildir.la \ ../numlib/libnumlib.la $(DBLIB) mailbot_LDADD=../rfc2045/librfc2045.la ../maildir/libmaildir.la \ ../rfc822/librfc822.la ../liblock/liblock.la \ - ../numlib/libnumlib.la $(DBLIB) -lunicode + ../numlib/libnumlib.la $(DBLIB) -lcourier-unicode mailbot_LDFLAGS = -static if HAVE_LIBIDN diff --git a/maildrop/mailbot.c b/maildrop/mailbot.c index 0c41cec..f87d867 100644 --- a/maildrop/mailbot.c +++ b/maildrop/mailbot.c @@ -8,7 +8,7 @@ #include "liblock/config.h" #include "liblock/liblock.h" #include "maildir/maildirmisc.h" -#include <unicode.h> +#include <courier-unicode.h> #include "numlib/numlib.h" #include <string.h> #include <stdlib.h> diff --git a/pcp/Makefile.am b/pcp/Makefile.am index d2f6a60..5df0aa7 100644 --- a/pcp/Makefile.am +++ b/pcp/Makefile.am @@ -28,7 +28,7 @@ pcp_SOURCES=pcp.c pcp_DEPENDENCIES=libpcp.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \ ../numlib/libnumlib.la -pcp_LDADD=$(pcp_DEPENDENCIES) -lunicode @LIBINTL@ @EFENCE@ @NETLIBS@ +pcp_LDADD=$(pcp_DEPENDENCIES) -lcourier-unicode @LIBINTL@ @EFENCE@ @NETLIBS@ pcpd_SOURCES=pcpd.c pcpdauth.c pcpdauth.h pcpdauthme.c pcpdauthtoken.c \ pcpdauthtoken.h pcpdtimer.c pcpdtimer.h @@ -41,7 +41,7 @@ COMMONLIBS=libpcp.la ../maildir/libmaildir.la \ ../liblock/liblock.la pcpd_DEPENDENCIES=$(COMMONLIBS) -pcpd_LDADD=$(COMMONLIBS) @LDAUTH@ -lunicode -lcourierauth @LIBINTL@ @EFENCE@ @NETLIBS@ +pcpd_LDADD=$(COMMONLIBS) @LDAUTH@ -lcourier-unicode -lcourierauth @LIBINTL@ @EFENCE@ @NETLIBS@ calendardir.h: config.status echo '#define CALENDARDIR "$(calendardir)"' >calendardir.h @@ -29,7 +29,7 @@ #include <rfc822/rfc822hdr.h> #include <rfc2045/rfc2045.h> #include <rfc2045/rfc2045charset.h> -#include <unicode.h> +#include <courier-unicode.h> #include <numlib/numlib.h> #define PCP_ERRMSG(s) gettext(s) diff --git a/rfc2045/Makefile.am b/rfc2045/Makefile.am index bb17b4c..22b15a3 100644 --- a/rfc2045/Makefile.am +++ b/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/rfc2045/reformime.c b/rfc2045/reformime.c index b5ed474..8fb311c 100644 --- a/rfc2045/reformime.c +++ b/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/rfc2045/rfc2045decodemimesectionu.c b/rfc2045/rfc2045decodemimesectionu.c index 1fc9e74..e94188f 100644 --- a/rfc2045/rfc2045decodemimesectionu.c +++ b/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/rfc2045/rfc2045reply.c b/rfc2045/rfc2045reply.c index 28726dc..52d7b71 100644 --- a/rfc2045/rfc2045reply.c +++ b/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/rfc2045/rfc2231.c b/rfc2045/rfc2231.c index 22c0c50..c3aefcb 100644 --- a/rfc2045/rfc2231.c +++ b/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/rfc2045/rfc3676parser.h b/rfc2045/rfc3676parser.h index 95811b5..3890983 100644 --- a/rfc2045/rfc3676parser.h +++ b/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/rfc822/ChangeLog b/rfc822/ChangeLog index 6dc142a..0145335 100644 --- a/rfc822/ChangeLog +++ b/rfc822/ChangeLog @@ -1,3 +1,7 @@ +2015-02-28 Sam Varshavchik <mrsam@courier-mta.com> + + * Update to courier-unicode 1.2. + 2013-02-20 Sam Varshavchik <mrsam@courier-mta.com> * rfc2047.c, rfc2047u.c: workaround for invalid utf-8 input making @@ -173,7 +177,7 @@ (rfc2047_encode_callback): New argument: qp_allow - function that indicates acceptable characters in QP-encoded words. (rfc2047_encode_str): Ditto. - (rfc2047_qp_allow_any, rfc2047_qp_allow_comment) + (rfc2047_qp_allow_any, rfc2047_qp_allow_comment) (rfc2047_qp_allow_word): Possible arguments to qp_allow for various situations. diff --git a/rfc822/Makefile.am b/rfc822/Makefile.am index ec41e4c..931c3c9 100644 --- a/rfc822/Makefile.am +++ b/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/rfc822/encodeautodetect.c b/rfc822/encodeautodetect.c index 194c91b..86cffaa 100644 --- a/rfc822/encodeautodetect.c +++ b/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/rfc822/rfc2047.c b/rfc822/rfc2047.c index 872c557..2c18c50 100644 --- a/rfc822/rfc2047.c +++ b/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/rfc822/rfc2047u.c b/rfc822/rfc2047u.c index dc2244e..9966faf 100644 --- a/rfc822/rfc2047u.c +++ b/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" diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog index 74b38fd..5769d82 100644 --- a/sqwebmail/ChangeLog +++ b/sqwebmail/ChangeLog @@ -1,3 +1,7 @@ +2015-02-28 Sam Varshavchik <mrsam@courier-mta.com> + + * Update to courier-unicode 1.2. + 5.8.0 2014-12-13 Sam Varshavchik <mrsam@courier-mta.com> @@ -580,7 +584,7 @@ * rfc2045/rfc2045decodemsgtoutf8.c (rfc2045_decodemsgtoutf8): Add a pass-through opaque pointer, closure. - * rfc2045/rfc2045decodemimesectionu.c (rfc2045_decodetextmimesection): + * rfc2045/rfc2045decodemimesectionu.c (rfc2045_decodetextmimesection): Total rewrite that uses iconv, rather the built-in libunicode. * images/sqwebmail.css: Additional style sheets for search results @@ -953,7 +957,7 @@ * gpglib/gpg.c: Fix signing of multipart messages that contain 8 bit content. - * configure.in: Updated PAM file for Fedora 7. + * configure.in: Updated PAM file for Fedora 7. 5.1.6 @@ -1077,7 +1081,7 @@ * folder.c (folder_list): Forbit rename folder if new folder name contains a dot. - * mailfilter.c (mailfilter_submit): Quietly prune trailing ':' from + * mailfilter.c (mailfilter_submit): Quietly prune trailing ':' from the tail end of a header name. 2006-09-05 Pawel Tecza <p.tecza@net.icm.edu.pl> @@ -1120,7 +1124,7 @@ 2006-07-11 Mr. Sam <mrsam@courier-mta.com> - * sqwebmaild.spec: Improved RH/Fedora initscript + * sqwebmaild.spec: Improved RH/Fedora initscript 2006-07-11 Pawel Tecza <p.tecza@net.icm.edu.pl> @@ -1128,11 +1132,11 @@ 2006-07-09 Mr. Sam <mrsam@courier-mta.com> - * images/sqwebmail.css: tweak background colors of quoted text. + * images/sqwebmail.css: tweak background colors of quoted text. 2006-07-07 Peter Bieringer <pb@bieringer.de> - * images/sqwebmail.css: some stylsheet tweaks, and other fixes. + * images/sqwebmail.css: some stylsheet tweaks, and other fixes. 2006-07-07 Marcin Semeniuk <m.semeniuk@net.icm.edu.pl> @@ -1210,7 +1214,7 @@ 2006-05-12 Pawel Tecza <p.tecza@net.icm.edu.pl> - * mailfilter: Implemented "Purge" option. + * mailfilter: Implemented "Purge" option. 2006-05-03 Mr. Sam <mrsam@courier-mta.com> @@ -1220,7 +1224,7 @@ * webmail: miscellaneous small i18n fixes. -2006-05-02 +2006-05-02 * configure.in: --enable-minnpasslen configure option. @@ -1238,7 +1242,7 @@ 2006-03-27 Alessandro Vesely <vesely@tana.it> - * ldapaddressbook: Fix compilation on Solaris with LDAP + * ldapaddressbook: Fix compilation on Solaris with LDAP 2006-03-25 "Serhij Dubyk / Сергій Дубик" <dubyk@library.lviv.ua> @@ -1338,7 +1342,7 @@ * ldapaddressbook/abookread.c: the dropped LDAP address book params are set to empty strings; the format of the address book configuration file has not changed. - + * ldapaddressbook/configure.in: "undocumented" backdoor: --without-ldapaddressbook disables the LDAP address book wrapper. @@ -1358,7 +1362,7 @@ * pcp/pcpd.c: Fix gcc4 compiler warning. - * pcp/pcpdir.c: Ditto. + * pcp/pcpdir.c: Ditto. * rfc822/rfc2047.c (encodebase64): Ditto. @@ -1569,7 +1573,7 @@ 2004-11-03 Mr. Sam <mrsam@courier-mta.com> - * Makefile.am (SUBDIRS): Ok, only build in bdbobj/gdbmobj according + * Makefile.am (SUBDIRS): Ok, only build in bdbobj/gdbmobj according to what autoconf finds. 2004-11-03 Brian Candler <B.Candler@pobox.com> @@ -1749,7 +1753,7 @@ 2004-05-03 Mr. Sam <mrsam@courier-mta.com> - * sqwebmaild.rc.in: Fix PCP start script. + * sqwebmaild.rc.in: Fix PCP start script. 2004-05-01 Brian Candler <B.Candler@pobox.com> @@ -1813,7 +1817,7 @@ (rfc2047_encode_callback): New argument: qp_allow - function that indicates acceptable characters in QP-encoded words. (rfc2047_encode_str): Ditto. - (rfc2047_qp_allow_any, rfc2047_qp_allow_comment) + (rfc2047_qp_allow_any, rfc2047_qp_allow_comment) (rfc2047_qp_allow_word): Possible arguments to qp_allow for various situations. @@ -2000,19 +2004,19 @@ 2004-02-01 IKEDA Soji <nezumi@jca.apc.org> * iso2022jp.pl / iso2022jp.h: JIS X 0208 mapping has been updated - based on latest regional standard (JIS X 0208:1997) and some vendor + based on latest regional standard (JIS X 0208:1997) and some vendor standards. Errorneous (lacking or false) mappings has been fixed. Support for older JIS X 0208 (JIS C 6226:1978) mapping was added. JIS X 0212:1990 mapping was added. - * iso2022jp.c: Converters became (upper-)compatible with ISO-2022-JP + * iso2022jp.c: Converters became (upper-)compatible with ISO-2022-JP (RFC1468 / JIS X 0208:1997 Annex 2) and ISO-2022-JP-1 (RFC2237). - Buffer overflow vulnerability (when Unicode character is out + Buffer overflow vulnerability (when Unicode character is out of BMP range) has been closed. Convert error handling was implemented. - * shiftjis.c: Broken SHIFT_JIS converters has been fixed and became + * shiftjis.c: Broken SHIFT_JIS converters has been fixed and became (upper-)compatible with Shifted Encoding Method (JIS X 0208:1997 - Annex 1). Buffer overflow vulnerability (when Unicode character is out + Annex 1). Buffer overflow vulnerability (when Unicode character is out of BMP range) has been closed. Convert error handling was implemented. * eucjp.c: New converters for EUC-JP. @@ -2054,7 +2058,7 @@ 2004-01-10 Michael Bowe <mbowe@pipeline.com.au> * authvchkpw update. - + 2003-12-27 Mr. Sam <mrsam@courier-mta.com> * maildir/maildirmake2.c (maildir_make): Fix memory leak. @@ -2181,7 +2185,7 @@ * authlib: Respect $(EXEEXT) - * libhmac: Respect $(EXEEXT) + * libhmac: Respect $(EXEEXT) * rfc2045/testsuite: Fix enable-mimecharset breaking make check. @@ -2416,7 +2420,7 @@ 2003-06-18 Mr. Sam <mrsam@courier-mta.com> * http11/contentlanguage.c (http11_content_charset): Fix return code - + 2003-06-17 James A Baker <jabaker@mac.com> @@ -2466,7 +2470,7 @@ * folder.c: HTML output cleanup. * sqwebmail.css: cleanup. - + 2003-06-11 Mr. Sam <mrsam@courier-mta.com> * authlib/authldap.schema: Remove duplicate definition of @@ -2478,7 +2482,7 @@ that support utf-8 will receive all content in utf-8. Supress charset conversion warning for utf-8 browsers. - * http11/contentlanguage.c (http11_content_charset): Allow a + * http11/contentlanguage.c (http11_content_charset): Allow a comma-separated list in {templatedir}/CHARSET, select the first charset found in the Accept-Charset: HTTP header. @@ -2533,7 +2537,7 @@ 2003-05-15 "Hatuka*nezumi \(IKEDA Soji\)" <nezumi@jca.apc.org> * folder.c (truncate_at): take into account double-width chars. - + 2003-05-15 Mr. Sam <mrsam@courier-mta.com> * folder.c (truncate_at): use wcwidth(), if available. @@ -2544,7 +2548,7 @@ an EISDIR, even though we should <sigh>... 2003-05-14 Stefan Hornburg <racke@linuxia.de> - + * userdb/makeuserdb.sgml: Fix command names. 2003-05-14 Mr. Sam <mrsam@courier-mta.com> @@ -2695,7 +2699,7 @@ newline. * configure.in: Conditionally probe if SA_NOCLDWAIT could be used. - + * pcpd.c (start): Use SA_NOCLDWAIT, if blessed by configure. 2003-02-22 Toshikazu Ichikawa <ichikawa@toshikazu.org> @@ -2865,7 +2869,7 @@ DEBUG_LOGIN_ENV is not set. 2002-10-14 Olivier Girondel <olivier.girondel@cw.com> - + * authlib/authldaplib.c (authldap_read_config): LDAP_FILTER fix. 2002-10-07 Mr. Sam <mrsam@courier-mta.com> @@ -2965,7 +2969,7 @@ * pcp: Refreshed to gettext 0.11.1-2 3.3.6 - + 2002-06-27 Mr. Sam <mrsam@courier-mta.com> * authlib/authldaplib.c: Fix null ptr deref in new LDAP_MAILROOT @@ -3077,14 +3081,14 @@ 2002-05-07 Keith T. Garner <kgarner@kgarner.com> - * authlib: Additional LDAP authentication filter. + * authlib: Additional LDAP authentication filter. 2002-05-07 John Morrissey <jwm@horde.net> * authlib: Solaris LDAP fix. 3.3.4 - + 2002-05-01 Mr. Sam <mrsam@courier-mta.com> * pcp.c (createcache): Get rid of a spurious error message. @@ -3271,7 +3275,7 @@ is maildirfilter-generated recipe. 3.3 - + 2001-12-30 Mr. Sam <mrsam@courier-mta.com> * pcp/pcpnet.c (bookevent): Fix memory corruption. @@ -3678,7 +3682,7 @@ * liblock/lockdaemon.c: fix several improper tests for failed fopen(). 2.1.0 - + 2001-05-25 Mr. Sam <mrsam@courier-mta.com> * Fix handling of --imageurl to not require a trailing slash. @@ -3736,7 +3740,7 @@ * folder.c (folder_list): block attempt to delete INBOX (which ends up blowing away preferences). Problem noted by gourgen@acc.am. -2001-04-24 "Roland Hänel" <rh@ginko.net> +2001-04-24 "Roland Hänel" <rh@ginko.net> * authlib/authmysql: applied patch to replace the remaining hardcoded mysql table field names with configurable values from @@ -3766,7 +3770,7 @@ * Cosmetic fixes. Replace // with /* */ comments in some .c files and replace return of void datatype with an explicit return. Other misc stuff too. - + 2001-04-11 Mr. Sam <mrsam@courier-mta.com> * userdb/makeuserdb.html.in: Fix some documentation typos. @@ -3786,7 +3790,7 @@ a benign artifact of the parsing logic. * Added /usr/local/bin to AC_PATH macros in all configure.in scripts - + 2001-04-07 Mr. Sam <mrsam@courier-mta.com> * gpglib/mimegpg.c (isgpg): Drop the check for micalg=pgp-sha1 @@ -3923,14 +3927,14 @@ * configure.in (INSTALL_SCRIPT): added sqwebmail-system-auth.pamconf and added a script to set webmail.authpam to either that, or the original sqwebmail.pamconf, if we do not find /etc/pam.d/system-auth - + 2001-01-30 Mr. Sam <mrsam@courier-mta.com> * folder.c (showunknown): Fix misorder of TD & TR tags. 1.2.4 - + 2001-01-27 Mr. Sam <mrsam@courier-mta.com> * pref.c: Add option not to archive sent mail. @@ -3944,7 +3948,7 @@ recursion logic. 1.2.3 - + 2001-01-25 Mr. Sam <mrsam@courier-mta.com> * Added a hook for passing some additional flags to the @@ -3955,7 +3959,7 @@ * Fix big5/gb2312 conversion bug. 1.2.2 - + 2001-01-24 Mr. Sam <mrsam@courier-mta.com> * cgi/cgirelscriptptr.c: Fixed bug in automatic http/https selection @@ -4114,7 +4118,7 @@ Some tweaks to MySQL configuration and detection logic. Some tweaks for the MSIE breakage. - + Added a "custom" authentication module -- a stub that doesn't authenticate anything. It takes care of all the low level details relating to interfacing with the authentication library. Just insert @@ -4201,7 +4205,7 @@ 03/16/2000 - 0.34 Several fixes to allow sqwebmail to be manually installed suid to non-root, as long as all mailboxes are owned by the same uid. --with-maxmsgsize patch (default 2 MB). - + 03/13/2000 - 0.33 MySQL patch. Courier integration. Added LINK to the list of banned HTML tags. Content-Base:/Content-Location support. diff --git a/sqwebmail/Makefile.am b/sqwebmail/Makefile.am index 2840588..8d7b527 100644 --- a/sqwebmail/Makefile.am +++ b/sqwebmail/Makefile.am @@ -39,7 +39,7 @@ COMMONDEPENDENCIES=$(LIBOBJS) ../pcp/libpcp.la ../maildir/libmaildir.la \ ../random128/librandom128.la ../md5/libmd5.la \ ../numlib/libnumlib.la \ @dblibrary@ -COMMONLDADD=$(COMMONDEPENDENCIES) `cat ../pcp/pcp.libs` -lunicode +COMMONLDADD=$(COMMONDEPENDENCIES) `cat ../pcp/pcp.libs` -lcourier-unicode noinst_LTLIBRARIES=libwebmail.la diff --git a/sqwebmail/acl.c b/sqwebmail/acl.c index 8c89d98..7de93bb 100644 --- a/sqwebmail/acl.c +++ b/sqwebmail/acl.c @@ -56,7 +56,7 @@ #include <utime.h> #endif -#include <unicode.h> +#include <courier-unicode.h> #include "strftime.h" diff --git a/sqwebmail/attachments.c b/sqwebmail/attachments.c index 92a6787..5318f55 100644 --- a/sqwebmail/attachments.c +++ b/sqwebmail/attachments.c @@ -45,7 +45,7 @@ #include "maildir/maildirmisc.h" #include "htmllibdir.h" -#include <unicode.h> +#include <courier-unicode.h> extern char *newmsg_alladdrs(FILE *); extern void newmsg_copy_content_headers(FILE *fp); diff --git a/sqwebmail/auth.c b/sqwebmail/auth.c index 1c37a04..3030e77 100644 --- a/sqwebmail/auth.c +++ b/sqwebmail/auth.c @@ -39,7 +39,7 @@ extern int check_sqwebpass(const char *); extern char *sqwebmail_content_charset, *sqwebmail_system_charset; -#include <unicode.h> +#include <courier-unicode.h> const char *myhostname() { diff --git a/sqwebmail/autoresponse.c b/sqwebmail/autoresponse.c index e5fdfee..447355c 100644 --- a/sqwebmail/autoresponse.c +++ b/sqwebmail/autoresponse.c @@ -10,7 +10,7 @@ #include "autoresponse.h" #include "maildir/autoresponse.h" #include "mailfilter.h" -#include <unicode.h> +#include <courier-unicode.h> #include "sqwebmail.h" #include "htmllibdir.h" #include "maildir.h" diff --git a/sqwebmail/filter.h b/sqwebmail/filter.h index 2a90e6c..df7e810 100644 --- a/sqwebmail/filter.h +++ b/sqwebmail/filter.h @@ -39,7 +39,7 @@ #include <stdlib.h> -#include <unicode.h> +#include <courier-unicode.h> struct filter_info { unicode_convert_handle_t handle; diff --git a/sqwebmail/folder.c b/sqwebmail/folder.c index 04af2cb..c36c35a 100644 --- a/sqwebmail/folder.c +++ b/sqwebmail/folder.c @@ -68,7 +68,7 @@ #endif #include <errno.h> -#include <unicode.h> +#include <courier-unicode.h> #include <unistd.h> #if HAVE_WCHAR_H diff --git a/sqwebmail/gpg.c b/sqwebmail/gpg.c index 60a325b..fc28952 100644 --- a/sqwebmail/gpg.c +++ b/sqwebmail/gpg.c @@ -12,7 +12,7 @@ #include "pref.h" #include "cgi/cgi.h" #include "gpglib/gpglib.h" -#include <unicode.h> +#include <courier-unicode.h> #include "numlib/numlib.h" #include "rfc822/rfc822.h" #include "htmllibdir.h" diff --git a/sqwebmail/html.c b/sqwebmail/html.c index f9d91e1..0e381c1 100644 --- a/sqwebmail/html.c +++ b/sqwebmail/html.c @@ -8,7 +8,7 @@ #include "html.h" -#include <unicode.h> +#include <courier-unicode.h> #include "rfc2045/rfc2045.h" #include <stdlib.h> #include <string.h> diff --git a/sqwebmail/html.h b/sqwebmail/html.h index 2d10a68..c8d25fa 100644 --- a/sqwebmail/html.h +++ b/sqwebmail/html.h @@ -3,7 +3,7 @@ #ifndef html_h #define html_h -#include <unicode.h> +#include <courier-unicode.h> /* ** Copyright 2011 Double Precision, Inc. See COPYING for diff --git a/sqwebmail/ldaplist.c b/sqwebmail/ldaplist.c index 9bc5f6a..904bd6f 100644 --- a/sqwebmail/ldaplist.c +++ b/sqwebmail/ldaplist.c @@ -35,7 +35,7 @@ extern void output_attrencoded_oknl_fp(const char *, FILE *); extern const char *sqwebmail_content_charset; -#include <unicode.h> +#include <courier-unicode.h> void ldaplist() { diff --git a/sqwebmail/maildir.c b/sqwebmail/maildir.c index 5c6a016..b822697 100644 --- a/sqwebmail/maildir.c +++ b/sqwebmail/maildir.c @@ -62,7 +62,7 @@ #include <utime.h> #endif -#include <unicode.h> +#include <courier-unicode.h> #include "strftime.h" diff --git a/sqwebmail/msg2html.c b/sqwebmail/msg2html.c index 4aa9eea..f5b703b 100644 --- a/sqwebmail/msg2html.c +++ b/sqwebmail/msg2html.c @@ -9,7 +9,7 @@ #include "msg2html.h" #include "buf.h" -#include <unicode.h> +#include <courier-unicode.h> #include "numlib/numlib.h" #include "gpglib/gpglib.h" #include "cgi/cgi.h" diff --git a/sqwebmail/newmsg.c b/sqwebmail/newmsg.c index 8fdb7ce..58676be 100644 --- a/sqwebmail/newmsg.c +++ b/sqwebmail/newmsg.c @@ -42,7 +42,7 @@ #endif #include <errno.h> #include "htmllibdir.h" -#include <unicode.h> +#include <courier-unicode.h> extern const char *sqwebmail_content_charset; extern int spell_start(const char *); diff --git a/sqwebmail/newmsg.h b/sqwebmail/newmsg.h index 8666f37..b86742a 100644 --- a/sqwebmail/newmsg.h +++ b/sqwebmail/newmsg.h @@ -8,7 +8,7 @@ #undef VERSION #include "config.h" #endif -#include <unicode.h> +#include <courier-unicode.h> /* ** Copyright 1998 - 2011 Double Precision, Inc. See COPYING for ** distribution information. diff --git a/sqwebmail/newmsg_create.c b/sqwebmail/newmsg_create.c index e4e4382..1fb712f 100644 --- a/sqwebmail/newmsg_create.c +++ b/sqwebmail/newmsg_create.c @@ -28,7 +28,7 @@ #include "gpglib/gpglib.h" #include "http11/http11.h" #include "htmllibdir.h" -#include <unicode.h> +#include <courier-unicode.h> #include "courierauth.h" #include <stdlib.h> diff --git a/sqwebmail/strftime.c b/sqwebmail/strftime.c index 20cb6e2..1ad0d6b 100644 --- a/sqwebmail/strftime.c +++ b/sqwebmail/strftime.c @@ -4,7 +4,7 @@ #include <string.h> #include <time.h> #include "sqwebmail.h" -#include <unicode.h> +#include <courier-unicode.h> extern const char *sqwebmail_system_charset; extern const char *sqwebmail_content_charset; |