X-Git-Url: http://git.hcoop.net/hcoop/debian/courier-authlib.git/blobdiff_plain/ac40fd9eb9d1980c90dc009d526a23ead1ec0f76..781cfcb8fd50934c470e0dabf79d32ab333dec68:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4faed97..01ac10c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
-# $Id: Makefile.am,v 1.134 2008/07/12 19:40:55 mrsam Exp $
+# $Id: Makefile.am,v 1.146 2009/12/25 21:53:37 mrsam Exp $
 #
-# Copyright 1998 - 2008 Double Precision, Inc.  See COPYING for
+# Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for
 # distribution information.
 
 AUTOMAKE_OPTIONS=dist-bzip2
 
-SUBDIRS=libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
+SUBDIRS=libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb unicode rfc822 random128 liblock liblog
 
 INCLUDES = $(LTDLINCL)
 
@@ -52,6 +52,7 @@ libcourierauthcommon_la_SOURCES= \
 	authsaslfrombase64.c authsasltobase64.c \
 	authstaticlist.h \
 	authsyschangepwd.c authsyscommon.c \
+	authldapescape.c \
 	cramlib.c cramlib.h \
 	checkpassword.c cryptpassword.c \
 	checkpasswordmd5.c checkpasswordsha1.c
@@ -254,6 +255,7 @@ HTMLFILES=README.html NEWS.html INSTALL.html \
 
 EXTRA_DIST=$(HTMLFILES) sysconftool COPYING COPYING.GPL\
 	authldap.schema \
+	authldap.ldif \
 	authldaprc authmysqlrc authpgsqlrc README.ldap \
 	README.authmysql.myownquery \
 	README.authdebug.html.in \
@@ -263,7 +265,7 @@ EXTRA_DIST=$(HTMLFILES) sysconftool COPYING COPYING.GPL\
 	authlib.html.in authlib.3.in \
 	authpasswd.html authpasswd.1 \
 	authtest.html authtest.1 \
-	auth_sasl.html auth_sasl.3 \
+	auth_sasl.html auth_sasl.3 auth_sasl_ex.3 \
 	auth_generic.html auth_generic.3 \
 	auth_login.html auth_login.3 \
 	auth_passwd.html auth_passwd.3 \
@@ -342,7 +344,7 @@ man3=authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
 	auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
 man1=authpasswd.1 authtest.1
 
-man_MANS=$(man1) $(man3)
+man_MANS=$(man1) $(man3) auth_sasl_ex.3
 
 BUILT1=authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
 	authdaemonrc.h packageversion.h \
@@ -403,7 +405,7 @@ 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
+	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
@@ -415,13 +417,13 @@ uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlr
 				$(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
+	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
+	$(SHELL) ./config.status --file=authlib.html
 
 authlib.3: authlib.3.in
-	CONFIG_FILES=authlib.3 CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=authlib.3
 
 if HAVE_SGML
 authpasswd.html: authpasswd.sgml docbook/sgml2html
@@ -441,6 +443,7 @@ authlib.html.in: authlib.sgml docbook/sgml2html
 
 authlib.3.in: authlib.sgml docbook/sgml2man
 	docbook/sgml2man authlib.sgml authlib.3.in
+	mv authlib.3 authlib.3.in
 
 README_authlib.html.in: README_authlib.sgml docbook/sgml2html
 	docbook/sgml2html README_authlib.sgml README_authlib.html.in
@@ -487,11 +490,20 @@ auth_sasl.html: auth_sasl.sgml docbook/sgml2html
 auth_sasl.3: auth_sasl.sgml docbook/sgml2man
 	docbook/sgml2man auth_sasl.sgml auth_sasl.3
 
+auth_sasl_ex.3: auth_sasl.3
+	touch $@
 
 endif
 
+authldap.ldif: authldap.schema
+	echo 'dn: cn=courier,cn=schema,cn=config' >authldap.ldif.tmp
+	echo 'objectClass: olcSchemaConfig' >>authldap.ldif.tmp
+	echo 'cn: courier' >>authldap.ldif.tmp
+	sed '/^#/d;s/^attributetype/olcAttributeTypes:/;s/^objectclass/olcObjectClasses:/;s/^$$/#/' <$(srcdir)/authldap.schema | tr '\011' ' ' >>authldap.ldif.tmp
+	mv -f authldap.ldif.tmp authldap.ldif
+
 README_authlib.html: README_authlib.html.in config.status
-	CONFIG_FILES=README_authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=README_authlib.html
 
 authdaemond.o: authdaemonrc.h authdaemond.c
 
@@ -508,15 +520,15 @@ install-configure:
 # For maintainer's use only
 
 distrelease:
-	umask 022; $(MAKE) -$(MAKEFLAGS) distcheck
-	$(MAKE) -$(MAKEFLAGS) rpm
+	umask 022; $(MAKE) distcheck
+	$(MAKE) rpm
 	socksify cvs commit
 	socksify cvs tag -F @PACKAGE@-latest
-	$(MAKE) -$(MAKEFLAGS)
-	$(MAKE) -$(MAKEFLAGS)
+	$(MAKE)
+	$(MAKE)
 	rm -f @PACKAGE@.spec @PACKAGE@.lpspec
-	$(MAKE) -$(MAKEFLAGS) @PACKAGE@.spec @PACKAGE@.lpspec
-	$(MAKE) -$(MAKEFLAGS) dist
+	$(MAKE) @PACKAGE@.spec @PACKAGE@.lpspec
+	$(MAKE) dist
 
 tagrelease:
 	socksify cvs tag -F -r @PACKAGE@-latest \
@@ -525,16 +537,16 @@ tagrelease:
 rpm: rpm-build
 
 rpm-build:
-	$(MAKE) -$(MAKEFLAGS) bump.rpm.release
-	$(MAKE) -$(MAKEFLAGS) dist
-	$(MAKE) -$(MAKEFLAGS) dorpm
+	$(MAKE) bump.rpm.release
+	$(MAKE) dist
+	$(MAKE) dorpm
 
 lpm: lpm-build
 
 lpm-build:
-	$(MAKE) -$(MAKEFLAGS) bump.rpm.release
-	$(MAKE) -$(MAKEFLAGS) dist
-	$(MAKE) -$(MAKEFLAGS) dolpm
+	$(MAKE) bump.rpm.release
+	$(MAKE) dist
+	$(MAKE) dolpm
 
 dolpm:
 	rm -rf lpm
@@ -544,10 +556,10 @@ dolpm:
 publish: publish-@REPOSITORY@
 
 publish-dev:
-	$(MAKE) -$(MAKEFLAGS) dopublish SUBDIR=dev
+	$(MAKE) dopublish SUBDIR=dev
 
 publish-prod:
-	$(MAKE) -$(MAKEFLAGS) dopublish SUBDIR=prod
+	$(MAKE) dopublish SUBDIR=prod
 
 dopublish:
 	lpbuild --resign lpm/*
@@ -568,7 +580,17 @@ dorpm:
 	rm -f rpm/SOURCES/*
 	rm -f rpm/SPECS/*
 	rm -f rpm/SRPMS/*
-	unset MAKEFLAGS ; test ! -f $$HOME/.bashrc || . $$HOME/.bashrc; rpmbuild -ta --clean @PACKAGE@-@VERSION@.tar.bz2
+	rpmbuild -ta --clean \
+		--define "_topdir `pwd`/rpm" \
+		--define '_rpmdir %{_topdir}/RPMS' \
+		--define '_srcrpmdir %{_topdir}/SRPMS' \
+		--define '_sourcedir %{_topdir}/SOURCES' \
+		--define '_specdir %{_topdir}/SPECS' \
+		--define '_builddir %{_topdir}/BUILD' \
+		--define '_build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
+		--define '_tmppath %{_var}/tmp' \
+		--define '__spec_prep_pre %{___build_pre}' \
+		@PACKAGE@-@VERSION@.tar.bz2
 
 bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec
 	test -f $(srcdir)/rpm.release && . $(srcdir)/rpm.release; \
@@ -588,14 +610,14 @@ upload-beta:
 	test -z "$(SFPASSWD)" && exit 1; exit 0
 	rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
 	socksify ssh grace.speakeasy.net echo @PACKAGE@-@VERSION@.tar.bz2 `ls -l @PACKAGE@-@VERSION@.tar.bz2 | awk ' { print $$5 } '` \>courier-mta.org/@PACKAGE@.beta
-	rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
-	../sftools/release.pl mrsam $(SFPASSWD) courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` "" "" @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
+	../sftools/release.pl mrsam $(SFPASSWD) courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
 
 upload-dist:
 	rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
 	socksify cvs tag -F -r @PACKAGE@-latest \
                `echo @PACKAGE@-@VERSION@ | tr '.' '-'`
-	rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
+	socksify ../sftools/release.pl mrsam $(SFPASSWD) courier authlib @VERSION@ @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
+	socksify ssh grace.speakeasy.net rm -f courier-mta.org/@PACKAGE@.beta
 
 release-dist:
 	test -z "$(SFPASSWD)" && exit 1; exit 0
@@ -609,4 +631,4 @@ HTMLDOCFILES=$(HTMLFILES) README.authdebug.html README_authlib.html \
 	$(man3:%.3=%.html) $(man1:%.1=%.html)
 
 htmldoc: $(HTMLDOCFILES)
-	for f in $^; do d=`basename $$f`; test "$$d" = "README.html" && d="index2.html"; xsltproc --nonet $$HOME/www/www.courier-mta.org/xsl/authlib.xsl $$f | perl -ne 's~\$(id):.*\$$~\$(id):'"$$h"'\$$~; print' >html/$$d; done
+	for f in $^; do d=`basename $$f`; test "$$d" = "README.html" && d="index2.html"; tidy -i -q --tidy-mark no --doctype transitional --input-encoding utf8 --output-encoding utf8 -asxml <$$f >$$f.tmp ; xsltproc --nonet $$HOME/www/www.courier-mta.org/xsl/authlib.xsl $$f.tmp | perl -ne 's~\$(id):.*\$$~\$(id):'"$$h"'\$$~; print' >html/$$d; rm -f $$f.tmp; done