Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	dbus/dbus.nm
	openldap/openldap.nm

diff --combined dbus/dbus.nm
index b96796b7f218bab8e9be51bd2e5aae7c3ce874d5,c751bf14c4ca430396a4aba9fd8460b396eeae6e..6bfd2ea6bcbcbfda08b25619d1cd976d64719a6c
--- 1/dbus/dbus.nm
--- 2/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = dbus
 -version    = 1.4.14
 -release    = 3
 +version    = 1.4.16
- release    = 1
++release    = 2
  
  groups     = System/Daemons
  url        = http://www.freedesktop.org/software/dbus/
@@@ -24,33 -24,32 +24,33 @@@ buil
        requires
                audit-devel
                expat-devel
 +              libcap-ng-devel
                libselinux-devel
        end
  
        configure_options += \
                --sysconfdir=/etc \
                --localstatedir=/var \
-               --libdir=/lib \
-               --libexecdir=/lib \
+               --libdir=/%{lib} \
+               --libexecdir=/%{lib} \
                --enable-libaudit \
                --enable-selinux=yes \
                --with-systemdsystemunitdir=/lib/systemd/system/ \
                --with-dbus-user=dbus
  
        install_cmds
-               mkdir -pv %{BUILDROOT}/usr/lib
-               mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+               mkdir -pv %{BUILDROOT}%{libdir}
+               mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
  
                #change the arch-deps.h include directory to /usr/lib instead of /lib
-               sed -e 's@-I${libdir}@-I${prefix}/lib@' -i %{BUILDROOT}/usr/lib/pkgconfig/dbus-1.pc
+               sed -e 's@-I${libdir}@-I${prefix}/%{lib}@' -i %{BUILDROOT}%{libdir}/pkgconfig/dbus-1.pc
  
-               mkdir -pv %{BUILDROOT}/usr/lib/dbus-1.0/include
-               mv -v %{BUILDROOT}/lib/dbus-1.0/include/* %{BUILDROOT}/usr/lib/dbus-1.0/include
-               rm -rvf %{BUILDROOT}/lib/dbus-1.0
+               mkdir -pv %{BUILDROOT}%{libdir}/dbus-1.0/include
+               mv -v %{BUILDROOT}/%{lib}/dbus-1.0/include/* %{BUILDROOT}%{libdir}/dbus-1.0/include
+               rm -rvf %{BUILDROOT}/%{lib}/dbus-1.0
  
-               rm -vf %{BUILDROOT}/lib/libdbus-1.so
-               ln -svf ../../lib/libdbus-1.so.3 %{BUILDROOT}/usr/lib/libdbus-1.so
+               rm -vf %{BUILDROOT}/%{lib}/libdbus-1.so
+               ln -svf ../../%{lib}/libdbus-1.so.3 %{BUILDROOT}%{libdir}/libdbus-1.so
        end
  end
  

diff --combined openldap/openldap.nm
index a664039f13542582ef68e02a078dc101a93eff1b,699f023605e2ac3bf443e677b02a7c5bc739ffd5..c6bfb7ee2ec901da58859bf99130d6280d872e1b
--- 1/openldap/openldap.nm
--- 2/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = openldap
 -version    = 2.4.25
 -release    = 3
 +version    = 2.4.28
- release    = 1
++release    = 2
  
  groups     = System/Daemons
  url        = http://www.openldap.org/
@@@ -21,7 -21,7 +21,7 @@@ descriptio
        documentation for OpenLDAP.
  end
  
 -source_dl  =
 +source_dl  = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
  sources    = %{thisapp}.tgz
  
  build
@@@ -36,7 -36,7 +36,7 @@@
        end
  
        configure_options += \
-               --libexecdir=/usr/lib \
+               --libexecdir=%{libdir} \
                --sysconfdir=/etc \
                --localstatedir=/var \
                --with-threads=posix \
@@@ -57,7 -57,7 +57,7 @@@
  #endef
  
        install_cmds
-               mv -v %{BUILDROOT}/usr/lib/slapd %{BUILDROOT}/usr/sbin/slapd
+               mv -v %{BUILDROOT}%{libdir}/slapd %{BUILDROOT}/usr/sbin/slapd
                ln -svf slapd %{BUILDROOT}/usr/sbin/slapacl
                ln -svf slapd %{BUILDROOT}/usr/sbin/slapadd
                ln -svf slapd %{BUILDROOT}/usr/sbin/slapauth
@@@ -71,7 -71,7 +71,7 @@@
                rm -rvf %{BUILDROOT}/var/openldap-data
  
                for LINK in lber ldap ldap_r; do
-                       chmod -v 0755 %{BUILDROOT}/usr/lib/$(readlink %{BUILDROOT}/usr/lib/lib${LINK}.so)
+                       chmod -v 0755 %{BUILDROOT}%{libdir}/$(readlink %{BUILDROOT}%{libdir}/lib${LINK}.so)
                done
  
                # Install configuration