Skip to content

Commit 5cbaa2f

Browse files
committed
2 parents 991c122 + 9bfed95 commit 5cbaa2f

File tree

2 files changed

+66
-36
lines changed

2 files changed

+66
-36
lines changed

pam-selinux/.SRCINFO

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
pkgbase = pam-selinux
22
pkgdesc = SELinux aware PAM (Pluggable Authentication Modules) library
3-
pkgver = 1.6.1
4-
pkgrel = 3
3+
pkgver = 1.7.0
4+
pkgrel = 1
55
url = http://linux-pam.org
66
arch = x86_64
77
arch = aarch64
88
groups = selinux
99
license = GPL-2.0-only
10-
makedepends = git
11-
makedepends = flex
12-
makedepends = w3m
13-
makedepends = libxslt
1410
makedepends = docbook-xml
15-
makedepends = docbook5-xml
1611
makedepends = docbook-xsl
12+
makedepends = docbook5-xml
13+
makedepends = flex
1714
makedepends = fop
18-
depends = glibc
19-
depends = libtirpc
15+
makedepends = git
16+
makedepends = libxslt
17+
makedepends = meson
18+
makedepends = w3m
2019
depends = audit
21-
depends = libselinux
22-
depends = pambase-selinux
20+
depends = glibc
2321
depends = libaudit.so
24-
depends = libxcrypt
2522
depends = libcrypt.so
2623
depends = libnsl
24+
depends = libselinux
25+
depends = libtirpc
26+
depends = libxcrypt
27+
depends = pambase-selinux
2728
depends = systemd-libs
2829
provides = libpam.so
2930
provides = libpamc.so
3031
provides = libpam_misc.so
31-
provides = pam=1.6.1-3
32-
provides = selinux-pam=1.6.1-3
32+
provides = pam=1.7.0-1
33+
provides = selinux-pam=1.7.0-1
3334
conflicts = pam
3435
conflicts = selinux-pam
3536
options = !emptydirs
@@ -43,11 +44,11 @@ pkgbase = pam-selinux
4344
backup = etc/security/pam_env.conf
4445
backup = etc/security/time.conf
4546
backup = etc/environment
46-
source = pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v1.6.1
47+
source = pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v1.7.0
4748
source = pam.tmpfiles
4849
validpgpkeys = 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB
4950
validpgpkeys = 296D6F29A020808E8717A8842DB5BD89A340AEB7
50-
b2sums = 12891f9064ce7f00d22452d8ff39c14af87c24f9fbf3eab65e475a7d2a592d2b1c1d585f3718b2fa72f277a8ad1faa17149fe0a911bfabdaa4a2957c32e29fe3
51+
b2sums = 88ecba59692fe86f6f6516007b87fb897018cc5f818c106a037f15df4dda7c31e50fbfcb137493d49cb754e41f2f69a60f24ffea3374ff5e38ce6263bfa7abac
5152
b2sums = 36582c80020008c3810b311a2e126d2fb4ffc94e565ea4c0c0ab567fdb92943e269781ffa548550742feb685847c26c340906c7454dcc31df4e1e47d511d8d6f
5253

5354
pkgname = pam-selinux

pam-selinux/PKGBUILD

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,60 @@
99
# If you want to help keep it up to date, please open a Pull Request there.
1010

1111
pkgname=pam-selinux
12-
pkgver=1.6.1
13-
pkgrel=3
12+
pkgver=1.7.0
13+
pkgrel=1
1414
pkgdesc="SELinux aware PAM (Pluggable Authentication Modules) library"
1515
arch=('x86_64' 'aarch64')
1616
license=('GPL-2.0-only')
1717
url="http://linux-pam.org"
18-
depends=('glibc' 'libtirpc' 'audit' 'libselinux' 'pambase-selinux' 'libaudit.so' 'libxcrypt' 'libcrypt.so' 'libnsl' 'systemd-libs')
19-
makedepends=('git' 'flex' 'w3m' 'libxslt' 'docbook-xml' 'docbook5-xml' 'docbook-xsl' 'fop')
18+
depends=(
19+
audit
20+
glibc
21+
libaudit.so
22+
libcrypt.so
23+
libnsl
24+
libselinux
25+
libtirpc
26+
libxcrypt
27+
pambase-selinux
28+
systemd-libs
29+
)
30+
makedepends=(
31+
docbook-xml
32+
docbook-xsl
33+
docbook5-xml
34+
flex
35+
fop
36+
git
37+
libxslt
38+
meson
39+
w3m
40+
)
2041
conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
21-
provides=('libpam.so' 'libpamc.so' 'libpam_misc.so'
22-
"${pkgname/-selinux}=${pkgver}-${pkgrel}"
23-
"selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
24-
backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf} etc/environment)
42+
provides=(
43+
libpam.so
44+
libpamc.so
45+
libpam_misc.so
46+
"${pkgname/-selinux}=${pkgver}-${pkgrel}"
47+
"selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}"
48+
)
49+
backup=(
50+
etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf}
51+
etc/environment
52+
)
2553
groups=('selinux')
2654
source=("pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v${pkgver}"
2755
"${pkgname/-selinux}.tmpfiles")
2856
validpgpkeys=(
2957
'8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk
3058
'296D6F29A020808E8717A8842DB5BD89A340AEB7' # Dimitry V. Levin <[email protected]>
3159
)
32-
b2sums=('12891f9064ce7f00d22452d8ff39c14af87c24f9fbf3eab65e475a7d2a592d2b1c1d585f3718b2fa72f277a8ad1faa17149fe0a911bfabdaa4a2957c32e29fe3'
60+
b2sums=('88ecba59692fe86f6f6516007b87fb897018cc5f818c106a037f15df4dda7c31e50fbfcb137493d49cb754e41f2f69a60f24ffea3374ff5e38ce6263bfa7abac'
3361
'36582c80020008c3810b311a2e126d2fb4ffc94e565ea4c0c0ab567fdb92943e269781ffa548550742feb685847c26c340906c7454dcc31df4e1e47d511d8d6f')
3462
options=('!emptydirs')
3563

3664
prepare() {
3765
cd "${pkgname/-selinux}"
38-
./autogen.sh
3966
# apply patch from the source array (should be a pacman feature)
4067
local src
4168
for src in "${source[@]}"; do
@@ -48,20 +75,22 @@ prepare() {
4875
}
4976

5077
build() {
51-
cd "${pkgname/-selinux}"
52-
./configure \
53-
--libdir=/usr/lib \
54-
--sbindir=/usr/bin \
55-
--enable-logind \
56-
--disable-db \
57-
--enable-selinux
58-
make
78+
arch-meson "${pkgname/-selinux}" \
79+
-Dlogind=enabled \
80+
-Deconf=disabled \
81+
-Dselinux=enabled \
82+
-Dpam_userdb=disabled \
83+
build
84+
meson compile -C build
85+
}
86+
87+
check() {
88+
meson test -C build
5989
}
6090

6191
package() {
92+
meson install -C build --destdir "${pkgdir}"
6293
install -Dm 644 ${pkgname/-selinux}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname/-selinux}.conf
63-
cd "${pkgname/-selinux}"
64-
make DESTDIR="${pkgdir}" SCONFIGDIR=/etc/security install
6594

6695
# set unix_chkpwd uid
6796
chmod +s "${pkgdir}"/usr/bin/unix_chkpwd

0 commit comments

Comments
 (0)