[SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc (77fc3475946a8f522845af67bb7774f2d5761aee)

Jaka Kranjc scm at mail.sourcemage.org
Sun Jan 14 02:55:47 EST 2007


GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 security-libs/pam_ldap/DETAILS            |    1 +
 security-libs/pam_ldap/HISTORY            |    5 +++++
 security-libs/pam_ldap/INSTALL            |    2 ++
 security-libs/pam_ldap/PRE_BUILD          |    4 ++++
 security-libs/pam_ldap/no-ldap.conf.patch |   13 +++++++++++++
 5 files changed, 25 insertions(+)

New commits:
commit 77fc3475946a8f522845af67bb7774f2d5761aee
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    fixing pam_ldap to install a default /etc/ldap.conf as config file
    
    Conflicts:
    
    	security-libs/pam_ldap/DETAILS
    	security-libs/pam_ldap/HISTORY

diff --git a/security-libs/pam_ldap/DETAILS b/security-libs/pam_ldap/DETAILS
index 80d9a69..2a31d5a 100755
--- a/security-libs/pam_ldap/DETAILS
+++ b/security-libs/pam_ldap/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
          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 6f36928..9b0d1e1 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-11-17 Arjan Bouter <abouter at sourcemage.org>
 	* SECUTIRY_PATCH=1
 
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)



More information about the SM-Commit mailing list