[Pkg-sssd-devel] sssd: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/apparmor-profile |    2 +-
 debian/changelog        |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 57dfb9ef6b8f6d05aacb1146e2775073d5e6916c
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu May 2 17:42:42 2013 +0300

    Merge from unreleased Debian git.
    
    * Merge from unreleased Debian git.
      - apparmor-profile: Fix the profile to use the multiarch path for
        it's helper location (LP: #1175317).

diff --git a/debian/changelog b/debian/changelog
index d1d181a..484da70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+sssd (1.9.5-0ubuntu3) saucy; urgency=low
+
+  * Merge from unreleased Debian git.
+    - apparmor-profile: Fix the profile to use the multiarch path for
+      it's helper location (LP: #1175317).
+
+ -- Timo Aaltonen <tjaalton at ubuntu.com>  Thu, 02 May 2013 15:52:19 +0300
+
+sssd (1.9.5-0ubuntu2) saucy; urgency=low
+
+  * Rebuild against newer ding-libs for the ABI transition.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Mon, 29 Apr 2013 14:45:01 -0600
+
 sssd (1.9.5-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased Debian git.

commit 6698a3947e5e30bacb4247bdc970aea8234b6904
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu May 2 15:23:45 2013 +0300

    apparmor-profile: Fix the profile to use a multiarch path for it's helper location (LP: #1175317).

diff --git a/debian/apparmor-profile b/debian/apparmor-profile
index 83ff96a..a6b086b 100644
--- a/debian/apparmor-profile
+++ b/debian/apparmor-profile
@@ -23,7 +23,7 @@
 
   /usr/sbin/sssd rmix,
   /usr/lib/@{multiarch}/ldb/modules/ldb/* m,
-  /usr/lib/sssd/sssd/* rix,
+  /usr/lib/@{multiarch}/sssd/* rix,
 
   /tmp/{,.}krb5cc_* rwk,
 
diff --git a/debian/changelog b/debian/changelog
index 9b18402..4917058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ sssd (1.9.5-1) UNRELEASED; urgency=low
   * fix-cve-2013-0219*.diff, -0220.diff: Dropped, included upstream.
   * libsss-sudo.postrm: Run ldconfig on remove/purge.
   * fix-linking.diff: simple_access_tests need -ldl.
+  * apparmor-profile: Fix the profile to use the multiarch path for it's
+    helper location (LP: #1175317).
 
   [ Stéphane Graber ]
   * Add postinst/postrm script for libsss-sudo. Those will add a "sudoers"