diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/binutils/PKGBUILD | 14 | ||||
-rw-r--r-- | core/fakeroot/PKGBUILD | 8 | ||||
-rw-r--r-- | core/gcc/PKGBUILD | 29 | ||||
-rw-r--r-- | core/gcc/gcc-pr49720.patch | 26 | ||||
-rw-r--r-- | core/glibc/PKGBUILD | 6 | ||||
-rw-r--r-- | core/keyutils/PKGBUILD | 8 | ||||
-rw-r--r-- | core/krb5/PKGBUILD | 17 | ||||
-rw-r--r-- | core/krb5/krb5-1.9.1-2011-007.patch | 40 | ||||
-rw-r--r-- | core/linux-api-headers/PKGBUILD | 10 | ||||
-rw-r--r-- | core/mkinitcpio-busybox/PKGBUILD | 2 | ||||
-rw-r--r-- | core/module-init-tools/PKGBUILD | 18 | ||||
-rw-r--r-- | core/module-init-tools/depmod.conf | 5 | ||||
-rw-r--r-- | core/nfs-utils/PKGBUILD | 2 | ||||
-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 | ||||
-rw-r--r-- | core/wpa_actiond/PKGBUILD | 2 |
20 files changed, 155 insertions, 63 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index f81ad0e10..bc1928a92 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 135920 2011-08-20 07:14:19Z allan $ +# $Id: PKGBUILD 144850 2011-12-08 12:17:07Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.21.1 -pkgrel=2.2 -_date=20110627 +pkgver=2.22 +pkgrel=2 +_date=20111201 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') -groups=('base') +groups=('base-devel') depends=('glibc>=2.14' 'zlib') checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('2face559e80d649ba148e42bb2d1fb0f') +md5sums=('77c15027ac112c65fd5f73ca91b0651c') mksource() { mkdir ${pkgname}-${_date} cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch + export _TAG=binutils-2_22-branch export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' cvs -z9 co -r $_TAG binutils || return 1 mv src binutils diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index e392f774a..d3fd6f97d 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139748 2011-10-04 21:10:33Z allan $ +# $Id: PKGBUILD 144854 2011-12-08 12:17:14Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=fakeroot -pkgver=1.18.1 -pkgrel=1.1 +pkgver=1.18.2 +pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('8eedda3dcb71b6ab6f62297b82ae5ac6') +md5sums=('79f32331358ad58499704ea5e19fd0ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index f9633577b..bd6f44227 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141368 2011-10-30 06:46:42Z allan $ +# $Id: PKGBUILD 144846 2011-12-08 12:16:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,31 +10,33 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.6.2 -pkgrel=1.1 -#_snapshot=4.6-20110819 +pkgrel=3 +_snapshot=4.6-20111125 _libstdcppmanver=20110814 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" if [[ "${CARCH}" != "mips64el" ]]; then - makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada') + makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') else - makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl') + makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl') fi checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc_mips64el_lib.patch - gcc-hash-style-both.patch) -md5sums=('028115c4fbfb6cfd75d6369f4a90d87e' + gcc-hash-style-both.patch + gcc-pr49720.patch) +md5sums=('922b0ee688669c188d237bbd21d42d07' 'ce920d2550ff7e042b9f091d27764d8f' '4030ee1c08dd1e843c0225b772360e76' '67e337993d821d72fccacbed52d48c34' - '4df25b623799b148a0703eaeec8fdf3f') + '4df25b623799b148a0703eaeec8fdf3f' + 'f9d7e5b792c59175f3da3f8421447512') if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -58,6 +60,9 @@ build() { fi patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch + # fix compiler segfault in binutils testsuite + patch -Np1 -i ${srcdir}/gcc-pr49720.patch + echo ${pkgver} > gcc/BASE-VER cd ${srcdir} @@ -84,7 +89,7 @@ build() { --enable-plugin --with-plugin-ld=ld.gold \ --disable-multilib --disable-libssp --disable-libstdcxx-pch \ --enable-checking=release - make profiledbootstrap + make } check() { @@ -132,7 +137,7 @@ package_gcc-libs() package_gcc() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl') + depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl') groups=('base-devel') install=gcc.install diff --git a/core/gcc/gcc-pr49720.patch b/core/gcc/gcc-pr49720.patch new file mode 100644 index 000000000..8f50c4120 --- /dev/null +++ b/core/gcc/gcc-pr49720.patch @@ -0,0 +1,26 @@ +--- trunk/gcc/simplify-rtx.c 2011/10/28 05:55:10 180603 ++++ trunk/gcc/simplify-rtx.c 2011/10/28 06:35:31 180604 +@@ -4352,10 +4352,20 @@ + { + rtx x = XEXP (op0, 0); + rtx c = XEXP (op0, 1); ++ enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS; ++ rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c); + +- c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS, +- cmp_mode, op1, c); +- return simplify_gen_relational (code, mode, cmp_mode, x, c); ++ /* Detect an infinite recursive condition, where we oscillate at this ++ simplification case between: ++ A + B == C <---> C - B == A, ++ where A, B, and C are all constants with non-simplifiable expressions, ++ usually SYMBOL_REFs. */ ++ if (GET_CODE (tem) == invcode ++ && CONSTANT_P (x) ++ && rtx_equal_p (c, XEXP (tem, 1))) ++ return NULL_RTX; ++ ++ return simplify_gen_relational (code, mode, cmp_mode, x, tem); + } + + /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 6af3811e8..d3462cb2e 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141374 2011-10-30 06:48:27Z allan $ +# $Id: PKGBUILD 144848 2011-12-08 12:17:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.14.1 -pkgrel=1 +pkgrel=2 _glibcdate=20111025 _glibcportsver=2.14 _glibcportsdate=20110908 @@ -15,7 +15,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.0' 'tzdata') +depends=('linux-api-headers>=3.1' 'tzdata') makedepends=('gcc>=4.6') backup=(etc/gai.conf etc/locale.gen diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 691cc0add..5a9db6545 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142277 2011-11-07 20:10:07Z stephane $ +# $Id: PKGBUILD 144590 2011-12-07 12:54:45Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.5 +pkgrel=1 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64 'mips64el') url="http://www.kernel.org" @@ -10,7 +10,7 @@ license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('19811ee31f683058a9aae3e6a3a23a7f') +md5sums=('9e8ab5164bc8f84be148761cc89e9d6f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index ddc548bbc..9eb17fc59 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142223 2011-11-06 13:03:25Z stephane $ +# $Id: PKGBUILD 144896 2011-12-09 11:55:57Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.9.2 -pkgrel=1.1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -18,12 +18,14 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-sig krb5-kadmind krb5-kdc krb5-kpropd - krb5-1.9.1-config-script.patch) + krb5-1.9.1-config-script.patch + krb5-1.9.1-2011-007.patch) sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '7342410760cf44bfa01bb99bb4c49e12496cb46f') + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') options=('!emptydirs') build() { @@ -37,10 +39,15 @@ build() { # by libkrb5, unless do_deps is set to 1, which indicates that the caller # wants the whole list. # - # Patch from upstream : + # Patch from upstream : # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + # Apply upstream patch to fix a null pointer dereference when processing TGS requests + # CVE-2011-1530 + # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch + # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 diff --git a/core/krb5/krb5-1.9.1-2011-007.patch b/core/krb5/krb5-1.9.1-2011-007.patch new file mode 100644 index 000000000..336a4ad31 --- /dev/null +++ b/core/krb5/krb5-1.9.1-2011-007.patch @@ -0,0 +1,40 @@ +diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in +index f46cad3..102fbaa 100644 +--- a/src/kdc/Makefile.in ++++ b/src/kdc/Makefile.in +@@ -67,6 +67,7 @@ check-unix:: rtest + + check-pytests:: + $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) ++ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) + + install:: + $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc +diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c +index c169c54..840a2ef 100644 +--- a/src/kdc/do_tgs_req.c ++++ b/src/kdc/do_tgs_req.c +@@ -243,7 +243,8 @@ tgt_again: + if (!tgs_1 || !data_eq(*server_1, *tgs_1)) { + errcode = find_alternate_tgs(request, &server); + firstpass = 0; +- goto tgt_again; ++ if (errcode == 0) ++ goto tgt_again; + } + } + status = "UNKNOWN_SERVER"; +diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py +new file mode 100644 +index 0000000..1760bcd +--- /dev/null ++++ b/src/kdc/t_emptytgt.py +@@ -0,0 +1,8 @@ ++#!/usr/bin/python ++from k5test import * ++ ++realm = K5Realm(start_kadmind=False, create_host=False) ++output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1) ++if 'not found in Kerberos database' not in output: ++ fail('TGT lookup for empty realm failed in unexpected way') ++success('Empty tgt lookup.') diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD index 2acfc5dc5..9ed3709f6 100644 --- a/core/linux-api-headers/PKGBUILD +++ b/core/linux-api-headers/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135918 2011-08-20 07:14:16Z allan $ +# $Id: PKGBUILD 144852 2011-12-08 12:17:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=3.0.1 -_basever=3.0 +pkgver=3.1.4 +_basever=3.1 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ conflicts=('kernel-headers') replaces=('kernel-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-libre/linux-${_basever}-libre.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basever}-libre-${pkgver}-libre.xz") -md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - 'af8d721036d89ed5500675c3289e3b48') +md5sums=('d73df15ab1d36fe3c102755d8f42117f' + 'ad965eeb168f19c536722ede6e22983b') build() { cd ${srcdir}/linux-${_basever} diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index e17c3f9cf..22980acea 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mkinitcpio-busybox pkgver=1.19.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://www.busybox.net/" diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index d52b61042..1e3b467f9 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' 'mips64el') 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/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index eced63917..4ec7c926d 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.5 -pkgrel=1 +pkgrel=1.1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 45e945496..e46251076 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' 'mips64el') 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 } diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD index 9d3d375ad..582bae1e3 100644 --- a/core/wpa_actiond/PKGBUILD +++ b/core/wpa_actiond/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_actiond pkgver=1.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/wpa_actiond.git/" |