Skip to content

Commit

Permalink
chore: revert t64
Browse files Browse the repository at this point in the history
Log:
  • Loading branch information
xzl01 authored and Zeno-sole committed Sep 27, 2024
1 parent b2cc60f commit cf21eba
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 13 deletions.
5 changes: 4 additions & 1 deletion debian/apparmor-profile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <abstractions/base>
#include <abstractions/kerberosclient>
#include <abstractions/nameservice>
#include <abstractions/openssl>
#include <abstractions/user-tmp>

capability chown,
Expand All @@ -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,

Expand All @@ -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,
Expand All @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
21 changes: 10 additions & 11 deletions debian/control
Original file line number Diff line number Diff line change
@@ -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),
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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}),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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}
Expand All @@ -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.
.
Expand Down Expand Up @@ -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}
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion debian/libipa-hbac0t64.lintian-overrides

This file was deleted.

0 comments on commit cf21eba

Please sign in to comment.