Changes 0.64.0:

* authpam.c (callback_pam): Call pam_end() after an authentication attempt.
* Makefile.am: Renamed authstaticlist.h to courierauthstaticlist.h, and
added it to the list of header files that 'make install' puts into
includedir.
* Fix gcc 4.6 warnings
* courier.spec.in: switch to systemd.
* Fix autoconf warnings.
* courier-authlib.spec: Make rmplint happy.

5 files changed, 33 insertions, 32 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 44f0f91c11d..1438834445b 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2012/05/13 15:23:33 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2012/06/09 11:57:20 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-DISTNAME=	courier-authlib-0.63.0
+DISTNAME=	courier-authlib-0.64.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/courier-authlib/PLIST b/security/courier-authlib/PLIST
index c431f8eee8f..e2944623f6f 100644
--- a/security/courier-authlib/PLIST
+++ b/security/courier-authlib/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2009/07/02 12:23:44 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/06/09 11:57:20 adam Exp $
 bin/courierauthconfig
 include/courier_auth_config.h
 include/courierauth.h
 include/courierauthdebug.h
 include/courierauthsasl.h
 include/courierauthsaslclient.h
+include/courierauthstaticlist.h
 lib/courier-authlib/libcourierauth.la
 lib/courier-authlib/libcourierauthcommon.la
 lib/courier-authlib/libcourierauthsasl.la
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 31b04ef8536..db2c506b1ea 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2010/06/15 23:10:44 pettai Exp $
+$NetBSD: distinfo,v 1.15 2012/06/09 11:57:20 adam Exp $
 
-SHA1 (courier-authlib-0.63.0.tar.bz2) = c0877274de8b58ec4c7a41cfd87ad9b37c408304
-RMD160 (courier-authlib-0.63.0.tar.bz2) = 4528672a11895c9d705340523e578284e40b5dea
-Size (courier-authlib-0.63.0.tar.bz2) = 2817119 bytes
-SHA1 (patch-aa) = 19e4481ef98ccce9376222611f4ac179af747ed3
-SHA1 (patch-ab) = a266fc7b01fb77117b78630892574ebee81f9a57
+SHA1 (courier-authlib-0.64.0.tar.bz2) = ea8a38b81135f23ab8084fc89751fb320fe6b7d1
+RMD160 (courier-authlib-0.64.0.tar.bz2) = a2933436eb4ae799c2ef760a12b94dec6c3747a9
+Size (courier-authlib-0.64.0.tar.bz2) = 2267236 bytes
+SHA1 (patch-aa) = bd3f7cc7a809717be7b32e5eb5890f6a8175b439
+SHA1 (patch-ab) = 89ef33fa3dc4aba6aed2b3fed19ccdcf8b1b47fd
diff --git a/security/courier-authlib/patches/patch-aa b/security/courier-authlib/patches/patch-aa
index fd313e1bf85..90653115e6a 100644
--- a/security/courier-authlib/patches/patch-aa
+++ b/security/courier-authlib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
+$NetBSD: patch-aa,v 1.9 2012/06/09 11:57:20 adam Exp $
 
---- Makefile.in.orig	2009-02-03 23:39:56.000000000 +0000
+--- Makefile.in.orig	2012-04-28 13:21:54.000000000 +0000
 +++ Makefile.in
-@@ -511,7 +511,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h 
+@@ -516,7 +516,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h 
  
  DISTCLEANFILES = dbobj.config README_authlib.html
  commonlibdep = libcourierauthcommon.la
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  commonlibadd = libcourierauthcommon.la
  libcourierauthcommon_t = @CRYPTLIBS@
  libcourierauthcommon_la_SOURCES = \
-@@ -527,7 +527,7 @@ libcourierauthcommon_la_SOURCES = \
+@@ -532,7 +532,7 @@ libcourierauthcommon_la_SOURCES = \
  
  libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
  libcourierauthcommon_la_LIBADD = libcourierauth.la
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
  	authmoduser2.c authmoduser3.c debug.c \
  	courierauthdebug.h \
-@@ -536,7 +536,7 @@ libcourierauth_la_SOURCES = authdaemon.c
+@@ -541,7 +541,7 @@ libcourierauth_la_SOURCES = authdaemon.c
  libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
  	random128/librandom128.la rfc822/libencode.la
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  
  # The userdb module
  libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
-@@ -629,7 +629,7 @@ libcourierauthsasl_la_SOURCES = \
+@@ -634,7 +634,7 @@ libcourierauthsasl_la_SOURCES = \
  	authsaslfrombase64.c authsasltobase64.c
  
  libcourierauthsasl_la_LIBADD = libcourierauth.la
@@ -38,16 +38,16 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
  	authsaslclient.c authsaslclient.h authsaslclientcram.c \
  	authsaslclientcrammd5.c authsaslclientcramsha1.c \
-@@ -638,7 +638,7 @@ libcourierauthsaslclient_la_SOURCES = co
+@@ -643,7 +643,7 @@ libcourierauthsaslclient_la_SOURCES = co
  	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
+ 	courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
  
-@@ -669,9 +669,9 @@ authdaemondprog_DEPENDENCIES = libcourie
+@@ -674,9 +674,9 @@ authdaemondprog_DEPENDENCIES = libcourie
  
  authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
  	libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  authdaemontest_SOURCES = authdaemontest.c
  authdaemontest_DEPENDENCIES = libcourierauthcommon.la
  authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
-@@ -1689,14 +1689,14 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -1697,14 +1697,14 @@ uninstall-man: uninstall-man1 uninstall-
  authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
  
  @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
@@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  
  @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
  @HAVE_AUTHPGSQL_FALSE@	@:
-@@ -1705,19 +1705,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
+@@ -1713,19 +1713,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
  @HAVE_AUTHPGSQL_FALSE@	@:
  
  authpgsqlrc.h:
@@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  
  @HAVE_LDAP_FALSE@install-authldaprc:
  @HAVE_LDAP_FALSE@	@:
-@@ -1726,19 +1726,19 @@ authldaplib.lo: authldaplib.c authldaprc
+@@ -1734,19 +1734,19 @@ authldaplib.lo: authldaplib.c authldaprc
  @HAVE_LDAP_FALSE@	@:
  
  authldaprc.h:
@@ -131,7 +131,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  
  @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
  @HAVE_AUTHMYSQL_FALSE@	@:
-@@ -1747,27 +1747,27 @@ authmysqllib.lo: authmysqllib.c authmysq
+@@ -1755,27 +1755,27 @@ authmysqllib.lo: authmysqllib.c authmysq
  @HAVE_AUTHMYSQL_FALSE@	@:
  
  authmysqlrc.h:
@@ -168,7 +168,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
  	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
  	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
-@@ -1785,20 +1785,20 @@ authchangepwdir.h: config.status
+@@ -1793,20 +1793,20 @@ authchangepwdir.h: config.status
  	echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
  
  sbindir.h: config.status
@@ -193,7 +193,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  
  dist-hook:
  	for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
-@@ -1814,10 +1814,10 @@ install-exec-hook:
+@@ -1822,10 +1822,10 @@ install-exec-hook:
  	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
  	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
  	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
@@ -208,7 +208,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
  		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
  				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
-@@ -1831,7 +1831,6 @@ install-exec-hook:
+@@ -1839,7 +1839,6 @@ install-exec-hook:
  				$(DESTDIR)$(sbindir)/userdbpw ; \
  		$(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
  				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
@@ -216,7 +216,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
  	rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
-@@ -1930,13 +1930,13 @@ README_authlib.html: README_authlib.html
+@@ -1938,13 +1937,13 @@ README_authlib.html: README_authlib.html
  authdaemond.o: authdaemonrc.h authdaemond.c
  
  install-migrate: authmigrate
diff --git a/security/courier-authlib/patches/patch-ab b/security/courier-authlib/patches/patch-ab
index 644eea0e593..cb083d66224 100644
--- a/security/courier-authlib/patches/patch-ab
+++ b/security/courier-authlib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2010/06/15 23:10:44 pettai Exp $
+$NetBSD: patch-ab,v 1.8 2012/06/09 11:57:20 adam Exp $
 
---- configure.orig	2009-02-03 23:39:55.000000000 +0000
+--- configure.orig	2012-04-28 13:21:55.000000000 +0000
 +++ configure
-@@ -17617,7 +17617,7 @@ done
+@@ -14193,7 +14193,7 @@ done
  test -n "$PG_CONFIG" || PG_CONFIG="pg_config"
  
  
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.7 2010/06/15 23:10:44 pettai Exp $
 +test -n "$PGSQL_LIBS" || PGSQL_LIBS="-lpq"
  
  # Check whether --with-pgsql-libs was given.
- if test "${with_pgsql_libs+set}" = set; then
-@@ -19439,7 +19439,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
+ if test "${with_pgsql_libs+set}" = set; then :
+@@ -14913,7 +14913,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
  
  result=""
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.7 2010/06/15 23:10:44 pettai Exp $
  then
  	$COURIERCONFIG >conftest.out || exit 1
  	sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-@@ -19451,7 +19451,7 @@ then
+@@ -14925,7 +14925,7 @@ then
  	result=" (from courier-config)"
  fi