Stash

2025-01-23 18:14:54 +08:00 · 2013-01-07 22:17:05 +01:00 · 2013-01-07 22:17:05 +01:00 · 721922f2a1
commit 721922f2a1
parent e69a5a719f 967ba9c48f
451 changed files with 71129 additions and 28999 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,51 @@
+.gitignore
+
+_buildscripts
+_repo
+_sources
+_temp
+pkg
+src
+dbg
+hdr
+*~
+build.sh
+clean-builddir.sh
+clean-workdir.sh
+copy.sh
+copy-any.sh
+fakeuname
+get-any.sh
+makepkg
+move.sh
+pkgrels-decrease.sh
+pkgrels-increase.sh
+pkgrels-reset.sh
+rebuildlist-build.sh
+rebuildlist-generate.sh
+repoclean-local.sh
+repoclean-remote.sh
+show-config.sh
+show-pkglists.sh
+sync-complete.sh
+sync-down.sh
+sync-up-nodb.sh
+sync-up.sh
+remove.sh
+recreate-database.sh
+upload.sh
+upload-nodb.sh
+unlock-database.sh
+unlock-repo.sh
+
+*-cfg.conf
+*-makepkg.conf
+*-pkgs.conf
+user.conf
+
+*.db.tar.*
+*.pkg.tar.*
+*.tar.*
+*.log
+*.log*
+
--- a/acl/PKGBUILD
+++ b/acl/PKGBUILD
@ -1,23 +1,16 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas@chakra-project.org

 pkgname=acl
 pkgver=2.2.51
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for filesystem ACL support"
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/acl"
 license=('LGPL')
 depends=('attr>=2.4.46')
-replaces=('xfsacl')
-provides=('xfsacl')
-conflicts=('xfsacl')
 options=('!libtool')
 source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
 sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225')
@ -26,7 +19,7 @@ build() {
  cd "${srcdir}"/${pkgname}-${pkgver}

  export INSTALL_USER=root INSTALL_GROUP=root 
-  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
+  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
  make 
 }

@ -36,6 +29,6 @@ package() {
  make DIST_ROOT="${pkgdir}" install install-lib install-dev

  # tidy up
-  rm -f ${pkgdir}/lib/libacl.a
-  chmod 0755 ${pkgdir}/lib/libacl.so.*.*.*
+  rm -f ${pkgdir}/usr/lib/libacl.a
+  chmod 0755 ${pkgdir}/usr/lib/libacl.so.*.*.*
 }
--- a/acpi_call-lts/PKGBUILD
+++ b/acpi_call-lts/PKGBUILD
@ -1,25 +1,26 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org

-# Find the kernel name inside the chroot
-_extramodules=extramodules-`pacman -Q linux-lts | cut -c11-13 | sed 's/linux-lts //g'`-CHAKRA-LTS
-_kver="$(cat /lib/modules/${_extramodules}/version)"
+_kver="3.0.43-1-lts"

 pkgname=acpi_call-lts
-pkgver=20120115
-pkgrel=2
+_pkgname=acpi_call
+pkgver=20120613
+pkgrel=5
 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
 arch=('i686' 'x86_64')
 url=("http://github.com/mkottman/acpi_call")
 license=('GPL')
 depends=('linux-lts>=3.0' 'linux-lts<3.1' 'linux-lts-headers')
 makedepends=('git')
+provides=('acpi_call')
+replaces=('acpi_call')
+conflicts=('acpi_call')
 install=acpi_call.install
-source=(http://chakra.sourceforge.net/sources/acpi_call/acpi_call-${pkgver}.tar.xz)
-md5sums=('129841dd806887492609214462792413')
+source=("http://chakra-linux.org/sources/acpi_call/acpi_call-${pkgver}.tar.xz")
+md5sums=('fcee74cba78ff644b43d60e046864b9e')


 # create tarball: source PKGBUILD && mksource
@ -36,26 +37,34 @@ build() {
  cd ${srcdir}

 ## Build
-  rm -rf ${srcdir}/acpi_call-build
-  cp -r ${srcdir}/acpi_call ${srcdir}/acpi_call-build
-  cd ${srcdir}/acpi_call-build
+  #rm -rf ${srcdir}/acpi_call-build
+  #cp -r ${srcdir}/acpi_call ${srcdir}/acpi_call-build
+  cd ${srcdir}/$_pkgname-${pkgver}

  sed \
-    -e  's/$(shell uname -r)/3.0-CHAKRA-LTS/g' \
+    -e  's/$(shell uname -r)/3.0.43-1-lts/g' \
    -i Makefile
+
  make
 }
 package() {
-  cd ${srcdir}/acpi_call-build
-  install -d ${pkgdir}/usr/share/acpi_call || return 1
-  install -d ${pkgdir}/usr/bin || return 1
-  install -d ${pkgdir}/usr/share/acpi_call/doc || return 1
-  install -Dm755  ${srcdir}/acpi_call-build/test_off.sh \
-    ${pkgdir}/usr/share/acpi_call/test_off-lts.sh || return 1
-  ln -s /usr/share/acpi_call/test_off-lts.sh \
-    ${pkgdir}/usr/bin/test_off-lts.sh || return 1
+  cd ${srcdir}/$_pkgname-${pkgver}
+  install -d ${pkgdir}/usr/share/$_pkgname 
+  install -d ${pkgdir}/usr/bin  
+  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/asus1215n.sh \
+    ${pkgdir}/usr/share/$_pkgname/asus1215n.sh 
+  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/m11xr2.sh \
+    ${pkgdir}/usr/share/$_pkgname/m11xr2-lts.sh 
+  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/query_dsdt.pl \
+    ${pkgdir}/usr/share/$_pkgname/query_dsdt.pl 
+  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/test_off.sh \
+    ${pkgdir}/usr/share/$_pkgname/test_off.sh 
+  ln -s /usr/share/$_pkgname/test_off.sh \
+    ${pkgdir}/usr/bin/test_off.sh 
+  cp -R windump_hack \
+    ${pkgdir}/usr/share/$_pkgname/
  install -Dm644 README \
-    ${pkgdir}/usr/share/acpi_call/README-lts
+    ${pkgdir}/usr/share/$_pkgname/README

  msg2 "Building module for $_kver..."

@ -63,5 +72,5 @@ package() {
  make KDIR=/usr/src/linux-${_kver} clean
  make KDIR=/usr/src/linux-${_kver}

-  install -D -m644 acpi_call.ko $pkgdir/lib/modules/$_extramodules/acpi_call.ko
+  install -D -m644 acpi_call.ko $pkgdir/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko
 }
--- a/acpi_call-lts/acpi_call.install
+++ b/acpi_call-lts/acpi_call.install
@ -2,14 +2,14 @@ post_install() {
  depmod -a
  echo ""
  echo "[+] modprobe acpi_call"
-  echo ">>> run /usr/bin/test_off-lts.sh to test/view different acpi_call functions to see if it disables your secondary/hybrid video card"
+  echo ">>> run /usr/bin/test_off.sh to test/view different acpi_call functions to see if it disables your secondary/hybrid video card"
 }

 post_upgrade() {
  depmod -a
  echo ""
  echo "[+] modprobe acpi_call"
-  echo ">>> run /usr/bin/test_off-lts.sh to test/view different acpi_call functions to see if it disables your secondary/hybrid video card"
+  echo ">>> run /usr/bin/test_off.sh to test/view different acpi_call functions to see if it disables your secondary/hybrid video card"
 }

 post_remove() {
--- a/acpi_call/PKGBUILD
+++ b/acpi_call/PKGBUILD
@ -1,25 +1,22 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org

-# Find the kernel name inside the chroot
-_extramodules=extramodules-`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA
-_kver="$(cat /lib/modules/${_extramodules}/version)"
+_kver="3.6.6-1-CHAKRA"

 pkgname=acpi_call
-pkgver=20120115
-pkgrel=4
+pkgver=20120613
+pkgrel=6
 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url=("http://github.com/mkottman/acpi_call")
 license=('GPL')
-depends=('linux>=3.2' 'linux<3.3' 'linux-headers')
+depends=('linux>=3.6' 'linux<3.7' 'linux-headers')
 makedepends=('git')
 install=acpi_call.install
-source=(http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('129841dd806887492609214462792413')
+source=("http://chakra-linux.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('fcee74cba78ff644b43d60e046864b9e')


 # create tarball: source PKGBUILD && mksource
@ -36,32 +33,36 @@ build() {
  cd ${srcdir}

 ## Build
-  rm -rf ${srcdir}/$pkgname-build
-  cp -r ${srcdir}/$pkgname ${srcdir}/$pkgname-build
-  cd ${srcdir}/$pkgname-build
+  #rm -rf ${srcdir}/$pkgname-${pkgver}-build
+  #cp -r ${srcdir}/$pkgname-${pkgver} ${srcdir}/$pkgname${pkgver}-build
+  cd ${srcdir}/$pkgname-${pkgver}

-  sed \
-    -e  's/$(shell uname -r)/3.2-CHAKRA/g' \
-    -i Makefile
  make
 }
 package() {
-  cd ${srcdir}/$pkgname-build
-  install -d ${pkgdir}/usr/share/$pkgname || return 1
-  install -d ${pkgdir}/usr/bin || return 1
-  install -d ${pkgdir}/usr/share/$pkgname/doc || return 1
-  install -Dm755  ${srcdir}/$pkgname-build/test_off.sh \
-    ${pkgdir}/usr/share/$pkgname || return 1
+  cd ${srcdir}/$pkgname-${pkgver}
+  install -d ${pkgdir}/usr/share/$pkgname 
+  install -d ${pkgdir}/usr/bin  
+  install -Dm755  ${srcdir}/$pkgname-${pkgver}/asus1215n.sh \
+    ${pkgdir}/usr/share/$pkgname 
+  install -Dm755  ${srcdir}/$pkgname-${pkgver}/m11xr2.sh \
+    ${pkgdir}/usr/share/$pkgname 
+  install -Dm755  ${srcdir}/$pkgname-${pkgver}/query_dsdt.pl \
+    ${pkgdir}/usr/share/$pkgname 
+  install -Dm755  ${srcdir}/$pkgname-${pkgver}/test_off.sh \
+    ${pkgdir}/usr/share/$pkgname 
  ln -s /usr/share/$pkgname/test_off.sh \
-    ${pkgdir}/usr/bin/test_off.sh || return 1
+    ${pkgdir}/usr/bin/test_off.sh 
+  cp -R windump_hack \
+    ${pkgdir}/usr/share/$pkgname/
  install -Dm644 README \
    ${pkgdir}/usr/share/$pkgname/README

-  msg2 "Building module for $_kver..."
+    msg2 "Building module for $_kver..."

  # KDIR is necessary even when cleaning
-  make KDIR=/usr/src/linux-${_kver} clean
+  #make KDIR=/usr/src/linux-${_kver} clean
  make KDIR=/usr/src/linux-${_kver}

-  install -D -m644 acpi_call.ko $pkgdir/lib/modules/$_extramodules/acpi_call.ko
+  install -D -m644 acpi_call.ko $pkgdir/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko
 }
--- a/apr-util/PKGBUILD
+++ b/apr-util/PKGBUILD
@ -1,25 +1,19 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas@chakra-project.org

 pkgname=apr-util
-pkgver=1.3.12
-pkgrel=3
+pkgver=1.5.1
+pkgrel=1
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://apr.apache.org/"
 depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('2aeddb384b03f3f73107770724d5c97b')
-
-md5sums=('0f671b037ca62751a8a7005578085560')
+md5sums=('9c1db8606e520f201c451ec9a0b095f6')

 build() {
  cd "${srcdir}/apr-util-${pkgver}"
--- a/apr/PKGBUILD
+++ b/apr/PKGBUILD
@ -1,34 +1,37 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas[at]chakra-project[dot]org>

 pkgname=apr
-pkgver=1.4.5
-pkgrel=2
+pkgver=1.4.6
+pkgrel=1
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://apr.apache.org/"
-depends=('util-linux-ng>=2.16')
+depends=('util-linux')
 options=('!libtool')
 license=('APACHE')
-source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('daf5487c82dd7bec9c005c96f8cb01b1')
-
-md5sums=('8b53f5a5669d0597f2da889a2f576eb6')
+source=("http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2")
+md5sums=('ffee70a111fd07372982b0550bbb14b7')

 build() {
  cd "${srcdir}/apr-${pkgver}"
-  export apr_cv_accept4=no
+

  ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
    --with-installbuilddir=/usr/share/apr-1/build \
    --enable-nonportable-atomics \
    --with-devrandom=/dev/urandom
  make
+}
+
+check() {
+  cd "${srcdir}/apr-${pkgver}"
+  make -j1 check
+}
+
+package() {
+  cd "${srcdir}/apr-${pkgver}"
  make DESTDIR="${pkgdir}" install
 }
--- a/attr/PKGBUILD
+++ b/attr/PKGBUILD
@ -1,15 +1,11 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas@chakra-project.org

 pkgname=attr
 pkgver=2.4.46
-pkgrel=2
+pkgrel=3
 pkgdesc="Extended attribute support library for ACL support"
 arch=(i686 x86_64)
 url="http://oss.sgi.com/projects/xfs/"
@ -17,9 +13,6 @@ license=('LGPL')
 groups=('base')
 depends=('glibc') 
 makedepends=('gettext')
-replaces=('xfsattr')
-provides=('xfsattr')
-conflicts=('xfsattr')
 options=('!libtool')
 source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
 sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f')
@ -28,7 +21,7 @@ build() {
  cd "${srcdir}"/${pkgname}-${pkgver}
  
  export INSTALL_USER=root INSTALL_GROUP=root
-  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
+  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
  make
 }

@ -38,8 +31,8 @@ package() {
  make DIST_ROOT="${pkgdir}" install install-lib install-dev

  # tidy up
-  rm -f "${pkgdir}"/lib/libattr.a
-  chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.*
+  rm -f "${pkgdir}"/usr/lib/libattr.a
+  chmod 0755 "${pkgdir}"/usr/lib/libattr.so.*.*.*
  # remove conflicting manpages
  rm -rf "${pkgdir}"/usr/share/man/man2
 }
--- a/aufs2-util/PKGBUILD
+++ b/aufs2-util/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=aufs2-util
 pkgver=20110519
 pkgrel=2
--- a/aufs3-util/PKGBUILD
+++ b/aufs3-util/PKGBUILD
@ -1,35 +1,30 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas@chakra-project.org

 pkgname=aufs3-util
-pkgver=20110817
-_aufs="3.0-20110815"
-pkgrel=1
+pkgver=20120607
+pkgrel=2
 pkgdesc="Another Unionfs Implementation that supports NFS branches"
 arch=('i686' 'x86_64')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
 depends=('glibc')
-makedepends=("aufs3>=$_aufs" 'linux-headers')
+makedepends=('linux-headers')
 conficts=('aufs-utils' 'aufs2-util')
-source=(http://chakra-project.org/sources/aufs3-util/aufs3-util-$pkgver.tar.gz)
-md5sums=('49373f619b5088c6a95759011188d073')
+source=(http://chakra-linux.org/sources/aufs3-util/aufs3-util-$pkgver.tar.gz)
+md5sums=('a1012045b45ec13ccc1be231d5e76464')

 build() {
-  cd $srcdir/aufs3-util-$pkgver || return 1
-  # fix KDIR
-  export CPPFLAGS="-I /usr/src/linux-3.0-CHAKRA/include/"
-  #sed  -i 's|$(shell uname -r)|2.6.36-CHAKRA|g' ./Makefile
+  cd $srcdir/aufs3-util-$pkgver 

-  # build
-  make || return 1
-  # install
-  #mkdir -p $pkgdir/{sbin,usr/bin,etc/default/aufs}
-  make DESTDIR=$pkgdir install || return 1
+  export CPPFLAGS="-I /usr/src/linux-3.4.2-1-CHAKRA/include/"
+  make 
+}
+
+package() {
+  cd $srcdir/aufs3-util-$pkgver
+
+  make DESTDIR=$pkgdir install 
 }
--- a/aufs3-util/create-tarball.sh
+++ b/aufs3-util/create-tarball.sh
@ -1,7 +1,7 @@
 #!/bin/sh
 #AUFS2VERSION=""
 #KERNELVERSION=2.6.35
-GITSNAPSHOT=20110817
+GITSNAPSHOT=20120607
 _aufsver=aufs3.0
 # aufs2 (no -xx) for the latest -rc version.
 rm -Rf aufs-util
--- a/autoconf/PKGBUILD
+++ b/autoconf/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=autoconf
 pkgver=2.68
 pkgrel=4
--- a/b43-fwcutter/PKGBUILD
+++ b/b43-fwcutter/PKGBUILD
@ -1,22 +1,18 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=b43-fwcutter
-pkgver=015
+pkgver=017
 pkgrel=1
 pkgdesc="firmware extractor for the bcm43xx kernel module"
-url="http://linuxwireless.org/en/users/Drivers/b43"
+url="http://wireless.kernel.org/en/users/Drivers/b43"
 depends=('glibc')
 license=('GPL')
-arch=('i686' 'x86_64')
-source=(http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('628e030565222a107bc40300313cbe76')
+arch=('x86_64')
+source=("http://bues.ch/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('fe6a3cc765d8a8328dc09f7a6159bfb7')

 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
--- a/bash/PKGBUILD
+++ b/bash/PKGBUILD
@ -1,16 +1,15 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>

 pkgname=bash
 _basever=4.2
-_patchlevel=020 #prepare for some patches
+_patchlevel=042 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/bash/bash.html"
 groups=('base')
@ -29,6 +28,97 @@ if [ $_patchlevel -gt 000 ]; then
        source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
    done
 fi
+md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
+         '8d37a3f97a48c1e56e1a4ded877ed944'
+         '027d6bd8f5f6a06b75bb7698cb478089'
+         '2902e0fee7a9168f3a4fd2ccd60ff047'
+         '42f4400ed2314bd7519c020d0187edc5'
+         '3546099a1b2f667adc9794f52e78e35b'
+         '472f536d7c9e8250dc4568ec4cfaf294'
+         '1100bc1dda2cdc06ac44d7e5d17864a3'
+         'a7184b76eb4a079f10174a0a8f574819'
+         '30e7948079921d3261efcc6a40722135'
+         'c4d45307f7e69fe508ce347c4cec1955'
+         '9ea06decec43a198f3d7cf29acc602f8'
+         '74bddae6eeb9227a04a467d42597a34d'
+         'fb48f6134d7b013135929476aa0c250c'
+         '3e6a18226b16c773229246abd07a1f5e'
+         'e70e45de33426b38153b390be0dbbcd4'
+         'e667dc9348ebc3e0e14bfdd87f4b6ff2'
+         'ce4e5c484993705b27daa151eca242c2'
+         '41cbd8e57589bc081a546a014ddb12f8'
+         '88d1f96db29461767602e2546803bda7'
+         'b8b781520f4c7493a2a1ac3010a44a44'
+         '24c574bf6d6a581e300823d9c1276af6'
+         '354a0899a7c4b446454c52546562b55b'
+         '4c5835f2fbab36c4292bb334977e5b6d'
+         'ff4547ca7b508d52101729d61f5b77b6'
+         '0a51602b535ef661ee707be6c8bdb373'
+         'cec7c92a4d8052ea4b29216365d16566'
+         '58deacf3d57cbd75575444ff6a3b0806'
+         '9ed2a08e549c3c17745f19e8413cfb31'
+         '72d5059820015231483bb7415d09e9db'
+         '45b04b41a4230f469d3e47ab9952c2df'
+         '608336ebe215984ef126e3c29d2d3409'
+         '623f63025d155a84977b62531e260ee2'
+         'ed19da878e3f630834c62b9d9dcc6fce'
+         'eef2dd4a0e4505dc8f8e664b40c6cd66'
+         '2d07daba0b8ca8f876d2aa052ff594b4'
+         '0cb823a44e6dc1cde7ac97ae5c8163c9'
+         '53d246537e1fffd1aaa02ba5c056211c'
+         '60f983a1dded5f0b28040ff4b3f1e9b5'
+         '304fd129a58fee2d8a34f8b4704db0aa'
+         '9df4bf4f46aaadc436f430187741f815'
+         '6921a0b4228fe89b6537a5c29f027c89'
+         '4ef0e2a2cbfbdd53346f927000b7e112'
+         '1195d85447f3d048d2c9bcd075fa765c'
+         'b0f3a651ce29a1feee687d93177870f1'
+         'b09000bba08da6ac753124593850cdf7'
+         '204bb5054d1f8bafe2b446d4e5d0d99a'
+         '09d3f96a16b881334cfaee0cf320b47e'
+         'aab415350bcc2bb0c29943b413499d96'
+         '597bf71a2aac6feb510b7505cdd3d4f7'
+         'b0db384bdedecafbdd70c8d22c56af5f'
+         '3fab459b4e09daea529cacad025b13b3'
+         'bab99835ad6198cb1109fac89a085262'
+         '4ad8d11e72afc6090e701073ff034cf4'
+         '5658ef10c9d0d804126ec1ce700e4e2c'
+         'c7d2493e44490f01dd20bdc8feb0a6a7'
+         'e4855dbc4b743618b54d408bd5878637'
+         '9f19c199dd8d1fa9254eebe738759272'
+         '600c8e90c2fb13cdbc7aa3f18566df03'
+         'a6ed82daf034587aee2f2581ba5fe829'
+         '821620a0389df723644911c56796ca8c'
+         'da9265aa2527fd4a7481baa3e0550287'
+         '0043f8b75f46f43608a67b863e300fe8'
+         'ec444d229e8899fbaaf6fc7de2d82ae6'
+         'b632fca3a4943825bfaf3bd29df6b27d'
+         'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
+         '2ffa9a802bbd57540021715f84cc76f4'
+         '89390ff6a3c2ef7e09dd4b8b097a8e56'
+         '3e9b529ef3726b75d125d678de76977f'
+         'eee08003395c417f677d1a4bf8c548ee'
+         'f670f7672b11d0df8c31885dbf15f390'
+         '2fe070dd6d75d8ff16f269184a16e9c4'
+         '5018b6b7737808141043b57cf4eb842d'
+         '4e610506c1711bf3483b965800ac3d5d'
+         'cb65e541f9b60a8cb1fe58404f264b73'
+         '7cd9bfdf7cbfd45274d07620ee94c8d9'
+         'a7d2eace0da5fd236c93dbfd93458838'
+         '9c3142956064d175a880bcb186e51ef9'
+         'a1a87649853f20fe99572ddc02b0c67f'
+         'c10692f447d4966c879f8fb8d7c8ebc9'
+         '1bf5e34ad46566bc2d0eb7560ff8968e'
+         '9ef3c308cde413e95866c1266cfb4e98'
+         'afbb94e04dab29bd4ce92199892f2b5e'
+         'cd48f57a404498d4e5c73a3501c4b1a5'
+         'd2693a2728b5a0448947d23ce47cb4b3'
+         '00a2371b6c05acbfce6bc850c6d982f8'
+         '72744ac844a1dfd15dddbba7f73ec45c'
+         '7bc4942a66ca4024ee964db7ede07896'
+         '7e97f02d9dd1436eed278f2732542ecf'
+         '1cf7701017ebfc8e129de92c8f8b798c'
+         '4ef8b5af440bf7b939b7955ce68b4dc7')

 build() {
  cd ${srcdir}/${pkgname}-$_basever
@ -73,52 +163,3 @@ package() {
  install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile
  install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
 }
-
-md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
-         '8d37a3f97a48c1e56e1a4ded877ed944'
-         '027d6bd8f5f6a06b75bb7698cb478089'
-         '2902e0fee7a9168f3a4fd2ccd60ff047'
-         '42f4400ed2314bd7519c020d0187edc5'
-         'fe5d3a367f7d5f754214dc05e3d958ab'
-         '472f536d7c9e8250dc4568ec4cfaf294'
-         '1100bc1dda2cdc06ac44d7e5d17864a3'
-         'a7184b76eb4a079f10174a0a8f574819'
-         '30e7948079921d3261efcc6a40722135'
-         'c4d45307f7e69fe508ce347c4cec1955'
-         '9ea06decec43a198f3d7cf29acc602f8'
-         '74bddae6eeb9227a04a467d42597a34d'
-         'fb48f6134d7b013135929476aa0c250c'
-         '3e6a18226b16c773229246abd07a1f5e'
-         'e70e45de33426b38153b390be0dbbcd4'
-         'e667dc9348ebc3e0e14bfdd87f4b6ff2'
-         'ce4e5c484993705b27daa151eca242c2'
-         '41cbd8e57589bc081a546a014ddb12f8'
-         '88d1f96db29461767602e2546803bda7'
-         'b8b781520f4c7493a2a1ac3010a44a44'
-         '24c574bf6d6a581e300823d9c1276af6'
-         '354a0899a7c4b446454c52546562b55b'
-         '4c5835f2fbab36c4292bb334977e5b6d'
-         'ff4547ca7b508d52101729d61f5b77b6'
-         '0a51602b535ef661ee707be6c8bdb373'
-         'cec7c92a4d8052ea4b29216365d16566'
-         '58deacf3d57cbd75575444ff6a3b0806'
-         '9ed2a08e549c3c17745f19e8413cfb31'
-         '72d5059820015231483bb7415d09e9db'
-         '45b04b41a4230f469d3e47ab9952c2df'
-         '608336ebe215984ef126e3c29d2d3409'
-         '623f63025d155a84977b62531e260ee2'
-         'ed19da878e3f630834c62b9d9dcc6fce'
-         'eef2dd4a0e4505dc8f8e664b40c6cd66'
-         '2d07daba0b8ca8f876d2aa052ff594b4'
-         '0cb823a44e6dc1cde7ac97ae5c8163c9'
-         '53d246537e1fffd1aaa02ba5c056211c'
-         '60f983a1dded5f0b28040ff4b3f1e9b5'
-         '304fd129a58fee2d8a34f8b4704db0aa'
-         '9df4bf4f46aaadc436f430187741f815'
-         '6921a0b4228fe89b6537a5c29f027c89'
-         '4ef0e2a2cbfbdd53346f927000b7e112'
-         '1195d85447f3d048d2c9bcd075fa765c'
-         'b0f3a651ce29a1feee687d93177870f1'
-         'b09000bba08da6ac753124593850cdf7'
-         '204bb5054d1f8bafe2b446d4e5d0d99a')
-
--- a/bash/system.bashrc
+++ b/bash/system.bashrc
@ -20,4 +20,4 @@ case ${TERM} in
    ;;
 esac

-[ -r /etc/bash_completion   ] && . /etc/bash_completion
+[ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
--- a/bdf-unifont/PKGBUILD
+++ b/bdf-unifont/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=bdf-unifont
 pkgver=5.1.20080820
 pkgrel=2
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@ -6,60 +6,81 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc

 pkgname=binutils
-pkgver=2.22
+pkgver=2.23
 pkgrel=1
-_date=20120109
-pkgdesc="A set of programs to assemble and manipulate binary and object files."
-arch=('i686' 'x86_64')
+pkgdesc="A set of programs to assemble and manipulate binary and object files"
+arch=('x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
-groups=('base')
+groups=('base-devel')
 depends=('glibc>=2.15' 'zlib')
-checkdepends=('dejagnu')
+checkdepends=('dejagnu' 'bc')
 options=('!libtool' '!distcc' '!ccache')
-install="binutils.install"
-source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2")
-md5sums=('d6df201cbf66394defc603e1318061fd')
-
-mksource() {
-  export _TAG="binutils-2_22-branch"
-  export CVSROOT=":pserver:anoncvs@sourceware.org:/cvs/src"
-
-  mkdir -p "${pkgname}-${_date}"
-  pushd "${pkgname}-${_date}" >/dev/null
-    cvs -z9 co -r "${_TAG}" binutils && \
-    mv src binutils                  && \
-    tar -cvjf "../binutils-${pkgver}_${_date}.tar.bz2" binutils/*
-  popd >/dev/null
-}
+install=binutils.install
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz{,.sig})
+md5sums=('ed58f50d8920c3f1d9cb110d5c972c27'
+         '5293d43d444852f71f7c96c6295ba66d')

 build() {
-  cd "${srcdir}"
-  mkdir -p binutils-build && cd binutils-build
+  cd ${srcdir}
+  mkdir binutils-build && cd binutils-build

-  [ "${CARCH}" == 'x86_64' ] && CONFIGFLAGS=('--enable-64-bit-bfd' '--disable-multilib')
-
-  "${srcdir}/${pkgname}/configure" \
-  	--prefix=/usr \
-  	--enable-ld=default \
-  	--enable-gold \
-  	--enable-lto \
-  	--enable-plugins \
-  	--enable-threads \
-  	--enable-shared \
-	  "${CONFIGFLAGS[@]}"
+  ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
+    --with-lib-path=/usr/lib:/usr/local/lib \
+    --with-bugurl=http://chakra-linux.org/bugs/ \
+    --enable-ld=default --enable-gold \
+    --enable-plugins --enable-threads --enable-shared \
+    --disable-werror --disable-multilib

  # check the host environment and makes sure all the necessary tools are available
  make configure-host

-  make tooldir="${pkgdir}/usr"
+  make tooldir=${pkgdir}/usr
+
+  # Rebuild libiberty.a with -fPIC
+  cp -a libiberty libiberty-pic
+  make -C libiberty-pic clean
+  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
+
+  # Rebuild libbfd.a with -fPIC
+  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
+  cp -a bfd bfd-pic
+  make -C bfd-pic clean
+  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
+
+  # Rebuild libopcodes.a with -fPIC
+  cp -a opcodes opcodes-pic
+  make -C opcodes-pic clean
+  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
+}
+
+check() {
+  cd ${srcdir}/binutils-build
+
+  # unset LDFLAGS as testsuite makes assumptions about which ones are active
+  # do not abort on errors - manually check log files
+  make LDFLAGS="" -k check || true
 }

 package() {
-  cd "${srcdir}/binutils-build"
-  make prefix="${pkgdir}/usr" tooldir="${pkgdir}/usr" install
+  cd ${srcdir}/binutils-build
+  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
+  
+  # Add some useful headers
+  install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include
+  install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include
+
+  # install libraries rebuilt with -fPIC
+  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
+  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
+  install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib

  # Remove Windows/Novell specific man pages
-  rm -f "${pkgdir}/usr/share/man/man1"/{dlltool,nlmconv,windres,windmc}*
-}
+  rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*

+  # Remove these symlinks, they are not ABI stable.
+  # Programs should compile static to the .a file.
+  rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
+  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
+  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
+}
--- a/boost/PKGBUILD
+++ b/boost/PKGBUILD
@ -1,13 +1,9 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 # Contributor: Artyom Smirnov <smirnoffjr@gmail.com>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 # Note: you have to rebuild those pkgs
 # Core: repo-clean
 # Platform: akonadi (exempi uses boost just as makedep)
--- a/bridge-utils/PKGBUILD
+++ b/bridge-utils/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=bridge-utils
 pkgver=1.5
 pkgrel=1
--- a/broadcom-wl-lts/PKGBUILD
+++ b/broadcom-wl-lts/PKGBUILD
@ -1,16 +1,15 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer : abveritas@chakra-project.org

 # Find the kernel name inside the chroot
-_extramodules=extramodules-`pacman -Q linux-lts | cut -c11-13 | sed 's/linux-lts //g'`-CHAKRA-LTS
+_extramodules=extramodules-3.0-lts
 _kver="$(cat /lib/modules/${_extramodules}/version)"

 pkgname=broadcom-wl-lts
 pkgver=5.100.82.112
-pkgrel=2
+pkgrel=4
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 arch=('i686' 'x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
--- a/broadcom-wl/PKGBUILD
+++ b/broadcom-wl/PKGBUILD
@ -1,44 +1,32 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org

 # Find the kernel name inside the chroot
-_extramodules=extramodules-`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA
+_extramodules=extramodules-3.6-CHAKRA
 _kver="$(cat /lib/modules/${_extramodules}/version)"

 pkgname=broadcom-wl
 pkgver=5.100.82.112
-pkgrel=6
+pkgrel=13
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
 license=('custom')
-depends=('linux>=3.2' 'linux<3.3')
+depends=('linux>=3.6' 'linux<3.7')
 makedepends=('linux-headers')

-pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
-url='http://www.broadcom.com/support/802.11/linux_sta.php'
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('linux')
-makedepends=('linux-headers')
-
-[[ $CARCH = x86_64 ]] && ARCH=x86_64 || ARCH=x86_32
-source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver//./_}.tar.gz"
+source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v${pkgver//./_}.tar.gz"
        'modprobe.d'
-        'linux3.patch'
-        'linux3.2.patch'
        'license.patch'
-        'semaphore.patch')
-sha1sums=('01aa32f9e85621253a3f15cf4361bb80d41da3e8'
+        'user-ioctl.patch'
+        'linux-recent.patch')
+sha1sums=('5bd78c20324e6a4aa9f3fafdc6f0155e884d5131'
          '89bf92286ede30dd85304c6c4e42e89cfdc0f60a'
-          '3e18f905bbe5e8b99a53d6ecb3b80a919f3531f2'
-          '229f41b7c371842bf9c1c81b03f34ee32fcb3310'
          'ea7b67982ddc0f56fd3becb9914fd4458fe7d373'
-          '105f8e1d48ebe1f25d53859e5ab9326a27435c66')
-[[ $CARCH = x86_64 ]] && sha1sums[0]='5bd78c20324e6a4aa9f3fafdc6f0155e884d5131'
+          'e0366dd15ea5b25aae0f61bec6be7a203dfca7e4'
+          'df3cd65e24beed349a40abcf476bdaa82bbc57d3')

 backup=('etc/modprobe.d/broadcom-wl.conf')
 install=install
@ -46,10 +34,9 @@ install=install
 build() {
 	cd "${srcdir}"

-	patch -p1 -i linux3.patch
-	patch -p0 src/wl/sys/wl_linux.c < linux3.2.patch
 	patch -p1 -i license.patch
-	patch -p1 -i semaphore.patch
+	patch -p1 -i linux-recent.patch
+	patch -p1 -i user-ioctl.patch

 	make -C /lib/modules/"${_kver}"/build M=`pwd`
 }
--- a/broadcom-wl/linux-recent.patch
+++ b/broadcom-wl/linux-recent.patch
@ -0,0 +1,84 @@
+diff -Naur old/Makefile new/Makefile
+--- old/Makefile	2012-10-15 23:08:11.256904135 +1100
+++ new/Makefile	2012-10-15 23:08:18.970262327 +1100
+@@ -15,21 +15,9 @@
+ 
+ ifneq ($(KERNELRELEASE),)
+ 
+-  LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
+-    if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \
+-      echo TRUE; \
+-    else \
+-      echo FALSE; \
+-    fi \
+-  ))
+  LINUXVER_GOODFOR_CFG80211:=TRUE
+ 
+-    LINUXVER_WEXT_ONLY:=$(strip $(shell \
+-    if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \
+-      echo FALSE; \
+-    else \
+-      echo TRUE; \
+-    fi \
+-  ))
+  LINUXVER_WEXT_ONLY:=FALSE
+ 
+   ifneq ($(API),)
+     ifeq ($(API), CFG80211)
+diff -Naur old/src/wl/sys/wl_cfg80211.c new/src/wl/sys/wl_cfg80211.c
+--- old/src/wl/sys/wl_cfg80211.c	2012-10-15 23:08:11.266904352 +1100
+++ new/src/wl/sys/wl_cfg80211.c	2012-10-15 23:08:32.313638398 +1100
+@@ -42,7 +42,7 @@
+            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
+ static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+            struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
+-static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
+            struct cfg80211_scan_request *request);
+ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
+ static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+@@ -570,10 +570,12 @@
+ }
+ 
+ static s32
+-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+wl_cfg80211_scan(struct wiphy *wiphy,
+                  struct cfg80211_scan_request *request)
+ {
+ 	s32 err = 0;
+	struct wl_priv *wl = wiphy_to_wl(wiphy);
+	struct net_device *ndev = wl_to_ndev(wl);
+ 
+ 	CHECK_SYS_UP();
+ 	err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
+diff -Naur old/src/wl/sys/wl_iw.h new/src/wl/sys/wl_iw.h
+--- old/src/wl/sys/wl_iw.h	2012-10-15 23:08:11.266904352 +1100
+++ new/src/wl/sys/wl_iw.h	2012-10-15 23:08:18.973595675 +1100
+@@ -15,6 +15,7 @@
+ #ifndef _wl_iw_h_
+ #define _wl_iw_h_
+ 
+#include <linux/semaphore.h>
+ #include <linux/wireless.h>
+ 
+ #include <typedefs.h>
+diff -Naur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c
+--- old/src/wl/sys/wl_linux.c	2012-10-15 23:08:11.266904352 +1100
+++ new/src/wl/sys/wl_linux.c	2012-10-15 23:08:18.973595675 +1100
+@@ -40,7 +40,6 @@
+ #include <linux/pci_ids.h>
+ #define WLC_MAXBSSCFG		1	
+ 
+-#include <asm/system.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
+ #include <asm/pgtable.h>
+@@ -385,7 +384,7 @@
+ #endif
+ 	.ndo_get_stats = wl_get_stats,
+ 	.ndo_set_mac_address = wl_set_mac_address,
+-	.ndo_set_multicast_list = wl_set_multicast_list,
+	.ndo_set_rx_mode = wl_set_multicast_list,
+ 	.ndo_do_ioctl = wl_ioctl
+ };
+ 
--- a/broadcom-wl/linux3.2.patch
+++ b/broadcom-wl/linux3.2.patch
@ -1,4 +0,0 @@
-332c332
-< 	.ndo_set_multicast_list = wl_set_multicast_list,
---
-> 	.ndo_set_rx_mode = wl_set_multicast_list,
--- a/broadcom-wl/linux3.patch
+++ b/broadcom-wl/linux3.patch
@ -1,21 +0,0 @@
-diff -Naur broadcom-sta-5.100.82.111.orig/Makefile broadcom-sta-5.100.82.111/Makefile
--- broadcom-sta-5.100.82.111.orig/Makefile	2011-10-06 08:16:10.000000000 +0900
-+++ broadcom-sta-5.100.82.111/Makefile	2011-10-24 08:54:26.000000000 +0900
-@@ -16,7 +16,7 @@
- ifneq ($(KERNELRELEASE),)
- 
-   LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
-    if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \
-+    if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "0$(SUBLEVEL)" -ge "32" ]; then \
-       echo TRUE; \
-     else \
-       echo FALSE; \
-@@ -24,7 +24,7 @@
-   ))
- 
-     LINUXVER_WEXT_ONLY:=$(strip $(shell \
-    if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \
-+    if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "0$(SUBLEVEL)" -ge "17" ]; then \
-       echo FALSE; \
-     else \
-       echo TRUE; \
--- a/broadcom-wl/semaphore.patch
+++ b/broadcom-wl/semaphore.patch
@ -1,11 +0,0 @@
-diff -aur old/src/wl/sys/wl_iw.h new/src/wl/sys/wl_iw.h
--- old/src/wl/sys/wl_iw.h	2010-12-15 02:58:07.000000000 +0100
-+++ new/src/wl/sys/wl_iw.h	2010-12-25 18:17:01.826676379 +0100
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
- 
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
- 
- #include <typedefs.h>
--- a/broadcom-wl/user-ioctl.patch
+++ b/broadcom-wl/user-ioctl.patch
@ -0,0 +1,31 @@
+diff -aur old/src/wl/sys/wl_cfg80211.c new/src/wl/sys/wl_cfg80211.c
+--- old/src/wl/sys/wl_cfg80211.c	2011-10-23 03:56:55.000000000 +1100
+++ new/src/wl/sys/wl_cfg80211.c	2012-05-24 18:43:17.324465658 +1000
+@@ -1466,7 +1466,10 @@
+ 		scb_val.val = 0;
+ 		err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
+ 		if (err) {
+-			WL_ERR(("Could not get rssi (%d)\n", err));
+			if (err != -EINVAL) {
+				// Don't fill syslog with EINVAL error
+				WL_ERR(("Could not get rssi (%d)\n", err));
+			}
+ 			return err;
+ 		}
+ 		rssi = dtoh32(scb_val.val);
+diff -aur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c
+--- old/src/wl/sys/wl_linux.c	2011-10-23 03:56:55.000000000 +1100
+++ new/src/wl/sys/wl_linux.c	2012-05-24 18:43:17.324465658 +1000
+@@ -1579,11 +1579,7 @@
+ 	}
+ 
+ 	WL_LOCK(wl);
+-	if (!capable(CAP_NET_ADMIN)) {
+-		bcmerror = BCME_EPERM;
+-	} else {
+-		bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
+-	}
+	bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
+ 	WL_UNLOCK(wl);
+ 
+ done1:
--- a/bzip2/PKGBUILD
+++ b/bzip2/PKGBUILD
@ -1,22 +1,18 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf 
+# maintainer abveritas@chakra-project.org

 pkgname=bzip2
 pkgver=1.0.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-quality data compression program"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('custom')
 url="http://sources.redhat.com/bzip2"
 groups=('base')
 depends=('glibc')
-source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz)
+source=("http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz")
 md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b')

 build() {
@ -31,27 +27,32 @@ build() {

  make -f Makefile-libbz2_so
  make bzip2recover libbz2.a
+}

-  install -dm755 $pkgdir/bin
-  install -m755 bzip2-shared $pkgdir/bin/bzip2
-  install -m755 bzip2recover $pkgdir/bin
-  ln -sf bzip2 $pkgdir/bin/bunzip2
-  ln -sf bzip2 $pkgdir/bin/bzcat
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make test
+}

-  install -dm755 $pkgdir/usr/bin
-  install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
+package() {
+  cd "$srcdir/$pkgname-$pkgver"

-  install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0
+  install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1}

-  install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
-  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
+  install -m755 bzip2-shared $pkgdir/usr/bin/bzip2
+  install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin
+  ln -sf bzip2 $pkgdir/usr/bin/bunzip2
+  ln -sf bzip2 $pkgdir/usr/bin/bzcat

-  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
+  install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib
+  ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so
+  ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1
+  ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0
+  install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a

-  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
+  install -m644 bzlib.h $pkgdir/usr/include/
+
+  install -m644 bzip2.1 $pkgdir/usr/share/man/man1/
  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1
  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1
  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1
--- a/bzr/PKGBUILD
+++ b/bzr/PKGBUILD
@ -6,23 +6,23 @@
 # Contributer: Joshua L. Blocher <verbalshadow@gmail.com>

 pkgname=bzr
-pkgver=2.4.2
+pkgver=2.5.1
 pkgrel=1
-pkgdesc="A decentralized revision control system (bazaar)"
+pkgdesc="Bazaar is a version control system that helps you track project history over time and to collaborate easily with others."
 arch=('i686' 'x86_64')
 url="http://bazaar.canonical.com/en/"
 license=('GPL')
 depends=('python2')
 optdepends=('python-paramiko: for sftp support')
 source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('cfc06fddd348445c65a247c0b33a05db'
-         '90294e34a45df20b16be47a32c800c89')
+md5sums=('ac5079858364a046071000d5cdccb67b'
+         'c83dd08dd2c3e27edbab873500d7d6eb')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
  sed -i 's|man/man1|share/man/man1|' setup.py
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+  sed -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+      -i bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
  python2 setup.py build
 }

@ -33,3 +33,5 @@ package() {
  # bash-completion
  install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr"
 }
+
+# vim:set ts=2 sw=2 et:
--- a/ca-certificates/PKGBUILD
+++ b/ca-certificates/PKGBUILD
@ -1,29 +1,24 @@
 #
 # Core packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas[at]chakra-project[dot]org>

 pkgname=ca-certificates
-pkgver=20110502
-_debpkgver="${pkgver}+nmu1"
-pkgrel=3
+pkgver=20121114
+pkgrel=1
 pkgdesc='Common CA certificates'
 arch=('any')
 url='http://packages.qa.debian.org/c/ca-certificates.html'
 license=('MPL' 'GPL')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${_debpkgver}.tar.gz")
+source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz")
 depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
 makedepends=('ruby' 'python2')
 install=ca-certificates.install
 backup=('etc/ca-certificates.conf')
-md5sums=('13aed718a5cdd05b4086c93dafd4e1e2')
+md5sums=('3000802ea54fbe3a9b6aaa58428241c3')

 build() {
-  cd "${srcdir}/${pkgname}-${_debpkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"

  sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py
  sed 's|python|python2|g' -i mozilla/Makefile
@ -31,7 +26,7 @@ build() {
 }

 package() {
-  cd "${srcdir}/${pkgname}-${_debpkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"

  install -d -m755 "${pkgdir}"/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
  make install DESTDIR="${pkgdir}"
--- a/chakra-init/PKGBUILD
+++ b/chakra-init/PKGBUILD
@ -0,0 +1,29 @@
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer: abveritas[at]chakra-project[dot]org>
+
+pkgname=chakra-init
+pkgver=2012.09
+pkgrel=1
+pkgdesc="Transitional systemd scripts"
+arch=('i686' 'x86_64')
+url="http://www.chakra-project.org"
+license=('GPL2')
+depends=('filesystem')
+makedepends=('asciidoc')
+install=chakra-init.install
+source=('rc.shutdown' 'rc.local.shutdown' 'inittab')
+md5sums=('e4798daef2b565e3b6f2ec5e0d5ce3d2'
+         '669ce6d766dd9deb86686219f3763fe4'
+         'ec5d68e47feac3fb486b72f82ddabfb5')
+
+package() {
+  cd ${srcdir}
+  # setup /etc
+  mkdir ${pkgdir}/etc
+  install -m644 -t ${pkgdir}/etc inittab
+  install -m755 -t ${pkgdir}/etc rc.local.shutdown  
+  install -m755 -t ${pkgdir}/etc rc.shutdown 
+	
+}
--- a/chakra-init/chakra-init.install
+++ b/chakra-init/chakra-init.install
@ -0,0 +1,7 @@
+post_install() {
+  grep "KEYMAP=" /etc/rc.conf.pacsave >> /etc/vconsole.conf
+  grep "HOSTNAME=" /etc/rc.conf.pacsave | awk -F'"' '{print $2}' > /etc/hostname
+  sed -i -e 's/halt/poweroff/' /usr/share/config/kdm/kdmrc
+  systemctl reenable NetworkManager.service
+  systemctl reenable kdm.service
+}
--- a/chakra-init/inittab
+++ b/chakra-init/inittab
@ -0,0 +1,48 @@
+#
+# /etc/inittab
+#
+
+#  Runlevels:
+#    0    Halt
+#    1(S)	Single-user
+#    2    Not used
+#    3    Multi-user
+#    4    Not used
+#    5    X11
+#    6    Reboot
+
+## Only one of the following two lines can be uncommented!
+# Boot to console
+#id:3:initdefault:
+# Boot to X11
+#id:5:initdefault:
+
+#rc::sysinit:/etc/rc.sysinit
+#rs:S1:wait:/etc/rc.single
+#rm:2345:wait:/etc/rc.multi
+rh:06:wait:/etc/rc.shutdown
+#su:S:wait:/sbin/sulogin -p
+
+# -8 options fixes umlauts problem on login
+c1:2345:respawn:/sbin/agetty -8 -s 38400 tty1 linux
+c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty -8 -s 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty -8 -s 38400 tty6 linux
+
+# Serial Virtual Console for KVM and others VMs
+#s0:2345:respawn:/sbin/agetty -8 -s 9600 ttyS0 linux
+
+# Hypervisor Virtual Console for Xen and KVM
+#h0:2345:respawn:/sbin/agetty -8 -s 38400 hvc0 linux
+
+ca::ctrlaltdel:/sbin/shutdown -t3 -r now
+
+# Example lines for starting a login manager
+#x:5:respawn:/usr/bin/xdm -nodaemon
+#x:5:respawn:/usr/sbin/gdm -nodaemon
+#x:5:respawn:/usr/bin/kdm -nodaemon
+#x:5:respawn:/usr/bin/slim >/dev/null 2>&1
+
+# End of file
--- a/chakra-init/rc.local.shutdown
+++ b/chakra-init/rc.local.shutdown
@ -0,0 +1,5 @@
+#!/bin/bash
+#
+# /etc/rc.local.shutdown: Local shutdown script.
+#
+
--- a/chakra-init/rc.shutdown
+++ b/chakra-init/rc.shutdown
@ -0,0 +1,143 @@
+#!/bin/bash
+#
+# /etc/rc.shutdown
+#
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# avoid staircase effect
+stty onlcr
+
+echo " "
+printhl "Initiating Shutdown..."
+echo " "
+
+run_hook shutdown_start
+
+[[ -x /etc/rc.local.shutdown ]] && /etc/rc.local.shutdown
+
+stop_all_daemons
+
+stat_busy "Saving Random Seed"
+	RANDOM_SEED=/var/lib/misc/random-seed
+	install -TDm 0600 /dev/null $RANDOM_SEED
+	POOL_FILE=/proc/sys/kernel/random/poolsize
+	if [[ -r $POOL_FILE ]]; then
+		read POOL_SIZE < $POOL_FILE
+		(( POOL_SIZE /= 8 ))
+	else
+		POOL_SIZE=512
+	fi
+	dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &>/dev/null
+stat_done
+
+[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE"
+
+# Write to wtmp file before unmounting
+halt -w
+
+# stop monitoring of lvm2 groups before unmounting filesystems
+[[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) ]] &&
+	status "Deactivating monitoring of LVM2 groups" vgchange --monitor n
+
+# any future uevents can and should be ignored
+status "Shutting down UDev" udevadm control --exit
+
+run_hook shutdown_prekillall
+
+kill_all
+
+run_hook shutdown_postkillall
+
+run_hook shutdown_preumount
+
+# unmount any non-api partitions that are backed by swap, we don't want to
+# move their contents into memory (waste of time and might caues OOM).
+status "Unmounting Swap-backed Filesystems" umount_all "tmpfs"
+
+# almost everything is dead now, so the swap should hopefully be relatively
+# empty, and quick to switch off
+status "Deactivating Swap" swapoff -a
+
+status "Unmounting Non-API Filesystems" umount_all
+
+run_hook shutdown_postumount
+
+# Kill non-root encrypted partition mappings
+if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then
+	stat_busy "Deactivating encrypted volumes:"
+		# Maybe someone has LVM on an encrypted block device
+		# executing an extra vgchange is errorless
+		[[ $USELVM = [Yy][Ee][Ss] ]] && vgchange --sysinit -a n &>/dev/null
+		do_lock() {
+			stat_append "${1}.."
+			if cryptsetup remove "$1" &>/dev/null; then
+				stat_append "ok "
+			else
+				stat_append "failed "
+			fi
+		}
+		read_crypttab do_lock
+	stat_done
+fi
+
+[[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]] &&
+	status "Deactivating LVM2 groups" vgchange --sysinit -a n &>/dev/null
+
+run_hook shutdown_poweroff
+
+if [[ -x /run/initramfs/shutdown ]]; then
+
+	# decide what we want to do
+	if [[ $RUNLEVEL = 0 ]]; then
+		action="poweroff"
+	else
+		action="reboot"
+	fi
+
+	# make /run/initrafs a mount
+	mount --bind /run/initramfs /run/initramfs
+
+	# in case someone has shared our mountpoints, unshare them
+	mount --make-private /run/initramfs
+	mount --make-private /
+
+	# bind all api mounts
+	mkdir -p /run/initramfs/{sys,proc,dev,run,oldroot}
+	mount --bind /sys /run/initramfs/sys
+	mount --bind /proc /run/initramfs/proc
+	mount --bind /dev /run/initramfs/dev
+	mount --bind /run /run/initramfs/run
+
+	# enter shutdownramfs
+	cd /run/initramfs
+	pivot_root . oldroot
+
+	#reexec init
+	/oldroot/sbin/init u
+
+	# run /shutdown in the new root
+	exec chroot . /shutdown $action </dev/console >/dev/console 2>&1
+
+else
+
+	status "Remounting Root Filesystem Read-only" \
+		mount -o remount,ro /
+
+	# Power off or reboot
+	printsep
+	if [[ $RUNLEVEL = 0 ]]; then
+		printhl "${C_H2}POWER OFF"
+		poweroff -d -f -h -i
+	else
+		printhl "${C_H2}REBOOTING"
+		# if kexec is installed and a kernel is loaded, use it
+		[[ -x $(type -P kexec) ]] && kexec -e &>/dev/null
+		reboot -d -f -i
+	fi
+
+fi
+
+# End of file
+# vim: set ts=2 sw=2 noet:
--- a/cloog/PKGBUILD
+++ b/cloog/PKGBUILD
@ -5,9 +5,9 @@

 pkgname=cloog
 pkgver=0.17.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Library that generates loops for scanning polyhedra"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.bastoul.net/cloog/"
 license=('GPL')
 depends=('isl' 'gmp')
@ -31,4 +31,3 @@ package() {
  cd "${srcdir}/${pkgname}-${pkgver}"
  make DESTDIR="${pkgdir}/" install
 }
-
--- a/cmake/PKGBUILD
+++ b/cmake/PKGBUILD
@ -1,32 +1,34 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
+# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=cmake
-pkgver=2.8.7
-pkgrel=2
+pkgver=2.8.9
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('custom')
 url="http://www.cmake.org"
 depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt')
 install=${pkgname}.install
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e1b237aeaed880f65dec9c20602452f6')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'fix-pkg-config.patch')
+md5sums=('801f4c87f8b604f727df5bf1f05a59e7'
+         '1d0e7fddd703a36df30262d7616a59be')

 build() {
  cd "${srcdir}"/${pkgname}-${pkgver}

+  #patch -p1 -i "${srcdir}"/fix-pkg-config.patch
+
  ./bootstrap --prefix=/usr \
    --mandir=/share/man \
    --docdir=/share/doc/cmake \
    --system-libs \
    --qt-gui \
-    --parallel=2
+    --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
  make
 }

@ -38,5 +40,6 @@ package() {
  install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
  install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
  install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
+
  install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
--- a/cmake/cmake.install
+++ b/cmake/cmake.install
@ -1,5 +1,6 @@
 post_install() {
 	update-mime-database usr/share/mime &> /dev/null
+    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
 }

 post_upgrade() {
--- a/cmake/fix-pkg-config.patch
+++ b/cmake/fix-pkg-config.patch
@ -0,0 +1,32 @@
+X-Git-Url: 
+http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 5d93ab1..39d3a76 100644
+--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
+@@ -13,11 +13,10 @@
+ # When the 'QUIET' argument is set, no status messages will be printed.
+ #
+ # It sets the following variables:
+-#   PKG_CONFIG_FOUND          ... true if pkg-config works on the system
+#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #   PKG_CONFIG_EXECUTABLE     ... pathname of the pkg-config program
+ #   PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
+ #                                 (since CMake 2.8.8)
+-#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #
+ # For the following variables two sets of values exist; first one is the
+ # common one and has the given PREFIX. The second set contains flags
+@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
+                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
+
+# This is needed because the module name is "PkgConfig" but the name of
+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
+# handled by FPHSA.
+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
+
+ # Unsets the given variables
+ macro(_pkgconfig_unset var)
+   set(${var} "" CACHE INTERNAL "")
--- a/coreutils/PKGBUILD
+++ b/coreutils/PKGBUILD
@ -1,66 +1,48 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
+# maintainer abveritas@chakra-project.org

 pkgname=coreutils
-pkgver=8.14
+pkgver=8.20
 pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL3')
 url="http://www.gnu.org/software/coreutils"
 groups=('base')
-depends=('glibc' 'shadow' 'pam' 'acl' 'gmp>=5.0' 'libcap')
-provides=('mktemp')
-conflicts=('mktemp')
-replaces=('sh-utils' 'fileutils' 'textutils' 'mktemp')
-backup=('etc/pam.d/su')
+depends=('glibc' 'pam' 'acl' 'gmp' 'libcap')
 install=${pkgname}.install
-options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
-	coreutils-uname.patch
-	coreutils-pam.patch
-        su.pam)
-md5sums=('bcb135ce553493a45aba01b39eb3920a'
-         'c4fcca138b6abf6d443d48a6f0cd8833'
-         'aad79a2aa6d566c375d7bdd1b0767278'
-         'fa85e5cce5d723275b14365ba71a8aad')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('3d69af8f561fce512538a9fe85f147ff'
+         '7e6076e4e0961d24c38cf8685efca35b')

 build() {
  cd ${srcdir}/${pkgname}-${pkgver}

-  # added pam patch and i18n patch from fedora cvs
-  patch -Np1 -i $srcdir/coreutils-pam.patch || return 1
-
-  # from gentoo portage
-  patch -Np1 -i $srcdir/coreutils-uname.patch || return 1
-
-  autoreconf -v
-  ./configure --prefix=/usr \
-              --enable-install-program=su \
-              --enable-no-install-program=groups,hostname,kill,uptime \
-              --enable-pam ac_cv_func_openat=no || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  cd ${pkgdir}/usr/bin
-  install -dm755 ${pkgdir}/{bin,usr/sbin}
-  
-  # binaries required by FHS
-  _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \
-        mkdir mknod mv pwd rm rmdir stty su sync true uname"
-  mv ${_fhs} $pkgdir/bin
-
-  # binaries required by various scripts
-  _bin="cut dir dircolors du install mkfifo readlink shred \
-        sleep touch tr vdir"
-  mv ${_bin} $pkgdir/bin
-  ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep
-    
-  mv chroot $pkgdir/usr/sbin
-  install -Dm644 $srcdir/su.pam ${pkgdir}/etc/pam.d/su
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+              --enable-no-install-program=groups,hostname,kill,uptime
+  make
 }

+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make RUN_EXPENSIVE_TESTS=yes check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  cd ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/bin
+  # makepkg requirement
+  ln -s /usr/bin/du "${pkgdir}/bin/du"
+  # binaries required by FHS
+  _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
+        'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync'
+        'true' 'uname')
+  for i in ${_fhs[@]}; do
+    ln -s ../usr/bin/$i ${pkgdir}/bin/$i
+  done
+}
--- a/coreutils/coreutils-pam.patch
+++ b/coreutils/coreutils-pam.patch
@ -1,428 +0,0 @@
-diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac
--- coreutils-8.4-orig/configure.ac	2010-01-11 18:20:42.000000000 +0100
-+++ coreutils-8.4/configure.ac	2010-02-12 10:17:46.000000000 +0100
-@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then
-   AC_SUBST([GNULIB_WARN_CFLAGS])
- fi
- 
-+dnl Give the chance to enable PAM
-+AC_ARG_ENABLE(pam, dnl
-+[  --enable-pam              Enable use of the PAM libraries],
-+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
-+LIB_PAM="-ldl -lpam -lpam_misc"
-+AC_SUBST(LIB_PAM)])
-+
- AC_FUNC_FORK
- 
- optional_bin_progs=
-diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi
--- coreutils-8.4-orig/doc/coreutils.texi	2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/doc/coreutils.texi	2010-02-12 10:17:46.000000000 +0100
-@@ -15081,8 +15081,11 @@ to certain shells, etc.).
- @findex syslog
- @command{su} can optionally be compiled to use @code{syslog} to report
- failed, and optionally successful, @command{su} attempts.  (If the system
-supports @code{syslog}.)  However, GNU @command{su} does not check if the
-user is a member of the @code{wheel} group; see below.
-+supports @code{syslog}.)
-+
-+This version of @command{su} has support for using PAM for
-+authentication.  You can edit @file{/etc/pam.d/su} to customize its
-+behaviour.
- 
- The program accepts the following options.  Also see @ref{Common options}.
- 
-@@ -15124,6 +15127,8 @@ environment variables except @env{TERM},
- @env{PATH} to a compiled-in default value.  Change to @var{user}'s home
- directory.  Prepend @samp{-} to the shell's name, intended to make it
- read its login startup file(s).
-+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables 
-+are preserved as well for PAM functionality.
- 
- @item -m
- @itemx -p
-@@ -15163,33 +15168,6 @@ Exit status:
- the exit status of the subshell otherwise
- @end display
- 
-@cindex wheel group, not supported
-@cindex group wheel, not supported
-@cindex fascism
-@subsection Why GNU @command{su} does not support the @samp{wheel} group
-
-(This section is by Richard Stallman.)
-
-@cindex Twenex
-@cindex MIT AI lab
-Sometimes a few of the users try to hold total power over all the
-rest.  For example, in 1984, a few users at the MIT AI lab decided to
-seize power by changing the operator password on the Twenex system and
-keeping it secret from everyone else.  (I was able to thwart this coup
-and give power back to the users by patching the kernel, but I
-wouldn't know how to do that in Unix.)
-
-However, occasionally the rulers do tell someone.  Under the usual
-@command{su} mechanism, once someone learns the root password who
-sympathizes with the ordinary users, he or she can tell the rest.  The
-``wheel group'' feature would make this impossible, and thus cement the
-power of the rulers.
-
-I'm on the side of the masses, not that of the rulers.  If you are
-used to supporting the bosses and sysadmins in whatever they do, you
-might find this idea strange at first.
-
-
- @node timeout invocation
- @section @command{timeout}: Run a command with a time limit
- 
-diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am
--- coreutils-8.4-orig/src/Makefile.am	2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/src/Makefile.am	2010-02-12 10:17:46.000000000 +0100
-@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP)
- uptime_LDADD += $(GETLOADAVG_LIBS)
- 
- # for crypt
-su_LDADD += $(LIB_CRYPT)
-+su_LDADD += $(LIB_CRYPT) @LIB_PAM@
- 
- # for various ACL functions
- copy_LDADD += $(LIB_ACL)
-diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c
--- coreutils-8.4-orig/src/su.c	2010-02-12 10:15:15.000000000 +0100
-+++ coreutils-8.4/src/su.c	2010-02-12 10:24:29.000000000 +0100
-@@ -37,6 +37,16 @@
-    restricts who can su to UID 0 accounts.  RMS considers that to
-    be fascist.
- 
-+#ifdef USE_PAM
-+
-+   Actually, with PAM, su has nothing to do with whether or not a
-+   wheel group is enforced by su.  RMS tries to restrict your access
-+   to a su which implements the wheel group, but PAM considers that
-+   to be fascist, and gives the user/sysadmin the opportunity to
-+   enforce a wheel group by proper editing of /etc/pam.conf
-+
-+#endif
-+
-    Compile-time options:
-    -DSYSLOG_SUCCESS	Log successful su's (by default, to root) with syslog.
-    -DSYSLOG_FAILURE	Log failed su's (by default, to root) with syslog.
-@@ -53,6 +63,15 @@
- #include <pwd.h>
- #include <grp.h>
- 
-+#ifdef USE_PAM
-+# include <signal.h>
-+# include <sys/wait.h>
-+# include <sys/fsuid.h>
-+# include <unistd.h>
-+# include <security/pam_appl.h>
-+# include <security/pam_misc.h>
-+#endif /* USE_PAM */
-+
- #include "system.h"
- #include "getpass.h"
- 
-@@ -120,10 +139,17 @@
- /* The user to become if none is specified.  */
- #define DEFAULT_USER "root"
- 
-+#ifndef USE_PAM
- char *crypt (char const *key, char const *salt);
-+#endif
- 
-static void run_shell (char const *, char const *, char **, size_t)
-+static void run_shell (char const *, char const *, char **, size_t,
-+	const struct passwd *)
-+#ifdef USE_PAM
-+	;
-+#else
-      ATTRIBUTE_NORETURN;
-+#endif
- 
- /* If true, pass the `-f' option to the subshell.  */
- static bool fast_startup;
-@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su
- }
- #endif
- 
-+#ifdef USE_PAM
-+static pam_handle_t *pamh = NULL;
-+static int retval;
-+static struct pam_conv conv = {
-+  misc_conv,
-+  NULL
-+};
-+
-+#define PAM_BAIL_P if (retval) { \
-+  pam_end(pamh, PAM_SUCCESS); \
-+  return 0; \
-+}
-+#define PAM_BAIL_P_VOID if (retval) {		\
-+  pam_end(pamh, PAM_SUCCESS);			\
-+return;						\
-+}
-+#endif
-+
- /* Ask the user for a password.
-+   If PAM is in use, let PAM ask for the password if necessary.
-    Return true if the user gives the correct password for entry PW,
-    false if not.  Return true without asking for a password if run by UID 0
-    or if PW has an empty password.  */
-@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su
- static bool
- correct_password (const struct passwd *pw)
- {
-+#ifdef USE_PAM
-+  struct passwd *caller;
-+  char *tty_name, *ttyn;
-+  retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
-+  PAM_BAIL_P;
-+
-+  if (getuid() != 0 && !isatty(0)) {
-+	fprintf(stderr, "standard in must be a tty\n");
-+	exit(1);
-+  }
-+
-+  caller = getpwuid(getuid());
-+  if(caller != NULL && caller->pw_name != NULL) {
-+	  retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name);
-+	  PAM_BAIL_P;
-+  }
-+
-+  ttyn = ttyname(0);
-+  if (ttyn) {
-+    if (strncmp(ttyn, "/dev/", 5) == 0)
-+       tty_name = ttyn+5;
-+    else
-+       tty_name = ttyn;
-+    retval = pam_set_item(pamh, PAM_TTY, tty_name);
-+    PAM_BAIL_P;
-+  }
-+  retval = pam_authenticate(pamh, 0);
-+  PAM_BAIL_P;
-+  retval = pam_acct_mgmt(pamh, 0);
-+  if (retval == PAM_NEW_AUTHTOK_REQD) {
-+    /* password has expired.  Offer option to change it. */
-+    retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-+    PAM_BAIL_P;
-+  }
-+  PAM_BAIL_P;
-+  /* must be authenticated if this point was reached */
-+  return 1;
-+#else /* !USE_PAM */
-   char *unencrypted, *encrypted, *correct;
- #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
-   /* Shadow passwd stuff for SVR3 and maybe other systems.  */
-@@ -241,6 +324,7 @@ correct_password (const struct passwd *p
-   encrypted = crypt (unencrypted, correct);
-   memset (unencrypted, 0, strlen (unencrypted));
-   return STREQ (encrypted, correct);
-+#endif /* !USE_PAM */
- }
- 
- /* Update `environ' for the new shell based on PW, with SHELL being
-@@ -254,12 +338,18 @@ modify_environment (const struct passwd 
-       /* Leave TERM unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
-          Unset all other environment variables.  */
-       char const *term = getenv ("TERM");
-+      char const *display = getenv ("DISPLAY");
-+      char const *xauthority = getenv ("XAUTHORITY");
-       if (term)
-         term = xstrdup (term);
-       environ = xmalloc ((6 + !!term) * sizeof (char *));
-       environ[0] = NULL;
-       if (term)
-         xsetenv ("TERM", term);
-+      if (display)
-+        xsetenv ("DISPLAY", display);
-+      if (xauthority)
-+        xsetenv ("XAUTHORITY", xauthority);
-       xsetenv ("HOME", pw->pw_dir);
-       xsetenv ("SHELL", shell);
-       xsetenv ("USER", pw->pw_name);
-@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw
- {
- #ifdef HAVE_INITGROUPS
-   errno = 0;
-  if (initgroups (pw->pw_name, pw->pw_gid) == -1)
-+  if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
-+#ifdef USE_PAM
-+    pam_close_session(pamh, 0);
-+    pam_end(pamh, PAM_ABORT);
-+#endif
-     error (EXIT_CANCELED, errno, _("cannot set groups"));
-+  }
-   endgrent ();
- #endif
-   if (setgid (pw->pw_gid))
-@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw
-     error (EXIT_CANCELED, errno, _("cannot set user id"));
- }
- 
-+#ifdef USE_PAM
-+static int caught=0;
-+/* Signal handler for parent process later */
-+static void su_catch_sig(int sig)
-+{
-+  ++caught;
-+}
-+
-+int
-+pam_copyenv (pam_handle_t *pamh)
-+{
-+  char **env;
-+
-+  env = pam_getenvlist(pamh);
-+  if(env) {
-+    while(*env) {
-+	if (putenv (*env))
-+	  xalloc_die ();
-+	env++;
-+    }
-+  }
-+  return(0);
-+}
-+#endif
-+
- /* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
-    If COMMAND is nonzero, pass it to the shell with the -c option.
-    Pass ADDITIONAL_ARGS to the shell as more arguments; there
-@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw
- 
- static void
- run_shell (char const *shell, char const *command, char **additional_args,
-           size_t n_additional_args)
-+           size_t n_additional_args, const struct passwd *pw)
- {
-   size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
-   char const **args = xnmalloc (n_args, sizeof *args);
-   size_t argno = 1;
-+#ifdef USE_PAM
-+  int child;
-+  sigset_t ourset;
-+  int status;
-+
-+  retval = pam_open_session(pamh,0);
-+  if (retval != PAM_SUCCESS) {
-+    fprintf (stderr, "could not open session\n");
-+    exit (1);
-+  }
-+
-+/* do this at the last possible moment, because environment variables may
-+   be passed even in the session phase
-+*/
-+  if(pam_copyenv(pamh) != PAM_SUCCESS)
-+     fprintf (stderr, "error copying PAM environment\n");
-+  
-+  /* Credentials should be set in the parent */ 
-+  if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) {
-+    pam_close_session(pamh, 0);
-+    fprintf(stderr, "could not set PAM credentials\n");
-+    exit(1);
-+  }
-+
-+  child = fork();
-+  if (child == 0) {  /* child shell */
-+  change_identity (pw);
-+  pam_end(pamh, 0);
-+#endif
- 
-   if (simulate_login)
-     {
-       char *arg0;
-       char *shell_basename;
- 
-+      if(chdir(pw->pw_dir))
-+	      error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+
-       shell_basename = last_component (shell);
-       arg0 = xmalloc (strlen (shell_basename) + 2);
-       arg0[0] = '-';
-@@ -344,6 +496,67 @@ run_shell (char const *shell, char const
-     error (0, errno, "%s", shell);
-     exit (exit_status);
-   }
-+#ifdef USE_PAM
-+  } else if (child == -1) {
-+      fprintf(stderr, "can not fork user shell: %s", strerror(errno));
-+      pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+      pam_close_session(pamh, 0);
-+      pam_end(pamh, PAM_ABORT);
-+      exit(1);
-+  }
-+  /* parent only */
-+  sigfillset(&ourset);
-+  if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
-+    fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME);
-+    caught = 1;
-+  }
-+  if (!caught) {
-+    struct sigaction action;
-+    action.sa_handler = su_catch_sig;
-+    sigemptyset(&action.sa_mask);
-+    action.sa_flags = 0;
-+    sigemptyset(&ourset);
-+    if (sigaddset(&ourset, SIGTERM)
-+        || sigaddset(&ourset, SIGALRM)
-+        || sigaction(SIGTERM, &action, NULL)
-+        || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
-+      fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+      caught = 1;
-+    }
-+  }
-+  if (!caught) {
-+    do {
-+      int pid;
-+
-+      pid = waitpid(-1, &status, WUNTRACED);
-+
-+      if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) {
-+          kill(getpid(), WSTOPSIG(status));
-+          /* once we get here, we must have resumed */
-+          kill(pid, SIGCONT);
-+      }
-+    } while (0 != WIFSTOPPED(status));
-+  }
-+
-+  if (caught) {
-+    fprintf(stderr, "\nSession terminated, killing shell...");
-+    kill (child, SIGTERM);
-+  }
-+  /* Not checking retval on this because we need to call close session */
-+  pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+  retval = pam_close_session(pamh, 0);
-+  PAM_BAIL_P_VOID;
-+  retval = pam_end(pamh, PAM_SUCCESS);
-+  PAM_BAIL_P_VOID;
-+  if (caught) {
-+    sleep(2);
-+    kill(child, SIGKILL);
-+    fprintf(stderr, " ...killed.\n");
-+    exit(-1);
-+  }
-+  exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status)
-+                                  : WTERMSIG (status) + 128);
-+#endif /* USE_PAM */
- }
- 
- /* Return true if SHELL is a restricted shell (one not returned by
-@@ -511,9 +724,9 @@ main (int argc, char **argv)
-   shell = xstrdup (shell ? shell : pw->pw_shell);
-   modify_environment (pw, shell);
- 
-+#ifndef USE_PAM
-   change_identity (pw);
-  if (simulate_login && chdir (pw->pw_dir) != 0)
-    error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+#endif
- 
-   /* error() flushes stderr, but does not check for write failure.
-      Normally, we would catch this via our atexit() hook of
-@@ -523,5 +736,5 @@ main (int argc, char **argv)
-   if (ferror (stderr))
-     exit (EXIT_CANCELED);
- 
-  run_shell (shell, command, argv + optind, MAX (0, argc - optind));
-+  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
- }
--- a/coreutils/coreutils-uname.patch
+++ b/coreutils/coreutils-uname.patch
@ -1,173 +0,0 @@
-On linux platforms, grok /proc/cpuinfo for the CPU/vendor info.
-
-Prob not suitable for upstream seeing as how it's 100% linux-specific
-http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html
-
-Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but 
-heavily reworked to suck less.
-
-To add support for additional platforms, check out the show_cpuinfo()
-func in the linux/arch/<ARCH>/ source tree of the kernel.
-
--- coreutils/src/uname.c
-+++ coreutils/src/uname.c
-@@ -50,6 +50,11 @@
- # include <mach-o/arch.h>
- #endif
- 
-+#if defined(__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -138,6 +143,117 @@
-   exit (status);
- }
- 
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+#  define CPUINFO_FILE    "/proc/sysinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+#  define CPUINFO_FILE    "/proc/cpuinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR      0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+	/* first eat trailing space */
-+	char *tmp = buf + strlen(buf) - 1;
-+	while (tmp > buf && isspace(*tmp))
-+		*tmp-- = '\0';
-+	/* then eat leading space */
-+	tmp = buf;
-+	while (*tmp && isspace(*tmp))
-+		tmp++;
-+	if (tmp != buf)
-+		memmove(buf, tmp, strlen(tmp)+1);
-+	/* finally collapse whitespace */
-+	tmp = buf;
-+	while (tmp[0] && tmp[1]) {
-+		if (isspace(tmp[0]) && isspace(tmp[1])) {
-+			memmove(tmp, tmp+1, strlen(tmp));
-+			continue;
-+		}
-+		++tmp;
-+	}
-+}
-+
-+static int __linux_procinfo(int x, char *fstr, size_t s)
-+{
-+	FILE *fp;
-+
-+	char *procinfo_keys[] = {
-+		/* --processor --hardware-platform */
-+		#if defined(__alpha__)
-+			"cpu model", "system type"
-+		#elif defined(__arm__)
-+			"Processor", "Hardware"
-+		#elif defined(__avr32__)
-+			"processor", "cpu family"
-+		#elif defined(__bfin__)
-+			"CPU", "BOARD Name"
-+		#elif defined(__cris__)
-+			"cpu", "cpu model"
-+		#elif defined(__frv__)
-+			"CPU-Core", "System"
-+		#elif defined(__i386__) || defined(__x86_64__)
-+			"model name", "vendor_id"
-+		#elif defined(__ia64__)
-+			"family", "vendor"
-+		#elif defined(__hppa__)
-+			"cpu", "model"
-+		#elif defined(__m68k__)
-+			"CPU", "MMU"
-+		#elif defined(__mips__)
-+			"cpu model", "system type"
-+		#elif defined(__powerpc__) || defined(__powerpc64__)
-+			"cpu", "machine"
-+		#elif defined(__s390__) || defined(__s390x__)
-+			"Type", "Manufacturer"
-+		#elif defined(__sh__)
-+			"cpu type", "machine"
-+		#elif defined(sparc) || defined(__sparc__)
-+			"type", "cpu"
-+		#elif defined(__vax__)
-+			"cpu type", "cpu"
-+		#else
-+			"unknown", "unknown"
-+		#endif
-+	};
-+
-+	if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+		char key[65], value[257], eol, *ret = NULL;
-+
-+		while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+			__eat_cpuinfo_space(key);
-+			if (!strcmp(key, procinfo_keys[x])) {
-+				__eat_cpuinfo_space(value);
-+				ret = value;
-+				break;
-+			}
-+			if (eol != '\n') {
-+				/* we need two fscanf's here in case the previous
-+				 * length limit caused us to read right up to the
-+				 * newline ... doing "%*[^\n]\n" wont eat the newline
-+				 */
-+				fscanf(fp, "%*[^\n]");
-+				fscanf(fp, "\n");
-+			}
-+		}
-+		fclose(fp);
-+
-+		if (ret) {
-+			strncpy(fstr, ret, s);
-+			return 0;
-+		}
-+	}
-+
-+	return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -250,10 +344,14 @@ main (int argc, char **argv)
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
-#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
-         static char processor[257];
-+#if defined(USE_PROCINFO)
-+        if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
-         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
-           element = processor;
-       }
- #endif
-@@ -306,9 +404,13 @@ main (int argc, char **argv)
-       if (element == unknown)
-         {
-           static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+          if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
-           size_t s = sizeof hardware_platform;
-           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
-           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
-             element = hardware_platform;
-         }
- #endif
--- a/coreutils/coreutils.install
+++ b/coreutils/coreutils.install
@ -1,11 +1,9 @@
-infodir=/usr/share/info
-filelist=(coreutils.info)
+infodir=usr/share/info
+file=coreutils.info

 post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
 }

 post_upgrade() {
@ -13,9 +11,7 @@ post_upgrade() {
 }

 pre_remove() {
- [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
 }

--- a/crda/PKGBUILD
+++ b/crda/PKGBUILD
@ -1,24 +1,23 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org


 pkgname=crda
 pkgver=1.1.2
-pkgrel=1
+pkgrel=5
 pkgdesc="Central Regulatory Domain Agent"
-arch=(i686 x86_64)
+arch=('x86_64')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw')
+depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw')
 makedepends=('python-m2crypto')
 install=crda.install
-source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
-        crda.rc)
+source=("http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2"
+        'set-wireless-regdom')
 md5sums=('5226f65aebacf94baaf820f8b4e06df4'
-         '014eef3f8655e9a130064ec6891317fc')
+         '65c93f2ff2eb1b29d9e9fa102ae2dd45')

 build() {
  msg "Compiling crda ..."
@ -28,17 +27,14 @@ build() {
 }

 package() {
-  # Install crda, regdbdump and udev rules
-  msg "Installing crda ..."
  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+
+  make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ SBINDIR=/usr/bin/ install
+  sed 's|/sbin/crda|/usr/bin/crda|' -i "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
  # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules
+  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules

-  msg "Installing license ..."
  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
-
-  msg "Installing boot script ..."
-  install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom
+  install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom
 }

--- a/crda/crda.install
+++ b/crda/crda.install
@ -4,15 +4,3 @@ post_install() {
  echo "It will automatically be set when necessary."
 }

-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package
-  # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one
-  # from wireless-regdb by the user-defined one
-  if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then
-    if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then
-      mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom
-    fi
-  fi
-}
--- a/crda/crda.rc
+++ b/crda/crda.rc
@ -1,26 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/wireless-regdom
-
-case "$1" in
-  start)
-    if [ -n "${WIRELESS_REGDOM}" ]; then
-        stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}"
-        if iw reg set ${WIRELESS_REGDOM}; then
-            stat_done
-        else
-            stat_fail
-        fi
-    fi
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start"  
-esac
-exit 0
--- a/crda/set-wireless-regdom
+++ b/crda/set-wireless-regdom
@ -0,0 +1,5 @@
+#!/bin/bash
+
+unset WIRELESS_REGDOM
+. /etc/conf.d/wireless-regdom
+[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM}
--- a/cryptsetup/PKGBUILD
+++ b/cryptsetup/PKGBUILD
@ -1,32 +1,30 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
+# maintainer abveritas@chakra-project.org

 pkgname=cryptsetup
-pkgver=1.4.1
-pkgrel=1
+pkgver=1.4.2
+pkgrel=3
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://code.google.com/p/cryptsetup/"
 groups=('base')
-depends=('device-mapper' 'libgcrypt' 'popt')
+depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
 conflicts=('mkinitcpio<0.5.99')
 options=('!libtool' '!emptydirs')
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
        http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
        encrypt_hook
 	encrypt_install)
-sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb'
-            '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88'
+sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7'
+            '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed'
            '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
-            'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573')
+            '868fbc7ed1ff49803be06d78ff35b5f9a35dcc5ee820fd8cabe0dfcf74061182')
 build() {
  cd "${srcdir}"/$pkgname-${pkgver}
-  ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
+  ./configure --prefix=/usr --disable-static
  make
 }

@ -34,10 +32,7 @@ package() {
  cd "${srcdir}"/$pkgname-${pkgver}
  make DESTDIR="${pkgdir}" install
  # install hook
-  install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt
-  install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt
-  # Fix pkgconfig location
-  install -d -m755 "${pkgdir}"/usr/lib
-  mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/
+  install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
 }

--- a/cryptsetup/encrypt_install
+++ b/cryptsetup/encrypt_install
@ -1,4 +1,4 @@
-# vim: set ft=sh:
+#!/bin/bash

 build()
 {
@ -7,20 +7,33 @@ build()
    else
        MODULES=" dm-crypt ${CRYPTO_MODULES} "
    fi
-    FILES=""
-    SCRIPT="encrypt"
-    [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
-    [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
-    add_binary "/sbin/dmsetup"
-    add_file "/lib/udev/rules.d/10-dm.rules"
-    add_file "/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+
+        FILES=""
+        SCRIPT="encrypt"
+        [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
+        [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
+        add_binary "/sbin/dmsetup"
+        add_file "/usr/lib/udev/rules.d/10-dm.rules"
+        add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+        add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+        add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
 } 
    
-help ()
-{
-cat<<HELPEOF
-  This hook allows for an encrypted root device.
+help() {
+    cat <<HELPEOF
+This hook allows for an encrypted root device. Users should specify the device
+to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
+where 'device' is the path to the raw device, and 'dmname' is the name given to
+the device after unlocking, and will be available as /dev/mapper/dmname.
+
+For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on
+the kernel cmdline, where 'device' represents the raw block device where the key
+exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is
+the absolute path of the keyfile within the device.
+
+Without specifying a keyfile, you will be prompted for the password at runtime.
+This means you must have a keyboard available to input it, and you may need
+the keymap hook as well to ensure that the keyboard is using the layout you
+expect.
 HELPEOF
 }
--- a/curl/ChangeLog
+++ b/curl/ChangeLog
@ -1,69 +0,0 @@
-2010-02-09  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.20.0-1
-	* Upstream update
-
-2009-11-04  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.7-1
-	* Upstream update
-
-2009-10-03  Robson Peixoto <robsonpeixoto@gmail.com>
-
-	* curl 7.19.6-2
-	* Compile with ca-path like Debian and Gentoo
-
-2009-08-12  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.6-1
-	* Upstream update
-
-2009-05-18  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.5-1
-	* Upstream update
-
-2009-03-03  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.4-1
-	* Upstream update
-
-2009-01-21  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.3-1
-	* Upstream update
-
-2008-11-14  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.2-1
-	* Upstream update
-
-2008-11-08  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.1-1
-	* Upstream update
-
-2008-09-20  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.19.0-1
-	* Upstream update
-
-2008-06-04  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.18.2-1
-	* Upstream update
-	* Switched to the CA Root Certificates provided by the ca-certificates package (close FS#10569)
-	* Removed bundled certificates
-	* Removed perl-libwww makedepends
-
-2008-04-30  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.18.1-2
-	* Added CA Root Certificates (close FS#10129)
-	* Added perl-libwww makedepends
-
-2008-03-31  Eric Belanger  <eric@archlinux.org>
-
-	* curl 7.18.1-1
-	* Upstream update
-	* Added ChangeLog
--- a/curl/PKGBUILD
+++ b/curl/PKGBUILD
@ -1,27 +1,23 @@
 #
 # Core packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas[at]chakra-project[dot]org>

 pkgname=curl
-pkgver=7.21.6
-pkgrel=2
+pkgver=7.28.1
+pkgrel=1
 pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://curl.haxx.se"
 license=('MIT')
 depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
 options=('!libtool')
-source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
-        curlbuild.h)
+source=("http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2"
+        'curlbuild.h')

-[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h
-[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h
-md5sums=('6611989a81ebd7b03a35adc3001ddee0'
+_curlbuild=curlbuild-64.h
+
+md5sums=('26eb081c999b0e203770869427e9a93d'
         '751bd433ede935c8fae727377625a8ae')

 build() {
@ -37,6 +33,7 @@ build() {
        --disable-ldap \
        --enable-manual \
        --enable-versioned-symbols \
+        --enable-threaded-resolver \
        --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
        --without-libidn \
        --enable-threaded-resolver
--- a/curl/m4-typo.patch
+++ b/curl/m4-typo.patch
@ -1,13 +0,0 @@
-diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libcurl.m4
-index ce8e476..50dc20d 100644
--- a/docs/libcurl/libcurl.m4
-+++ b/docs/libcurl/libcurl.m4
-@@ -198,7 +198,7 @@ x=CURLOPT_VERBOSE;
- 
- 	      # We don't have --protocols, so just assume that all
- 	      # protocols are available
-	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP
-+	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
- 
- 	      if test x$libcurl_feature_SSL = xyes ; then
- 	         _libcurl_protocols="$_libcurl_protocols HTTPS"
--- a/cvs/PKGBUILD
+++ b/cvs/PKGBUILD
@ -1,34 +1,33 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>

 pkgname=cvs
 pkgver=1.11.23
-pkgrel=10
+pkgrel=11
 pkgdesc="Concurrent Versions System - a source control system"
-arch=(i686 x86_64)
+arch=('x86_64')
 url="http://cvs.nongnu.org"
 license=('GPL')
 depends=('krb5')
 optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh')
 install=cvs.install
-source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	     cvs-1.11.23-getline64.patch
-        cvs-1.11.23-cve-2010-3846.patch)
-sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9'
-            '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf'
-            'c6506d0a5efc7b0cab6415f26e070ec214fb9781fac8d295506f4d0825431a8f')
+source=("ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+	'cvs-1.11.23-getline64.patch'
+        'cvs-1.11.23-cve-2010-3846.patch')
+md5sums=('0213ea514e231559d6ff8f80a34117f0'
+         '943f10d93fbadaea0ac54553dd85c03f'
+         'b089d3792c225857f00c3eee33809a16')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
  unset EDITOR VISUAL

-  patch -Np1 -i ../cvs-1.11.23-getline64.patch
+  patch -p1 -i ../cvs-1.11.23-getline64.patch

  # CVE-2010-3864, see https://www.redhat.com/security/data/cve/CVE-2010-3846.html
-  patch -Np1 -i ../cvs-1.11.23-cve-2010-3846.patch
+  patch -p1 -i ../cvs-1.11.23-cve-2010-3846.patch

  ./configure --prefix=/usr
  make
--- a/db/PKGBUILD
+++ b/db/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=db
 pkgver=4.8.30
 _basever=4.8.30
--- a/dbus-core/PKGBUILD
+++ b/dbus-core/PKGBUILD
@ -1,68 +1,52 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer: abveritas@chakra-project.org

 pkgname=dbus-core
-pkgver=1.4.14
-pkgrel=2
-pkgdesc="Freedesktop.org message bus system."
+pkgver=1.6.4
+pkgrel=3
+pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem')
-makedepends=('libx11')
-conflicts=('dbus<1.2.3-2')
+depends=('expat' 'coreutils' 'filesystem' 'shadow') # shadow for install scriptlet FS#29341
+makedepends=('libx11' 'systemd')
 options=(!libtool)
-install="dbus.install"
-source=("http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz"
-        'dbus')
-md5sums=('ae6de2562a57516cfabaf56903375ba9'
-         '81eb58bbe2b2212210e592ccd1eb5c3c')
+install=dbus.install
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
+md5sums=('5ec43dc4554cba638917317b2b4f7640'
+         '3d4482ee39b49da334441c76f83bf1cb')

 build() {
-  cd "${srcdir}/dbus-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc --localstatedir=/var \
-              --libexecdir=/usr/lib/dbus-1.0 \
-              --with-dbus-user=81 \
-              --with-system-pid-file=/var/run/dbus.pid \
-              --enable-inotify \
-              --disable-dnotify \
-              --disable-verbose-mode \
-              --disable-static \
-              --disable-tests \
-              --disable-asserts \
-              --with-systemdsystemunitdir=/lib/systemd/system
-
+  cd dbus-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
+      --with-system-pid-file=/run/dbus/pid \
+      --with-system-socket=/run/dbus/system_bus_socket \
+      --with-console-auth-dir=/run/console/ \
+      --enable-inotify --disable-dnotify \
+      --disable-verbose-mode --disable-static \
+      --disable-tests --disable-asserts \
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --enable-systemd
  make
 }

 package(){
-  cd "${srcdir}/dbus-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd dbus-$pkgver
+  make DESTDIR="$pkgdir" install

-  rm -f "${pkgdir}/usr/bin/dbus-launch"
-  rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
+  rm -f "$pkgdir/usr/bin/dbus-launch"
+  rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1"
+  rm -rf "$pkgdir/var/run"

-  chown 81:81 "${pkgdir}/var/run/dbus"
+  #install -m755 -d "$pkgdir/etc/rc.d"
+  #install -m755 ../dbus "$pkgdir/etc/rc.d/"

-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
+  #Fix configuration file
+  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "$pkgdir/etc/dbus-1/system.conf"

-  # Fix configuration file
-  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
-
-  # Install .keep files so pacman doesn't delete empty dirs
-  touch "${pkgdir}/usr/share/dbus-1/services/.keep"
-  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep"
-  touch "${pkgdir}/etc/dbus-1/session.d/.keep"
-  touch "${pkgdir}/etc/dbus-1/system.d/.keep"
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
+  install -dm755 "$pkgdir/usr/share/licenses/dbus-core"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/dbus-core/"
 }
-
-# vim:set ts=2 sw=2 et:
--- a/dbus-core/dbus
+++ b/dbus-core/dbus
@ -4,19 +4,14 @@
 . /etc/rc.conf
 . /etc/rc.d/functions

-case "$1" in
+case $1 in
    start)
        stat_busy "Starting D-BUS system messagebus"
-
-	if [ ! -x /var/run/dbus ] ; then
-	    install -m755 -g 81 -o 81 -d /var/run/dbus
-	fi
-
-        if [ -x /usr/bin/dbus-uuidgen ] ; then
-            /usr/bin/dbus-uuidgen --ensure
+        if [[ ! -d /run/dbus ]] ; then
+            install -m755 -g 81 -o 81 -d /run/dbus
        fi

-        if ! /usr/bin/dbus-daemon --system; then
+        if ! dbus-daemon --system; then
            stat_fail
        else
            add_daemon dbus
@ -25,27 +20,25 @@ case "$1" in
        ;;
    stop)
        stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill "$(cat /var/run/dbus.pid)" &>/dev/null
-        if [ ${?} -gt 0 ]; then
+        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
            stat_fail
        else
-	    rm -f /var/run/dbus.pid
+            rm -f /run/dbus/pid
            rm_daemon dbus
            stat_done
        fi
        ;;
    restart)
-        "${0}" stop
-	sleep 1
-        "${0}" start
+        $0 stop
+        sleep 1
+        $0 start
        ;;
    reload)
        stat_busy "Reloading D-BUS configuration"
-        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
+        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
                --system --type=method_call \
                --dest=org.freedesktop.DBus \
-                /org.freedesktop.DBus.ReloadConfig
-        if [ ${?} -gt 0 ]; then
+                / org.freedesktop.DBus.ReloadConfig; }; then
            stat_fail
        else
            stat_done
@ -53,6 +46,6 @@ case "$1" in
        ;;
    *)
        echo "usage: $0 {start|stop|restart|reload}"
-	;;
+        ;;
 esac
 exit 0
--- a/dbus-core/dbus.install
+++ b/dbus-core/dbus.install
@ -1,39 +1,25 @@
 post_install() {
-  if ! getent group dbus >/dev/null; then
-    /usr/sbin/groupadd -g 81 dbus || {
-      echo 'Could not set up the dbus group!'
-      return 1
-    }
-  fi
-
-  if ! getent passwd dbus >/dev/null; then
-    /usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus || {
-      echo 'Could not set up the dbus user!'
-      return 1
-    }
-  fi
-
-  usr/bin/passwd -l dbus >/dev/null
+  getent group dbus >/dev/null || groupadd -g 81 dbus
+  getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
+  passwd -l dbus &>/dev/null
  dbus-uuidgen --ensure
+  ln /var/lib/dbus/machine-id /etc/machine-id
 }

 post_upgrade() {
  post_install

-  #Make sure new rc script can shutdown running dbus
-  if [ -f /var/run/dbus/pid ]; then
-    mv /var/run/dbus/pid /var/run/dbus.pid
+  # Make sure new rc script can shutdown running dbus
+  if [ -f run/dbus.pid -a -d run/dbus ]; then
+    mv run/dbus.pid run/dbus/pid
  fi
 }

 post_remove() {
  if getent passwd dbus >/dev/null; then
-    /usr/sbin/userdel dbus
+    userdel dbus
  fi
-
  if getent group dbus >/dev/null; then
-    /usr/sbin/groupdel dbus
+    groupdel dbus
  fi
 }
-
-# vim:set ts=2 sw=2 et:
--- a/dcron/PKGBUILD
+++ b/dcron/PKGBUILD
@ -1,20 +1,22 @@
-# Maintainer: Paul Mattal <paul.archlinux.org>
+# Maintainer: Samir Benmendil <ram-z@chakra-project.org>

 pkgname=dcron
 pkgver=4.5
-pkgrel=2
+pkgrel=4
 pkgdesc="dillon's lightweight cron daemon"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.jimpryor.net/linux/dcron"
 backup=('var/spool/cron/root' 'etc/conf.d/crond')
 depends=('glibc' 'bash')
+optdepends=('smtp-server: sending cron job output via email')
 provides=('cron')
 groups=('base')
-source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('078833f3281f96944fc30392b1888326')
-optdepends=('smtp-server: sending cron job output via email')
 install=$pkgname.install
+source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz"
+	"dcron.service")
+md5sums=('078833f3281f96944fc30392b1888326'
+         '5a68a7aee883738e7f7f8549481bb297')

 build() {
 	cd "$srcdir/${pkgname}-${pkgver}"
@ -41,4 +43,7 @@ package() {
 	install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
 	sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
 	install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
+
+	# install systemd units
+	install -Dm644 "$srcdir/dcron.service" "$pkgdir/usr/lib/systemd/system/dcron.service"
 }
--- a/dcron/dcron.service
+++ b/dcron/dcron.service
@ -0,0 +1,10 @@
+[Unit]
+Description=Periodic Command Scheduler
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/crond
+ExecStart=/usr/sbin/crond $CROND_ARGS
+
+[Install]
+WantedBy=multi-user.target
--- a/dhcpcd/PKGBUILD
+++ b/dhcpcd/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=dhcpcd
 pkgver=5.2.12
-pkgrel=2
+pkgrel=4
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
 arch=('i686' 'x86_64')
@ -16,9 +16,11 @@ depends=('glibc' 'sh')
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d')
+        'dhcpcd.conf.d'
+	'dhcpcd@.service')
 sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0')
+          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
+          '3d0542eab1b89a88d56ca427128228ac72c40d1f')

 build() {
  cd ${srcdir}/${pkgname}-${pkgver}
@ -48,4 +50,7 @@ package() {

  # Set Options in /etc/dhcpcd.conf
  echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf || return 1 # Disable ip4vall
+
+  # install systemd unit
+  install -Dm644 "$srcdir/dhcpcd@.service" "$pkgdir/usr/lib/systemd/system/dhcpcd@.service"
 }
--- a/dhcpcd/dhcpcd@.service
+++ b/dhcpcd/dhcpcd@.service
@ -0,0 +1,13 @@
+[Unit]
+Description=dhcpcd on %I
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd-%I.pid
+ExecStart=/sbin/dhcpcd -A -q -w %I
+ExecStop=/sbin/dhcpcd -k %I
+
+[Install]
+Alias=multi-user.target.wants/dhcpcd@eth0.service
--- a/dialog/PKGBUILD
+++ b/dialog/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=dialog
 pkgver=1.1_20110302
 pkgrel=2
--- a/diffutils/PKGBUILD
+++ b/diffutils/PKGBUILD
@ -1,22 +1,22 @@
 #
-# Chakra Packages for Chakra, part of chakra-project.org
+# Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Drake Justice <djustice[at]chakra-linux[dot]org>
+# maintainer: abveritas@chakra-project.org


 pkgname=diffutils
 pkgver=3.2
 pkgrel=1
 pkgdesc="Utility programs used for creating patch files"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.gnu.org/software/diffutils"
 license=('GPL3')
 groups=('base')
 depends=('glibc' 'sh')
 install=diffutils.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('26ff64c332429c830c154be46b393382')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('26ff64c332429c830c154be46b393382'
+         '6f7560ae92525d3f2e64dbc8bf0e9023')

 build() {
  cd ${srcdir}/${pkgname}-${pkgver}
--- a/dmraid/PKGBUILD
+++ b/dmraid/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=dmraid
 pkgver=1.0.0.rc16.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 depends=('device-mapper>=2.0.54')
@ -15,11 +15,13 @@ license=('GPL')
 source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
        http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2
        dmraid_install
-        dmraid_hook)
+        dmraid_hook
+	dmraid.service)
 install=dmraid.install
 md5sums=('819338fcef98e8e25819f0516722beeb'
         'd01908b414e1686c0f3233ff37de78a5'
-         '0a748b6e78b156f2f9dda45fc629651f')
+         '0a748b6e78b156f2f9dda45fc629651f'
+         'ad9328bb52328eab47e12b7f9df32b82')

 build() {
  cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
@ -37,4 +39,7 @@ package() {
  # fix permissions
  chmod 644 "$pkgdir"/lib/libdmraid.a
  chmod 644 "$pkgdir"/usr/include/dmraid/*
+  
+  # install systemd unit
+  install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service"
 }
--- a/dmraid/dmraid.service
+++ b/dmraid/dmraid.service
@ -0,0 +1,16 @@
+[Unit]
+Description=Assemble FakeRAID arrays
+DefaultDependencies=no
+Requires=udev-settle.service
+After=udev-settle.service
+Before=basic.target shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+ExecStart=/sbin/dmraid --ignorelocking --activate y
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=true
+
+[Install]
+WantedBy=basic.target
--- a/dnsutils/PKGBUILD
+++ b/dnsutils/PKGBUILD
@ -1,39 +1,44 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer: abveritas@chakra-project.org

 pkgname=dnsutils
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.0.P1
-_pkgver=9.8.0-P1
-pkgrel=2
+# _pkver when P version used.
+pkgver=9.9.2.1
+_pkgver=9.9.2-P1
+pkgrel=1
 pkgdesc="Various DNS utilities - dig host nslookup nsupdate"
-arch=(i686 x86_64)
+arch=('x86_64')
 url="https://www.isc.org/software/bind"
 license=('custom:ISC')
 depends=('openssl')
-replaces=('bind-tools' 'host')
 options=('makeflags')
-source=(http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz
-	tools-only.patch)
-md5sums=('d97ecd8f62a4cf4a769742c79cd8f921'
-         'be0558f70ed81d90e68e6b6003ba12ed')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+	'tools-only.patch')
+md5sums=('44b9d1feb11de09811160775f94c2554'
+         'a7b414849b4fb2137e33f348c3cdd458')

 build() {
-  cd "${srcdir}/bind-${_pkgver}"
-  patch -Np1 -i "${srcdir}/tools-only.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--with-openssl=yes --disable-linux-caps || return 1
-  make || return 1
+	cd "${srcdir}/bind-${_pkgver}"
+
+	patch -p1 -i "${srcdir}/tools-only.patch"
+	export STD_CDEFINES='-DDIG_SIGCHASE'
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-linux-caps \
+		--with-openssl  
+
+	make
 }

 package() {
-  cd "${srcdir}/bind-${_pkgver}/bin"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+	cd "${srcdir}/bind-${_pkgver}"
+	
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd bin; make DESTDIR="${pkgdir}" install
 }
--- a/dnsutils/tools-only.patch
+++ b/dnsutils/tools-only.patch
@ -1,19 +1,19 @@
-diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in
--- bind-9.7.1-P2.orig/bin/Makefile.in	2009-10-05 08:07:08.000000000 -0400
-+++ bind-9.7.1-P2/bin/Makefile.in	2010-07-22 15:55:00.000000000 -0400
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
+++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
@@ -19,8 +19,7 @@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
 -SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-		check confgen @PKCS11_TOOLS@
-+SUBDIRS =	dig nsupdate
+-		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+SUBDIRS =	dig
 TARGETS =
 
 @BIND9_MAKE_RULES@
-diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in
--- bind-9.7.1-P2.orig/lib/Makefile.in	2007-06-19 19:47:13.000000000 -0400
-+++ bind-9.7.1-P2/lib/Makefile.in	2010-07-22 15:56:29.000000000 -0400
+diff -aur old/lib/Makefile.in new/lib/Makefile.in
+--- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
+++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
@@ -23,7 +23,7 @@
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
--- a/e2fsprogs/PKGBUILD
+++ b/e2fsprogs/PKGBUILD
@ -1,44 +1,48 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas@chakra-project.org

 pkgname=e2fsprogs
-pkgver=1.41.14
-pkgrel=2
+pkgver=1.42.5
+pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL' 'LGPL' 'MIT')
 url="http://e2fsprogs.sourceforge.net"
 groups=('base')
-depends=('sh' 'util-linux-ng')
+depends=('sh' 'util-linux')
 makedepends=('bc')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
        'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
 install=${pkgname}.install
-sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5'
+sha1sums=('41bc6d247238eac65864193e6de941956da493cb'
          'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"

  # Remove unnecessary init.d directory
-  sed -i '/init\.d/s|^|#|' misc/Makefile.in || return 1
+  sed -i '/init\.d/s|^|#|' misc/Makefile.in

-  ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \
-      --disable-fsck --disable-uuidd \
-      --disable-libuuid --disable-libblkid || return 1
+  ./configure --prefix=/usr \
+      --with-root-prefix="" \
+      --libdir=/usr/lib \
+      --enable-elf-shlibs \
+      --disable-fsck \
+      --disable-uuidd \
+      --disable-libuuid \
+      --disable-libblkid

+  make
+}

-  make || return 1
-  make DESTDIR="${pkgdir}" install install-libs || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install install-libs

-  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1
+  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
  
  # remove references to build directory
  sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
@ -46,5 +50,5 @@ build() {

  # install MIT license
  install -Dm644 "${srcdir}/MIT-LICENSE" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1
+    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
 }
--- a/elfutils/PKGBUILD
+++ b/elfutils/PKGBUILD
@ -5,32 +5,33 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=elfutils
-pkgver=0.152
+pkgver=0.154
 pkgrel=1
-pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information"
+pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information."
 arch=('i686' 'x86_64')
 url="https://fedorahosted.org/elfutils/"
 license=('GPL2')
 depends=('glibc')
-#optdepends=('zlib' 'xz' 'bzip2')
 provides=('libelf')
 replaces=('libelf')
 conflicts=('libelf')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2)
-md5sums=('39739ed58a0fa1862eff8735f111fe5c')
+source=("https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2")
+md5sums=('e5b26ceaee67db40e742f13052087354')

-build()
-{
-  cd ${srcdir}/${pkgname}-${pkgver}
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
  ./configure --prefix=/usr --program-prefix="eu-"
  make
-  echo "<<< STARTING TESTS >>>"
-  make check
-  echo "<<< ENDING TESTS >>>"
 }

-package()
-{
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make install DESTDIR="${pkgdir}"
+}
+
+# vim:set ts=2 sw=2 et:
--- a/eventlog/PKGBUILD
+++ b/eventlog/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=eventlog
 pkgver=0.2.12
 pkgrel=2
--- a/expat/PKGBUILD
+++ b/expat/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=expat
 pkgver=2.0.1
 pkgrel=7
--- a/fakeroot/PKGBUILD
+++ b/fakeroot/PKGBUILD
@ -4,11 +4,8 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=fakeroot
-pkgver=1.18.2
+pkgver=1.18.4
 pkgrel=1
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user."
 arch=('i686' 'x86_64')
@ -19,7 +16,7 @@ install="fakeroot.install"
 depends=('glibc' 'filesystem' 'util-linux' 'sed' 'sh')
 options=('!libtool')
 source=("http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2")
-md5sums=('79f32331358ad58499704ea5e19fd0ae')
+md5sums=('706171d8d520b1ca1576ac73f2ceb4f3')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
--- a/filesystem/PKGBUILD
+++ b/filesystem/PKGBUILD
@ -1,112 +1,109 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dog]org>
+# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=filesystem
-pkgver=2012.02
+pkgver=2012.11
 pkgrel=1
-_codename=Archimedes
-pkgdesc="Base filesystem"
-arch=('any')
+_codename=Claire
+pkgdesc='Base filesystem'
+arch=('x86_64')
 license=('GPL')
-url="http://www.chakra-project.org"
+url='http://www.chakra-project.org'
 groups=('base')
-install=filesystem.install
+install='filesystem.install'
 depends=('iana-etc' 'bash' 'coreutils')
-backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd
-        etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf
-        etc/shells etc/host.conf etc/securetty etc/profile etc/issue
-        etc/chakra-release)
-source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz")
-md5sums=('e201fff56c0de549e227af66d0486aa4')
-
-# create tarball: source PKGBUILD && mksource
-
-mksource() {
-	  rm -vRf chakra-${pkgname}
-	  git clone git://gitorious.org/chakra/chakra-${pkgname}.git
-	  rm -vRf chakra-${pkgname}/.git
-	  pushd chakra-${pkgname}
-	  popd
-	  tar -cvJf ${pkgname}-${pkgver}-${pkgrel}.tar.xz chakra-${pkgname}/*
-	  md5sum ${pkgname}-${pkgver}-${pkgrel}.tar.xz
-}
+makedepends=('asciidoc')
+backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
+        'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
+        'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue' 'etc/hostname'
+        'etc/machine-info' 'etc/vconsole.conf')
+source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
+        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'hostname' 'motd' 'resolv.conf' 'shells'
+        'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'machine-info' 'os-release'
+        'vconsole.conf' 'locale.sh')
+md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
+         '8266bc7566e99f2b5f5e0b5b1ac17241'
+         '13753e4e0964f3652b0cc60a28528bdf'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '455b78cada80f40b6f6968f5cbd97a2e'
+         '01249bb0ba4468f95e2cc3a627f5e6e3'
+         'ca716f853860199c1286e7939b2f2666'
+         'a367150bd0fe6b02114365121de64a53'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'b7244a8455581eeb441edeec03495054'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         '677523dbe94b79299aa91b35ed8203b6'
+         'f3b6ae7db8adffaaa4bffc6099dcbd50'
+         'a8a962370cd0128465d514e6a1f74130'
+         '8aba0b33527e812211b9e5f9b87887ae'
+         'ad64ad33ec45e4f87c6bf225a91ff484'
+         '201bbb8b4734d2f46afe1e24d7cc6173'
+         '45100e8a4a6d8d4b3a7dcd34b0fa4281')

 package() {
-	cd ${srcdir}/chakra-${pkgname}
+	cd ${pkgdir}

 	#
 	# setup root filesystem
 	#
-	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys run; do
-		install -d -m755 ${pkgdir}/${d}
+	for d in boot dev etc home media mnt usr var opt srv/http run; do
+		install -d -m755 ${d}
 	done
-
-	install -d -m555 ${pkgdir}/proc
-	install -d -m0750 ${pkgdir}/root
-	install -d -m1777 ${pkgdir}/tmp
+	install -d -m555 proc
+	install -d -m555 sys
+	install -d -m0750 root
+	install -d -m1777 tmp
 	# vsftpd won't run with write perms on /srv/ftp
-	install -d -m555 -g ftp ${pkgdir}/srv/ftp
+	install -d -m555 -g ftp srv/ftp

-	#
 	# setup /etc
-	#
-	install -d ${pkgdir}/etc/{ld.so.conf.d,skel,profile.d}
-	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
-		install -m644 ${srcdir}/chakra-${pkgname}/${f} ${pkgdir}/etc/
+	install -d etc/{ld.so.conf.d,skel,profile.d}
+	for f in fstab group host.conf hostname hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile machine-info os-release vconsole.conf; do
+		install -m644 ${srcdir}/${f} etc/
 	done
-
+	ln -s /proc/self/mounts etc/mtab
 	for f in gshadow shadow crypttab; do
-		install -m600 ${srcdir}/chakra-${pkgname}/${f} ${pkgdir}/etc/
+		install -m600 ${srcdir}/${f} etc/
 	done
+	touch etc/chakra-release
+	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
+	install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh

-	install -D -m644 ${srcdir}/chakra-${pkgname}/modprobe.d.usb-load-ehci-first ${pkgdir}/lib/modprobe.d/usb-load-ehci-first.conf
-
-	#
 	# setup /var
-	#
-	for d in cache/man local opt run log/old lib/misc empty; do
-		install -d -m755 ${pkgdir}/var/${d}
+	for d in cache/man local opt log/old lib/misc empty; do
+		install -d -m755 var/${d}
 	done
-
-	install -d -m1777 ${pkgdir}/var/{lock,tmp,spool/mail}
-
-	#
+	install -d -m1777 var/{tmp,spool/mail}
 	# allow setgid games to write scores
-	#
-	install -d -m775 -g games ${pkgdir}/var/games
-	ln -s spool/mail ${pkgdir}/var/mail
-
-	#
-	# prevent pacman from removing directory (FS#16886)
-	#
-	touch ${pkgdir}/var/empty/.keep
+	install -d -m775 -g games var/games
+	ln -s spool/mail var/mail
+	ln -s ../run var/run
+	ln -s ../run/lock var/lock

 	#
 	# setup /usr hierarchy
 	#
 	for d in bin include lib sbin share/misc src; do
-		install -d -m755 ${pkgdir}/usr/${d}
+		install -d -m755 usr/${d}
+	done
+	for d in $(seq 8); do
+		install -d -m755 usr/share/man/man${d}
 	done

-	for d in $(seq 8); do
-		install -d -m755 ${pkgdir}/usr/share/man/man${d}
-	done

 	#
 	# setup /usr/local hierarchy
 	#
 	for d in bin etc games include lib man sbin share src; do
-		install -d -m755 ${pkgdir}/usr/local/${d}
+		install -d -m755 usr/local/${d}
 	done
-
-	ln -s ../man ${pkgdir}/usr/local/share/man
-
-	#
-	# setup chakra tags
-	#
-	echo "Chakra Linux release ${pkgver} (${_codename})" > "${pkgdir}/etc/chakra-release"
-	sed -i -e "s~Chakra Linux~Chakra Linux (${pkgver} - ${_codename})~g" "${pkgdir}/etc/issue"
+	ln -s ../man usr/local/share/man
 }
+
--- a/filesystem/crypttab
+++ b/filesystem/crypttab
@ -0,0 +1,17 @@
+# crypttab: mappings for encrypted partitions
+#
+# Each mapped device will be created in /dev/mapper, so your /etc/fstab
+# should use the /dev/mapper/<name> paths for encrypted devices.
+#
+# The Chakra specific syntax has been deprecated, see crypttab(5) for the
+# new supported syntax.
+#
+# NOTE: Do not list your root (/) partition here, it must be set up
+#       beforehand by the initramfs (/etc/mkinitcpio.conf).
+
+# <name>       <device>         <password>              <options>
+# home         /dev/hda4        /etc/mypassword1
+# data1        /dev/hda3        /etc/mypassword2
+# data2        /dev/hda5        /etc/cryptfs.key
+# swap         /dev/hdx4        /dev/urandom            swap,cipher=aes-cbc-essiv:sha256,size=256
+# vol          /dev/hdb7        none
--- a/filesystem/filesystem.install
+++ b/filesystem/filesystem.install
@ -1,45 +1,30 @@
 post_install() {
-	[ -f var/log/lastlog ] ||  : >var/log/lastlog
-	[ -f var/log/wtmp ]    ||  : >var/log/wtmp
-	[ -f var/run/utmp ]    ||  : >var/run/utmp
-	chown root:20 var/run/utmp
-	chmod 664 var/run/utmp
-	[ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
+	[ -f var/log/lastlog ] ||   : >var/log/lastlog
+	[ -f var/log/wtmp ]    ||   : >var/log/wtmp
+	[ -f var/log/btmp ]    || { : >var/log/btmp && chmod 600 var/log/btmp; }
 	# workaround for bug #7194
 	# readded due to bug #9465
 	# please do not remove!
-	bin/chmod 1777 var/spool/mail tmp var/tmp var/lock
-	# link conflicting folders
-	ln -sf /proc/self/mounts etc/mtab
+	chmod 1777 var/spool/mail tmp var/tmp
 }

 # args: <group> [options]
 _addgroup() {
-	if ! bin/grep -q "^$1:" etc/group; then
-		usr/sbin/groupadd ${@} >/dev/null
+	if ! getent group "$1" >/dev/null; then
+		groupadd "$@" >/dev/null
 	fi
 }

 # args: <group> [options]
 _adduser() {
-	if ! bin/grep -q "^$1:" etc/passwd; then
-		usr/sbin/useradd ${@} >/dev/null
+	if ! getent passwd "$1" >/dev/null; then
+		useradd "$@" >/dev/null
 	fi
 }

 post_upgrade() {
 	post_install

-	if [ -n "`grep /tmp /etc/fstab`" ]; then
-	  echo "Your system might have a damaged /etc/fstab file."
-	  echo "We try to fix your /etc/fstab file."
-	  echo "Your original /etc/fstab file will be saved as '/etc/fstab.backup'"
-	  cat /etc/fstab > /etc/fstab.backup
-	  cat /etc/fstab | grep -v -e "/tmp" > /etc/fstab.new
-	  mv /etc/fstab.new /etc/fstab
-	fi
-
-	_addgroup cdemu   -g 103
 	_addgroup optical -g 93
 	_addgroup audio   -g 92
 	_addgroup video   -g 91
@ -52,23 +37,26 @@ post_upgrade() {
 	_addgroup games   -g 50
 	_addgroup uucp    -g 14
 	_addgroup http    -g 33
-	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false http
+	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false
 	_addgroup scanner -g 96
 	_addgroup rfkill  -g 24
+	_addgroup lock    -g 54
+	_addgroup uuidd   -g 68
+	_adduser uuidd   -u 68 -d / -g uuidd -s /sbin/nologin

-	# sync gshadow to group (fixes FS#19869
-	if ! bin/grep -q '^rfkill:' etc/gshadow; then
-		usr/sbin/grpconv >/dev/null
+	# sync gshadow to group 
+	if ! grep -q '^lock:' etc/gshadow; then
+		grpconv >/dev/null
 	fi

-	if ! bin/grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
-		bin/echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
+	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
+		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
 	fi

 	# set "Last password change" > 0; otherwise su $user wont work
 	for user in bin daemon mail ftp http nobody; do
-		if LANG=C usr/bin/chage -l ${user} | bin/grep -q 'password must be changed'; then
-			usr/bin/chage -d 14871 ${user}
+		if LANG=C chage -l ${user} | grep -q 'password must be changed'; then
+			chage -d 14871 ${user}
 		fi
 	done
 }
--- a/filesystem/fstab
+++ b/filesystem/fstab
@ -0,0 +1,5 @@
+# 
+# /etc/fstab: static file system information
+#
+# <file system>	<dir>	<type>	<options>	<dump>	<pass>
+tmpfs		/tmp	tmpfs	nodev,nosuid	0	0
--- a/filesystem/group
+++ b/filesystem/group
@ -0,0 +1,33 @@
+root:x:0:root
+bin:x:1:root,bin,daemon
+daemon:x:2:root,bin,daemon
+sys:x:3:root,bin
+adm:x:4:root,daemon
+tty:x:5:
+disk:x:6:root
+lp:x:7:daemon
+mem:x:8:
+kmem:x:9:
+wheel:x:10:root
+ftp:x:11:
+mail:x:12:
+uucp:x:14:
+log:x:19:root
+utmp:x:20:
+locate:x:21:
+rfkill:x:24:
+smmsp:x:25:
+http:x:33:
+games:x:50:
+lock:x:54:
+uuidd:x:68:
+network:x:90:
+video:x:91:
+audio:x:92:
+optical:x:93:
+floppy:x:94:
+storage:x:95:
+scanner:x:96:
+power:x:98:
+nobody:x:99:
+users:x:100:
--- a/filesystem/gshadow
+++ b/filesystem/gshadow
@ -0,0 +1,33 @@
+root:::root
+bin:::root,bin,daemon
+daemon:::root,bin,daemon
+sys:::root,bin
+adm:::root,daemon
+tty:::
+disk:::root
+lp:::daemon
+mem:::
+kmem:::
+wheel:::root
+ftp:::
+mail:::
+uucp:::
+log:::root
+utmp:x::
+locate:::
+rfkill:x::
+smmsp:::
+http:::
+games:::
+lock:::
+uuidd:!::
+network:x::
+video:x::
+audio:::
+optical:::
+floppy:x::
+storage:x::
+scanner:x::
+power:x::
+nobody:::
+users:::
--- a/filesystem/host.conf
+++ b/filesystem/host.conf
@ -0,0 +1,8 @@
+#
+# /etc/host.conf
+#
+
+order hosts,bind
+multi on
+
+# End of file
--- a/filesystem/hostname
+++ b/filesystem/hostname
@ -0,0 +1 @@
+localhost 
--- a/filesystem/hosts
+++ b/filesystem/hosts
@ -0,0 +1,9 @@
+#
+# /etc/hosts: static lookup table for host names
+#
+
+#<ip-address>	<hostname.domain.org>	<hostname>
+127.0.0.1	localhost.localdomain	localhost
+::1		localhost.localdomain	localhost
+
+# End of file
--- a/filesystem/issue
+++ b/filesystem/issue
@ -0,0 +1 @@
+Chakra-Project \r (\l)
--- a/filesystem/ld.so.conf
+++ b/filesystem/ld.so.conf
@ -0,0 +1,7 @@
+#
+# /etc/ld.so.conf
+#
+
+include /etc/ld.so.conf.d/*.conf
+
+# End of file
--- a/filesystem/locale.sh
+++ b/filesystem/locale.sh
@ -0,0 +1,24 @@
+#!/bin/sh
+
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
+      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
+
+if [ ! -r /etc/locale.conf ]; then
+  return
+fi
+
+. /etc/locale.conf
+
+export LANG="${LANG:-C}"
+[ -n "$LC_CTYPE" ]          && export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
+[ -n "$LC_TIME" ]           && export LC_TIME
+[ -n "$LC_COLLATE" ]        && export LC_COLLATE
+[ -n "$LC_MONETARY" ]       && export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
+[ -n "$LC_PAPER" ]          && export LC_PAPER
+[ -n "$LC_NAME" ]           && export LC_NAME
+[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
--- a/filesystem/machine-info
+++ b/filesystem/machine-info
@ -0,0 +1,2 @@
+PRETTY_NAME="Chakra computer"
+ICON_NAME="chakra-pc"
--- a/filesystem/modprobe.d.usb-load-ehci-first
+++ b/filesystem/modprobe.d.usb-load-ehci-first
@ -0,0 +1,2 @@
+softdep ohci_hcd pre: ehci_hcd
+softdep uhci_hcd pre: ehci_hcd
--- a/filesystem/motd
+++ b/filesystem/motd
--- a/filesystem/nsswitch.conf
+++ b/filesystem/nsswitch.conf
@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
--- a/filesystem/os-release
+++ b/filesystem/os-release
@ -0,0 +1,8 @@
+NAME="The Chakra-Project"
+VERSION="Claire"
+ID=chakra
+PRETTY_NAME="The Chakra-Project (Claire)"
+ANSI_COLOR="0;36"
+HOME_URL="http://www.chakra-project.org/"
+BUG_REPORT_URL="http://chakra-linux.org/bugs/"
+
--- a/filesystem/passwd
+++ b/filesystem/passwd
@ -0,0 +1,8 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/bin/false
+daemon:x:2:2:daemon:/sbin:/bin/false
+mail:x:8:12:mail:/var/spool/mail:/bin/false
+ftp:x:14:11:ftp:/srv/ftp:/bin/false
+http:x:33:33:http:/srv/http:/bin/false
+uuidd:x:68:68:uuidd:/:/sbin/nologin
+nobody:x:99:99:nobody:/:/bin/false
--- a/filesystem/profile
+++ b/filesystem/profile
@ -0,0 +1,27 @@
+# /etc/profile
+
+#Set our umask
+umask 022
+
+# Set our default path
+PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
+export PATH
+
+# Load profiles from /etc/profile.d
+if test -d /etc/profile.d/; then
+	for profile in /etc/profile.d/*.sh; do
+		test -r "$profile" && . "$profile"
+	done
+	unset profile
+fi
+
+# Source global bash config
+if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
+	. /etc/bash.bashrc
+fi
+
+# Termcap is outdated, old, and crusty, kill it.
+unset TERMCAP
+
+# Man is much better than us at figuring this out
+unset MANPATH
--- a/filesystem/resolv.conf
+++ b/filesystem/resolv.conf
@ -0,0 +1,8 @@
+#
+# /etc/resolv.conf
+#
+
+#search <yourdomain.tld>
+#nameserver <ip>
+
+# End of file
--- a/filesystem/securetty
+++ b/filesystem/securetty
@ -0,0 +1,15 @@
+#
+# /etc/securetty
+#
+
+console
+tty1
+tty2
+tty3
+tty4
+tty5
+tty6
+ttyS0
+hvc0
+
+# End of file
--- a/filesystem/shadow
+++ b/filesystem/shadow
@ -0,0 +1,8 @@
+root::14871::::::
+bin:x:14871::::::
+daemon:x:14871::::::
+mail:x:14871::::::
+ftp:x:14871::::::
+http:x:14871::::::
+uuidd:x:14871::::::
+nobody:x:14871::::::
--- a/filesystem/shells
+++ b/filesystem/shells
@ -0,0 +1,8 @@
+#
+# /etc/shells
+#
+
+/bin/sh
+/bin/bash
+
+# End of file
--- a/filesystem/vconsole.conf
+++ b/filesystem/vconsole.conf
@ -0,0 +1,2 @@
+FONT=
+FONT_MAP=
--- a/findutils/PKGBUILD
+++ b/findutils/PKGBUILD
@ -1,21 +1,20 @@
 #
-# Chakra Packages for Chakra, part of chakra-project.org
+# Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> 
+# maintainer: abveritas@chakra-project.org

 pkgname=findutils
 pkgver=4.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc="GNU utilities to locate files"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL3')
 groups=('base')
 depends=('glibc' 'sh')
 url="http://www.gnu.org/software/findutils"
-source=(ftp://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.gz)
+source=("ftp://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.gz")
 install=findutils.install
-sha1sums=('e8dd88fa2cc58abffd0bfc1eddab9020231bb024')
+md5sums=('351cc4adb07d54877fa15f75fb77d39f')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
@ -28,6 +27,12 @@ build() {
  make
 }

+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+
 package() {
  cd "${srcdir}/${pkgname}-${pkgver}"
  make DESTDIR=$pkgdir install
--- a/flex/PKGBUILD
+++ b/flex/PKGBUILD
@ -1,12 +1,8 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=flex
 pkgver=2.5.35
 pkgrel=5
--- a/freetype2/PKGBUILD
+++ b/freetype2/PKGBUILD
@ -1,11 +1,7 @@
 # Platform Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=freetype2
 pkgver=2.4.7
 pkgrel=1
--- a/gawk/PKGBUILD
+++ b/gawk/PKGBUILD
@ -5,30 +5,31 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=gawk
-pkgver=3.1.8
-pkgrel=3
-pkgdesc="Gnu version of awk"
-arch=(i686 x86_64)
-url="http://www.gnu.org/directory/GNU/gawk.html"
+pkgver=4.0.1
+pkgrel=1
+pkgdesc="The GNU awk utility interprets a special-purpose programming language that makes it possible to handle simple data-reformatting jobs with just a few lines of code."
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gawk/gawk.html"
 license=('GPL')
 groups=('base')
 provides=('awk')
-install=gawk.install
-source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
+install="gawk.install"
+source=("ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 depends=('sh' 'glibc')
-md5sums=('35937a0f83f0efe7a8c2dee635624784')
+makedepends=('gzip')
+md5sums=('bab2bda483e9f32be65b43b8dab39fa5')

 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install
-  mv $pkgdir/usr/libexec $pkgdir/usr/lib
-  install -dm755 $pkgdir/bin
-  mv $pkgdir/usr/bin/gawk* $pkgdir/bin/
-  mv $pkgdir/usr/bin/awk $pkgdir/bin/
+  cd "${srcdir}/${pkgname}-${pkgver}"

-  rm $pkgdir/usr/share/info/dir
-  gzip -9 $pkgdir/usr/share/info/{gawk,gawkinet}.info
+  ./configure --prefix=/usr
+
+  make
 }

+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make install DESTDIR="${pkgdir}"
+}
+
+# vim:set ts=2 sw=2 et:
--- a/gcc/PKGBUILD
+++ b/gcc/PKGBUILD
@ -7,26 +7,25 @@
 # NOTE: libtool requires rebuilt with each new gcc version

 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.7.0
+pkgver=4.7.2
 pkgrel=1
-_snapshot=4.7-20120414
-_libstdcppmanver=20120307		# Note: check source directory name when updating this
+#_snapshot=4.7-20120721
 pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'doxygen')
 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
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.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
 	gcc_pure64.patch
-	gcc-4.7.0-cloog-0.17.patch)
-md5sums=('9f9d082b64753d5908690500251fc52e'
-         '489d2f5311535800a120efd8d18db719'
+	gcc-4.7.1-libada-pic.patch
+	gcc-4.7.1-libgo-write.patch)
+md5sums=('cc308a0891e778cfda7a151ab8a6e762'
         'ced48436c1b3c981d721a829f1094de1'
-         '488f11cf9822d110dde4a12add1d6e03')
+         '69f4c4ad538878085042b5c7f206887b'
+         '5647f5bbbb74fab3013b396da1749d2a')

 if [ -n "${_snapshot}" ]; then
  _basedir="${srcdir}/gcc-${_snapshot}"
@ -43,12 +42,13 @@ build() {
  # Do not run fixincludes
  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in

-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
+  patch -p1 -i ${srcdir}/gcc_pure64.patch

-  # compatibility with latest cloog
-  patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
+  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
+
+  # bug to file...
+  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch

  echo ${pkgver} > gcc/BASE-VER

@ -58,7 +58,7 @@ build() {
  ${_basedir}/configure --prefix=/usr \
      --libdir=/usr/lib --libexecdir=/usr/lib \
      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
+      --with-bugurl=http://chakra-linux.org/bugs/ \
      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
      --enable-shared --enable-threads=posix \
      --with-system-zlib --enable-__cxa_atexit \
@ -66,6 +66,7 @@ build() {
      --disable-libstdcxx-pch --enable-libstdcxx-time \
      --enable-gnu-unique-object --enable-linker-build-id \
      --with-ppl --enable-cloog-backend=isl \
+      --disable-ppl-version-check --disable-cloog-version-check \
      --enable-lto --enable-gold --enable-ld=default \
      --enable-plugin --with-plugin-ld=ld.gold \
      --with-linker-hash-style=gnu \
@ -73,10 +74,14 @@ build() {
      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
      --enable-checking=release
  make
+
+  # make documentation
+  cd $CHOST/libstdc++-v3
+  make doc-man-doxygen
 }

 check() {
-  cd gcc-build
+  cd ${srcdir}/gcc-build

  # increase stack size to prevent test failures
  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
@ -87,80 +92,71 @@ check() {
  ${_basedir}/contrib/test_summary
 }

-package_gcc-libs() {
-   pkgdesc="Runtime libraries shipped by GCC"
-   groups=('base')
-   depends=('glibc>=2.15')
-   install=gcc-libs.install
+package_gcc-libs()
+{
+  pkgdesc="Runtime libraries shipped by GCC"
+  groups=('base')
+  depends=('glibc>=2.15')
+  install=gcc-libs.install

-   cd gcc-build
-   make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-   for lib in libmudflap libgomp libstdc++-v3/src; do
-     make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-   done
-   make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-   make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+  cd ${srcdir}/gcc-build
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libstdc++-v3/src libitm; do
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+  make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info

-   make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-   make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-   make -j1 DESTDIR=${pkgdir} install-target-libobjc
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc

-   # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-   rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}

-   # remove static libraries
-   find ${pkgdir} -name *.a -delete
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
  
-   # Install Runtime Library Exception
-   install -Dm644 ${_basedir}/COPYING.RUNTIME \
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
 }

-package_gcc() {
-   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-   depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
-   groups=('base-devel')
-   install=gcc.install
+package_gcc()
+{
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl')
+  groups=('base-devel')
+  install=gcc.install

-   cd gcc-build
+  cd ${srcdir}/gcc-build
  
-   make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR=${pkgdir} install

-   install -d $pkgdir/usr/share/gdb/auto-load
-   mv $pkgdir/usr/{lib/libstdc++.so.6.0.17-gdb.py,share/gdb/auto-load}
+  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
+  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py

-   # unfortunately it is much, much easier to install the lot and clean-up the mess...
-   rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-   rm $pkgdir/usr/lib/*.so*
-   rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-   rm $pkgdir/usr/lib/libgfortran.spec
-   rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-   rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-   rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
-   rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
-   rm -r $pkgdir/usr/lib/go
-   rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
-   rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-   rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-   rm $pkgdir/usr/share/man/man3/ffi*
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib/*.so*
+  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
+  rm -r $pkgdir/usr/lib/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*

-   # many packages require these symlinks
-   install -dm755 ${pkgdir}/lib
-   ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-   ln -sf gcc ${pkgdir}/usr/bin/cc
-   ln -sf g++ ${pkgdir}/usr/bin/c++
+  # many packages expect this symlinks
+  ln -s gcc ${pkgdir}/usr/bin/cc

-   # install gengtype for plugin support
-   install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-   install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
-   # plugin headers are all over the place at the moment...
-   for i in common objc pragma pretty-print; do
-     ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
-   done
-
-   # POSIX conformance launcher scripts for c89 and c99
-   cat > $pkgdir/usr/bin/c89 <<"EOF"
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@ -186,80 +182,89 @@ done
 exec gcc $fl ${1+"$@"}
 EOF

-   chmod 755 $pkgdir/usr/bin/c{8,9}9
+  chmod 755 $pkgdir/usr/bin/c{8,9}9

-   # install the libstdc++ man pages
-   install -dm755 ${pkgdir}/usr/share/man/man3
-   install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+  # install the libstdc++ man pages
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 -t ${pkgdir}/usr/share/man/man3 \
+    ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3

-   # Install Runtime Library Exception
-   install -Dm644 ${_basedir}/COPYING.RUNTIME \
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
 }

-package_gcc-fortran() {
-   pkgdesc="Fortran front-end for GCC"
-   depends=("gcc=$pkgver-$pkgrel")
-   install=gcc-fortran.install
+package_gcc-fortran()
+{
+  pkgdesc="Fortran front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-fortran.install

-   cd gcc-build
-   make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-   make -j1 DESTDIR=$pkgdir install-target-libgfortran
-   make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-   make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-   install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+  cd ${srcdir}/gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=$pkgdir install-target-libgfortran
+  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
  
-   # remove libraries included in gcc-libs
-   rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
-   rm ${pkgdir}/usr/share/info/libquadmath.info
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info

-   # Install Runtime Library Exception
-   install -Dm644 ${_basedir}/COPYING.RUNTIME \
+  ln -s gfortran ${pkgdir}/usr/bin/f95
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
 }

-package_gcc-objc() {
-   pkgdesc="Objective-C front-end for GCC"
-   depends=("gcc=$pkgver-$pkgrel")
+package_gcc-objc()
+{
+  pkgdesc="Objective-C front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")

-   cd gcc-build
-   make -j1 DESTDIR=$pkgdir install-target-libobjc
-   install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-   install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  cd ${srcdir}/gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libobjc
+  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/

-   # remove libraries included in gcc-libs
-   rm ${pkgdir}/usr/lib/libobjc.so*
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/libobjc.so*

-   # Install Runtime Library Exception
-   install -Dm644 ${_basedir}/COPYING.RUNTIME \
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
 }

-package_gcc-ada() {
-   pkgdesc="Ada front-end for GCC (GNAT)"
-   depends=("gcc=$pkgver-$pkgrel")
-   install=gcc-ada.install
+package_gcc-ada()
+{
+  pkgdesc="Ada front-end for GCC (GNAT)"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-ada.install

-   cd gcc-build/gcc
-   make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-   install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+  cd ${srcdir}/gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver

-   # Install Runtime Library Exception
-   install -Dm644 ${_basedir}/COPYING.RUNTIME \
+  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
 }

-package_gcc-go() {
-   pkgdesc="Go front-end for GCC"
-   depends=("gcc=$pkgver-$pkgrel")
-   install=gcc-go.install
+package_gcc-go()
+{
+  pkgdesc="Go front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-go.install

-   cd gcc-build
-   make -j1 DESTDIR=$pkgdir install-target-libgo
-   make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-   install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+  cd ${srcdir}/gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1

-   # Install Runtime Library Exception
-   install -Dm644 ${_basedir}/COPYING.RUNTIME \
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
 }
--- a/Show More
+++ b/Show More