Giovanni Bechis wrote:
Update to latest version of courier software:
authlib, imap/pop server and maildrop.
Better diff for courier-authlib with correct lib bump.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 15 May 2008 14:16:41 -0000 1.9
+++ Makefile 25 Jun 2009 09:21:41 -0000
@@ -6,15 +6,15 @@ 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.58
-PKGNAME-main= ${DISTNAME}p3
-PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}p4
-PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}p2
-PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}p2
-PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}p3
+DISTNAME= courier-authlib-0.62.2
+PKGNAME-main= ${DISTNAME}
+PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
+PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
+PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
+PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
SHARED_LIBS += courierauth 0.0 # .0.0
-SHARED_LIBS += courierauthsasl 0.0 # .0.0
+SHARED_LIBS += courierauthsasl 1.0 # .0.0
SHARED_LIBS += courierauthsaslclient 0.0 # .0.0
SHARED_LIBS += courierauthcommon 0.0 # .0.0
SHARED_LIBS += authuserdb 0.0 # .0.0
@@ -28,7 +28,7 @@ CATEGORIES= mail security
HOMEPAGE= http://www.courier-mta.org/authlib/
MAINTAINER= Marc Balmer <[email protected]>
-# GPL
+# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -76,6 +76,7 @@ FLAVOR?=
PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_userdb
WANTLIB-main= c
+
LIB_DEPENDS-main= ltdl::devel/libtool,-ltdl
WANTLIB-ldap= crypto ssl asn1 com_err gssapi krb5
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Apr 2007 16:20:01 -0000 1.2
+++ distinfo 25 Jun 2009 09:21:41 -0000
@@ -1,5 +1,5 @@
-MD5 (courier-authlib-0.58.tar.bz2) = +2kVWNYRyxka5qgwAvAZWw==
-RMD160 (courier-authlib-0.58.tar.bz2) = ZHRhJJbNKH8pTH9SI56oU8ROSqE=
-SHA1 (courier-authlib-0.58.tar.bz2) = i9qzwuc0zI9HIwkk7GOLo2CakqE=
-SHA256 (courier-authlib-0.58.tar.bz2) =
2HfMbGXpBHHslBDFznr0Z7pb6zkiuc+/K/aqJPa9x60=
-SIZE (courier-authlib-0.58.tar.bz2) = 2006735
+MD5 (courier-authlib-0.62.2.tar.bz2) = i2l0Wxyxka5fdDuHWK0v+Q==
+RMD160 (courier-authlib-0.62.2.tar.bz2) = wPTzKZQFb4A08wBVz+VSONE3oso=
+SHA1 (courier-authlib-0.62.2.tar.bz2) = 3Ela1sVMJxSD1IYuCXiGIdhmKak=
+SHA256 (courier-authlib-0.62.2.tar.bz2) =
jOdW31fH9MCSGf6ccLT35gAqLg+/nec/MEwisxY4fFA=
+SIZE (courier-authlib-0.62.2.tar.bz2) = 2233216
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 25 Jun 2009 09:21:41 -0000
@@ -0,0 +1,64 @@
+$OpenBSD$
+--- Makefile.in.orig Wed Feb 4 00:39:56 2009
++++ Makefile.in Fri Jun 12 19:52:14 2009
+@@ -453,7 +453,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h
+
+ DISTCLEANFILES = dbobj.config README_authlib.html
+ commonlibdep = libcourierauthcommon.la
+-commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex
'courier_auth.*_init' -avoid-version
++commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex
'courier_auth.*_init'
+ commonlibadd = libcourierauthcommon.la
+ libcourierauthcommon_t = @CRYPTLIBS@
+ libcourierauthcommon_la_SOURCES = \
+@@ -468,7 +468,7 @@ libcourierauthcommon_la_SOURCES = \
+
+ libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
+ libcourierauthcommon_la_LIBADD = libcourierauth.la
+-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
-avoid-version
++libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
+ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
+ authmoduser2.c authmoduser3.c debug.c \
+ courierauthdebug.h \
+@@ -477,7 +477,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
+
+-libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
++libcourierauth_la_LDFLAGS = @NETLIBS@
+
+ # The userdb module
+ libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
+@@ -569,7 +569,7 @@ libcourierauthsasl_la_SOURCES = \
+ authsaslfrombase64.c authsasltobase64.c
+
+ libcourierauthsasl_la_LIBADD = libcourierauth.la
+-libcourierauthsasl_la_LDFLAGS = -export-symbols-regex
'^auth_sasl|auth_sasl_ex$$' -avoid-version
++libcourierauthsasl_la_LDFLAGS = -export-symbols-regex
'^auth_sasl|auth_sasl_ex$$'
+ libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
+ authsaslclient.c authsaslclient.h authsaslclientcram.c \
+ authsaslclientcrammd5.c authsaslclientcramsha1.c \
+@@ -578,7 +578,7 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
+ authsaslfrombase64.c authsasltobase64.c
+
+ libcourierauthsaslclient_la_LIBADD = libcourierauth.la
+-libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex
'^auth_sasl_client$$' -avoid-version
++libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex
'^auth_sasl_client$$'
+ include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
+ courierauthsaslclient.h courierauthdebug.h
+
+@@ -1659,7 +1659,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
+ rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
+@@ -1670,7 +1669,6 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae
+ $(DESTDIR)$(sbindir)/userdb \
+ $(DESTDIR)$(sbindir)/userdbpw \
+ $(DESTDIR)$(sbindir)/userdb-test-cram-md5
+- for f in $(pkglib_LTLIBRARIES); do . ./$$f; rm -f
$(DESTDIR)$(pkglibdir)/$$dlname.0; done
+
+ authlib.html: authlib.html.in
+ CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
Index: patches/patch-authldap_h
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/patches/patch-authldap_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-authldap_h
--- patches/patch-authldap_h 25 Jun 2007 12:12:26 -0000 1.2
+++ patches/patch-authldap_h 25 Jun 2009 09:21:41 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-authldap_h,v 1.2 2007/06/25 12:12:26 espie Exp $
--- authldap.h.orig Thu Oct 21 02:10:49 2004
-+++ authldap.h Mon Jun 25 12:56:17 2007
++++ authldap.h Mon May 18 18:21:47 2009
@@ -1,6 +1,8 @@
#ifndef authldap_h
#define authldap_h
@@ -8,5 +8,5 @@ $OpenBSD: patch-authldap_h,v 1.2 2007/06
+#define LDAP_DEPRECATED 1
+
/*
- ** $Id: patch-authldap_h,v 1.2 2007/06/25 12:12:26 espie Exp $
+ ** $Id: authldap.h,v 1.6 2004/10/21 00:10:49 mrsam Exp $
**
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 3 Nov 2006 11:45:31 -0000 1.1.1.1
+++ patches/patch-configure 25 Jun 2009 09:21:41 -0000
@@ -1,24 +1,20 @@
$OpenBSD: patch-configure,v 1.1.1.1 2006/11/03 11:45:31 mbalmer Exp $
---- configure.orig Fri Jan 6 20:38:09 2006
-+++ configure Fri Jan 6 20:39:31 2006
-@@ -25688,8 +25688,8 @@ if test -x "$COURIERCONFIG"
- then
+--- configure.orig Wed Feb 4 00:39:55 2009
++++ configure Mon May 18 18:24:00 2009
+@@ -25370,7 +25370,7 @@ then
$COURIERCONFIG >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-- . conftest2.out
+ . ./conftest2.out
- rm -f conftest.out conftest2.out
-+ . ./conftest2.out
+ rm -f ./conftest.out ./conftest2.out
cmailuser="$mailuser"
cmailgroup="$mailgroup"
-@@ -25700,8 +25700,8 @@ if test -x "$bindir/courierauthconfig"
- then
+@@ -25382,7 +25382,7 @@ then
$bindir/courierauthconfig --configfiles >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-- . conftest2.out
+ . ./conftest2.out
- rm -f conftest.out conftest2.out
-+ . ./conftest2.out
+ rm -f ./conftest.out ./conftest2.out
cmailuser="$mailuser"
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 23 Dec 2006 10:30:20 -0000 1.2
+++ pkg/PLIST-main 25 Jun 2009 09:21:41 -0000
@@ -4,7 +4,7 @@
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
%%SHARED%%
-bin/courierauthconfig
+...@bin bin/courierauthconfig
include/courier_auth_config.h
include/courierauth.h
include/courierauthdebug.h
@@ -24,7 +24,7 @@ include/courierauthsaslclient.h
@comment lib/libcourierauthsaslclient.a
@comment lib/libcourierauthsaslclient.la
libexec/courier-authlib/
-libexec/courier-authlib/authdaemond
+...@bin libexec/courier-authlib/authdaemond
libexec/courier-authlib/authmigrate
libexec/courier-authlib/authsystem.passwd
libexec/courier-authlib/sysconftool
@@ -38,12 +38,13 @@ libexec/courier-authlib/sysconftool
@man man/man3/auth_login.3
@man man/man3/auth_passwd.3
@man man/man3/auth_sasl.3
+...@man man/man3/auth_sasl_ex.3
@man man/man3/authlib.3
sbin/authdaemond
-sbin/authenumerate
-sbin/authpasswd
-sbin/authtest
-sbin/courierlogger
+...@bin sbin/authenumerate
+...@bin sbin/authpasswd
+...@bin sbin/authtest
+...@bin sbin/courierlogger
share/doc/courier-authlib/
share/doc/courier-authlib/COPYING
share/doc/courier-authlib/COPYING.GPL
Index: pkg/PLIST-userdb
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-userdb,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-userdb
--- pkg/PLIST-userdb 3 Nov 2006 11:45:31 -0000 1.1.1.1
+++ pkg/PLIST-userdb 25 Jun 2009 09:21:41 -0000
@@ -2,7 +2,7 @@
%%SHARED%%
@comment lib/libauthuserdb.a
@comment lib/libauthuserdb.la
-libexec/courier-authlib/makedatprog
+...@bin libexec/courier-authlib/makedatprog
@comment @man man/man8/makeuserdb.8
@comment @man man/man8/userdb.8
@comment @man man/man8/userdbpw.8
@@ -10,5 +10,4 @@ sbin/makeuserdb
sbin/pw2userdb
sbin/userdb
sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+...@bin sbin/userdbpw
