From ff20b83d60041f745a579e10770706b0b49d5617 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Oct 2012 02:26:56 -0700 Subject: Fri Oct 26 02:24:09 PDT 2012 --- core/bison/PKGBUILD | 8 ++++---- core/coreutils/PKGBUILD | 8 ++++---- core/cryptsetup/PKGBUILD | 14 +++++++------- core/cryptsetup/encrypt_hook | 5 +++-- core/libusb-compat/PKGBUILD | 10 +++------- core/nss-myhostname/PKGBUILD | 30 ++++++++++++++++++++++++++++++ core/systemd/PKGBUILD | 12 +++++++----- core/systemd/systemd.install | 24 +++++++++++++++++++++--- 8 files changed, 79 insertions(+), 32 deletions(-) create mode 100644 core/nss-myhostname/PKGBUILD (limited to 'core') diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 0294d30f4..df8dad3df 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164809 2012-08-06 13:29:10Z allan $ +# $Id: PKGBUILD 169690 2012-10-26 01:40:06Z allan $ # Maintainer: Allan McRae # Contributor: Eric Belanger pkgname=bison -pkgver=2.6.2 +pkgver=2.6.4 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('dea291996f98c34c3fd8e389a9cf6ea1' - 'e6d78e6423e9e29f3b6c5deee839b41c') +md5sums=('8b2dc57eb9d2d6de4715d30de6b2ee07' + '89b9f75a9aa1b02418fef0e685bd44f2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 58454c747..82fb6beb8 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166962 2012-09-23 12:22:15Z tomegun $ +# $Id: PKGBUILD 169689 2012-10-26 01:40:04Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=coreutils -pkgver=8.19 +pkgver=8.20 pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ groups=('base') depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('1a01231a2f3ed37c0efc073ccdda9375' - '7f564749d834397aa67f0f05bacb62d5') +md5sums=('3d69af8f561fce512538a9fe85f147ff' + '7e6076e4e0961d24c38cf8685efca35b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 27c7591c2..b1623ed81 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165243 2012-08-14 08:44:57Z thomas $ +# $Id: PKGBUILD 169687 2012-10-26 01:36:12Z dreisner $ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.5.0 -pkgrel=2 +pkgver=1.5.1 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -14,6 +14,10 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) +md5sums=('87cc018c0c65f36043f38ceb8ffd4d81' + '5f711687f453f4d5a38596f60df5247a' + 'c970831d733ca42e20415005967e7843' + '21c45f9cab3e0b5165f68358884fbd0f') build() { cd "${srcdir}"/$pkgname-${pkgver} @@ -28,7 +32,3 @@ package() { install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt } -md5sums=('0fa7ba8923b0ce8eed2aa65f2cb9950c' - 'efe1b74dfadf37726397fd27ad0df965' - '4dab1b0e23d81907b79b49c2d8d719b5' - '21c45f9cab3e0b5165f68358884fbd0f') diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index 372b7ba57..11db3443a 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -11,7 +11,9 @@ run_hook() { $cryptkey EOF - if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then + if [ "$ckdev" = "rootfs" ]; then + ckeyfile=$ckarg1 + elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then case ${ckarg1} in *[!0-9]*) # Use a file on the device @@ -50,7 +52,6 @@ EOF for cryptopt in ${cryptoptions//,/ }; do case ${cryptopt} in allow-discards) - echo "Enabling TRIM/discard support." cryptargs="${cryptargs} --allow-discards" ;; *) diff --git a/core/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD index 76b8f05a0..3e6e5f39b 100644 --- a/core/libusb-compat/PKGBUILD +++ b/core/libusb-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162998 2012-07-05 06:50:21Z tpowa $ +# $Id: PKGBUILD 169660 2012-10-25 08:23:04Z eric $ # Maintainer: # Contributor: Tobias Powalowski # Contributor: arjan @@ -12,15 +12,11 @@ url="http://libusb.sourceforge.net/" license=('LGPL') depends=('libusb' 'sh') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2" - "libusb-0.1-libusbx.patch") -md5sums=('2ca521fffadd0c28fdf174e6ec73865b' - '1612c3982f307da1332d6db57b16742b') +source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") +md5sums=('2ca521fffadd0c28fdf174e6ec73865b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # http://libusb.org/ticket/138 can be removed with libusbx 1.0.13 - patch -Np0 -i ../libusb-0.1-libusbx.patch ./configure --prefix=/usr --disable-static make } diff --git a/core/nss-myhostname/PKGBUILD b/core/nss-myhostname/PKGBUILD new file mode 100644 index 000000000..b07e30808 --- /dev/null +++ b/core/nss-myhostname/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 169661 2012-10-25 10:06:26Z tomegun $ +# Maintainer: Tom Gundersen +# Contributor: Mantas M. +pkgname="nss-myhostname" +pkgver=0.3 +pkgrel=3 +pkgdesc="NSS plugin providing host name resolution for the locally configured system hostname" +arch=(i686 x86_64) +url="http://0pointer.de/lennart/projects/nss-myhostname/" +license=('LGPL2.1') +depends=('glibc') +groups=('base') +source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-lynx + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +md5sums=('d4ab9ac36c053ab8fb836db1cbd4a48f') diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 073d99b15..cce4b8e44 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=194 -pkgrel=4 +pkgver=195 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -18,7 +18,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' 'use-split-usr-path.patch') -md5sums=('0ebb73aea444693b9b86f7a76f5df23c' +md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' @@ -86,10 +86,12 @@ package_systemd() { install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - # move bash-completion and symlink for loginctl + # move bash-completion and symlink for *ctl's install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ "$pkgdir/usr/share/bash-completion/completions/systemctl" - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + for ctl in {login,journal,timedate,locale,hostname}ctl; do + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl" + done rm -rf "$pkgdir/etc/bash_completion.d" # don't write units to /etc by default -- we'll enable this on post_install diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index fa3e8f29a..aad9691b0 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -4,18 +4,28 @@ sd_booted() { [ -e sys/fs/cgroup/systemd ] } +post_common() { + systemd-machine-id-setup + + setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt + + if sd_booted; then + systemctl --system daemon-reexec + fi +} + post_install() { + post_common + # enable getty@tty1 by default, but don't track the file systemctl enable getty@.service - systemd-machine-id-setup - echo ":: Append 'init=/bin/systemd' to your kernel command line in your" echo " bootloader to replace sysvinit with systemd" } post_upgrade() { - systemd-machine-id-setup + post_common # getty@tty1.service is no longer enabled by default, but we don't want to break # existing setups. @@ -29,6 +39,14 @@ post_upgrade() { printf '==> journald now writes to /var/log/journal by default. This can be\n' printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' fi + + # logind's protocol changed. kindly restart the daemon to avoid locking + # out further logins. + if [ "$(vercmp 195 "$2")" -eq 1 ]; then + if sd_booted; then + systemctl restart systemd-logind.service + fi + fi } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf