8 files changed, 37 insertions, 4 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index 9860fe6d5..760bd7095 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_elflibs
 VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-22}
+BUILD=${BUILD:-23}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
index 0c1cc6884..3ff4a28dc 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
@@ -20,3 +20,11 @@
 /usr/lib/libraw_r.so.16
 # We'll keep this one around for just a little bit:
 /usr/lib/libffi.so.6
+# Upgrading icu4c is always painful. We'll hang onto these until nothing in the
+# main tree or common third-party additions require them.
+/usr/lib/libicudata.so.65
+/usr/lib/libicui18n.so.65
+/usr/lib/libicuio.so.65
+/usr/lib/libicutest.so.65
+/usr/lib/libicutu.so.65
+/usr/lib/libicuuc.so.65
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 219443c8d..a4b0204e9 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=etc
 VERSION=15.0
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/etc/group.new b/source/a/etc/group.new
index 281b58c19..6d1d825e9 100644
--- a/source/a/etc/group.new
+++ b/source/a/etc/group.new
@@ -53,3 +53,4 @@ nobody:x:98:nobody
 nogroup:x:99:
 users:x:100:
 console:x:101:
+ldap:x:330:
diff --git a/source/a/etc/passwd.new b/source/a/etc/passwd.new
index 8f1513a7c..9b6dd226a 100644
--- a/source/a/etc/passwd.new
+++ b/source/a/etc/passwd.new
@@ -32,3 +32,4 @@ postfix:x:91:91:User for Postfix MTA:/dev/null:/bin/false
 dovecot:x:94:94:User for Dovecot processes:/dev/null:/bin/false
 dovenull:x:95:95:User for Dovecot login processing:/dev/null:/bin/false
 nobody:x:99:99:nobody:/:/bin/false
+ldap:x:330:330:OpenLDAP server:/var/lib/openldap:/bin/false
diff --git a/source/a/etc/shadow.new b/source/a/etc/shadow.new
index 7a6f542df..0b008c5d9 100644
--- a/source/a/etc/shadow.new
+++ b/source/a/etc/shadow.new
@@ -32,3 +32,4 @@ postfix:*:9797:0:::::
 dovecot:*:9797:0:::::
 dovenull:*:9797:0:::::
 nobody:*:9797:0:::::
+ldap:*:9797:0:::::
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index fd7ca0a67..c92be7f40 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.0
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-32}
+BUILD=${BUILD:-33}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
diff --git a/source/a/pkgtools/scripts/setup.services b/source/a/pkgtools/scripts/setup.services
index 2e83cb932..ee31b6f94 100644
--- a/source/a/pkgtools/scripts/setup.services
+++ b/source/a/pkgtools/scripts/setup.services
@@ -207,6 +207,28 @@ if [ -r etc/rc.d/rc.ntpd ]; then
 EOF
 fi
 
+if [ -r etc/rc.d/rc.openldap ]; then
+  if [ -x etc/rc.d/rc.openldap ]; then
+    RC_OPENLDAP=on
+  else
+    RC_OPENLDAP=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.openldap" "OpenLDAP server" $RC_OPENLDAP "The stand-alone LDAP daemon (slapd)." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.openvpn ]; then
+  if [ -x etc/rc.d/rc.openvpn ]; then
+    RC_OPENVPN=on
+  else
+    RC_OPENVPN=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.openvpn" "OpenVPN daemon" $RC_OPENVPN "A secure IP tunnel daemon." \\
+EOF
+fi
+
 if [ -r etc/rc.d/rc.pcmcia ]; then
   if [ -x etc/rc.d/rc.pcmcia ]; then
     RC_PCMCIA=on
@@ -328,7 +350,7 @@ if [ ! $? = 0 ]; then
   exit
 fi
 
-for service in rc.atalk rc.atd rc.bind rc.crond rc.cups rc.dovecot rc.dnsmasq rc.fuse rc.hald rc.hplip rc.httpd rc.inetd rc.ip_forward rc.lprng rc.messagebus rc.mysqld rc.ntpd rc.pcmcia rc.postfix rc.rpc rc.samba rc.saslauthd rc.smartd rc.snmpd rc.sendmail rc.syslog rc.sshd ; do
+for service in rc.atalk rc.atd rc.bind rc.crond rc.cups rc.dovecot rc.dnsmasq rc.fuse rc.hald rc.hplip rc.httpd rc.inetd rc.ip_forward rc.lprng rc.messagebus rc.mysqld rc.ntpd rc.openldap rc.openvpn rc.pcmcia rc.postfix rc.rpc rc.samba rc.saslauthd rc.smartd rc.snmpd rc.sendmail rc.syslog rc.sshd ; do
   if [ -f etc/rc.d/$service ]; then
     if grep -w $service $TMP/reply 1> /dev/null ; then
       chmod 755 etc/rc.d/$service