summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2015-01-21 09:48:10 +0800
committerNicolas Iooss2015-06-27 11:44:59 +0800
commit4a9b24c9b55c63a8ff8e9905a6952bf8b3a01f21 (patch)
treee6892784949317a19fa2190c453d358fb20e84f3
parent1276f1271d819b230f3c8eb7227baedf8f710b3c (diff)
downloadaur-4a9b24c9b55c63a8ff8e9905a6952bf8b3a01f21.tar.gz
shadow-selinux 4.2.1-3 update
Apply shadow 4.2.1-2 update: https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/shadow&id=808762db2606c7d3c27e0af6003c4745a9f1ff08
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--login.defs5
3 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 30bdb81c9ca6..eb1226bb33e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = shadow-selinux
pkgdesc = Password and account management tool suite with support for shadow files and PAM - SELinux support
pkgver = 4.2.1
- pkgrel = 2
+ pkgrel = 3
url = http://pkg-shadow.alioth.debian.org/
install = shadow.install
arch = i686
@@ -12,8 +12,8 @@ pkgbase = shadow-selinux
depends = pam-selinux
depends = acl
depends = libsemanage
- provides = shadow=4.2.1-2
- provides = selinux-shadow=4.2.1-2
+ provides = shadow=4.2.1-3
+ provides = selinux-shadow=4.2.1-3
conflicts = shadow
conflicts = selinux-shadow
options = strip
@@ -54,7 +54,7 @@ pkgbase = shadow-selinux
sha1sums = 4ad0e059406a305c8640ed30d93c2a1f62c2f4ad
sha1sums = 12427b1ca92a9b85ca8202239f0d9f50198b818f
sha1sums = 0e56fed7fc93572c6bf0d8f3b099166558bb46f1
- sha1sums = e92045fb75e0c21a3f294a00de0bd2cd252e9463
+ sha1sums = 5d67d1d499d031598372b856382702ecad4cf7e0
sha1sums = 12427b1ca92a9b85ca8202239f0d9f50198b818f
sha1sums = 611be25d91c3f8f307c7fe2485d5f781e5dee75f
sha1sums = a154a94b47a3d0c6c287253b98c0d10b861226d0
diff --git a/PKGBUILD b/PKGBUILD
index 3d4d4f98d1e6..c19bfe431598 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=shadow-selinux
pkgver=4.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="Password and account management tool suite with support for shadow files and PAM - SELinux support"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -25,6 +25,7 @@ backup=(etc/login.defs
etc/default/useradd)
options=(strip debug)
install='shadow.install'
+validpgpkeys=('D5C2F9BFCA128BBA22A77218872F702C4D6E25A8') # Christian Perrier
source=("http://pkg-shadow.alioth.debian.org/releases/${pkgname/-selinux}-$pkgver.tar.xz"{,.sig}
LICENSE
chgpasswd
@@ -44,7 +45,7 @@ sha1sums=('0917cbadd4ce0c7c36670e5ecd37bbed92e6d82d'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
- 'e92045fb75e0c21a3f294a00de0bd2cd252e9463'
+ '5d67d1d499d031598372b856382702ecad4cf7e0'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'611be25d91c3f8f307c7fe2485d5f781e5dee75f'
'a154a94b47a3d0c6c287253b98c0d10b861226d0'
@@ -53,10 +54,6 @@ sha1sums=('0917cbadd4ce0c7c36670e5ecd37bbed92e6d82d'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
'21e12966a6befb25ec123b403cd9b5c492fe5b16'
'f57ecde3f72b4738fad75c097d19cf46a412350f')
-# List of valid PGP keys in http://pkg-shadow.alioth.debian.org/download.php
-validpgpkeys=('96F7A8CCA87F0EB8349701B25A0A399AEA7CF5AD'
- 'F972A168A2703B34CC23E09FD4E5EDACC0143D2D'
- 'D5C2F9BFCA128BBA22A77218872F702C4D6E25A8')
prepare() {
cd "${pkgname/-selinux}-$pkgver"
diff --git a/login.defs b/login.defs
index 5913671003f7..cfbf59700bbf 100644
--- a/login.defs
+++ b/login.defs
@@ -201,3 +201,8 @@ USERGROUPS_ENAB yes
# file.
#
MOTD_FILE
+
+#
+# Hash shadow passwords with sha512.
+#
+ENCRYPT_METHOD sha512