Hi,
here is another update to all courier stuff, I added authsqlite to main package
because there are no additional dependencies, atm I am running with this diffs
in production (mysql backend).
Comments ? Ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 23 Dec 2012 12:25:31 -0000 1.31
+++ Makefile 14 Jan 2013 15:16:46 -0000
@@ -6,9 +6,7 @@ COMMENT-mysql= mysql authentication mod
COMMENT-pgsql= pgsql authentication module for courier-authLib
COMMENT-userdb= userdb authentication module for courier-authLib
-DISTNAME= courier-authlib-0.64.0
-REVISION-ldap= 0
-REVISION-pgsql= 0
+DISTNAME= courier-authlib-0.65.0
PKGNAME-main= ${DISTNAME}
PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
@@ -25,6 +23,7 @@ SHARED_LIBS += authpgsql 0.0
SHARED_LIBS += authldap 1.0 # .0.0
SHARED_LIBS += authmysql 0.0 # .0.0
SHARED_LIBS += authpipe 0.0 # .0.0
+SHARED_LIBS += authsqlite 0.0 # .0.0
CATEGORIES= mail security
HOMEPAGE= http://www.courier-mta.org/authlib/
@@ -40,7 +39,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
-USE_GMAKE= Yes
+USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
@@ -97,7 +96,8 @@ WANTLIB-pgsql= m courierauthcommon cour
LIB_DEPENDS-pgsql= ${BUILD_PKGPATH} \
databases/postgresql
-WANTLIB-userdb= c courierauthcommon courierauth gdbm>=3
+WANTLIB-userdb= c courierauthcommon courierauth gdbm>=3 iconv intl
+MODULES-userdb= textproc/intltool
LIB_DEPENDS-userdb= ${BUILD_PKGPATH} \
databases/gdbm
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 18 Oct 2012 08:04:01 -0000 1.5
+++ distinfo 14 Jan 2013 15:16:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-authlib-0.64.0.tar.bz2) = aUl9/o1BEEVswxJjUNvOvX5Bq3hQXFd5Pflu0/t5UDk=
-SIZE (courier-authlib-0.64.0.tar.bz2) = 2267236
+SHA256 (courier-authlib-0.65.0.tar.bz2) = 2z407isHWJeGTESqrpJDiMdLMu1AuD8Pz4YmoGDB6kc=
+SIZE (courier-authlib-0.65.0.tar.bz2) = 2303751
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 18 Oct 2012 08:04:01 -0000 1.2
+++ patches/patch-Makefile_in 14 Jan 2013 15:16:46 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2012/10/18 08:04:01 giovanni Exp $
---- Makefile.in.orig Sat Apr 28 15:21:54 2012
-+++ Makefile.in Fri Sep 7 14:34:02 2012
-@@ -516,7 +516,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h
+--- Makefile.in.orig Sun Oct 7 01:58:44 2012
++++ Makefile.in Mon Jan 14 15:45:03 2013
+@@ -561,7 +561,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authsqliterc.h
DISTCLEANFILES = dbobj.config README_authlib.html
commonlibdep = libcourierauthcommon.la
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/1
commonlibadd = libcourierauthcommon.la
libcourierauthcommon_t = @CRYPTLIBS@
libcourierauthcommon_la_SOURCES = \
-@@ -532,7 +532,7 @@ libcourierauthcommon_la_SOURCES = \
+@@ -578,7 +578,7 @@ libcourierauthcommon_la_SOURCES = \
libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
libcourierauthcommon_la_LIBADD = libcourierauth.la
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/1
libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
authmoduser2.c authmoduser3.c debug.c \
courierauthdebug.h \
-@@ -541,7 +541,7 @@ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib
+@@ -587,7 +587,7 @@ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib
libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
random128/librandom128.la rfc822/libencode.la
@@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/1
# The userdb module
libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
-@@ -634,7 +634,7 @@ libcourierauthsasl_la_SOURCES = \
+@@ -687,7 +687,7 @@ libcourierauthsasl_la_SOURCES = \
authsaslfrombase64.c authsasltobase64.c
libcourierauthsasl_la_LIBADD = libcourierauth.la
@@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/1
libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
authsaslclient.c authsaslclient.h authsaslclientcram.c \
authsaslclientcrammd5.c authsaslclientcramsha1.c \
-@@ -643,7 +643,7 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
+@@ -696,7 +696,7 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
authsaslfrombase64.c authsasltobase64.c
libcourierauthsaslclient_la_LIBADD = libcourierauth.la
@@ -46,15 +46,15 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/1
include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
-@@ -1839,7 +1839,6 @@ install-exec-hook:
+@@ -1954,7 +1954,6 @@ install-exec-hook:
$(DESTDIR)$(sbindir)/userdbpw ; \
$(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
$(DESTDIR)$(sbindir)/userdb-test-cram-md5
- for f in $(pkglib_LTLIBRARIES); do . ./$$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
- uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
+ uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc
rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
-@@ -1850,7 +1849,6 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae
+@@ -1965,7 +1964,6 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae
$(DESTDIR)$(sbindir)/userdb \
$(DESTDIR)$(sbindir)/userdbpw \
$(DESTDIR)$(sbindir)/userdb-test-cram-md5
Index: patches/patch-bdbobj_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/patches/patch-bdbobj_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bdbobj_Makefile_in
--- patches/patch-bdbobj_Makefile_in 18 Oct 2012 08:04:01 -0000 1.2
+++ patches/patch-bdbobj_Makefile_in 14 Jan 2013 15:16:46 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-bdbobj_Makefile_in,v 1.2
Removing "-static" from libtool linking flags makes our libtool happy
and doesn't break the testbdb binary
---- bdbobj/Makefile.in.orig Sun Nov 13 02:13:47 2011
-+++ bdbobj/Makefile.in Fri Sep 7 14:34:02 2012
-@@ -72,7 +72,7 @@ am__objects_2 = testbdb.$(OBJEXT)
+--- bdbobj/Makefile.in.orig Wed Oct 3 17:38:13 2012
++++ bdbobj/Makefile.in Mon Jan 14 15:45:03 2013
+@@ -89,7 +89,7 @@ am__objects_2 = testbdb.$(OBJEXT)
testbdb_OBJECTS = $(am_testbdb_OBJECTS)
testbdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 18 Oct 2012 08:04:01 -0000 1.3
+++ patches/patch-configure 14 Jan 2013 15:16:46 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2012/10/18 08:04:01 giovanni Exp $
---- configure.orig Sat Apr 28 15:21:55 2012
-+++ configure Fri Sep 7 14:34:02 2012
-@@ -14918,7 +14918,7 @@ then
+--- configure.orig Sun Oct 7 01:49:46 2012
++++ configure Mon Jan 14 15:45:03 2013
+@@ -15080,7 +15080,7 @@ then
$COURIERCONFIG >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
. ./conftest2.out
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.3 2012/10/
cmailuser="$mailuser"
cmailgroup="$mailgroup"
-@@ -14930,7 +14930,7 @@ then
+@@ -15092,7 +15092,7 @@ then
$bindir/courierauthconfig --configfiles >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
. ./conftest2.out
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PFRAG.shared-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.shared-main
--- pkg/PFRAG.shared-main 25 Nov 2006 20:51:02 -0000 1.1
+++ pkg/PFRAG.shared-main 14 Jan 2013 15:16:47 -0000
@@ -5,3 +5,4 @@
@lib lib/libcourierauthcommon.so.${LIBcourierauthcommon_VERSION}
@lib lib/libcourierauthsasl.so.${LIBcourierauthsasl_VERSION}
@lib lib/libcourierauthsaslclient.so.${LIBcourierauthsaslclient_VERSION}
+@lib lib/libauthsqlite.so.${LIBauthsqlite_VERSION}
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 18 Oct 2012 08:04:01 -0000 1.5
+++ pkg/PLIST-main 14 Jan 2013 15:16:47 -0000
@@ -16,6 +16,8 @@ include/courierauthstaticlist.h
@comment lib/libauthpipe.la
@comment lib/libauthpwd.a
@comment lib/libauthpwd.la
+@comment lib/libauthsqlite.a
+@comment lib/libauthsqlite.la
@comment lib/libcourierauth.a
@comment lib/libcourierauth.la
@comment lib/libcourierauthcommon.a
@@ -56,4 +58,6 @@ share/examples/courier-authlib/
@sample ${SYSCONFDIR}/courier/
share/examples/courier-authlib/authdaemonrc.dist
@sample ${SYSCONFDIR}/courier/authdaemonrc
+share/examples/courier-authlib/authsqliterc.dist
+@sample ${SYSCONFDIR}/courier/authsqliterc
@rcscript ${RCDIR}/courier_authdaemond
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile 18 Oct 2012 08:06:27 -0000 1.85
+++ Makefile 14 Jan 2013 15:26:43 -0000
@@ -3,7 +3,7 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.11.0
+V= 4.12.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
@@ -27,7 +27,7 @@ WANTLIB= c courierauth courierauthsasl
WANTLIB-pop3= c courierauth courierauthsasl idn ${MODGETTEXT_WANTLIB}
USE_GMAKE= Yes
-USE_LIBTOOL= Yes
+USE_LIBTOOL= Yes
USE_GROFF= Yes
CONFIGURE_STYLE= gnu
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 18 Oct 2012 08:06:27 -0000 1.17
+++ distinfo 14 Jan 2013 15:26:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-4.11.0.tar.bz2) = AHinGlQZtFSpqu4X1dSbazsRWjT9r9xti5ZtY1WueJM=
-SIZE (courier-imap-4.11.0.tar.bz2) = 3190857
+SHA256 (courier-imap-4.12.0.tar.bz2) = Oc3iu98GukIX46qpUYEUtOTx64btlhY0WT8sd4cR9IA=
+SIZE (courier-imap-4.12.0.tar.bz2) = 3192751
