Date: Thu, 23 Nov 2006 18:24:40 +0300 (MSK) From: Mark Starovoytov <mark_sf@kikg.ifmo.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105785: [update] mail/dbmail: update to 2.2.1 Message-ID: <200611231524.kANFOeoL037060@kikg.ifmo.ru> Resent-Message-ID: <200611231530.kANFUDgZ004813@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105785 >Category: ports >Synopsis: [update] mail/dbmail: update to 2.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 23 15:30:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Mark Starovoytov >Release: FreeBSD 4.11-STABLE i386 >Organization: >Environment: System: FreeBSD kikg.ifmo.ru 4.11-STABLE FreeBSD 4.11-STABLE #0: Fri Mar 24 01:40:43 MSK 2006 root@:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update dbmail to the latest stable 2.2.1 version. See http://www.dbmail.org/ for more info. >How-To-Repeat: >Fix: --- mail-dbmail_221.diff begins here --- diff -urN /usr/ports/mail/dbmail/Makefile /usr/home/mark/port-updates/dbmail22/Makefile --- /usr/ports/mail/dbmail/Makefile Sun Apr 9 01:02:12 2006 +++ /usr/home/mark/port-updates/dbmail22/Makefile Thu Nov 23 18:07:12 2006 @@ -6,84 +6,130 @@ # PORTNAME= dbmail -PORTVERSION= 2.0.10 +PORTVERSION= 2.2.1 CATEGORIES= mail -MASTER_SITES= http://www.dbmail.org/download/2.0/ -PKGNAMESUFFIX= -${DATABASE} +MASTER_SITES= http://www.dbmail.org/download/2.2/ MAINTAINER= mark_sf@kikg.ifmo.ru COMMENT= An SQL database-based mail system (POP3 and IMAP) +CONFLICTS= dbmail-*-2.0.* dbmail-2.1.* + +OPTIONS= MYSQL "Build with MySQL support" on \ + POSTGRESQL "Build with PostgreSQL support" off \ + SQLITE "Build with SQLite support" off \ + SIEVE "Build w. support for Sieve mail sorting language" off \ + LDAP "Build with support for LDAP authentication" off + +USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= YES CONFIGURE_ARGS= --prefix=${PREFIX} USE_GMAKE= YES -USE_OPENSSL= YES +USE_GCC= 3.2+ +USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh -INSTALLS_SHLIB= yes -CFLAGS += -fPIC +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +LIB_DEPENDS+= gmime-2.0.4:${PORTSDIR}/mail/gmime2 +USE_GNOME= glib20 +USE_OPENSSL= YES +USE_PTHREADS= YES + +CFLAGS+= -fPIC -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -pthread +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} + +PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \ + README.aliases README.exim README.ldap \ + README.postfix README.qmail README.sieve \ + README.smtp README.solaris README.usermap \ + THANKS +MAN1= dbmail-smtp.1 dbmail.1 +MAN5= dbmail.conf.5 +MAN8= dbmail-export.8 dbmail-imapd.8 dbmail-lmtpd.8 \ + dbmail-pop3d.8 dbmail-sievecmd.8 dbmail-timsieved.8 \ + dbmail-users.8 dbmail-util.8 +MANCOMPRESSED= no +MSG_FILE= ${PKGDIR}/pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message + +PLIST_SUB+= PORTNAME=${PORTNAME} +.if defined(NOPORTDOCS) +PLIST_SUB+= PORTDOCS="@comment " +.else +PLIST_SUB+= PORTDOCS="" +.endif + +.include <bsd.port.pre.mk> + +.if defined(WITH_MYSQL) +CONFIGURE_ARGS+=--with-mysql +USE_MYSQL= YES +DATABASE+= mysql +PLIST_SUB+= MYSQL="" +.else +PLIST_SUB+= MYSQL="@comment " +.endif .if defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+= --with-pgsql -USE_PGSQL= yes -DATABASE= postgresql -PLIST_SUB+= PGSQL="" -PLIST_SUB+= MYSQL="@comment " -LDFLAGS+= -L${LOCALBASE}/lib/ +CONFIGURE_ARGS+=--with-pgsql +USE_PGSQL= yes +DATABASE+= postgresql +PLIST_SUB+= PGSQL="" .else -USE_MYSQL= YES -CONFIGURE_ARGS+= --with-mysql -DATABASE= mysql -PLIST_SUB+= MYSQL="" -PLIST_SUB+= PGSQL="@comment " -CFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -.endif - -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} -PORTDOCS= INSTALL README EXTRAS - -MAN1= dbmail-smtp.1 -MAN8= dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \ - dbmail-users.8 dbmail-util.8 -MANCOMPRESSED= no - -pre-everything:: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} " By default dbmail uses MySQL backend database." - @${ECHO} " To build dbmail with PostgreSQL as backend database," - @${ECHO} " define WITH_POSTGRESQL" - @${ECHO} "" +PLIST_SUB+= PGSQL="@comment " +.endif + +.if defined(WITH_SQLITE) +CONFIGURE_ARGS+=--with-sqlite +USE_SQLITE= yes +DATABASE+= sqlite +PLIST_SUB+= SQLITE="" +.else +PLIST_SUB+= SQLITE="@comment " +.endif + +.if defined(WITH_SIEVE) +CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}/include +LIB_DEPENDS+= sieve.1:${PORTSDIR}/mail/libsieve +PLIST_SUB+= SIEVE="" +.else +PLIST_SUB+= SIEVE="@comment " +.endif + +.if defined(WITH_LDAP) +CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include +USE_OPENLDAP= yes +.endif + +.if defined(WITHOUT_MYSQL) && defined(WITHOUT_POSTGRESQL) && defined(WITHOUT_SQLITE) +IGNORE="requires at least one database backend selected. Run 'make config'" +.endif post-patch: @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr - @${FIND} ${WRKSRC} -name '*.orig' -type f -delete + @${FIND} ${WRKSRC} -name *.orig -type f | ${XARGS} ${RM} -fr + ${SED} -e 's|%%DATADIR%%|${DATADIR}|g' \ + ${MSG_FILE} > ${PKGMESSAGE} post-configure: @${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \ - ${WRKSRC}/dbmail.h + ${WRKSRC}/dbmail.h post-install: - ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist - @${MKDIR} ${DATADIR}/sql - ${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql - cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 + @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist + @if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \ + ${CP} -p ${PREFIX}/etc/dbmail.conf-dist ${PREFIX}/etc/dbmail.conf; \ + fi + @${MKDIR} ${DATADIR} + @for f in ${DATABASE}; do \ + ${MKDIR} ${DATADIR}/$$f ; \ + ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \ + done .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif - @${ECHO} "" - @${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!" - @${ECHO} "" - @${ECHO} " *) Don't forget to update the database using a script from" - @${ECHO} " ${DATADIR}/sql/" - @${ECHO} " *) Many programs have been renamed and their arguments changed." - @${ECHO} " *) Read the upgrading notes." - @${ECHO} " *) Don't be careless with this upgrade or mail will be lost!" - @${ECHO} " *) dbmail can be controled by setting dbmail_imapd_enable," - @${ECHO} " dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in" - @${ECHO} " /etc/rc.conf." - @${ECHO} "" + @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -urN /usr/ports/mail/dbmail/distinfo /usr/home/mark/port-updates/dbmail22/distinfo --- /usr/ports/mail/dbmail/distinfo Sun Apr 9 01:02:12 2006 +++ /usr/home/mark/port-updates/dbmail22/distinfo Thu Nov 23 17:47:26 2006 @@ -1,3 +1,3 @@ -MD5 (dbmail-2.0.10.tar.gz) = 985c41a6ded0a6094948c5835d9dd4ec -SHA256 (dbmail-2.0.10.tar.gz) = 249a57d7c163155c7bf2ca758fa1fabc676aa84d3a0d8403e497a8da7ff49716 -SIZE (dbmail-2.0.10.tar.gz) = 632451 +MD5 (dbmail-2.2.1.tar.gz) = 0023c5b55bdd2856ed4ec44c729adfdd +SHA256 (dbmail-2.2.1.tar.gz) = dd783cc7cb344a64a34e73721cfc4d95b0458d5465167ff07a592767e9b02074 +SIZE (dbmail-2.2.1.tar.gz) = 848546 diff -urN /usr/ports/mail/dbmail/pkg-descr /usr/home/mark/port-updates/dbmail22/pkg-descr --- /usr/ports/mail/dbmail/pkg-descr Tue Oct 7 05:17:49 2003 +++ /usr/home/mark/port-updates/dbmail22/pkg-descr Thu Nov 23 17:47:27 2006 @@ -1,22 +1,30 @@ -Dbmail is the name of a group of programs that enable the possiblilty of storing -and retrieving mail messages from a database (currently MySQL or PostgreSQL). +Dbmail is the name of a group of programs that enable the possiblilty +of storing and retrieving mail messages from a database (currently +MySQL, PostgreSQL or SQLite). What are the advantages? * Scalability. - Dbmail is as scalable as the database that is used for the mail storage. + Dbmail is as scalable as the database system that is used for + the mail storage. In theory millions of accounts can be managed + using dbmail. One could, for example, run 4 different servers + with the pop3 daemon each connecting to the same database + (cluster) server. * Manageability. - Dbmail is based upon a database. Dbmail can be managed by changing - settings in the database (f.e. using PHP/Perl/SQL). + Dbmail is based upon a database. Dbmail can be managed by + changing settings in the database (f.e. using PHP/Perl/SQL), + without needing shell access. * Speed. - Dbmail uses very efficient, database specific queries for retrieving mail - information. This is much faster then parsing a filesystem. + Dbmail uses very efficient, database specific queries for + retrieving mail information. This is much faster then parsing + a filesystem. * Security. - Dbmail has got nothing to do with the filesystem or interaction with other - programs in the Unix environment which need special permissions. Dbmail - is as secure as the database it's based upon. + Dbmail has got nothing to do with the filesystem or interaction + with other programs in the Unix environment which need special + permissions. Dbmail is as secure as the database it's based + upon. * Flexibility. - Changes on a Dbmail system (adding of users, changing passwords etc.) are - effective immediately. + Changes on a Dbmail system (adding of users, changing passwords + etc.) are effective immediately. WWW: http://www.dbmail.org/ diff -urN /usr/ports/mail/dbmail/pkg-message /usr/home/mark/port-updates/dbmail22/pkg-message --- /usr/ports/mail/dbmail/pkg-message Thu Jan 1 03:00:00 1970 +++ /usr/home/mark/port-updates/dbmail22/pkg-message Thu Nov 23 17:47:27 2006 @@ -0,0 +1,17 @@ + +NOTE FOR ADMINS UPGRADING FROM 2.0.X -> 2.2.X : + *) Update database using a script + %%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql or + %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql + *) Run `dbmail-util -by' + *) Edit configuration file + `[DBMAIL]' section must have `driver=mysql/pgsql' and + `authdriver=sql/ldap'. + +NOTE FOR ADMINS UPGRADING FROM 2.1.X -> 2.2 : + + *) Update database using a script + %%DATADIR%%/mysql/2_1_7-2_2_0.mysql (if you're using MySQL) + %%DATADIR%%/postgresql/2_1_7-2_2_0.pgsql (PostgreSQL) + %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite (SQLite3) + *) Run `dbmail-util -by' diff -urN /usr/ports/mail/dbmail/pkg-plist /usr/home/mark/port-updates/dbmail22/pkg-plist --- /usr/ports/mail/dbmail/pkg-plist Sun Apr 9 01:02:12 2006 +++ /usr/home/mark/port-updates/dbmail22/pkg-plist Thu Nov 23 17:47:27 2006 @@ -1,36 +1,61 @@ +@unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi etc/dbmail.conf-dist -lib/dbmail/libauthdbmail.so.0 -lib/dbmail/libauthdbmail.a -lib/dbmail/libauthdbmail.la -lib/dbmail/libauthdbmail.so -lib/dbmail/libsortdbmail.so.0 -lib/dbmail/libsortdbmail.a -lib/dbmail/libsortdbmail.la -lib/dbmail/libsortdbmail.so -lib/libdbmail.so.0 -lib/libdbmail.a -lib/libdbmail.la -lib/libdbmail.so -sbin/dbmail-imapd -sbin/dbmail-lmtpd -sbin/dbmail-pop3d +@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi +@exec mkdir -p %D/lib/dbmail +lib/dbmail/libmysql.a +lib/dbmail/libmysql.la +lib/dbmail/libmysql.so +lib/dbmail/libmysql.so.0 +lib/dbmail/libpgsql.a +lib/dbmail/libpgsql.la +lib/dbmail/libpgsql.so +lib/dbmail/libpgsql.so.0 +lib/dbmail/libsqlite.a +lib/dbmail/libsqlite.la +lib/dbmail/libsqlite.so +lib/dbmail/libsqlite.so.0 +lib/dbmail/libsort_sieve.a +lib/dbmail/libsort_sieve.la +lib/dbmail/libsort_sieve.so +lib/dbmail/libsort_sieve.so.0 +lib/dbmail/libauth_sql.a +lib/dbmail/libauth_sql.la +lib/dbmail/libauth_sql.so +lib/dbmail/libauth_sql.so.0 +lib/dbmail/libauth_ldap.a +lib/dbmail/libauth_ldap.la +lib/dbmail/libauth_ldap.so +lib/dbmail/libauth_ldap.so.0 +lib/dbmail/libdbmail.a +lib/dbmail/libdbmail.la +lib/dbmail/libdbmail.so +lib/dbmail/libdbmail.so.0 +@dirrm lib/dbmail sbin/dbmail-smtp -sbin/dbmail-users +sbin/dbmail-pop3d +sbin/dbmail-imapd sbin/dbmail-util -%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql -%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql -%%MYSQL%%lib/dbmail/libmysqldbmail.so.0 -%%MYSQL%%lib/dbmail/libmysqldbmail.a -%%MYSQL%%lib/dbmail/libmysqldbmail.la -%%MYSQL%%lib/dbmail/libmysqldbmail.so -%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql -%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql -%%PGSQL%%lib/dbmail/libpgsqldbmail.so.0 -%%PGSQL%%lib/dbmail/libpgsqldbmail.a -%%PGSQL%%lib/dbmail/libpgsqldbmail.la -%%PGSQL%%lib/dbmail/libpgsqldbmail.so -@dirrm lib/dbmail -@dirrm %%DATADIR%%/sql -@dirrm %%DATADIR%% +sbin/dbmail-users +sbin/dbmail-export +sbin/dbmail-lmtpd +%%SIEVE%%sbin/dbmail-sievecmd +%%SIEVE%%sbin/dbmail-timsieved +@exec mkdir -p %D/share/%%PORTNAME%% +%%MYSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/mysql +%%MYSQL%%share/%%PORTNAME%%/mysql/2_1_7-2_2_0.mysql +%%MYSQL%%share/%%PORTNAME%%/mysql/create_tables.mysql +%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql +%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_2.0_to_2.2.mysql +%%MYSQL%%share/%%PORTNAME%%/mysql/update_headervalue_01.mysql +%%MYSQL%%@dirrm share/%%PORTNAME%%/mysql +%%PGSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/postgresql +%%PGSQL%%share/%%PORTNAME%%/postgresql/2_1_7-2_2_0.pgsql +%%PGSQL%%share/%%PORTNAME%%/postgresql/create_tables.pgsql +%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_1.x_to_2.0.pgsql +%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_2.0_to_2.2.pgsql +%%PGSQL%%@dirrm share/%%PORTNAME%%/postgresql +%%SQLITE%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/sqlite +%%SQLITE%%share/%%PORTNAME%%/sqlite/2_1_7-2_2_0.sqlite +%%SQLITE%%share/%%PORTNAME%%/sqlite/create_tables.sqlite +%%SQLITE%%@dirrm share/%%PORTNAME%%/sqlite +@dirrm share/%%PORTNAME%% --- mail-dbmail_221.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611231524.kANFOeoL037060>