package/network/pam_ldap/pam_ldap-178-autotools.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../pam_ldap/pam_ldap-178-autotools.patch
   5 # Copyright (C) 2004 - 2007 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 diff -urN pam_ldap-180.orig/configure.in pam_ldap-180/configure.in
  17 --- pam_ldap-180.orig/configure.in      2005-08-18 00:35:13.000000000 +0200
  18 +++ pam_ldap-180/configure.in   2005-09-06 08:41:23.192126000 +0200
  19 @@ -13,8 +13,17 @@
  20  AC_ARG_ENABLE(ssl, [  --disable-ssl           disable SSL/TSL support])
  21  AC_ARG_WITH(ldap-lib, [  --with-ldap-lib=type    select ldap library [auto|netscape5|netscape4|netscape3|umich|openldap]])
  22  AC_ARG_WITH(ldap-dir, [  --with-ldap-dir=DIR     base directory of ldap SDK])
  23 -AC_ARG_WITH(ldap-conf-file, [  --with-ldap-conf-file     path to LDAP configuration file], [AC_DEFINE_UNQUOTED(PAM_LDAP_PATH_CONF, "$with_ldap_conf_file")])
  24 -AC_ARG_WITH(ldap-secret-file, [  --with-ldap-secret-file   path to LDAP root secret file], [AC_DEFINE_UNQUOTED(PAM_LDAP_PATH_ROOTPASSWD, "$with_ldap_secret_file")])
  25 +AC_ARG_WITH(ldap-conf-file, [  --with-ldap-conf-file     path to LDAP configuration file],
  26 +           [ PAM_LDAP_PATH_CONF=$with_ldap_conf_file ],
  27 +           [ PAM_LDAP_PATH_CONF="/etc/ldap.conf" ])
  28 +AC_ARG_WITH(ldap-secret-file, [  --with-ldap-secret-file   path to LDAP root secret file],
  29 +           [ PAM_LDAP_PATH_ROOTPASSWD="$with_ldap_secret_file" ],
  30 +           [ PAM_LDAP_PATH_ROOTPASSWD="/etc/ldap.secret" ])
  31 +
  32 +AC_DEFINE_UNQUOTED(PAM_LDAP_PATH_CONF, "$PAM_LDAP_PATH_CONF")
  33 +AC_DEFINE_UNQUOTED(PAM_LDAP_PATH_ROOTPASSWD, "$PAM_LDAP_PATH_ROOTPASSWD")
  34 +AC_SUBST(PAM_LDAP_PATH_CONF)
  35 +AC_SUBST(PAM_LDAP_PATH_ROOTPASSWD)
  36
  37  if test "$ac_cv_prog_gcc" = "yes"; then CFLAGS="$CFLAGS -Wall -fPIC"; fi
  38
  39 diff -urN pam_ldap-180.orig/Makefile.am pam_ldap-180/Makefile.am
  40 --- pam_ldap-180.orig/Makefile.am       2005-08-18 00:35:13.000000000 +0200
  41 +++ pam_ldap-180/Makefile.am    2005-09-06 08:43:04.938484750 +0200
  42 @@ -1,7 +1,13 @@
  43 -noinst_PROGRAMS = pam_ldap.so
  44 +noinst_PROGRAMS = pam_ldap.so chfn chsh
  45  EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README \
  46              ldap.conf pam.conf pam_ldap.spec pam.d
  47
  48 +PAM_LDAP_PATH_CONF = @PAM_LDAP_PATH_CONF@
  49 +PAM_LDAP_PATH_ROOTPASSWD = @PAM_LDAP_PATH_ROOTPASSWD@
  50 +
  51 +chfn_SOURCES = chfn.in
  52 +chsh_SOURCES = chsh.in
  53 +
  54  pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h
  55  pam_ldap_so_LDFLAGS = @pam_ldap_so_LDFLAGS@
  56
  57 @@ -35,11 +41,20 @@
  58
  59  install-data-local:
  60         @$(NORMAL_INSTALL)
  61 -       @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \
  62 -               $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
  63 -               $(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
  64 +       @if test ! -f $(DESTDIR)$(PAM_LDAP_PATH_CONF); then \
  65 +               $(mkinstalldirs) $(DESTDIR)$(dir $(PAM_LDAP_PATH_CONF)); \
  66 +               $(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(PAM_LDAP_PATH_CONF); \
  67         fi
  68
  69  uninstall-local:
  70         @$(NORMAL_UNINSTALL)
  71
  72 +
  73 +chfn$(EXEEXT): chfn.in
  74 +
  75 +chsh$(EXEEXT): chsh.in
  76 +
  77 +%$(EXEEXT)::   %.in
  78 +       sed -e "s:/etc/ldap.conf:$(PAM_LDAP_PATH_CONF):" \
  79 +           -e "s:/etc/ldap.secret:$(PAM_LDAP_PATH_ROOTPASSWD):" < $< > $@
  80 +