Commit: 08c8b599dc9814b1ba3e840e422b397161a69d03 - LFScripts (git)

Commit MetaInfo

• Revision: 08c8b599dc9814b1ba3e840e422b397161a69d03 (tree)
• Time: 2018-05-10 16:02:52
• Author: matsuand <matsuand@user...>
• Commiter: matsuand

Log Message

[BLFS] Updated openldap-2.4.46, and modified.

Change Summary

• modified: BLFS/openldap.sh

Incremental Difference

--- a/BLFS/openldap.sh
+++ b/BLFS/openldap.sh
@@ -3,18 +3,17 @@
 . ./_blfsset.sh
 
 APPNAME=openldap
-VER=2.4.42
+VER=2.4.46
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tgz
 TARGETDIR=$TARGET
 
 echo $TARGET
 
-. $WRK/_checkRequired.sh \
-	db
+. $WRK/_checkRequired.sh ""
 . $WRK/_checkOptions.sh  \
-	openslp tcp_wrappers cyrus-sasl icu \
-	unixODBC
+	openslp tcp_wrappers icu \
+	unixODBC db cyrus-sasl
 . $WRK/_checkTarball.sh
 . $WRK/_checkExit.sh "$1" || exit $?
 
@@ -24,16 +23,17 @@ Extract
 
 TimeStart
 
-mkdir -p /var/lib/openldap
+#mkdir -p /var/lib/openldap
 
 groupadd -g 83 ldap
-useradd -c "OpenLDAP Daemon Owner" -d /var/lib/openldap -u 83 \
-        -g ldap -s /bin/false ldap
+useradd  -c "OpenLDAP Daemon Owner" \
+         -d /var/lib/openldap -u 83 \
+         -g ldap -s /bin/false ldap
 
 cd $TARGETDIR
 
 Patching
-patch -Np1 -i $DLD/openldap-2.4.42-consolidated-1.patch \
+patch -Np1 -i $DLD/openldap-$VER-consolidated-1.patch \
 	1> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
 autoconf \
 	1>> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
@@ -54,6 +54,7 @@ $([ ${OPTION_cyrussasl} -eq 1 ] && echo --enable-spasswd) \
             --enable-slapd        \
 $([ ${OPTION_openslp} -eq 1 ] && echo --enable-slpd) \
             --enable-modules      \
+            --enable-rlookups     \
             --enable-backends=mod \
             --disable-ndb         \
             --disable-sql         \
@@ -77,7 +78,9 @@ porg -lp  $TARGET "make install" \
 	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
 porg -lp+ $TARGET "\
-install -v -dm700 -o ldap -g ldap /var/lib/openldap     &&
+install -v -dm700 -o ldap -g ldap /var/lib/openldap" \
+	1>> $LOG/$TARGET.3_install.log 2>&1 || exit 1
+porg -lp+ $TARGET "\
 install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d" \
 	1>> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
@@ -89,7 +92,7 @@ install -dm 755 /usr/share/doc/openldap-$VER
 porg -lp+ $TARGET "\
 cp      -vfr      doc/{drafts,rfc,guide} \
                   /usr/share/doc/openldap-$VER" \
-	1>> $LOG/$TARGET.4_install.log 2>&1
+	1>> $LOG/$TARGET.3_install.log 2>&1
 
 TimeEnd