--- courier-authlib-0.61.0/Makefile.am.p0 2008-07-13 06:40:55 +1100 +++ courier-authlib-0.61.0/Makefile.am 2008-09-06 13:07:59 +1100 @@ -42,7 +42,7 @@ CLEANFILES=authldaprc.h authmysqlrc.h au 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@ @@ -58,7 +58,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 \ @@ -66,7 +66,7 @@ libcourierauth_la_SOURCES=authdaemon.c a authoption.c 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 @@ -119,8 +119,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 @@ -154,8 +152,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 @@ -187,8 +183,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 @@ -212,12 +206,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 @@ -236,8 +230,6 @@ install-authdaemonrc: sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' 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 @@ -245,9 +237,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 @@ -286,7 +278,7 @@ libcourierauthsasl_la_SOURCES=\ authsaslcram.c authsasllogin.c authsaslplain.c \ 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 \ @@ -295,7 +287,7 @@ libcourierauthsaslclient_la_SOURCES=cour authsaslclientexternal.c \ 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 @@ -327,7 +319,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 @@ -388,8 +380,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 ; \ @@ -403,7 +393,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 @@ -415,7 +404,6 @@ uninstall-hook: uninstall-authldaprc uni $(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 --- courier-authlib-0.61.0/Makefile.in.p0 2008-07-13 06:41:08 +1100 +++ courier-authlib-0.61.0/Makefile.in 2008-09-06 13:24:11 +1100 @@ -111,7 +111,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) \ @@ -215,8 +215,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) \ @@ -453,7 +453,7 @@ CLEANFILES = authldaprc.h authmysqlrc.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 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@ @@ -536,9 +536,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) HTMLFILES = README.html NEWS.html INSTALL.html \ README.authmysql.html README.authpostgres.html @@ -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 = 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 @@ -609,7 +609,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 @@ -1073,12 +1073,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: @@ -1520,8 +1520,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 @@ -1541,8 +1539,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 @@ -1562,8 +1558,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 @@ -1577,7 +1571,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 @@ -1587,8 +1581,6 @@ install-authdaemonrc: sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' 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 @@ -1596,9 +1588,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 @@ -1644,8 +1636,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 ; \ @@ -1659,7 +1649,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 +1659,6 @@ uninstall-hook: uninstall-authldaprc uni $(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