svn commit: r450857 - in head: . databases/courier-authlib-mysql databases/courier-authlib-pgsql net/courier-authlib-ldap security/courier-authlib security/courier-authlib-base security/courier-aut...
Guido Falsi
madpilot at FreeBSD.org
Thu Sep 28 18:46:29 UTC 2017
Author: madpilot
Date: Thu Sep 28 18:46:27 2017
New Revision: 450857
URL: https://svnweb.freebsd.org/changeset/ports/450857
Log:
Make courier-autlib ports run the sysconftool on installation, as
suggested by upstream, like courier-imap port does.
The sample files are renamed to ".dist" because that is the name
the tool expects.
Also added a note to UPDATING to warn users about the sysconftool
expecting the comments not to be removed.
While here convert to localbase.
Suggested by: Doug McIntyre <merlyn at iphouse.net>
Modified:
head/UPDATING
head/databases/courier-authlib-mysql/Makefile
head/databases/courier-authlib-pgsql/Makefile
head/net/courier-authlib-ldap/Makefile
head/security/courier-authlib-base/Makefile
head/security/courier-authlib/Makefile
head/security/courier-authlib/files/patch-Makefile.in
head/security/courier-authlib/pkg-plist-base
head/security/courier-authlib/pkg-plist-ldap
head/security/courier-authlib/pkg-plist-mysql
head/security/courier-authlib/pkg-plist-pgsql
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu Sep 28 18:46:04 2017 (r450856)
+++ head/UPDATING Thu Sep 28 18:46:27 2017 (r450857)
@@ -5,6 +5,19 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20170928:
+ AFFECTS: users of security/courier-authlib and it's modules
+ AUTHOR: madpilot at FreeBSD.org
+
+ The affected ports have been modified to follow the upstrem
+ suggested best practice to use the sysconftool on installation.
+
+ Please make sure your configuration files include all the comments
+ that tool uses to correctly update the configuration on update.
+
+ You can use the ".sample" or ".dist" files as templates for missing
+ comments if needed.
+
20170915:
AFFECTS: users of devel/cargo
AUTHOR: rust at FreeBSD.org
Modified: head/databases/courier-authlib-mysql/Makefile
==============================================================================
--- head/databases/courier-authlib-mysql/Makefile Thu Sep 28 18:46:04 2017 (r450856)
+++ head/databases/courier-authlib-mysql/Makefile Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,7 +1,7 @@
# Created by: Yarema <yds at CoolRat.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -mysql
COMMENT= MySQL support for the Courier authentication library
Modified: head/databases/courier-authlib-pgsql/Makefile
==============================================================================
--- head/databases/courier-authlib-pgsql/Makefile Thu Sep 28 18:46:04 2017 (r450856)
+++ head/databases/courier-authlib-pgsql/Makefile Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,7 +1,7 @@
# Created by: Yarema <yds at CoolRat.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -pgsql
COMMENT= PostgreSQL support for the Courier authentication library
Modified: head/net/courier-authlib-ldap/Makefile
==============================================================================
--- head/net/courier-authlib-ldap/Makefile Thu Sep 28 18:46:04 2017 (r450856)
+++ head/net/courier-authlib-ldap/Makefile Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,7 +1,7 @@
# Created by: Yarema <yds at CoolRat.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -ldap
COMMENT= LDAP support for the Courier authentication library
Modified: head/security/courier-authlib-base/Makefile
==============================================================================
--- head/security/courier-authlib-base/Makefile Thu Sep 28 18:46:04 2017 (r450856)
+++ head/security/courier-authlib-base/Makefile Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,7 +1,7 @@
# Created by: Oliver Lehmann <oliver at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -base
COMMENT= Courier authentication library base
Modified: head/security/courier-authlib/Makefile
==============================================================================
--- head/security/courier-authlib/Makefile Thu Sep 28 18:46:04 2017 (r450856)
+++ head/security/courier-authlib/Makefile Thu Sep 28 18:46:27 2017 (r450857)
@@ -3,7 +3,7 @@
PORTNAME= courier-authlib
PORTVERSION= 0.68.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= security mail
.if defined(PKGNAMESUFFIX)
MASTER_SITES= SF/courier/authlib/${PORTVERSION}
@@ -34,7 +34,7 @@ OPTIONS_DEFINE+= GDBM
LIB_DEPENDS+= libltdl.so:devel/libltdl \
libcourier-unicode.so:devel/courier-unicode
-USES= iconv gmake libtool perl5 tar:bzip2
+USES= iconv gmake libtool localbase perl5 tar:bzip2
GNU_CONFIGURE= yes
USE_SUBMAKE= yes
@@ -46,9 +46,6 @@ AUTHDAEMONVAR= ${LOCALSTATEDIR}/run/authdaemond
VPOPMAILDIR?= ${LOCALBASE}/vpopmail
USERDB?= ${PREFIX}/etc/userdb
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
-
CONFIGURE_ARGS= --enable-unicode \
--disable-static \
--without-authcustom \
@@ -71,6 +68,8 @@ PLIST_SUB+= MAILOWN=${MAILOWN} MAILGRP=${MAILGRP}
AUTHMOD= auth${PKGNAMESUFFIX:S/-//:S/gdbm/db/}
.if ${AUTHMOD} == authbase
+RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
+
CONFIGURE_ARGS+=--with-base --with-authpam --with-authpipe
USERS= ${MAILOWN}
@@ -108,6 +107,7 @@ REMOVE_SUBDIRS+=makedat userdb
.endif
.if ${AUTHMOD} == authldap
+RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
DOCS= README.ldap
USE_OPENLDAP= yes
CONFIGURE_ARGS+=--with-authldap
@@ -116,6 +116,7 @@ CONFIGURE_ARGS+=--without-authldap
.endif
.if ${AUTHMOD} == authmysql
+RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
DOCS= README.authmysql.html README.authmysql.myownquery
USE_MYSQL= yes
CONFIGURE_ARGS+=--with-authmysql \
@@ -126,6 +127,7 @@ CONFIGURE_ARGS+=--without-authmysql
.endif
.if ${AUTHMOD} == authpgsql
+RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
DOCS= README.authpostgres.html
USES+= pgsql
CONFIGURE_ARGS+=--with-authpgsql
Modified: head/security/courier-authlib/files/patch-Makefile.in
==============================================================================
--- head/security/courier-authlib/files/patch-Makefile.in Thu Sep 28 18:46:04 2017 (r450856)
+++ head/security/courier-authlib/files/patch-Makefile.in Thu Sep 28 18:46:27 2017 (r450857)
@@ -188,32 +188,29 @@
@HAVE_AUTHPGSQL_TRUE at install-authpgsqlrc:
@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
@HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
-- at HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc at .dist
+ @HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc at .dist
- at HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc at .dist
- at HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc at .dist
-+ at HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc at .sample
@HAVE_AUTHPGSQL_TRUE at uninstall-authpgsqlrc:
@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc at .dist
-@@ -1951,9 +1990,7 @@ authpgsqlrc.h:
- @HAVE_LDAP_TRUE at install-authldaprc:
+@@ -1952,8 +1991,6 @@ authpgsqlrc.h:
@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
-- at HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc at .dist
+ @HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc at .dist
- at HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc at .dist
- at HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc at .dist
-+ at HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc at .sample
@HAVE_LDAP_TRUE at uninstall-authldaprc:
@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc at .dist
-@@ -1964,15 +2001,25 @@ authpgsqlrc.h:
+@@ -1964,6 +2001,18 @@ authpgsqlrc.h:
@HAVE_LDAP_FALSE at uninstall-authldaprc:
@HAVE_LDAP_FALSE@ @:
+ at HAVE_LDAP_TRUE@install-ldapschema:
+ at HAVE_LDAP_TRUE@ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema
+ at HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
-+ at HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.sample
++ at HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.dist
+ at HAVE_LDAP_TRUE@# if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \
+ at HAVE_LDAP_TRUE@# $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
+ at HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.schema ; \
@@ -225,24 +222,21 @@
authldaprc.h:
echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
- @HAVE_AUTHMYSQL_TRUE at install-authmysqlrc:
+@@ -1971,8 +2020,6 @@ authldaprc.h:
@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
@HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
-- at HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc at .dist
+ @HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc at .dist
- at HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc at .dist
- at HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc at .dist
-+ at HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc at .sample
@HAVE_AUTHMYSQL_TRUE at uninstall-authmysqlrc:
@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc at .dist
-@@ -1989,9 +2036,7 @@ authmysqlrc.h:
- @HAVE_AUTHSQLITE_TRUE at install-authsqliterc:
+@@ -1990,8 +2037,6 @@ authmysqlrc.h:
@HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || :
@HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \
-- at HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc at .dist
+ @HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc at .dist
- at HAVE_AUTHSQLITE_TRUE@ -chown @mailuser@ $(DESTDIR)@authsqliterc at .dist
- at HAVE_AUTHSQLITE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authsqliterc at .dist
-+ at HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc at .sample
@HAVE_AUTHSQLITE_TRUE at uninstall-authsqliterc:
@HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc at .dist
@@ -260,7 +254,7 @@
+ at HAVE_BASE_TRUE@install-authdaemonrc:
+ at HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
+ at HAVE_BASE_TRUE@ sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
-+ at HAVE_BASE_TRUE@ $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc at .sample
++ at HAVE_BASE_TRUE@ $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc at .dist
+ at HAVE_BASE_TRUE@ rm -f authdaemonrc.tmp
-uninstall-authdaemonrc:
Modified: head/security/courier-authlib/pkg-plist-base
==============================================================================
--- head/security/courier-authlib/pkg-plist-base Thu Sep 28 18:46:04 2017 (r450856)
+++ head/security/courier-authlib/pkg-plist-base Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,5 +1,7 @@
bin/courierauthconfig
- at sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authdaemonrc.sample
+ at postunexec if cmp -s %D/etc/authlib/authdaemonrc.dist %D/etc/authlib/authdaemonrc; then rm -f %D/etc/authlib/authdaemonrc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authdaemonrc.dist
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authdaemonrc
include/courier_auth_config.h
include/courierauth.h
include/courierauthdebug.h
Modified: head/security/courier-authlib/pkg-plist-ldap
==============================================================================
--- head/security/courier-authlib/pkg-plist-ldap Thu Sep 28 18:46:04 2017 (r450856)
+++ head/security/courier-authlib/pkg-plist-ldap Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,4 +1,6 @@
- at sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authldaprc.sample
- at sample etc/openldap/schema/authldap.schema.sample
+ at postunexec if cmp -s %D/etc/authlib/authldaprc.dist %D/etc/authlib/authldaprc; then rm -f %D/etc/authlib/authldaprc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authldaprc.dist
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authldaprc
+ at sample etc/openldap/schema/authldap.schema.dist
lib/courier-authlib/libauthldap.so
%%PORTDOCS%%%%DOCSDIR%%/README.ldap
Modified: head/security/courier-authlib/pkg-plist-mysql
==============================================================================
--- head/security/courier-authlib/pkg-plist-mysql Thu Sep 28 18:46:04 2017 (r450856)
+++ head/security/courier-authlib/pkg-plist-mysql Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,4 +1,6 @@
- at sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authmysqlrc.sample
+ at postunexec if cmp -s %D/etc/authlib/authmysqlrc.dist %D/etc/authlib/authmysqlrc; then rm -f %D/etc/authlib/authmysqlrc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authmysqlrc.dist
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authmysqlrc
lib/courier-authlib/libauthmysql.so
%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery
Modified: head/security/courier-authlib/pkg-plist-pgsql
==============================================================================
--- head/security/courier-authlib/pkg-plist-pgsql Thu Sep 28 18:46:04 2017 (r450856)
+++ head/security/courier-authlib/pkg-plist-pgsql Thu Sep 28 18:46:27 2017 (r450857)
@@ -1,3 +1,5 @@
- at sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authpgsqlrc.sample
+ at postunexec if cmp -s %D/etc/authlib/authpgsqlrc.dist %D/etc/authlib/authpgsqlrc; then rm -f %D/etc/authlib/authpgsqlrc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authpgsqlrc.dist
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authpgsqlrc
lib/courier-authlib/libauthpgsql.so
%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
More information about the svn-ports-head
mailing list