Mon Jul 16 00:01:23 UTC 2012

7 files changed, 47 insertions, 42 deletions

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index fb7a999a6..fefc12476 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163009 2012-07-05 13:48:25Z allan $
+# $Id: PKGBUILD 163511 2012-07-14 13:06:56Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.22
-pkgrel=8
+pkgrel=9
 _date=20120323
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
@@ -36,6 +36,7 @@ build() {
   [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
 
   ${srcdir}/binutils/configure --prefix=/usr \
+    --with-lib-path=/usr/lib:/usr/local/lib \
     --enable-ld=default --enable-gold \
     --enable-plugins --enable-threads \
     --enable-shared $CONFIGFLAG
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 7de5a9bf2..93a075106 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163008 2012-07-05 13:48:19Z allan $
+# $Id: PKGBUILD 163512 2012-07-14 13:07:15Z 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.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
@@ -96,6 +96,8 @@ check() {
 package() {
   cd ${srcdir}/glibc-build
 
+  ln -s usr/lib ${pkgdir}/lib
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -123,7 +125,7 @@ package() {
   if [[ ${CARCH} = "x86_64" ]]; then
     # fix paths and compliance with binary blobs...
     sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    ln -s /lib ${pkgdir}/lib64
+    ln -s usr/lib ${pkgdir}/lib64
   fi
 
   # Do not strip the following files for improved debugging support
@@ -143,9 +145,9 @@ package() {
 
   strip $STRIP_STATIC usr/lib/*.a
 
-  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-                      lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      lib/{libmemusage,libpcprofile,libSegFault}.so \
+  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
+                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
                       usr/lib/{pt_chown,{audit,gconv}/*.so}
 }
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 3f835206a..18c3ee0bd 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162219 2012-06-23 18:29:15Z dreisner $
+# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
 pkgver=9
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -13,18 +13,15 @@ options=('!libtool')
 provides=('module-init-tools=3.16')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
+install=kmod.install
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
-        "depmod-search.conf"
-        "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
+        "depmod-search.conf")
 md5sums=('c8ae2d2694fbca2b28e238b30543a0cd'
-         'dd62cbf62bd8f212f51ef8c43bec9a77'
-         'b099be8997331dcb549617188cabc6af')
+         'dd62cbf62bd8f212f51ef8c43bec9a77')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 <"$srcdir"/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
-
   ./configure \
     --sysconfdir=/etc \
     --with-zlib \
diff --git a/core/kmod/kmod.install b/core/kmod/kmod.install
new file mode 100644
index 000000000..0a2e88dc5
--- /dev/null
+++ b/core/kmod/kmod.install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+  if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then
+    echo "==> Kernel modules are now only read from /usr/lib/modules, all custom"
+    echo "    built kernels and modules must be moved there before rebooting."
+  fi
+}
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 2ddf56cb0..338fd8f94 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=185
-pkgrel=4
+pkgver=186
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,16 +16,12 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
-        '0001-vconsole-setup-enable-utf-8-mode-explicitly.patch'
-        '0001-udev-systemd-udev-settle.service-fix-After.patch'
         'locale.sh')
-md5sums=('a7dbbf05986eb0d2c164ec8e570eb78f'
+md5sums=('17eff1d31e6e49bf82e129fe57efd59b'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
-         '83f51149ff9c4d75ea946e2b3cc61e53'
-         'b3e41e90beaff35c66ba1b4bc223430a'
          'f15956945052bb911e5df81cf5e7e5dc')
 
 build() {
@@ -34,12 +30,6 @@ build() {
   # still waiting on ipw2x00 to get fixed...
   patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
 
-  # upstream commit d305a67b46644d6360ef557109384c831ee8e018
-  patch -Np1 <"$srcdir/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch"
-
-  # upstream commit 8e8eb8fbafcaa841fa5393e396acde27b26edf2f
-  patch -Np1 <"$srcdir/0001-udev-systemd-udev-settle.service-fix-After.patch"
-
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
@@ -62,10 +52,10 @@ package_systemd() {
   pkgdesc="system and service manager"
   depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
            "systemd-tools=$pkgver" 'util-linux' 'xz')
-  optdepends=('python2-dbus: systemd-analyze'
+  optdepends=('python-dbus: systemd-analyze'
               'initscripts: legacy support for hostname and vconsole setup'
               'initscripts-systemd: legacy generator for initialization scripts'
-              'python2-cairo: systemd-analyze'
+              'python-cairo: systemd-analyze'
               'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries')
   backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
@@ -86,9 +76,6 @@ package_systemd() {
   install -dm755 "$pkgdir/bin"
   ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
 
-  # fix systemd-analyze for python2
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
   # move bash-completion and symlink for loginctl
   install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
     "$pkgdir/usr/share/bash-completion/completions/systemctl"
@@ -197,6 +184,9 @@ package_systemd-tools() {
   # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
   ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
 
+  # add back tmpfiles.d/legacy.conf
+  install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
           s#GROUP="tape"#GROUP="storage"#g;
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 4b7332d61..1a2d85d4a 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162992 2012-07-04 21:44:53Z dreisner $
+# $Id: PKGBUILD 163535 2012-07-15 00:25:36Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.21.2
-pkgrel=3
+pkgrel=5
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -18,13 +18,11 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgve
         pam-login
         pam-common)
 backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login)
+install=util-linux.install
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
               --enable-fs-paths-extra=/usr/bin:/usr/sbin \
@@ -48,8 +46,6 @@ package() {
 
   cd "${pkgdir}"
 
-  install -dm755 var/lib/hwclock
-
   # broken tool, going away in next major release, so just remove it now
   rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1}
 
diff --git a/core/util-linux/util-linux.install b/core/util-linux/util-linux.install
new file mode 100644
index 000000000..90ce5bd73
--- /dev/null
+++ b/core/util-linux/util-linux.install
@@ -0,0 +1,10 @@
+post_upgrade() {
+  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
+    if [ -f /var/lib/hwclock/adjtime ]; then
+      mv /var/lib/hwclock/adjtime /etc/adjtime
+    fi
+    if [ -d /var/lib/hwclock ]; then
+      rmdir /var/lib/hwclock
+    fi
+  fi
+}