diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/module-init-tools/PKGBUILD | 18 | ||||
| -rw-r--r-- | core/module-init-tools/depmod.conf | 5 | ||||
| -rw-r--r-- | core/shadow/PKGBUILD | 13 | ||||
| -rw-r--r-- | core/shadow/chpasswd | 2 | ||||
| -rw-r--r-- | core/shadow/login | 3 | ||||
| -rw-r--r-- | core/shadow/newusers | 2 | ||||
| -rw-r--r-- | core/shadow/passwd | 4 | ||||
| -rw-r--r-- | core/shadow/shadow.install | 7 |
8 files changed, 34 insertions, 20 deletions
diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index 0459b25ab..b6050d66d 100644 --- a/core/module-init-tools/PKGBUILD +++ b/core/module-init-tools/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 142296 2011-11-08 00:38:05Z dreisner $ +# $Id: PKGBUILD 144465 2011-12-06 10:57:39Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=module-init-tools pkgver=3.16 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules" arch=('i686' 'x86_64') url="https://modules.wiki.kernel.org" license=('GPL') depends=('glibc') makedepends=('docbook2x') -backup=('etc/modprobe.d/modprobe.conf') +backup=('etc/modprobe.d/modprobe.conf' + 'etc/depmod.d/depmod.conf') source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2" modprobe.conf + depmod.conf docfix.patch) md5sums=('bc44832c6e41707b8447e2847d2019f5' '325657db471b3190f685e5a89c9b90e3' + '4b8cbcbc54b9029c99fd730e257d4436' '4320d19902ded43bed55c804b065cdc7') build() { @@ -35,9 +38,12 @@ package() { make DESTDIR=$pkgdir install - # extra modprobe.d conf dir - install -dm755 "$pkgdir/lib/modprobe.d" + # extra modprobe.d and depmod.d conf dirs + install -dm755 "$pkgdir/lib/modprobe.d" "$pkgdir/etc/depmod.d" - # Install our custom (read: empty) modprobe.conf + # Install custom depmod config to allow searching extramodules/ + install -Dm644 "$srcdir/depmod.conf" "$pkgdir/etc/depmod.d/depmod.conf" + + # Install our custom (empty) modprobe.conf install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf" } diff --git a/core/module-init-tools/depmod.conf b/core/module-init-tools/depmod.conf new file mode 100644 index 000000000..3feb67b05 --- /dev/null +++ b/core/module-init-tools/depmod.conf @@ -0,0 +1,5 @@ +# +# /etc/depmod.d/depmod.conf +# + +search updates extramodules built-in diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index b3a130166..000ffcbc1 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 129320 2011-06-26 16:36:48Z eric $ +# $Id: PKGBUILD 144463 2011-12-06 10:57:36Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.4.3 -pkgrel=2 +pkgrel=5 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' @@ -27,12 +28,12 @@ source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e' '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' - 'd66096ed9477bd7242e8d2cc28eaa23170269788' + '12427b1ca92a9b85ca8202239f0d9f50198b818f' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1' + '895aad07c192b288b457e19dd7b8c55841b4ad22' 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' - 'd66096ed9477bd7242e8d2cc28eaa23170269788' - '6f183bc7709b0a8d20ad17481a4ad025cf6e5056' + '12427b1ca92a9b85ca8202239f0d9f50198b818f' + '611be25d91c3f8f307c7fe2485d5f781e5dee75f' '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' diff --git a/core/shadow/chpasswd b/core/shadow/chpasswd index bc14857dc..5d447985a 100644 --- a/core/shadow/chpasswd +++ b/core/shadow/chpasswd @@ -3,4 +3,4 @@ auth sufficient pam_rootok.so auth required pam_unix.so account required pam_unix.so session required pam_unix.so -password required pam_unix.so md5 shadow +password required pam_unix.so sha512 shadow diff --git a/core/shadow/login b/core/shadow/login index 51ff96a4a..b8555f89c 100644 --- a/core/shadow/login +++ b/core/shadow/login @@ -9,7 +9,7 @@ account required pam_access.so account required pam_time.so account required pam_unix.so #password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok +#password required pam_unix.so sha512 shadow use_authtok session required pam_unix.so session required pam_env.so session required pam_motd.so @@ -18,3 +18,4 @@ session optional pam_mail.so dir=/var/spool/mail standard session optional pam_lastlog.so session optional pam_loginuid.so -session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so diff --git a/core/shadow/newusers b/core/shadow/newusers index bc14857dc..5d447985a 100644 --- a/core/shadow/newusers +++ b/core/shadow/newusers @@ -3,4 +3,4 @@ auth sufficient pam_rootok.so auth required pam_unix.so account required pam_unix.so session required pam_unix.so -password required pam_unix.so md5 shadow +password required pam_unix.so sha512 shadow diff --git a/core/shadow/passwd b/core/shadow/passwd index 1ffd1bdd8..ab56da496 100644 --- a/core/shadow/passwd +++ b/core/shadow/passwd @@ -1,4 +1,4 @@ #%PAM-1.0 #password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok -password required pam_unix.so md5 shadow nullok +#password required pam_unix.so sha512 shadow use_authtok +password required pam_unix.so sha512 shadow nullok diff --git a/core/shadow/shadow.install b/core/shadow/shadow.install index c1bd1066b..e990bfe39 100644 --- a/core/shadow/shadow.install +++ b/core/shadow/shadow.install @@ -1,8 +1,9 @@ post_upgrade() { - grpck -r &>/dev/null + grpck -r >/dev/null 2>&1 if [ $? -eq 2 ]; then - echo "Fixing gshadow file ..." - while :; do echo "y"; done | grpck &>/dev/null + printf '%s\n' \ + "==> Warning: /etc/group or /etc/gshadow are inconsistant." \ + " Run 'grpck' to correct this." fi return 0 } |