Hello Roel, I just grabbed cvs source, and the patch applied clean:
mail2:/usr/src/dbmail# ./grab_latest_cvs Press [Enter] at 'CVS password:' prompt Logging in to :pserver:[EMAIL PROTECTED]:2401/cvsroot-dbmail CVS password: Got latest cvs code - in directory dbmail-20030317 mail2:/usr/src/dbmail# cd dbmail-20030317/ mail2:/usr/src/dbmail/dbmail-20030317# patch -p1 < ../dbmail-autoconf_update+md5+pbsp+unique_id.patch patching file INSTALL patching file Makefile.am patching file Makefile.concept patching file Makefile.in patching file Makefile.mysql patching file Makefile.pgsql patching file acconfig.h patching file acinclude.m4 patching file aclocal.m4 patching file auth.h patching file bounce.c patching file bounce.h patching file build.sh patching file buildtools/Makefile.am patching file buildtools/aclocal.m4 patching file buildtools/confdefs.h patching file buildtools/config.log patching file buildtools/configure patching file buildtools/configure.in patching file buildtools/mkinstalldirs patching file clientinfo.h patching file config.c patching file config.h patching file config.in patching file configure patching file configure.in patching file db.h patching file dbmail.h patching file dbmailtypes.h patching file dbmd5.c patching file dbmd5.h patching file dbmsgbuf.h patching file dbsearch.h patching file dbtest.c patching file debug.c patching file debug.h patching file forward.c patching file forward.h patching file imap4.c patching file imap4.h patching file imapcommands.c patching file imapcommands.h patching file imapd.c patching file imaputil.c patching file imaputil.h patching file injector.c patching file list.c patching file list.h patching file main.c patching file main.h patching file maintenance.c patching file maintenance.h patching file man/dbmail-adduser.1 patching file mbox2dbmail.c patching file md5.c patching file md5.h patching file memblock.c patching file memblock.h patching file mime.c patching file mime.h patching file mini-injector.c patching file misc.c patching file misc.h patching file mysql/Makefile.in patching file mysql/dbauthmysql.c patching file mysql/dbmsgbufmysql.c patching file mysql/dbmysql.c patching file mysql/dbsearchmysql.c patching file pgsql/Makefile.am patching file pgsql/Makefile.in patching file pgsql/dbauthpgsql.c patching file pgsql/dbmsgbufpgsql.c patching file pgsql/dbpgsql.c patching file pgsql/dbsearchpgsql.c patching file pipe.c patching file pipe.h patching file pop3.c patching file pop3.h patching file pop3d.c patching file proctitleutils.c patching file proctitleutils.h patching file quota.c patching file quota.h patching file raw-convert.c patching file rfcmsg.c patching file rfcmsg.h patching file server.c patching file server.h patching file serverchild.c patching file serverchild.h patching file settings.c patching file settings.h patching file smtp-convert.c patching file sql/mysql/create_tables.mysql patching file sql/mysql/create_tables_innoDB.mysql patching file sql/mysql/md5_alter_users.mysql patching file sql/postgresql/create_tables.pgsql patching file sql/postgresql/md5_alter_users.7.3-pgsql patching file sql/postgresql/md5_alter_users.pre_7.3-pgsql patching file sql/postgresql/no-constraint-tables.pgsql patching file sql/postgresql/pop_before_smtp.pgsql patching file sstack.c patching file sstack.h patching file user.c patching file user.h patching file vut2dbmail.c mail2:/usr/src/dbmail/dbmail-20030317# Also, the additional paths Ryan was asking about are included in this patch, so it won't apply clean if they're already included (ie. don't apply the other patch, just this one). Thanks, Jesse ---- Original Message ---- From: Roel Rozendaal - IC&S <[email protected]> To: [email protected] Subject: Re: [Dbmail] autoconf update [PATCH] Sent: Mon, 17 Mar 2003 10:31:54 +0100 > Hi Jesse, > > the patches you send do not apply straight away - could you check them > against current cvs? thanks! > > roel > > > Jesse Norell heeft op vrijdag, 7 maa 2003 om 23:55 (Europe/Amsterdam) > het volgende geschreven: > > > Hello, > > > > Ok, here's that autoconf update + md5 password patch + pbsp > > and unique_id fixes for using multiple dbmail servers. I've > > tested building pgsql and mysql via build.sh and configure > > on i386, and tested pgsql on a Sparc. The only caveat I found > > was that md5 password hashes don't work if you don't link in > > a libcrypt, which is not the default. It'd be nice to make > > autoconf test if your crypt() supports md5 or not and link it > > in if so.. but that's not done. Another idea would be a "migration" > > mode you could turn on so, eg., if you have crypt passwords and > > want to migrate to md5 hashes, it'll happen automatically, but > > I didn't do that either :). And to answer your question, yes, > > both mysql and pgsql have been updated for all functionality. > > > > > > Some notes on the changes for those familiar w/ looking through > > the files: > > > > - aclocal.m4 is automatically generated from acconfig.h > > (when you run aclocal) > > - the old config.h is now dbmail.h, and this actually uses > > automake's config.h - also, all .h and .c files have been > > updated to include "config.h" (if HAVE_CONFIG_H is defined, > > which it is when you run ./configure), so even though most > > of them don't check autoconf-defined values now, they're > > ready for it in the future. > > - both the <endian.h> check and <crypt.h> (for FreeBSD problem) > > are handled by autoconf now. I don't have a FreeBSD box to > > test that, but I don't think there should be a problem. > > - settings.h is gone - it only had one setting, the default > > location of the config file, and that's been more appropriately > > put in dbmail.h, as more than one program need to know that. > > > > This patch is against dbmail 1.1, which was still the same as cvs > > as of this morning. Hollar with questions/problems/etc. > > > > Thanks, > > Jesse > > > > > > ---- Original Message ---- > > From: Eelco van Beek - IC&S <[email protected]> > > To: [email protected] > > Subject: Re: [Dbmail] autoconf update > > Sent: Fri, 7 Mar 2003 21:48:34 +0100 > > > >> Hi Jesse, > >> > >> Thanks for all your work. :) > >> Did you made the changes regarding the pbdp in all the driver files? > >> Could you add them to your next email? > >> > >> Thanks, > >> > >> Eelco > >> > >> On vrijdag, maa 7, 2003, at 19:13 Europe/Amsterdam, Jesse Norell > >> wrote: > >> > >>> > >>> Hello, > >>> > >>> Keep hitting enter on the Subject line, and firing off blank > >>> emails... sorry. > >>> > >>> I'm about to post an update to the autoconf setup which handles > >>> the endian.h check and FreeBSD's lack of crypt.h via the configure > >>> script, as well as a few misc. fixes. Ryan looked over it and > >>> thought > >>> it looked good. Was wondering (from Eelco/Roel) if you 'd want to > >>> include the md5 hash support in it or leave that seperate (in which > >>> case I'll have to generate yet another patch for it...). Also, I've > >>> got patches updated which make pbsp use the database server's time > >>> rather than the pop3/imap server (for using multiple dbmail servers > >>> off one database), and makes the unique_id more unique (there were > >>> major problems using simultaneous dbmail servers to one database). > >>> Would you want them included as well? > >>> > >>> Jesse > >>> > >>> > >>> -- > >>> Jesse Norell > >>> [EMAIL PROTECTED] > >>> _______________________________________________ > >>> Dbmail mailing list > >>> [email protected] > >>> https://mailman.fastxs.nl/mailman/listinfo/dbmail > >>> > >> _________________________ > >> E.J.A. van Beek > >> ICT Manager > >> IC&S > >> T: +31 30 2322878 > >> F: +31 30 2322305 > >> > >> PGP-key: > >> www.ic-s.nl/keys/eelco.txt > >> > >> _______________________________________________ > >> Dbmail mailing list > >> [email protected] > >> https://mailman.fastxs.nl/mailman/listinfo/dbmail > >> > > -- End Original Message -- > > > > > > -- > > Jesse Norell > > [EMAIL PROTECTED] > > <dbmail-autoconf_update+md5+pbsp+unique_id.patch> > > _________________________ > R.A. Rozendaal > ICT Manager > IC&S > T: +31 30 2322878 > F: +31 30 2322305 > www.ic-s.nl > > _______________________________________________ > Dbmail mailing list > [email protected] > https://mailman.fastxs.nl/mailman/listinfo/dbmail > -- End Original Message -- -- Jesse Norell jesse (at) kci.net
