Here is an updated patch, enjoy. Dan Weber Dan Weber wrote:
Ilja Booij wrote:Let me update my my libtool patches first,. I want to make sure we can get a large group of people testing it.Hi all,I'd like to release a new Release Candidate. Is anyone opposed to that idea? I know there are some people who still have some difficulties, and there are still some issues regarding bouncing when a user is over quotum, but other than that I can't think of any reasons not to make another release candidate.Does anybody object to this?Dan WeberIlja _______________________________________________ Dbmail-dev mailing list Dbmail-dev@dbmail.org http://twister.fastxs.net/mailman/listinfo/dbmail-dev------------------------------------------------------------------------ _______________________________________________ Dbmail-dev mailing list Dbmail-dev@dbmail.org http://twister.fastxs.net/mailman/listinfo/dbmail-dev
#! /bin/sh -e ## 09_libtool_dbmaillib.dpatch by <[EMAIL PROTECTED]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 exit 1 fi [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" case "$1" in -patch) patch -p1 ${patch_opts} < $0;; -unpatch) patch -R -p1 ${patch_opts} < $0;; *) echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 exit 1;; esac exit 0 @DPATCH@ diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/acinclude.m4 dbmail-2.0-cvs20040527/acinclude.m4 --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/acinclude.m4 2004-03-01 05:48:06.000000000 -0500 +++ dbmail-2.0-cvs20040527/acinclude.m4 2004-05-27 17:23:52.000000000 -0400 @@ -203,7 +203,8 @@ AC_MSG_RESULT([$MYSQLINC]) AC_MSG_CHECKING([MySQL libraries]) SQLLIB=`${mysqlconfig} --libs` - SQLALIB="mysql/libmysqldbmail.a" + SQLALIB="mysql/.libs/libmysqldbmail.a" + SQLLTLIB="mysql/libmysqldbmail.la" AC_MSG_RESULT([$SQLLIB]) fi else @@ -221,7 +222,8 @@ AC_MSG_CHECKING([PostgreSQL libraries]) PGLIBDIR=`${pgsqlconfig} --libdir` SQLLIB="-L$PGLIBDIR -lpq" - SQLALIB="pgsql/libpgsqldbmail.a" + SQLALIB="pgsql/.libs/libpgsqldbmail.a" + SQLLTLIB="pgsql/libpgsqldbmail.la" AC_MSG_RESULT([$SQLLIB]) fi fi @@ -234,7 +236,8 @@ AC_ARG_WITH(sieve,[ --with-sieve=PATH full path to libSieve header directory], sieveheadername="$withval$") dnl This always needs to be defined -SORTALIB="sort/libsortdbmail.a" +SORTALIB="sort/.libs/libsortdbmail.a" +SORTLTLIB="sort/libsortdbmail.la" WARN=0 if test ! "${sieveheadername-x}" = "x" @@ -309,7 +312,8 @@ AC_ARG_WITH(auth-ldap,[ --with-auth-ldap=PATH full path to ldap header directory], authldapheadername="$withval$") dnl This always needs to be defined -AUTHALIB="auth/libauthdbmail.a" +AUTHALIB="auth/.libs/libauthdbmail.a" +AUTHLTLIB="auth/libauthdbmail.la" WARN=0 if test ! "${authldapheadername-x}" = "x" diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/auth/Makefile.am dbmail-2.0-cvs20040527/auth/Makefile.am --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/auth/Makefile.am 2004-03-19 11:33:51.000000000 -0500 +++ dbmail-2.0-cvs20040527/auth/Makefile.am 2004-05-27 17:23:52.000000000 -0400 @@ -18,9 +18,9 @@ AM_CFLAGS = -fomit-frame-pointer -lib_LIBRARIES = libauthdbmail.a +pkglib_LTLIBRARIES = libauthdbmail.la if LDAP -libauthdbmail_a_SOURCES = authldap.c +libauthdbmail_la_SOURCES = authldap.c else -libauthdbmail_a_SOURCES = authsql.c +libauthdbmail_la_SOURCES = authsql.c endif diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/configure.in dbmail-2.0-cvs20040527/configure.in --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/configure.in 2004-03-19 11:33:51.000000000 -0500 +++ dbmail-2.0-cvs20040527/configure.in 2004-05-27 17:23:52.000000000 -0400 @@ -23,7 +23,6 @@ AM_INIT_AUTOMAKE(dbmail, 2.0) AM_MAINTAINER_MODE -AC_PROG_RANLIB pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \ /usr/local/include /usr/freeware/include/pgsql \ @@ -33,7 +32,7 @@ ldapheaderpaths="/usr/include /usr/local/include" sieveheaderpaths="/usr/include /usr/local/include" -AC_DEFINE(_GNU_SOURCE) +AC_DEFINE(_GNU_SOURCE,'','Defined GNU SOURCE') DBMAIL_BOTH_SQL_CHECK DBMAIL_CHECK_SQL_LIBS @@ -56,11 +55,18 @@ AC_SUBST(SQLLIB) AC_SUBST(LDAPLIB) AC_SUBST(SQLALIB) +AC_SUBST(SQLLTLIB) AC_SUBST(SORTALIB) +AC_SUBST(SORTLTLIB) AC_SUBST(AUTHALIB) +AC_SUBST(AUTHLTLIB) AC_SUBST(SIEVELIB) AC_SUBST(MYSQLINC) AC_SUBST(PGSQLINC) AC_SUBST(SIEVEINC) AC_SUBST(LDAPINC) + +# libtool patch +AC_PROG_LIBTOOL + AC_OUTPUT(Makefile mysql/Makefile pgsql/Makefile auth/Makefile sort/Makefile) diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/imap4.c dbmail-2.0-cvs20040527/imap4.c --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/imap4.c 2004-05-27 17:23:52.000000000 -0400 +++ dbmail-2.0-cvs20040527/imap4.c 2004-05-27 17:25:05.000000000 -0400 @@ -45,6 +45,7 @@ #define null_free(p) { my_free(p); p = NULL; } + /* cache */ cache_t cached_msg; diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/maintenance.c dbmail-2.0-cvs20040527/maintenance.c --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/maintenance.c 2004-05-26 09:23:39.000000000 -0400 +++ dbmail-2.0-cvs20040527/maintenance.c 2004-05-27 17:25:26.000000000 -0400 @@ -42,6 +42,7 @@ #include <time.h> #include <string.h> + char *configFile = DEFAULT_CONFIG_FILE; /* set up database login data */ diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/Makefile.am dbmail-2.0-cvs20040527/Makefile.am --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/Makefile.am 2004-05-27 17:23:52.000000000 -0400 +++ dbmail-2.0-cvs20040527/Makefile.am 2004-05-27 17:23:52.000000000 -0400 @@ -31,32 +31,36 @@ # CFLAGS AM_CFLAGS = -fomit-frame-pointer -dbmail_smtp_SOURCES = $(COMMON) $(DELIVER) main.c -dbmail_smtp_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_smtp_SOURCES = main.c +dbmail_smtp_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @SIEVELIB@ -dbmail_pop3d_SOURCES = $(COMMON) $(SERVER) pop3.c pop3d.c -dbmail_pop3d_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_pop3d_SOURCES = pop3.c pop3d.c +dbmail_pop3d_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -dbmail_imapd_SOURCES = $(COMMON) $(SERVER) quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c -dbmail_imapd_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_imapd_SOURCES = quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c +dbmail_imapd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ -dbmail_maintenance_SOURCES = $(COMMON) maintenance.c -dbmail_maintenance_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_maintenance_SOURCES = maintenance.c +dbmail_maintenance_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -dbmail_adduser_SOURCES = $(COMMON) user.c -dbmail_adduser_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_adduser_SOURCES = user.c +dbmail_adduser_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -dbmail_readvut_SOURCES = $(COMMON) vut2dbmail.c -dbmail_readvut_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_readvut_SOURCES = vut2dbmail.c +dbmail_readvut_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -dbmail_lmtpd_SOURCES = $(COMMON) $(SERVER) $(DELIVER) lmtp.c lmtpd.c -dbmail_lmtpd_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c +dbmail_lmtpd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ if SIEVE -dbmail_sievecmd_SOURCES = $(COMMON) sievecmd.c -dbmail_sievecmd_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_sievecmd_SOURCES = sievecmd.c +dbmail_sievecmd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -dbmail_timsieved_SOURCES = $(COMMON) $(SERVER) timsieve.c timsieved.c -dbmail_timsieved_LDADD = @SQLALIB@ @SORTALIB@ @AUTHALIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ +dbmail_timsieved_SOURCES = timsieve.c timsieved.c +dbmail_timsieved_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ endif + +lib_LTLIBRARIES = libdbmail.la +libdbmail_la_SOURCES = $(COMMON) $(SERVER) $(DELIVER) +libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/mysql/Makefile.am dbmail-2.0-cvs20040527/mysql/Makefile.am --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/mysql/Makefile.am 2004-03-19 11:33:51.000000000 -0500 +++ dbmail-2.0-cvs20040527/mysql/Makefile.am 2004-05-27 17:23:52.000000000 -0400 @@ -17,9 +17,9 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. if MYSQL -AM_CFLAGS = @MYSQLINC@ -fomit-frame-pointer +AM_CFLAGS = @MYSQLINC@ -fomit-frame-pointer -lib_LIBRARIES = libmysqldbmail.a +pkglib_LTLIBRARIES = libmysqldbmail.la -libmysqldbmail_a_SOURCES = dbmysql.c +libmysqldbmail_la_SOURCES = dbmysql.c endif diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/pgsql/Makefile.am dbmail-2.0-cvs20040527/pgsql/Makefile.am --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/pgsql/Makefile.am 2004-03-19 11:33:51.000000000 -0500 +++ dbmail-2.0-cvs20040527/pgsql/Makefile.am 2004-05-27 17:23:52.000000000 -0400 @@ -19,7 +19,7 @@ AM_CFLAGS = @PGSQLINC@ -fomit-frame-pointer -lib_LIBRARIES = libpgsqldbmail.a +pkglib_LTLIBRARIES = libpgsqldbmail.la -libpgsqldbmail_a_SOURCES = dbpgsql.c +libpgsqldbmail_la_SOURCES = dbpgsql.c endif diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/pop3.c dbmail-2.0-cvs20040527/pop3.c --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/pop3.c 2004-03-19 11:27:38.000000000 -0500 +++ dbmail-2.0-cvs20040527/pop3.c 2004-05-27 17:25:46.000000000 -0400 @@ -54,6 +54,7 @@ extern int pop_before_smtp; + int pop3(void *stream, char *buffer, char *client_ip, PopSession_t * session); diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/sort/Makefile.am dbmail-2.0-cvs20040527/sort/Makefile.am --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/sort/Makefile.am 2004-03-19 11:33:51.000000000 -0500 +++ dbmail-2.0-cvs20040527/sort/Makefile.am 2004-05-27 17:23:52.000000000 -0400 @@ -16,11 +16,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -lib_LIBRARIES = libsortdbmail.a +pkglib_LTLIBRARIES = libsortdbmail.la if SIEVE -libsortdbmail_a_SOURCES = sort.c sortsieve.c +libsortdbmail_la_SOURCES = sort.c sortsieve.c CFLAGS += -DSIEVE else -libsortdbmail_a_SOURCES = sort.c +libsortdbmail_la_SOURCES = sort.c endif diff -urNad /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/user.c dbmail-2.0-cvs20040527/user.c --- /usr/src/dbmail/snapshot/dbmail-2.0-cvs20040527/user.c 2004-05-26 09:23:39.000000000 -0400 +++ dbmail-2.0-cvs20040527/user.c 2004-05-27 17:26:01.000000000 -0400 @@ -43,6 +43,7 @@ #endif #include "dbmd5.h" + char *configFile = DEFAULT_CONFIG_FILE; #define SHADOWFILE "/etc/shadow"
signature.asc
Description: OpenPGP digital signature