From cf21eba9f2b0fbdac7b77761bf4b5f1dd99e6684 Mon Sep 17 00:00:00 2001
From: xzl <xiangzelong@deepin.org>
Date: Tue, 24 Sep 2024 14:42:05 +0800
Subject: [PATCH] chore: revert t64

Log:
---
 debian/apparmor-profile                       |  5 ++++-
 debian/changelog                              |  6 ++++++
 debian/control                                | 21 +++++++++----------
 ...-hbac0t64.install => libipa-hbac0.install} |  0
 debian/libipa-hbac0t64.lintian-overrides      |  1 -
 5 files changed, 20 insertions(+), 13 deletions(-)
 rename debian/{libipa-hbac0t64.install => libipa-hbac0.install} (100%)
 delete mode 100644 debian/libipa-hbac0t64.lintian-overrides

diff --git a/debian/apparmor-profile b/debian/apparmor-profile
index fadfa6c..7491662 100644
--- a/debian/apparmor-profile
+++ b/debian/apparmor-profile
@@ -4,6 +4,7 @@
   #include <abstractions/base>
   #include <abstractions/kerberosclient>
   #include <abstractions/nameservice>
+  #include <abstractions/openssl>
   #include <abstractions/user-tmp>
 
   capability chown,
@@ -16,6 +17,7 @@
   capability sys_resource,
 
   @{PROC} r,
+  @{PROC}/[0-9]*/cmdline r,
   @{PROC}/[0-9]*/net/psched r,
   @{PROC}/[0-9]*/status r,
 
@@ -42,7 +44,7 @@
   /var/lib/sss/* rw,
   /var/lib/sss/db/* rwk,
   /var/lib/sss/gpo_cache/* rw,
-  /var/lib/sss/mc/* rw,
+  /var/lib/sss/mc/* rwk,
   /var/lib/sss/pipes/* rw,
   /var/lib/sss/pipes/private/* rw,
   /var/lib/sss/pubconf/* rw,
@@ -53,6 +55,7 @@
 
   /{,var/}run/sssd.pid rw,
   /{,var/}run/systemd/notify w,
+  /{,var/}run/systemd/users/* r,
 
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.sbin.sssd>
diff --git a/debian/changelog b/debian/changelog
index bd98774..95c64bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sssd (2.9.5-3deepin1) unstable; urgency=medium
+
+  * Revert t64.
+
+ -- xiangzelong <xiangzelong@deepin.org>  Tue, 24 Sep 2024 14:41:42 +0800
+
 sssd (2.9.5-3) unstable; urgency=medium
 
   * rules: Flip the test logic to fix ftbfs on armel/armhf.
diff --git a/debian/control b/debian/control
index 2640d23..267ac64 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sssd
 Section: utils
 Priority: optional
-Maintainer: Debian SSSD Team <pkg-sssd-devel@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian SSSD Team <pkg-sssd-devel@alioth-lists.debian.net>
 Uploaders: Timo Aaltonen <tjaalton@debian.org>,
  Dominik George <natureshadow@debian.org>
 Build-Depends: dpkg-dev (>= 1.22.5),
@@ -17,7 +18,9 @@ Build-Depends: dpkg-dev (>= 1.22.5),
  docbook-xml,
  docbook-xsl,
  dpkg-dev (>= 1.16.1~),
- faketime <!nocheck>,
+# faketime is broken on armhf with _TIME_BITS=64,
+# see LP: #2059078
+ faketime [!armhf] <!nocheck>,
  gnutls-bin <!nocheck>,
  krb5-config,
  ldap-utils,
@@ -29,7 +32,6 @@ Build-Depends: dpkg-dev (>= 1.22.5),
  libdbus-1-dev,
  libdhash-dev,
  libfido2-dev,
- libgdm-dev [!s390x !kfreebsd-any !hurd-any],
  libglib2.0-dev,
  libini-config-dev,
  libjansson-dev,
@@ -170,7 +172,7 @@ Description: System Security Services Daemon -- Kerberos plugins for external id
 Package: sssd-ipa
 Architecture: any
 Depends:
- libipa-hbac0t64 (= ${binary:Version}),
+ libipa-hbac0 (= ${binary:Version}),
  libsss-idmap0 (= ${binary:Version}),
  sssd-ad-common (= ${binary:Version}),
  sssd-common (= ${binary:Version}),
@@ -241,7 +243,7 @@ Description: System Security Services Daemon -- proxy back end
  PAM modules to leverage SSSD caching.
 
 Package: sssd-tools
-Architecture: any
+Architecture: amd64 arm64 armhf ppc64el riscv64 s390x
 Depends:
  python3,
  python3-sss,
@@ -293,10 +295,7 @@ Description: Pam module for the System Security Services Daemon
  .
  This package provide the pam module to connect to the sssd daemon.
 
-Package: libipa-hbac0t64
-Provides: ${t64:Provides}
-Replaces: libipa-hbac0
-Breaks: libipa-hbac0 (<< ${source:Version})
+Package: libipa-hbac0
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -306,7 +305,7 @@ Description: FreeIPA HBAC Evaluator library
 Package: libipa-hbac-dev
 Section: libdevel
 Architecture: any
-Depends: libipa-hbac0t64 (= ${binary:Version}), ${misc:Depends}
+Depends: libipa-hbac0 (= ${binary:Version}), ${misc:Depends}
 Description: FreeIPA HBAC Evaluator library -- development files
  Utility library to validate FreeIPA HBAC rules for authorization requests.
  .
@@ -376,7 +375,7 @@ Package: python3-libipa-hbac
 Section: python
 Architecture: any
 Depends:
- libipa-hbac0t64 (= ${binary:Version}),
+ libipa-hbac0 (= ${binary:Version}),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends}
diff --git a/debian/libipa-hbac0t64.install b/debian/libipa-hbac0.install
similarity index 100%
rename from debian/libipa-hbac0t64.install
rename to debian/libipa-hbac0.install
diff --git a/debian/libipa-hbac0t64.lintian-overrides b/debian/libipa-hbac0t64.lintian-overrides
deleted file mode 100644
index 08b581c..0000000
--- a/debian/libipa-hbac0t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libipa-hbac0t64: package-name-doesnt-match-sonames libipa-hbac0