diff options
| author | Jaka Kranjc | 2007-01-14 08:55:28 +0100 |
|---|---|---|
| committer | Jaka Kranjc | 2007-01-14 08:55:28 +0100 |
| commit | 77fc3475946a8f522845af67bb7774f2d5761aee (patch) | |
| tree | 2accc4c40c1308917c8bdacdb75fa9817b26bbf0 | |
| parent | 227c93c1d11ddfb5dd782cea842d374111a20d5c (diff) | |
fixing pam_ldap to install a default /etc/ldap.conf as config file
Conflicts:
security-libs/pam_ldap/DETAILS
security-libs/pam_ldap/HISTORY
| -rwxr-xr-x | security-libs/pam_ldap/DETAILS | 1 | ||||
| -rw-r--r-- | security-libs/pam_ldap/HISTORY | 5 | ||||
| -rwxr-xr-x | security-libs/pam_ldap/INSTALL | 2 | ||||
| -rwxr-xr-x | security-libs/pam_ldap/PRE_BUILD | 4 | ||||
| -rw-r--r-- | security-libs/pam_ldap/no-ldap.conf.patch | 13 |
5 files changed, 25 insertions, 0 deletions
diff --git a/security-libs/pam_ldap/DETAILS b/security-libs/pam_ldap/DETAILS index 80d9a6969c..2a31d5a08f 100755 --- a/security-libs/pam_ldap/DETAILS +++ b/security-libs/pam_ldap/DETAILS @@ -9,6 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION UPDATED=20030810 KEYWORDS="pam ldap security libs" SHORT='PAM Ldap module' + PATCHLEVEL=2 SECURITY_PATCH=1 cat << EOF pam_ldap is a pam/ldap module that supports password changes, V2 diff --git a/security-libs/pam_ldap/HISTORY b/security-libs/pam_ldap/HISTORY index 6f36928a66..9b0d1e1ea4 100644 --- a/security-libs/pam_ldap/HISTORY +++ b/security-libs/pam_ldap/HISTORY @@ -1,3 +1,8 @@ +2007-01-14 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS, no-ldap.conf.patch,PRE_BUILD,INSTALL: + install the example ldap.conf as config file (not reaping + it when SA modified it, an important thing...) + 2006-11-17 Arjan Bouter <abouter@sourcemage.org> * SECUTIRY_PATCH=1 diff --git a/security-libs/pam_ldap/INSTALL b/security-libs/pam_ldap/INSTALL new file mode 100755 index 0000000000..f0504cc3a3 --- /dev/null +++ b/security-libs/pam_ldap/INSTALL @@ -0,0 +1,2 @@ +make install && +install_config_file ldap.conf /etc/ldap.conf diff --git a/security-libs/pam_ldap/PRE_BUILD b/security-libs/pam_ldap/PRE_BUILD new file mode 100755 index 0000000000..0e363babee --- /dev/null +++ b/security-libs/pam_ldap/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && +patch -N < "$SCRIPT_DIRECTORY/no-ldap.conf.patch" + diff --git a/security-libs/pam_ldap/no-ldap.conf.patch b/security-libs/pam_ldap/no-ldap.conf.patch new file mode 100644 index 0000000000..ba91fc0a3a --- /dev/null +++ b/security-libs/pam_ldap/no-ldap.conf.patch @@ -0,0 +1,13 @@ +--- Makefile.in 2006-10-19 13:22:27.000000000 +0000 ++++ Makefile.in.noldap 2007-01-13 22:33:13.000000000 +0000 +@@ -442,10 +442,6 @@ + + install-data-local: + @$(NORMAL_INSTALL) +- @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \ +- $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ +- $(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \ +- fi + + uninstall-local: + @$(NORMAL_UNINSTALL) |