2007-10-15 17:37:01 +02:00
|
|
|
$NetBSD: patch-aa,v 1.5 2007/10/15 15:37:01 jlam Exp $
|
2005-02-10 04:21:30 +01:00
|
|
|
|
2007-10-15 17:37:01 +02:00
|
|
|
--- Makefile.in.orig Sat Sep 29 14:43:44 2007
|
2005-02-10 04:21:30 +01:00
|
|
|
+++ Makefile.in
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -491,7 +491,7 @@ libcourierauthcommon_la_SOURCES = \
|
2005-08-11 02:03:16 +02:00
|
|
|
|
|
|
|
libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
|
|
|
|
libcourierauthcommon_la_LIBADD = libcourierauth.la
|
|
|
|
-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
|
|
|
|
+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
|
2005-03-24 08:13:14 +01:00
|
|
|
libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
|
|
|
|
authmoduser2.c authmoduser3.c debug.c \
|
|
|
|
courierauthdebug.h \
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -643,9 +643,9 @@ authdaemondprog_DEPENDENCIES = libcourie
|
2007-08-10 19:57:21 +02:00
|
|
|
|
|
|
|
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 $(DL_LIBS)
|
2005-02-10 04:21:30 +01:00
|
|
|
|
|
|
|
-authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
|
|
|
|
+authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@
|
|
|
|
authdaemontest_SOURCES = authdaemontest.c
|
|
|
|
authdaemontest_DEPENDENCIES = libcourierauthcommon.la
|
|
|
|
authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -1549,19 +1549,19 @@ authvchkpw.lo: authvchkpw.c vpopmail_con
|
2007-08-10 19:57:21 +02:00
|
|
|
preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
|
|
|
|
|
|
|
|
vpopmail_config.h:
|
|
|
|
- echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
|
|
|
|
+ echo '#include "$(vpopmail_home)/include/config.h"' >vpopmail_config.h
|
|
|
|
|
2005-02-10 04:21:30 +01:00
|
|
|
authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
|
|
|
|
|
|
|
|
@HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
|
2007-08-10 19:57:21 +02:00
|
|
|
-@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
|
|
|
|
+@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || :
|
2005-08-11 02:03:16 +02:00
|
|
|
@HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
|
2005-02-10 04:21:30 +01:00
|
|
|
-@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@ $(DESTDIR)$(authpgsqlrc).dist
|
2005-08-11 02:03:16 +02:00
|
|
|
+@HAVE_AUTHPGSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist
|
|
|
|
+@HAVE_AUTHPGSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist
|
2005-02-10 04:21:30 +01:00
|
|
|
|
|
|
|
@HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
|
|
|
|
-@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist
|
|
|
|
+@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)$(authpgsqlrc).dist
|
|
|
|
|
|
|
|
@HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
|
|
|
|
@HAVE_AUTHPGSQL_FALSE@ @:
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -1570,19 +1570,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
|
2005-08-11 02:03:16 +02:00
|
|
|
@HAVE_AUTHPGSQL_FALSE@ @:
|
|
|
|
|
|
|
|
authpgsqlrc.h:
|
|
|
|
- echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h
|
|
|
|
+ echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h
|
|
|
|
|
2005-02-10 04:21:30 +01:00
|
|
|
authldaplib.lo: authldaplib.c authldaprc.h
|
|
|
|
|
|
|
|
@HAVE_LDAP_TRUE@install-authldaprc:
|
2007-08-10 19:57:21 +02:00
|
|
|
-@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
|
|
|
|
+@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || :
|
2005-08-11 02:03:16 +02:00
|
|
|
@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
|
2005-02-10 04:21:30 +01:00
|
|
|
-@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@ $(DESTDIR)$(authldaprc).dist
|
2005-08-11 02:03:16 +02:00
|
|
|
+@HAVE_LDAP_TRUE@ -chown $(mailuser) $(DESTDIR)$(authldaprc).dist
|
|
|
|
+@HAVE_LDAP_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist
|
2005-02-10 04:21:30 +01:00
|
|
|
|
|
|
|
@HAVE_LDAP_TRUE@uninstall-authldaprc:
|
|
|
|
-@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist
|
|
|
|
+@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)$(authldaprc).dist
|
|
|
|
|
|
|
|
@HAVE_LDAP_FALSE@install-authldaprc:
|
|
|
|
@HAVE_LDAP_FALSE@ @:
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -1591,19 +1591,19 @@ authldaplib.lo: authldaplib.c authldaprc
|
2005-08-11 02:03:16 +02:00
|
|
|
@HAVE_LDAP_FALSE@ @:
|
|
|
|
|
|
|
|
authldaprc.h:
|
|
|
|
- echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
|
|
|
|
+ echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h
|
|
|
|
|
2005-02-10 04:21:30 +01:00
|
|
|
authmysqllib.lo: authmysqllib.c authmysqlrc.h
|
|
|
|
|
|
|
|
@HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
|
2007-08-10 19:57:21 +02:00
|
|
|
-@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
|
|
|
|
+@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || :
|
2005-08-11 02:03:16 +02:00
|
|
|
@HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
|
2005-02-10 04:21:30 +01:00
|
|
|
-@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@ $(DESTDIR)$(authmysqlrc).dist
|
2005-08-11 02:03:16 +02:00
|
|
|
+@HAVE_AUTHMYSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist
|
|
|
|
+@HAVE_AUTHMYSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist
|
2005-02-10 04:21:30 +01:00
|
|
|
|
|
|
|
@HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
|
|
|
|
-@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist
|
|
|
|
+@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)$(authmysqlrc).dist
|
|
|
|
|
|
|
|
@HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
|
|
|
|
@HAVE_AUTHMYSQL_FALSE@ @:
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -1612,27 +1612,27 @@ authmysqllib.lo: authmysqllib.c authmysq
|
2005-08-11 02:03:16 +02:00
|
|
|
@HAVE_AUTHMYSQL_FALSE@ @:
|
|
|
|
|
|
|
|
authmysqlrc.h:
|
|
|
|
- echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
|
|
|
|
+ echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h
|
|
|
|
|
|
|
|
authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h
|
|
|
|
|
|
|
|
authpiperc.h:
|
|
|
|
- echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
|
|
|
|
+ echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h
|
2005-02-10 04:21:30 +01:00
|
|
|
|
|
|
|
install-authdaemonrc:
|
2007-08-10 19:57:21 +02:00
|
|
|
- $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
|
|
|
|
+ $(mkinstalldirs) $(DESTDIR)`dirname $(authdaemonrc)` || :
|
2005-02-10 04:21:30 +01:00
|
|
|
sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
|
|
|
|
- $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
|
2005-08-11 02:03:16 +02:00
|
|
|
+ $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
|
2005-02-10 04:21:30 +01:00
|
|
|
rm -f authdaemonrc.tmp
|
|
|
|
- -chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
|
|
|
|
- -chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
|
2005-08-11 02:03:16 +02:00
|
|
|
+ -chown $(mailuser) $(DESTDIR)$(authdaemonrc).dist
|
|
|
|
+ -chgrp $(mailgroup) $(DESTDIR)$(authdaemonrc).dist
|
2005-02-10 04:21:30 +01:00
|
|
|
|
|
|
|
uninstall-authdaemonrc:
|
2005-08-11 02:03:16 +02:00
|
|
|
- rm -f $(DESTDIR)@authdaemonrc@.dist
|
|
|
|
+ rm -f $(DESTDIR)$(authdaemonrc).dist
|
|
|
|
|
|
|
|
authdaemonrc.h:
|
|
|
|
- echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
|
|
|
|
- echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
|
|
|
|
+ echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h
|
|
|
|
+ echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h
|
|
|
|
echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
|
|
|
|
echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
|
|
|
|
echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -1650,20 +1650,20 @@ authchangepwdir.h: config.status
|
2005-08-11 02:03:16 +02:00
|
|
|
echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
|
|
|
|
|
|
|
|
sbindir.h: config.status
|
|
|
|
- echo '#define SBINDIR "@sbindir@"' >sbindir.h
|
|
|
|
+ echo '#define SBINDIR "$(sbindir)"' >sbindir.h
|
|
|
|
|
|
|
|
pkglibdir.h: config.status
|
|
|
|
echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
|
2007-08-10 19:57:21 +02:00
|
|
|
|
|
|
|
packageversion.h: config.status
|
|
|
|
- echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h
|
|
|
|
+ echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h
|
|
|
|
|
|
|
|
pkgincludedir.h: config.status
|
2005-08-11 02:03:16 +02:00
|
|
|
echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
|
|
|
|
|
|
|
|
mailusergroup.h: config.status
|
|
|
|
- echo '#define MAILUSER "@mailuser@"' >mailusergroup.h
|
|
|
|
- echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h
|
|
|
|
+ echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h
|
|
|
|
+ echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h
|
|
|
|
|
|
|
|
dist-hook:
|
|
|
|
for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -1679,10 +1679,10 @@ install-exec-hook:
|
2007-08-10 19:57:21 +02:00
|
|
|
$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
|
|
|
|
$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
|
2005-02-10 04:21:30 +01:00
|
|
|
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
|
2007-08-10 19:57:21 +02:00
|
|
|
- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
|
2005-02-10 04:21:30 +01:00
|
|
|
- chmod 750 $(DESTDIR)@authdaemonvar@
|
|
|
|
- -chown @mailuser@ $(DESTDIR)@authdaemonvar@
|
|
|
|
- -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
|
2007-08-10 19:57:21 +02:00
|
|
|
+ $(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || :
|
2005-08-11 02:03:16 +02:00
|
|
|
+ chmod 750 $(DESTDIR)$(authdaemonvar)
|
|
|
|
+ -chown $(mailuser) $(DESTDIR)$(authdaemonvar)
|
|
|
|
+ -chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar)
|
2005-02-10 04:21:30 +01:00
|
|
|
test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
|
|
|
|
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
|
|
|
|
$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
|
2007-10-15 17:37:01 +02:00
|
|
|
@@ -1785,13 +1785,13 @@ README_authlib.html: README_authlib.html
|
2005-08-11 02:03:16 +02:00
|
|
|
authdaemond.o: authdaemonrc.h authdaemond.c
|
|
|
|
|
|
|
|
install-migrate: authmigrate
|
|
|
|
- @SHELL@ authmigrate
|
|
|
|
+ $(SHELL) authmigrate
|
|
|
|
|
|
|
|
install-configure:
|
|
|
|
- test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
|
|
|
|
- test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
|
|
|
|
- test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
|
|
|
|
- test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
|
|
|
|
+ test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true
|
|
|
|
+ test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true
|
|
|
|
+ test -f $(DESTDIR)$(authpgsqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authpgsqlrc).dist || true
|
|
|
|
+ test -f $(DESTDIR)$(authldaprc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authldaprc).dist || true
|
|
|
|
|
|
|
|
# For maintainer's use only
|
|
|
|
|