New commits:
commit 013eddfa2dff52d577f8e1e36f3c01b01ed360c6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
fixing pam_ldap to install a default /etc/ldap.conf as config file
diff --git a/security-libs/pam_ldap/DETAILS b/security-libs/pam_ldap/DETAILS
index cff9fcd..2a31d5a 100755
--- a/security-libs/pam_ldap/DETAILS
+++ b/security-libs/pam_ldap/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
UPDATED=20030810
KEYWORDS="pam ldap security libs"
SHORT='PAM Ldap module'
- PATCHLEVEL=1
+ 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 9eedf03..e7f1804 100644
--- a/security-libs/pam_ldap/HISTORY
+++ b/security-libs/pam_ldap/HISTORY
@@ -1,3 +1,8 @@
+2007-01-14 Thomas Orgis <sobukus AT 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-12-17 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD,DETAILS: make it install the .so module into /lib/security
and updated PATCHLEVEL ... we really want the module there
diff --git a/security-libs/pam_ldap/INSTALL b/security-libs/pam_ldap/INSTALL
new file mode 100755
index 0000000..f0504cc
--- /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 0000000..0e363ba
--- /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 0000000..ba91fc0
--- /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)
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (013eddfa2dff52d577f8e1e36f3c01b01ed360c6),
Thomas Orgis, 01/13/2007