--- courier-authlib-0.60.2/Makefile.am.orig	2007-10-07 13:50:45 +1100

+++ courier-authlib-0.60.2/Makefile.am	2008-04-27 01:09:12 +1100

@@ -136,8 +136,6 @@ install-authpgsqlrc:

 	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :

 	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \

 		$(DESTDIR)@authpgsqlrc@.dist

-	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist

 uninstall-authpgsqlrc:

 	rm -f $(DESTDIR)@authpgsqlrc@.dist

@@ -171,8 +169,6 @@ install-authldaprc:

 	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :

 	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \

 		$(DESTDIR)@authldaprc@.dist

-	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist

 uninstall-authldaprc:

 	rm -f $(DESTDIR)@authldaprc@.dist

@@ -204,8 +200,6 @@ install-authmysqlrc:

 	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :

 	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \

 		$(DESTDIR)@authmysqlrc@.dist

-	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist

 uninstall-authmysqlrc:

 	rm -f $(DESTDIR)@authmysqlrc@.dist

@@ -229,12 +223,12 @@ libauthcustom_la_LIBADD=$(commonlibadd)

 libauthcustom_la_LDFLAGS=$(commonldflags)

 # The authpipe module

-libauthpipe_la_SOURCES=authpipe.c authpipelib.h authpipelib.c

-libauthpipe_la_DEPENDENCIES=$(commonlibdep)

-libauthpipe_la_LIBADD=$(commonlibadd)

-libauthpipe_la_LDFLAGS=$(commonldflags)

+libauthpipe_la_SOURCES = authpipe.c authpipelib.h authpipelib.c debug.c

+libauthpipe_la_DEPENDENCIES = $(commonlibdep)

+libauthpipe_la_LIBADD = $(commonlibadd) numlib/libnumlib.la

+libauthpipe_la_LDFLAGS = $(commonldflags)

-authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h

+authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h debug.c

 authpiperc.h:

 	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h

@@ -266,8 +260,6 @@ install-authdaemonrc:

 	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp

 	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist

 	rm -f authdaemonrc.tmp

-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist

 uninstall-authdaemonrc:

 	rm -f $(DESTDIR)@authdaemonrc@.dist

@@ -275,9 +267,9 @@ uninstall-authdaemonrc:

 authdaemonrc.h:

 	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h

 	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONPID \"/var/run/courier-authdaemon.pid\"" >>authdaemonrc.h

 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONLOCK \"/var/lock/subsys/courier-authdaemon\"" >>authdaemonrc.h

 HTMLFILES=README.html NEWS.html INSTALL.html \

 		README.authmysql.html README.authpostgres.html

@@ -357,7 +349,7 @@ authdaemondprog_DEPENDENCIES=libcouriera

 	rfc822/libencode.la numlib/libnumlib.la

 authdaemondprog_LDADD=$(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \

 	libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \

-	rfc822/libencode.la numlib/libnumlib.la

+	rfc822/libencode.la numlib/libnumlib.la debug.o

 authdaemondprog_LDFLAGS=-export-dynamic $(modules:%=-dlopen %) @NETLIBS@

 authdaemontest_SOURCES=authdaemontest.c

@@ -418,8 +410,6 @@ install-exec-hook:

 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond

 	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :

 	chmod 750 $(DESTDIR)@authdaemonvar@

-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@

 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\

 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \

 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \

--- courier-authlib-0.60.2/Makefile.in.orig	2007-10-14 11:20:08 +1100

+++ courier-authlib-0.60.2/Makefile.in	2008-04-27 01:09:12 +1100

@@ -110,7 +110,7 @@ libauthpgsql_la_OBJECTS = $(am_libauthpg

 libauthpgsql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

 	$(libauthpgsql_la_LDFLAGS) $(LDFLAGS) -o $@

-am_libauthpipe_la_OBJECTS = authpipe.lo authpipelib.lo

+am_libauthpipe_la_OBJECTS = authpipe.lo authpipelib.lo debug.lo authdaemonlib.lo

 libauthpipe_la_OBJECTS = $(am_libauthpipe_la_OBJECTS)

 libauthpipe_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

@@ -227,8 +227,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB

 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

-	$(LDFLAGS) -o $@

+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

+	-o $@ $(AM_LDFLAGS) $(LDFLAGS) 

 SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la_SOURCES) \

 	$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \

 	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \

@@ -566,9 +566,9 @@ libauthcustom_la_LIBADD = $(commonlibadd

 libauthcustom_la_LDFLAGS = $(commonldflags)

 # The authpipe module

-libauthpipe_la_SOURCES = authpipe.c authpipelib.h authpipelib.c

+libauthpipe_la_SOURCES = authpipe.c authpipelib.h authpipelib.c debug.c

 libauthpipe_la_DEPENDENCIES = $(commonlibdep)

-libauthpipe_la_LIBADD = $(commonlibadd)

+libauthpipe_la_LIBADD = $(commonlibadd) numlib/libnumlib.la

 libauthpipe_la_LDFLAGS = $(commonldflags)

 @HAVE_MD5_FALSE@checkpasswordmd5c = 

 @HAVE_MD5_TRUE@checkpasswordmd5c = checkpasswordmd5.c

@@ -643,7 +643,7 @@ authdaemondprog_DEPENDENCIES = libcourie

 authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \

 	libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \

-	rfc822/libencode.la numlib/libnumlib.la

+	rfc822/libencode.la numlib/libnumlib.la debug.o

 authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@

 authdaemontest_SOURCES = authdaemontest.c

@@ -1109,12 +1109,12 @@ uninstall-man3:

 	done

 install-includeHEADERS: $(include_HEADERS)

 	@$(NORMAL_INSTALL)

-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"

+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)/@PACKAGE@"

 	@list='$(include_HEADERS)'; for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

 	  f=$(am__strip_dir) \

-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \

-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \

+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/@PACKAGE@/$$f'"; \

+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/@PACKAGE@/$$f"; \

 	done

 uninstall-includeHEADERS:

@@ -1557,8 +1557,6 @@ authpgsqllib.lo: authpgsqllib.c authpgsq

 @HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :

 @HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \

 @HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.dist

-@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist

-@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist

 @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:

 @HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist

@@ -1578,8 +1576,6 @@ authldaplib.lo: authldaplib.c authldaprc

 @HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :

 @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \

 @HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.dist

-@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist

-@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist

 @HAVE_LDAP_TRUE@uninstall-authldaprc:

 @HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist

@@ -1599,8 +1595,6 @@ authmysqllib.lo: authmysqllib.c authmysq

 @HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :

 @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \

 @HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.dist

-@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist

-@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist

 @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:

 @HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist

@@ -1614,7 +1608,7 @@ authmysqllib.lo: authmysqllib.c authmysq

 authmysqlrc.h:

 	echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h

-authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h

+authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h debug.c

 authpiperc.h:

 	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h

@@ -1624,8 +1618,6 @@ install-authdaemonrc:

 	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp

 	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist

 	rm -f authdaemonrc.tmp

-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist

 uninstall-authdaemonrc:

 	rm -f $(DESTDIR)@authdaemonrc@.dist

@@ -1633,9 +1625,9 @@ uninstall-authdaemonrc:

 authdaemonrc.h:

 	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h

 	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONPID \"/var/run/courier-authdaemon.pid\"" >>authdaemonrc.h

 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONLOCK \"/var/lock/subsys-authdaemon\"" >>authdaemonrc.h

 README: README.html

 	links -dump -no-references README.html >README

@@ -1681,8 +1673,6 @@ install-exec-hook:

 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond

 	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :

 	chmod 750 $(DESTDIR)@authdaemonvar@

-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@

 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\

 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \

 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \