util-linux-selinux 2.39.2-2 update

5 files changed, 87 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d0c04eefcd6..0df0f27a0ef2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,20 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
 	pkgver = 2.39.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/util-linux/util-linux
 	arch = x86_64
 	arch = aarch64
 	groups = selinux
-	license = GPL2
+	license = BSD-2-Clause
+	license = BSD-3-Clause
+	license = BSD-4-Clause-UC
+	license = GPL-2.0-only
+	license = GPL-2.0-or-later
+	license = GPL-3.0-or-later
+	license = ISC
+	license = LGPL-2.1-or-later
+	license = LicenseRef-PublicDomain
 	makedepends = git
 	makedepends = meson
 	makedepends = asciidoctor
@@ -19,8 +27,10 @@ pkgbase = util-linux-selinux
 	makedepends = libselinux
 	options = strip
 	source = git+https://github.com/util-linux/util-linux#tag=d32d74bf433a419f2a8976530fb03669bde722cd?signed
+	source = util-linux-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
 	source = pam-login
 	source = pam-common
+	source = pam-remote
 	source = pam-runuser
 	source = pam-su
 	source = util-linux.sysusers
@@ -29,8 +39,10 @@ pkgbase = util-linux-selinux
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
 	sha256sums = SKIP
-	sha256sums = 99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f
+	sha256sums = 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a
+	sha256sums = ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275
 	sha256sums = 57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af
+	sha256sums = 8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931
 	sha256sums = 48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1
 	sha256sums = 3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b
 	sha256sums = 10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3
@@ -39,6 +51,7 @@ pkgbase = util-linux-selinux
 	sha256sums = a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36
 
 pkgname = util-linux-selinux
+	depends = glibc
 	depends = pam-selinux
 	depends = shadow-selinux
 	depends = coreutils-selinux
@@ -52,12 +65,14 @@ pkgname = util-linux-selinux
 	depends = util-linux-libs-selinux
 	depends = libmagic.so
 	depends = libncursesw.so
+	depends = readline
+	depends = zlib
 	optdepends = python: python bindings to libmount
 	optdepends = words: default dictionary for look
 	provides = rfkill
 	provides = hardlink
-	provides = util-linux=2.39.2-1
-	provides = selinux-util-linux=2.39.2-1
+	provides = util-linux=2.39.2-2
+	provides = selinux-util-linux=2.39.2-2
 	conflicts = rfkill
 	conflicts = hardlink
 	conflicts = util-linux
@@ -65,6 +80,7 @@ pkgname = util-linux-selinux
 	backup = etc/pam.d/chfn
 	backup = etc/pam.d/chsh
 	backup = etc/pam.d/login
+	backup = etc/pam.d/remote
 	backup = etc/pam.d/runuser
 	backup = etc/pam.d/runuser-l
 	backup = etc/pam.d/su
@@ -80,7 +96,7 @@ pkgname = util-linux-libs-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = util-linux-libs=2.39.2-1
+	provides = util-linux-libs=2.39.2-2
 	provides = libutil-linux-selinux
 	conflicts = util-linux-libs
 	conflicts = libutil-linux-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 4d2eed592ad7..99c8ec50ea49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(util-linux-selinux util-linux-libs-selinux)
 _tag='d32d74bf433a419f2a8976530fb03669bde722cd' # git rev-parse v${_tag_name}
 _tag_name=2.39.2
 pkgver=${_tag_name/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc='SELinux aware miscellaneous system utilities for Linux'
 url='https://github.com/util-linux/util-linux'
 arch=('x86_64' 'aarch64')
@@ -25,18 +25,31 @@ groups=('selinux')
 #   util-linux-selinux depend on systemd at build time.
 makedepends=('git' 'meson' 'asciidoctor' 'bash-completion' 'libcap-ng'
              'libutempter' 'libxcrypt' 'python' 'systemd' 'libselinux')
-license=('GPL2')
+license=(
+  'BSD-2-Clause'
+  'BSD-3-Clause'
+  'BSD-4-Clause-UC'
+  'GPL-2.0-only'
+  'GPL-2.0-or-later'
+  'GPL-3.0-or-later'
+  'ISC'
+  'LGPL-2.1-or-later'
+  'LicenseRef-PublicDomain'
+)
 options=('strip')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed"
-        pam-{login,common,runuser,su}
+        ${pkgbase/-selinux}-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
+        pam-{login,common,remote,runuser,su}
         'util-linux.sysusers'
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
 sha256sums=('SKIP'
-            '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
+            '6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a'
+            'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275'
             '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
+            '8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931'
             '48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
             '3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b'
             '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
@@ -45,6 +58,10 @@ sha256sums=('SKIP'
             'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
 
 _backports=(
+  # meson: install write executable with group 'tty'
+  '00f115d81146599324c454f6756db6491855f430'
+  # meson: install wall executable with group 'tty'
+  '5f3359c5c9dab9d5791d05a646b9c04c19eeb80e'
 )
 
 _reverts=(
@@ -98,14 +115,15 @@ package_util-linux-selinux() {
   provides=('rfkill' 'hardlink'
             "${pkgname/-selinux}=${pkgver}-${pkgrel}"
             "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
-  depends=('pam-selinux' 'shadow-selinux' 'coreutils-selinux' 'systemd-libs' 'libsystemd.so'
+  depends=('glibc' 'pam-selinux' 'shadow-selinux' 'coreutils-selinux' 'systemd-libs' 'libsystemd.so'
            'libudev.so' 'libcap-ng' 'libutempter' 'libxcrypt' 'libcrypt.so' 'util-linux-libs-selinux'
-           'libmagic.so' 'libncursesw.so')
+           'libmagic.so' 'libncursesw.so' 'readline' 'zlib')
   optdepends=('python: python bindings to libmount'
               'words: default dictionary for look')
   backup=(etc/pam.d/chfn
           etc/pam.d/chsh
           etc/pam.d/login
+          etc/pam.d/remote
           etc/pam.d/runuser
           etc/pam.d/runuser-l
           etc/pam.d/su
@@ -125,6 +143,7 @@ package_util-linux-selinux() {
   install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn"
   install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh"
   install -m0644 pam-login "${pkgdir}/etc/pam.d/login"
+  install -m0644 pam-remote "${pkgdir}/etc/pam.d/remote"
   install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser"
   install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l"
   install -m0644 pam-su "${pkgdir}/etc/pam.d/su"
@@ -153,6 +172,9 @@ package_util-linux-selinux() {
     "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
   install -Dm0644 rfkill-block_.service \
     "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
+
+  install -vDm 644 ${pkgbase/-selinux}/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 ${pkgbase/-selinux}-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_util-linux-libs-selinux() {
@@ -173,4 +195,7 @@ package_util-linux-libs-selinux() {
   mv util-linux-libs/include "$pkgdir"/usr/include
   mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
   mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
+
+  install -vDm 644 ${pkgbase/-selinux}/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 ${pkgbase/-selinux}-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
diff --git a/pam-login b/pam-login
index 2dac6ab61102..28f6fc5de578 100644
--- a/pam-login
+++ b/pam-login
@@ -1,6 +1,5 @@
 #%PAM-1.0
 
-auth       required     pam_securetty.so
 auth       requisite    pam_nologin.so
 auth       include      system-local-login
 account    include      system-local-login
diff --git a/pam-remote b/pam-remote
new file mode 100644
index 000000000000..7fce079c1d93
--- /dev/null
+++ b/pam-remote
@@ -0,0 +1,8 @@
+#%PAM-1.0
+
+auth       required     pam_securetty.so
+auth       requisite    pam_nologin.so
+auth       include      system-remote-login
+account    include      system-remote-login
+session    include      system-remote-login
+password   include      system-remote-login
diff --git a/util-linux-BSD-2-Clause.txt b/util-linux-BSD-2-Clause.txt
new file mode 100644
index 000000000000..e4c5da7234ec
--- /dev/null
+++ b/util-linux-BSD-2-Clause.txt
@@ -0,0 +1,26 @@
+xxHash Library
+Copyright (c) 2012-2021 Yann Collet
+All rights reserved.
+
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.