OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=10

openldap-rc.tgz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c052d00a8fc045161e25ed3dea2601eb16b38eb35e62399a9f319392907f9aa
+oid sha256:2e9338b64501752c54ac1be438c424402fb9cb9386112da0c59802da192a0981
-size 4350
+size 4903

openldap2-client.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 15:50:11 CEST 2007 - rhafer@suse.de
+
+- imported apparmor profile from apparmor (this profile is not
+  enabled by default)
+
 -------------------------------------------------------------------
 Fri May  4 14:00:39 CEST 2007 - rhafer@suse.de
 

openldap2-client.spec

@@ -28,7 +28,7 @@ Summary:        OpenLDAP2 Client Utilities
 %endif
 Autoreqprov:    on
 Version:        2.3.35
-Release:        1
+Release:        5
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        openldap-admin-guide.tar.bz2
@@ -133,7 +133,7 @@ autoreconf
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS"
 ./configure --prefix=/usr \
         --exec-prefix=/usr \
-        --sysconfdir=/etc \
+        --sysconfdir=%{_sysconfdir} \
         --localstatedir=/var/run/slapd \
         --libexecdir=/usr/lib/openldap \
         --libdir=%{_libdir} \
@@ -189,8 +189,10 @@ install -m 755 rc.ldap $RPM_BUILD_ROOT/etc/init.d/ldap
 install -m 755 rc.slurpd $RPM_BUILD_ROOT/etc/init.d/slurpd
 ln -sf ../../etc/init.d/ldap $RPM_BUILD_ROOT/usr/sbin/rcldap
 ln -sf ../../etc/init.d/slurpd $RPM_BUILD_ROOT/usr/sbin/rcslurpd
-mkdir -p $RPM_BUILD_ROOT/etc/sasl2
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sasl2/slapd.conf
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2/slapd.conf
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/
+install -m 644 apparmor/usr.lib.openldap.slapd $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 install -m 700 -d $RPM_BUILD_ROOT/var/lib/slurpd
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
@@ -220,6 +222,10 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 #put filelists into files
 cat >openldap2.filelist <<EOF
 /var/adm/fillup-templates/sysconfig.openldap
+%dir %attr(-, root, root) %{_sysconfdir}/apparmor/
+%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/
+%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/extras/
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 %config /etc/init.d/ldap
 %config /etc/init.d/slurpd
 /etc/sysconfig/SuSEfirewall2.d/services/openldap
@@ -345,6 +351,9 @@ fi
 %endif
 
 %changelog
+* Tue May 15 2007 - rhafer@suse.de
+- imported apparmor profile from apparmor (this profile is not
+  enabled by default)
 * Fri May 04 2007 - rhafer@suse.de
 - Update to Version 2.3.35. Most important changes:
   * Fixed ldapmodify to use correct memory free functions (ITS#4901)

openldap2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 15:50:11 CEST 2007 - rhafer@suse.de
+
+- imported apparmor profile from apparmor (this profile is not
+  enabled by default)
+
 -------------------------------------------------------------------
 Fri May  4 14:00:39 CEST 2007 - rhafer@suse.de
 

openldap2.spec

@@ -28,7 +28,7 @@ Summary:        The New OpenLDAP Server (LDAPv3)
 %endif
 Autoreqprov:    on
 Version:        2.3.35
-Release:        1
+Release:        5
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        openldap-admin-guide.tar.bz2
@@ -136,7 +136,7 @@ autoreconf
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS"
 ./configure --prefix=/usr \
         --exec-prefix=/usr \
-        --sysconfdir=/etc \
+        --sysconfdir=%{_sysconfdir} \
         --localstatedir=/var/run/slapd \
         --libexecdir=/usr/lib/openldap \
         --libdir=%{_libdir} \
@@ -192,8 +192,10 @@ install -m 755 rc.ldap $RPM_BUILD_ROOT/etc/init.d/ldap
 install -m 755 rc.slurpd $RPM_BUILD_ROOT/etc/init.d/slurpd
 ln -sf ../../etc/init.d/ldap $RPM_BUILD_ROOT/usr/sbin/rcldap
 ln -sf ../../etc/init.d/slurpd $RPM_BUILD_ROOT/usr/sbin/rcslurpd
-mkdir -p $RPM_BUILD_ROOT/etc/sasl2
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sasl2/slapd.conf
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2/slapd.conf
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/
+install -m 644 apparmor/usr.lib.openldap.slapd $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 install -m 700 -d $RPM_BUILD_ROOT/var/lib/slurpd
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
@@ -223,6 +225,10 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 #put filelists into files
 cat >openldap2.filelist <<EOF
 /var/adm/fillup-templates/sysconfig.openldap
+%dir %attr(-, root, root) %{_sysconfdir}/apparmor/
+%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/
+%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/extras/
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 %config /etc/init.d/ldap
 %config /etc/init.d/slurpd
 /etc/sysconfig/SuSEfirewall2.d/services/openldap
@@ -348,6 +354,9 @@ fi
 %endif
 
 %changelog
+* Tue May 15 2007 - rhafer@suse.de
+- imported apparmor profile from apparmor (this profile is not
+  enabled by default)
 * Fri May 04 2007 - rhafer@suse.de
 - Update to Version 2.3.35. Most important changes:
   * Fixed ldapmodify to use correct memory free functions (ITS#4901)