diff options
Diffstat (limited to 'security/courier-authlib/files/patch-Makefile.in')
| -rw-r--r-- | security/courier-authlib/files/patch-Makefile.in | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in index 0318890c8005..c5334cc17384 100644 --- a/security/courier-authlib/files/patch-Makefile.in +++ b/security/courier-authlib/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Jul 23 02:06:37 2005 -+++ Makefile.in Sat Jul 23 15:35:52 2005 -@@ -47,11 +47,10 @@ +--- Makefile.in.orig Sat Dec 30 06:27:59 2006 ++++ Makefile.in Mon Jan 1 22:23:31 2007 +@@ -45,11 +45,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -16,7 +16,7 @@ DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/README.authdebug.html.in $(srcdir)/authdaemond.in \ -@@ -87,7 +86,7 @@ +@@ -85,7 +84,7 @@ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkglibexecdir)" \ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" @@ -25,11 +25,11 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) am__DEPENDENCIES_1 = libcourierauthcommon.la am_libauthcustom_la_OBJECTS = authcustom.lo preauthcustom.lo -@@ -400,8 +399,14 @@ +@@ -401,8 +400,14 @@ userdb = @userdb@ vpopmail_home = @vpopmail_home@ AUTOMAKE_OPTIONS = dist-bzip2 --SUBDIRS = libltdl @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog +-SUBDIRS = @LIBLTDL_SUBDIR@ @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog -DIST_SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog +SUBDIRS = libltdl @DBSUBDIR@ md5 sha1 libhmac numlib +@HAVE_USERDB_TRUE@SUBDIRS += makedat userdb @@ -42,7 +42,7 @@ INCLUDES = $(LTDLINCL) modules = @LIBAUTHUSERDB@ \ @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ -@@ -410,9 +415,11 @@ +@@ -411,9 +416,11 @@ pkglibexecdir = $(libexecdir)/courier-authlib pkglibexec_SCRIPTS = authsystem.passwd @@ -57,7 +57,7 @@ sbin_SCRIPTS = authdaemond EXTRA_LTLIBRARIES = libauthuserdb.la \ -@@ -570,8 +577,8 @@ +@@ -571,8 +578,8 @@ libcourierauthsaslclient_la_LIBADD = libcourierauth.la libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' @@ -68,7 +68,7 @@ courierauthconfig_SOURCES = authinfo.c authpasswd_SOURCES = authpasswd.c -@@ -601,7 +608,7 @@ +@@ -613,7 +620,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 @@ -77,7 +77,7 @@ man_MANS = $(man1) $(man3) BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ authdaemonrc.h vpopmail_config.h packageversion.h \ -@@ -985,8 +992,8 @@ +@@ -997,8 +1004,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -88,7 +88,7 @@ done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -1030,8 +1037,8 @@ +@@ -1042,8 +1049,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -99,7 +99,7 @@ done uninstall-man3: @$(NORMAL_UNINSTALL) -@@ -1398,15 +1405,21 @@ +@@ -1422,15 +1429,21 @@ info-am: @@ -129,7 +129,7 @@ install-info: install-info-recursive -@@ -1516,6 +1529,19 @@ +@@ -1540,6 +1553,19 @@ @HAVE_LDAP_FALSE@uninstall-authldaprc: @HAVE_LDAP_FALSE@ @: @@ -149,12 +149,12 @@ authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -@@ -1545,16 +1571,22 @@ +@@ -1569,16 +1595,22 @@ authpiperc.h: echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h -install-authdaemonrc: -- $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` +- $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || : - sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp - $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist - rm -f authdaemonrc.tmp @@ -181,7 +181,7 @@ authdaemonrc.h: echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h -@@ -1597,18 +1629,18 @@ +@@ -1621,18 +1653,18 @@ # automake still a bit stupid... install-data-hook: install-authdaemonrc install-authpgsqlrc \ @@ -190,26 +190,26 @@ : install-exec-hook: -- $(mkinstalldirs) $(DESTDIR)$(bindir) -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -- $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) +- $(mkinstalldirs) $(DESTDIR)$(bindir) || : +- $(mkinstalldirs) $(DESTDIR)$(sbindir) || : +- $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond -- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ +- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || : - chmod 750 $(DESTDIR)@authdaemonvar@ - -chown @mailuser@ $(DESTDIR)@authdaemonvar@ - -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@ -+@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(bindir) -+@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(sbindir) -+@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) ++@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(bindir) || : ++@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(sbindir) || : ++@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : +@HAVE_BASE_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond -+@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ ++@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || : +@HAVE_BASE_TRUE@ chmod 750 $(DESTDIR)@authdaemonvar@ +@HAVE_BASE_TRUE@ -chown @mailuser@ $(DESTDIR)@authdaemonvar@ +@HAVE_BASE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@ test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \ $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ -@@ -1626,7 +1658,7 @@ +@@ -1650,7 +1682,7 @@ $(DESTDIR)$(sbindir)/userdb-test-cram-md5 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc @@ -218,7 +218,7 @@ test "@AUTHUSERDB@" = "" && exit 0 ;\ rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \ $(DESTDIR)$(sbindir)/vchkpw2userdb \ -@@ -1640,7 +1672,7 @@ +@@ -1664,7 +1696,7 @@ CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status authlib.3: authlib.3.in @@ -227,7 +227,7 @@ @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml docbook/sgml2html @HAVE_SGML_TRUE@ docbook/sgml2html authpasswd.sgml authpasswd.html -@@ -1714,10 +1746,10 @@ +@@ -1738,10 +1770,10 @@ @SHELL@ authmigrate install-configure: |