Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6f2fecf639bb1758b49e8529271e320357ab4410)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6f2fecf639bb1758b49e8529271e320357ab4410)
  • Date: Sat, 14 Apr 2007 10:40:29 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

collab/openldap/CONFIGURE | 5 ++++-
collab/openldap/DEPENDS | 4 ++++
collab/openldap/DETAILS | 1 +
collab/openldap/HISTORY | 7 +++++++
collab/openldap/PRE_BUILD | 8 ++++++++
collab/openldap/openldap-2.3.33-contextpatch.bz2 |binary
security-libs/pam_ldap/BUILD | 2 +-
security-libs/pam_ldap/CONFIGURE | 2 ++
security-libs/pam_ldap/DEPENDS | 5 ++++-
security-libs/pam_ldap/DETAILS | 2 +-
security-libs/pam_ldap/HISTORY | 9 +++++++++
security-libs/pam_ldap/PRE_BUILD | 8 ++++++--
security-libs/pam_ldap/pam_ldap-context.patch.bz2 |binary
utils/nss_ldap/CONFIGURE | 6 ++++--
utils/nss_ldap/DEPENDS | 5 ++++-
utils/nss_ldap/DETAILS | 7 +++----
utils/nss_ldap/HISTORY | 6 ++++++
utils/nss_ldap/PRE_BUILD | 7 +++++++
utils/nss_ldap/nss_ldap-context.patch.bz2 |binary
19 files changed, 71 insertions(+), 13 deletions(-)

New commits:
commit 2a3d4aa9bf7bb272107ca89837fc60f5f1780d51
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nss_ldap: add context support, see http://timof.qipc.org/ldap/libldap.html

commit 18ae539dc87aa532ddadbfd2ef59034d176867dc
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nss_ldap: bump to 255

commit 11a081d8e69be92efbc42191798bcda0f15de977
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

openldap: add context support by Timo Felbinger as optional feature since
upstream seems not to care about the issue

commit b055e1f5c69127918e14a8bbf140f76dd54a42d7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pam_ldap: add LDAP context support

commit ac7437f834251058d160477632cce9e893d50478
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pam_ldap: no quotes in OPTS

diff --git a/collab/openldap/CONFIGURE b/collab/openldap/CONFIGURE
index 66f54a1..9fbb772 100755
--- a/collab/openldap/CONFIGURE
+++ b/collab/openldap/CONFIGURE
@@ -14,4 +14,7 @@ if echo $OPENLDAP_SLAPD | grep -q enable; then
'--enable-monitor=mod' '--disable-monitor' &&
config_query_option SLAPD_ACI 'Enable per-object access control' n \
'--enable-aci' '--disable-aci'
-fi
+fi &&
+
+config_query OPENLDAP_CONTEXT \
+ 'Security: Add context support (see
http://timof.qipc.org/ldap/libldap.html)?' n \
diff --git a/collab/openldap/DEPENDS b/collab/openldap/DEPENDS
index 69ca576..5789993 100755
--- a/collab/openldap/DEPENDS
+++ b/collab/openldap/DEPENDS
@@ -41,4 +41,8 @@ if echo $OPENLDAP_SLAPD | grep -q enable; then
'--enable-wrappers' \
'--disable-wrappers' \
'for TCP wrappers support'
+fi &&
+
+if [[ "$OPENLDAP_CONTEXT" == y ]]; then
+ depends autoconf
fi
diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 18114df..f7130bb 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -13,6 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20010922
LICENSE[0]=http://www.openldap.org/software/release/license.html
KEYWORDS="ldap collab"
+ SECURITY_PATCH=1
SHORT="Fully featured open source LDAP software suite"
cat << EOF
The OpenLDAP Project is a collaborative effort to provide a robust,
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index e0dfc98..e3f6683 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,10 @@
+2007-04-14 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, CONFIGURE, DEPENDS, openldap-2.3.33-contextpatch.bz2:
+ Add context support, see http://timof.qipc.org/ldap/libldap.html .
+ Upstream is not reacting to the issue, so I think this patch here
+ is justified.
+ * DETAILS: security patch, even if only optional, this is relevant
+
2007-02-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3.34

diff --git a/collab/openldap/PRE_BUILD b/collab/openldap/PRE_BUILD
new file mode 100755
index 0000000..3146676
--- /dev/null
+++ b/collab/openldap/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+if [[ "$OPENLDAP_CONTEXT" == y ]]; then
+ message "${MESSAGE_COLOR}Applying the context patch.$DEFAULT_COLOR" &&
+ # patch for version 2.3.33, also tested for 2.3.34
+ bzcat "$SCRIPT_DIRECTORY/openldap-2.3.33-contextpatch.bz2" | patch -p1 &&
+ autoconf
+fi
diff --git a/collab/openldap/openldap-2.3.33-contextpatch.bz2
b/collab/openldap/openldap-2.3.33-contextpatch.bz2
new file mode 100644
index 0000000..98a04a1
Binary files /dev/null and b/collab/openldap/openldap-2.3.33-contextpatch.bz2
differ
diff --git a/security-libs/pam_ldap/BUILD b/security-libs/pam_ldap/BUILD
index 2a97c9a..7d55359 100755
--- a/security-libs/pam_ldap/BUILD
+++ b/security-libs/pam_ldap/BUILD
@@ -5,5 +5,5 @@ if ! [[ -x configure ]]; then
automake --add-missing &&
autoconf
fi &&
-OPTS="$OPTS --libdir=\"$INSTALL_ROOT/lib\"" &&
+OPTS="$OPTS --libdir=$INSTALL_ROOT/lib" &&
default_build
diff --git a/security-libs/pam_ldap/CONFIGURE
b/security-libs/pam_ldap/CONFIGURE
new file mode 100755
index 0000000..269a105
--- /dev/null
+++ b/security-libs/pam_ldap/CONFIGURE
@@ -0,0 +1,2 @@
+config_query PAM_LDAP_CONTEXT \
+ 'Security: Try to use context support (see
http://timof.qipc.org/ldap/libldap.html)?' n
diff --git a/security-libs/pam_ldap/DEPENDS b/security-libs/pam_ldap/DEPENDS
index bce4a0e..734657f 100755
--- a/security-libs/pam_ldap/DEPENDS
+++ b/security-libs/pam_ldap/DEPENDS
@@ -1,4 +1,7 @@
depends automake &&
depends libtool &&
depends openldap &&
-depends linux-pam
+depends linux-pam &&
+if [[ "$PAM_LDAP_CONTEXT" == y ]]; then
+ depends autoconf
+fi
diff --git a/security-libs/pam_ldap/DETAILS b/security-libs/pam_ldap/DETAILS
index 2a31d5a..c166ce5 100755
--- a/security-libs/pam_ldap/DETAILS
+++ b/security-libs/pam_ldap/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="pam ldap security libs"
SHORT='PAM Ldap module'
PATCHLEVEL=2
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
cat << EOF
pam_ldap is a pam/ldap module that supports password changes, V2
clients, Netscapes SSL, ypldapd, Netscape Directory Server password
diff --git a/security-libs/pam_ldap/HISTORY b/security-libs/pam_ldap/HISTORY
index 198a77e..1a9a05a 100644
--- a/security-libs/pam_ldap/HISTORY
+++ b/security-libs/pam_ldap/HISTORY
@@ -1,3 +1,12 @@
+2007-04-14 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: remove the quotes in OPTS that only can hurt as it is now
+ (a regenerated configure chokes on what sorcery makes out of them,
+ we don't support INSTALL_ROOT with spaces)
+ * PRE_BUILD, DEPENDS, CONFIGURE, pam_ldap-context.patch.bz2:
+ add LDAP context support by Timo Felbinger from
+ http://timof.qipc.org/ldap/libldap.html
+ * DETAILS: it's a security patch, really
+
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
diff --git a/security-libs/pam_ldap/PRE_BUILD
b/security-libs/pam_ldap/PRE_BUILD
index 0e363ba..ea1970b 100755
--- a/security-libs/pam_ldap/PRE_BUILD
+++ b/security-libs/pam_ldap/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -N < "$SCRIPT_DIRECTORY/no-ldap.conf.patch"
-
+patch -N < "$SCRIPT_DIRECTORY/no-ldap.conf.patch" &&
+if [[ "$PAM_LDAP_CONTEXT" == y ]]; then
+ message "${MESSAGE_COLOR}Applying the context patch.$DEFAULT_COLOR" &&
+ bzcat "$SCRIPT_DIRECTORY/pam_ldap-context.patch.bz2" | patch -p1 &&
+ autoconf
+fi
diff --git a/security-libs/pam_ldap/pam_ldap-context.patch.bz2
b/security-libs/pam_ldap/pam_ldap-context.patch.bz2
new file mode 100644
index 0000000..5e3d558
Binary files /dev/null and
b/security-libs/pam_ldap/pam_ldap-context.patch.bz2 differ
diff --git a/utils/nss_ldap/CONFIGURE b/utils/nss_ldap/CONFIGURE
index 200cd31..8e3b88b 100755
--- a/utils/nss_ldap/CONFIGURE
+++ b/utils/nss_ldap/CONFIGURE
@@ -1,2 +1,4 @@
-config_query_option SCHEMA_MAPPING "enable schema mapping" n
"--enable-schema-mapping" "--disable-schema-mapping"
-
+config_query_option SCHEMA_MAPPING "enable schema mapping" n \
+ "--enable-schema-mapping" "--disable-schema-mapping" &&
+config_query NSS_LDAP_CONTEXT \
+ 'Security: Try to use context support (see
http://timof.qipc.org/ldap/libldap.html)?' n
diff --git a/utils/nss_ldap/DEPENDS b/utils/nss_ldap/DEPENDS
index e58c444..2c7bca4 100755
--- a/utils/nss_ldap/DEPENDS
+++ b/utils/nss_ldap/DEPENDS
@@ -1 +1,4 @@
-depends openldap '--with-ldap-lib=openldap'
+depends openldap '--with-ldap-lib=openldap' &&
+if [[ "$NSS_LDAP_CONTEXT" == y ]]; then
+ depends autoconf
+fi
diff --git a/utils/nss_ldap/DETAILS b/utils/nss_ldap/DETAILS
index 3cd348c..6f56fc6 100755
--- a/utils/nss_ldap/DETAILS
+++ b/utils/nss_ldap/DETAILS
@@ -1,13 +1,12 @@
SPELL=nss_ldap
- VERSION=248
-
SOURCE_HASH='sha512:6111f7d9c5d9a9c6229a3e6fb1a9483ed6ca2c4a5c0e6a8ea03708261f293634037334f98537fd3a87ad980419a36210a71f8a6ad331fbb60425b720cdd77353'
+ VERSION=255
+
SOURCE_HASH=sha512:ad4d96386e593fa5ff4c0fde7c968c089cb1ff658b58699750a15c406c17259ad1a83c7a7fdd8741a91bc40fbe657bf89fbaefe3050ce8599a46c4fb69ed3541
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.padl.com/download/$SOURCE
WEB_SITE=http://www.padl.com/OSS/nss_ldap.html
ENTERED=20020210
- UPDATED=20030726
- PATCHLEVEL=1
+ SECURITY_PATCH=1
KEYWORDS="ldap utils"
SHORT='nss_ldap is a library for using ldap for name service'
cat << EOF
diff --git a/utils/nss_ldap/HISTORY b/utils/nss_ldap/HISTORY
index 2a34773..9340ee4 100644
--- a/utils/nss_ldap/HISTORY
+++ b/utils/nss_ldap/HISTORY
@@ -1,3 +1,9 @@
+2007-04-14 Thomas Orgis <sobukus AT sourcemake.org>
+ * DETAILS: update to version 255
+ * CONFIGURE,DEPENDS,DETAILS,PRE_BUILD,nss_ldap-context.patch.bz2:
+ add context support + security patch,
+ see http://timof.qipc.org/ldap/libldap.html
+
2007-01-20 Thomas Orgis <sobukus AT sourcemake.org>
* CONFIGURE, BUILD: add option for schema mappings, needed when you
are
really serious about LDAP
diff --git a/utils/nss_ldap/PRE_BUILD b/utils/nss_ldap/PRE_BUILD
new file mode 100755
index 0000000..7477f2a
--- /dev/null
+++ b/utils/nss_ldap/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+if [[ "$NSS_LDAP_CONTEXT" == y ]]; then
+ message "${MESSAGE_COLOR}Applying the context patch.$DEFAULT_COLOR" &&
+ bzcat "$SCRIPT_DIRECTORY/nss_ldap-context.patch.bz2" | patch -p1 &&
+ autoconf
+fi
diff --git a/utils/nss_ldap/nss_ldap-context.patch.bz2
b/utils/nss_ldap/nss_ldap-context.patch.bz2
new file mode 100644
index 0000000..4a85473
Binary files /dev/null and b/utils/nss_ldap/nss_ldap-context.patch.bz2 differ



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6f2fecf639bb1758b49e8529271e320357ab4410), Thomas Orgis, 04/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page