Merge branch 'testing' of ssh://git.chakraos.org:22/core into testing

acpi_call-lts/PKGBUILD

@@ -1,62 +1,40 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
 
-# Find the kernel name inside the chroot
-_extramodules=extramodules-3.2-lts
-_kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-_kernelver=3.2.63
+_extramodules=extramodules-3.14-CHAKRA-LTS
+_kver="$(cat /lib/modules/${_extramodules}/version)"
+_kernelver=3.14.44
 
 pkgname=acpi_call-lts
 _pkgname=acpi_call
-pkgver=1.0.0
-pkgrel=8
+pkgver=1.1.0
+pkgrel=2
 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=('x86_64')
 url=("http://github.com/mkottman/acpi_call")
 license=('GPL')
-depends=("linux-lts>=${_kernelver}" "linux-lts-headers=${_kernelver}")
-makedepends=('git')
-provides=('acpi-call-lts')
-replaces=('acpi-call-lts')
-conflicts=('acpi-call-lts')
-install=acpi_call.install
-source=("https://github.com/mkottman/acpi_call/archive/v${pkgver}.tar.gz")
-md5sums=('3c71239792ddd725d13f7c8d168b4ecf')
+depends=("linux-lts>=${_kernelver}")
+makedepends=("linux-lts-headers=${_kernelver}")
+provides=("${pkgname%-*}")
+install="${pkgname%-*}.install"
+source=("acpi_call-$pkgver.tar.gz::${url}/archive/v${pkgver}.tar.gz")
+sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0')
 
 build() {
-  cd ${srcdir}/$_pkgname-${pkgver}
-  
-  sed \
-    -e  's/$(shell uname -r)/3.2.63-1-lts/g' \
-    -i Makefile
+  cd ${pkgname%-*}-${pkgver}
 
-  make
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+  make KVERSION="${_kernver}"
 }
+
 package() {
-  cd ${srcdir}/$_pkgname-${pkgver}
-  install -d ${pkgdir}/usr/share/$_pkgname 
-  install -d ${pkgdir}/usr/bin  
-  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/examples/asus1215n.sh \
-    ${pkgdir}/usr/share/$_pkgname 
-  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/examples/m11xr2.sh \
-    ${pkgdir}/usr/share/$_pkgname 
-  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/examples/dellL702X.sh \
-    ${pkgdir}/usr/share/$_pkgname 
-  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/examples/turn_off_gpu.sh \
-    ${pkgdir}/usr/share/$_pkgname 
-  ln -s /usr/share/$_pkgname/turn_off_gpu.sh  \
-    ${pkgdir}/usr/bin/turn_off_gpu.sh 
-  install -Dm755  ${srcdir}/$_pkgname-${pkgver}/support/query_dsdt.pl \
-    ${pkgdir}/usr/share/$_pkgname-${pkgver}
-  cp -R support/windump_hack \
-    ${pkgdir}/usr/share/$_pkgname/
-  install -Dm644 README.md \
-    ${pkgdir}/usr/share/$_pkgname/README.md
+  cd ${pkgname%-*}-${pkgver}
 
-    msg2 "Building module for $_kver..."
+  install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
+  install -m 644 ${pkgname%-*}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/
+  gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgname%-*}.ko
+  echo ${pkgname%-*} > "${pkgdir}"/usr/lib/modules-load.d/${pkgname}.conf
 
-  # KDIR is necessary even when cleaning
-  #make KDIR=/usr/src/linux-${_kver} clean
-  make KDIR=/usr/src/linux-${_kver}
-
-  install -D -m644 acpi_call.ko $pkgdir/usr/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko
+  install -dm 755 "${pkgdir}"/usr/share/${pkgname}
+  cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/
 }

acpi_call/PKGBUILD

@@ -1,14 +1,14 @@
 #
-# Core Packages for Chakra, part of chakra-project.org
+# Core Packages for Chakra, part of chakraos.org
 
-_extramodules=extramodules-3.19-CHAKRA
+_extramodules=extramodules-4.0-CHAKRA
 _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-_kernelver=3.19.4
+_kernelver=4.0.5
 
 pkgname=acpi_call
 _pkgname=acpi_call
 pkgver=1.1.0
-pkgrel=23
+pkgrel=24
 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=('x86_64')
 url=("http://github.com/mkottman/acpi_call")

acpi_call/acpi_call.install

@@ -1,5 +1,5 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.19-CHAKRA'
+  EXTRAMODULES='extramodules-4.0-CHAKRA'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
   echo ""
   echo "[+] modprobe acpi_call"
@@ -12,7 +12,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.19-CHAKRA'
+  EXTRAMODULES='extramodules-4.0-CHAKRA'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 

apr-util/PKGBUILD

@@ -1,16 +1,15 @@
 # Maintainer: Neophytos Kolokotronis <tetris4ATgmailDOTcom>
 
 pkgname=apr-util
-pkgver=1.5.3
+pkgver=1.5.4
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 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=('6f3417691c7a27090f36e7cf4d94b36e')
+md5sums=('2202b18f269ad606d70e1864857ed93c')
 
 build() {
   cd "${srcdir}/apr-util-${pkgver}"

apr/PKGBUILD

@@ -1,16 +1,17 @@
 # Maintainer: Neophytos Kolokotronis <tetris4ATgmailDOTcom>
 
 pkgname=apr
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('x86_64')
 url="http://apr.apache.org/"
 depends=('util-linux')
-options=('!libtool')
 license=('APACHE')
-source=("http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2")
-md5sums=('5486180ec5a23efb5cae6d4292b300ab')
+source=(http://www.apache.org/dist/apr/apr-$pkgver.tar.bz2{,.asc})
+md5sums=('4e9769f3349fe11fc0a5e1b224c236aa'
+         'SKIP')
+validpgpkeys=('5B5181C2C0AB13E59DA3F7A3EC582EB639FF092C') # Jeff Trawick
 
 build() {
   cd "${srcdir}/apr-${pkgver}"
@@ -19,7 +20,7 @@ build() {
   ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
     --with-installbuilddir=/usr/share/apr-1/build \
     --enable-nonportable-atomics \
-    --with-devrandom=/dev/urandom
+    --with-devrandom=/dev/urandom --disable-static
   make
 }
 

automake/PKGBUILD

@@ -1,10 +1,6 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer abveritas@chakra-project.org
 
 pkgname=automake
-pkgver=1.11.6
+pkgver=1.15
 pkgrel=1
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
@@ -13,9 +9,19 @@ url="http://www.gnu.org/software/automake"
 groups=('base-devel')
 depends=('perl' 'bash')
 makedepends=('autoconf')
+checkdepends=('dejagnu' 'python3' 'gcc-fortran' 'java-environment' 'vala' 'emacs')
 install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('0286dc30295b62985ca51919202ecfcc')
+source=(http://mirror.bibleonline.ru/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('9a1ddb0e053474d9d1105cfe39b0c48d'
+         'SKIP')
+validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573')   # Stefano Lattarini
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # skip failing test...
+  sed -i "/instmany-python.sh/d" Makefile.in
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -23,15 +29,12 @@ build() {
   make
 }
 
-check()
-{
+check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  # 1.11 is not really maintained anymore, thefore tests failing is a WONTFIX for upstream
-  [ ${pkgver} = "1.11.6" ] ||  make check
+  make check
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-}
-
+}

b43-fwcutter/PKGBUILD

@@ -1,10 +1,6 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=b43-fwcutter
-pkgver=017
+pkgver=019
 pkgrel=1
 pkgdesc="firmware extractor for the bcm43xx kernel module"
 url="http://wireless.kernel.org/en/users/Drivers/b43"
@@ -12,7 +8,7 @@ depends=('glibc')
 license=('GPL')
 arch=('x86_64')
 source=("http://bues.ch/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fe6a3cc765d8a8328dc09f7a6159bfb7')
+md5sums=('19d1f4226a625756726bdf7ed5dc2a0a')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}

bash/PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgname=bash
 _basever=4.3
-_patchlevel=030 #prepare for some patches
+_patchlevel=039 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
@@ -17,7 +17,7 @@ depends=('readline>=6.3' 'glibc')
 optdepends=('bash-completion: for tab completion')
 provides=('sh')
 install=bash.install
-source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
+source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz
 	dot.bashrc
 	dot.bash_profile
 	dot.bash_logout
@@ -27,7 +27,7 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
 
 if [[ $((10#${_patchlevel})) -gt 0 ]]; then
     for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do
-	source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//.}-$(printf "%03d" $_p){,.sig})
+	source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//.}-$(printf "%03d" $_p))
     done
 fi
 
@@ -80,7 +80,6 @@ package() {
 }
 
 md5sums=('81348932d5da294953e15d4814c74dd1'
-         'SKIP'
          '027d6bd8f5f6a06b75bb7698cb478089'
          '2902e0fee7a9168f3a4fd2ccd60ff047'
          '42f4400ed2314bd7519c020d0187edc5'
@@ -88,62 +87,41 @@ md5sums=('81348932d5da294953e15d4814c74dd1'
          '472f536d7c9e8250dc4568ec4cfaf294'
          'a577d42e38249d298d6a8d4bf2823883'
          '1ab682b4e36afa4cf1b426aa7ac81c0d'
-         'SKIP'
          '8fc22cf50ec85da00f6af3d66f7ddc1b'
-         'SKIP'
          'a41728eca78858758e26b5dea64ae506'
-         'SKIP'
          'bf8d53d227829d67235927689a03cc7a'
-         'SKIP'
          'c0c00935c8b8ffff76e8ab77e7be7d15'
-         'SKIP'
          '6f01e364cd092faa28dd7119f47ddb5f'
-         'SKIP'
          'dcf471d222bcd83283d3094e6ceeb6f8'
-         'SKIP'
          'f7553416646dc26c266454c78a916d36'
-         'SKIP'
          '7e73d2151f4064b484a4ba2c4b09960e'
-         'SKIP'
          'a275463d21735bb6d7161f9fbd320d8f'
-         'SKIP'
          'c17103ee20420d77e46b224c8d3fceda'
-         'SKIP'
          '3e2a057a19d02b3f92a3a09eacbc03ae'
-         'SKIP'
          'fb377143a996d4ff087a2771bc8332f9'
-         'SKIP'
          '1a1aaecc99a9d0cbc310e8e247dcc8b6'
-         'SKIP'
          '4f04387458a3c1b4d460d199f49991a8'
-         'SKIP'
          '90e759709720c4f877525bebc9d5dc06'
-         'SKIP'
          '11e4046e1b86070f6adbb7ffc89641be'
-         'SKIP'
          'cd5a9b46f5bea0dc0248c93c7dfac011'
-         'SKIP'
          'cff4dc024d9d3456888aaaf8a36ca774'
-         'SKIP'
          '167839c5f147347f4a03d88ab97ff787'
-         'SKIP'
          '1d350671c48dec30b34d8b81f09cd79d'
-         'SKIP'
          '11c349af66a55481a3215ef2520bec36'
-         'SKIP'
          'b3cb0d80fd0c47728264405cbb3b23c7'
-         'SKIP'
          'b5ea5600942acceb4b6f07313d2de74e'
-         'SKIP'
          '193c06f578d38ffdbaebae9c51a7551f'
-         'SKIP'
          '922578e2be7ed03729454e92ee8d3f3a'
-         'SKIP'
          '8ff6948b16f2db5c29b1b9ae1085bbe7'
-         'SKIP'
          'dd51fa67913b5dca45a702b672b3323f'
-         'SKIP'
          '0729364c977ef4271e9f8dfafadacf67'
-         'SKIP'
          'efb709fdb1368945513de23ccbfae053'
-         'SKIP')
+         '236df1ac1130a033ed0dbe2d2115f28f'
+         '2360f7e79cfb28526f80021025ea5909'
+         'b551c4ee7b8713759e4143499d0bbd48'
+         'c9a56fbe0348e05a886dff97f2872b74'
+         'e564e8ab44ed1ca3a4e315a9f6cabdc9'
+         'b00ff66c41a7c0f06e191200981980b0'
+         'be2a7b05f6ae560313f3c9d5f7127bda'
+         '61e0522830b24fbe8c0d1b010f132470'
+         'a4775487abe958536751c8ce53cdf6f9')

broadcom-wl-lts/PKGBUILD

@@ -1,14 +1,14 @@
 #
-# Chakra Packages for Chakra, part of chakra-project.org
+# Chakra Packages for Chakra, part of chakraos.org
 #
 
-_extramodules=extramodules-3.2-lts
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-_kernelver=3.2.63
+_extramodules=extramodules-3.14-CHAKRA-LTS
+_kver="$(cat /lib/modules/${_extramodules}/version)"
+_kernelver=3.14.44
 
 pkgname=broadcom-wl-lts
 pkgver=6.30.223.248
-pkgrel=2
+pkgrel=4
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 arch=('x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
@@ -17,20 +17,29 @@ depends=("linux-lts=${_kernelver}")
 makedepends=("linux-lts-headers=${_kernelver}")
 backup=('etc/modprobe.d/broadcom-wl-lts.conf')
 install=install
-
 source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz"
+         #"http://ftp.de.debian.org/debian/pool/non-free/b/broadcom-sta/broadcom-sta_5.100.82.112.orig.tar.gz" "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver//./_}.tar.gz" we need the debian version, because upstream URL doesn't exist anymore
         'modprobe.d'
-        'license.patch')
+        'license.patch'
+        'gcc.patch')
 sha1sums=('bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c'
           '89bf92286ede30dd85304c6c4e42e89cfdc0f60a'
-          'ea7b67982ddc0f56fd3becb9914fd4458fe7d373')
+          'ea7b67982ddc0f56fd3becb9914fd4458fe7d373'
+          '8a940675e8c0baa65494c378e6155543b26a9a58')
+
+prepare() {
+        cd "${srcdir}"
+        patch -p1 -i license.patch
+        patch -p1 -i gcc.patch
+
+        sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \
+            -i src/wl/sys/wl_linux.c
+}
 
 build() {
 	cd "${srcdir}"
 
-	patch -p1 -i ${srcdir}/license.patch
-
-	make -C /lib/modules/"${_kernver}"/build M=`pwd`
+	make -C /lib/modules/"${_kver}"/build M=`pwd`
 }
 
 package() {

broadcom-wl-lts/gcc.patch

@@ -0,0 +1,11 @@
+--- a/Makefile	2014-06-26 10:42:08.000000000 +0000
++++ b/Makefile	2014-07-17 22:44:01.662297228 +0000
+@@ -126,6 +126,8 @@
+ EXTRA_CFLAGS       += -I$(src)/src/shared/bcmwifi/include
+ #EXTRA_CFLAGS       += -DBCMDBG_ASSERT -DBCMDBG_ERR
+ 
++EXTRA_CFLAGS       += -Wno-date-time
++
+ EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped
+ 
+ KBASE              ?= /lib/modules/`uname -r`

broadcom-wl/PKGBUILD

@@ -1,12 +1,12 @@
 #maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
 
-_extramodules=extramodules-3.19-CHAKRA
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-_kernelver=3.19.4
+_extramodules=extramodules-4.0-CHAKRA
+_kver="$(cat /usr/lib/modules/${_extramodules}/version)"
+_kernelver=4.0.5
 
 pkgname=broadcom-wl
 pkgver=6.30.223.248
-pkgrel=12
+pkgrel=14
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
 arch=('x86_64')
@@ -15,25 +15,29 @@ depends=("linux=${_kernelver}")
 makedepends=("linux-headers=${_kernelver}")
 source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz"
          #"http://ftp.de.debian.org/debian/pool/non-free/b/broadcom-sta/broadcom-sta_5.100.82.112.orig.tar.gz" "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver//./_}.tar.gz" we need the debian version, because upstream URL doesn't exist anymore
-        'modprobe.d'
-        'license.patch'
-        'gcc.patch'
-        'linux-recent.patch')
+        modprobe.d
+        license.patch
+        gcc.patch
+        linux-recent.patch
+        support-for-Linux-4.0.patch)
 sha1sums=('bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c'
           'a37c5dd9ab279372f0c68595bb2a8f1fe694cd13'
           '81c05d48b234d56ad2e18eaee5ce89b79550ef20'
           '8a940675e8c0baa65494c378e6155543b26a9a58'
-          '758cb8ed0448aeedae18c64c25ddf330ac1a5177')
+          '758cb8ed0448aeedae18c64c25ddf330ac1a5177'
+          'bc38818662f50418c7b4e2588f84b8d7cafcd56c')
 
 install=install
 
-
 prepare() {
 	cd "${srcdir}"
 
 	patch -p1 -i linux-recent.patch
 	patch -p1 -i license.patch
         patch -p1 -i gcc.patch
+        
+        # based on https://bugs.launchpad.net/ubuntu/+source/bcmwl/+bug/1424676
+        patch -p1 -i support-for-Linux-4.0.patch
 
         sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \
             -i src/wl/sys/wl_linux.c
@@ -42,7 +46,7 @@ prepare() {
 build() {
 	cd "${srcdir}"
 
-	make -C /usr/lib/modules/"${_kernver}"/build M=`pwd`
+	make -C /usr/lib/modules/"${_kver}"/build M=`pwd`
 }
 
 package() {

broadcom-wl/install

@@ -1,9 +1,13 @@
 post_upgrade() {
-	cd lib/modules
-	for i in extramodules-*; do depmod $(cat "$i/version"); done
-	cd ../..
+        for i in /usr/lib/modules/extramodules-*
+        do
+                if [ -f "$i/version" ]
+                then
+                        depmod $(cat "$i/version")
+                fi
+        done
 }
 
 post_install() {
-	post_upgrade
+        post_upgrade
 }

broadcom-wl/support-for-Linux-4.0.patch

@@ -0,0 +1,20 @@
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-02-25 16:48:03.117609023 -0500
++++ b/src/wl/sys/wl_cfg80211_hybrid.c	2015-02-25 17:00:43.073595414 -0500
+@@ -1441,7 +1441,7 @@
+ 		WL_DBG(("Could not get rate (%d)\n", err));
+ 	} else {
+ 		rate = dtoh32(rate);
+-		sinfo->filled |= STATION_INFO_TX_BITRATE;
++		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
+ 		sinfo->txrate.legacy = rate * 5;
+ 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
+ 	}
+@@ -1454,7 +1454,7 @@
+ 			return err;
+ 		}
+ 		rssi = dtoh32(scb_val.val);
+-		sinfo->filled |= STATION_INFO_SIGNAL;
++		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
+ 		sinfo->signal = rssi;
+ 		WL_DBG(("RSSI %d dBm\n", rssi));
+ 	}

btrfs-progs/PKGBUILD

@@ -6,7 +6,7 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=3.18.2
+pkgver=4.0.1
 pkgrel=1
 pkgdesc='Btrfs filesystem utilities'
 arch=('x86_64')
@@ -28,8 +28,9 @@ md5sums=('SKIP'
 
 build() {
    cd $pkgname
-   make CFLAGS="$CFLAGS"
-   make CFLAGS="$CFLAGS" btrfs-select-super
+   ./autogen.sh
+   ./configure --prefix=/usr
+   make
 }
 
 check() {
@@ -41,7 +42,9 @@ package() {
    cd $pkgname
 
    make prefix="$pkgdir"/usr install
-   install -Dm755 btrfs-select-super "$pkgdir"/usr/bin
+   
+   # install bash completion (FS#44618)
+   install -Dm644 btrfs-completion "$pkgdir/usr/share/bash-completion/completions/btrfs"
 
    # install mkinitcpio hooks
    cd "$srcdir"

ca-certificates/PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgbase=ca-certificates
 pkgname=(ca-certificates-utils ca-certificates)
-pkgver=20140923
+pkgver=20150402
 pkgrel=1
 pkgdesc='Common CA certificates'
 arch=('any')
@@ -12,8 +12,8 @@ url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git'
 license=('GPL2')
 makedepends=('asciidoc' 'p11-kit')
 source=(update-ca-trust update-ca-trust.8.txt)
-sha256sums=('fe6d5bc3bd133d7bd1047abef9f98ad9b9c1e3762766e1b2df9dbeabe3420abe'
-            '916bc0582b5230aedc7fdada70bc387fbd605dbc9d3d421621e4736c60a8ef41')
+sha256sums=('746d2cce8ec107fa3b7aaa246d69a7e238c3d2ac5cd82c5aeed996fe9cb0a874'
+            '38c10446738c1e99bc95e42fe844a9e95ea106795059fa769f3b4ba82b395929')
 
 build() {
 	asciidoc.py -v -d manpage -b docbook update-ca-trust.8.txt

ca-certificates/ca-certificates-utils.install

@@ -2,25 +2,17 @@ export LC_ALL=C
 
 post_install() {
 	usr/bin/update-ca-trust
-}
 
-pre_upgrade() {
-	if (( $(vercmp $2 20140923-1) < 0 )); then
-		find /etc/ssl/certs -type l -print | while read symlink; do
-			case $(readlink $symlink) in
-			/usr/share/ca-certificates*) rm -f $symlink;;
-			esac
-		done
-		find /etc/ssl/certs -type l -print | while read symlink; do
-			test -f $symlink || rm -f $symlink
-		done
-	fi
+	# This should be a normally packaged file, but that would
+	# require user intervention at upgrade
+	ln -srf etc/ca-certificates/extracted/tls-ca-bundle.pem \
+		etc/ssl/certs/ca-certificates.crt
 }
 
 post_upgrade() {
 	usr/bin/update-ca-trust
 
-	if (( $(vercmp $2 20140923-1) < 0 )); then
+	if (( $(vercmp $2 20140923-7.1) < 0 )); then
 		cat <<MSG
   The way local CA certificates are handled has changed.
   If you have added any certificates manually:
@@ -33,10 +25,20 @@ post_upgrade() {
   Also see \`man 8 update-ca-trust\` and \`trust --help\`.
 MSG
 	fi
+
+	if (( $(vercmp $2 20150402) < 0 )); then
+		ln -srf etc/ca-certificates/extracted/tls-ca-bundle.pem \
+			etc/ssl/certs/ca-certificates.crt
+
+		# Moved to etc/ca-certificates/extracted
+		rm -f etc/ssl/certs/ca-bundle.trust.crt
+	fi
 }
 
 pre_remove() {
 	usr/bin/update-ca-trust
+
+	rm -f etc/ssl/certs/{ca-certificates.crt,java/cacerts}
 }
 
-# vim:set noet ts=8 sw=8:
+# vim:set noet ts=8 sw=8 sts=0:

ca-certificates/update-ca-trust

@@ -6,23 +6,22 @@
 # files in $DEST.
 
 DEST=/etc/ca-certificates/extracted
-trust extract --overwrite --format=pem-bundle --filter=ca-anchors --purpose server-auth  $DEST/tls-ca-bundle.pem
-trust extract --overwrite --format=pem-bundle --filter=ca-anchors --purpose email        $DEST/email-ca-bundle.pem
-trust extract --overwrite --format=pem-bundle --filter=ca-anchors --purpose code-signing $DEST/objsign-ca-bundle.pem
 
-# Removes all files in the target directory, but not directories or files therein
-trust extract --overwrite --format=openssl-directory --filter=certificates $DEST/cadir
-
-SSL=/etc/ssl/certs
-trust extract --overwrite --format=openssl-bundle --filter=certificates $SSL/ca-bundle.trust.crt
-trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth $SSL/java/cacerts
-ln -fsrT $DEST/tls-ca-bundle.pem $SSL/ca-certificates.crt
+# The directory-format extractors remove all files in the target directory, but not directories or files therein
+trust extract --overwrite --format=pem-directory-hash --filter=ca-anchors --purpose server-auth  $DEST/cadir
+trust extract --overwrite --format=pem-bundle         --filter=ca-anchors --purpose server-auth  $DEST/tls-ca-bundle.pem
+trust extract --overwrite --format=pem-bundle         --filter=ca-anchors --purpose email        $DEST/email-ca-bundle.pem
+trust extract --overwrite --format=pem-bundle         --filter=ca-anchors --purpose code-signing $DEST/objsign-ca-bundle.pem
+trust extract --overwrite --format=openssl-bundle     --filter=certificates                      $DEST/ca-bundle.trust.crt
 
 # We don't want to have to remove everything from the certs directory but neither
 # do we want to leave stale certs around, so symlink it all from somewhere else
 for f in $DEST/cadir/*; do
-  ln -fsr -t $SSL "$f"
+  ln -fsr -t /etc/ssl/certs "$f"
 done
 
 # Now find and remove all broken symlinks
-find -L $SSL -maxdepth 1 -type l -delete
+find -L /etc/ssl/certs -maxdepth 1 -type l -delete
+
+# Java bundle
+trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth /etc/ssl/certs/java/cacerts

ca-certificates/update-ca-trust.8.txt

@@ -178,18 +178,16 @@ please rather install them in the respective subdirectory below the
 /usr/share/ca-certificates/trust-source/ or /etc/ca-certificates/trust-source/
 directories, as described in the <<sourceconf,SOURCE CONFIGURATION>> section.
 
+The directory /etc/ssl/certs contains a OpenSSL-cadir-style hash farm.
+Distrust information cannot be represented in this format,
+and distrusted certificates are missing from these files.
+
 The directory /etc/ssl/certs/java contains 
 a CA certificate bundle in the java keystore file format.
 Distrust information cannot be represented in this file format,
 and distrusted certificates are missing from these files.
 File cacerts contains CA certificates trusted for TLS server authentication.
 
-The directory /etc/ssl/certs contains a OpenSSL-cadir-style hash farm, as well 
-as a ca-bundle.trust.crt bundle file in the extended BEGIN/END TRUSTED CERTIFICATE file format, 
-as described in the x509(1) manual page.
-The dir or the bundle contain the full set of all trusted
-or distrusted certificates, including the associated trust flags.
-
 The directory /etc/ca-certificates/extracted contains 
 CA certificate bundle files in the simple BEGIN/END CERTIFICATE file format, 
 as decribed in the x509(1) manual page.
@@ -201,6 +199,10 @@ File email-ca-bundle.pem contains CA certificates
 trusted for E-Mail protection.
 File objsign-ca-bundle.pem contains CA certificates 
 trusted for code signing.
+File ca-bundle.trust.crt contains certificates in the extended
+BEGIN/END TRUSTED CERTIFICATE file format, as described in the x509(1) manual page.
+This bundle contains the full set of all trusted
+and distrusted certificates, including the associated trust flags.
 
 
 COMMANDS
@@ -218,27 +220,6 @@ COMMANDS
 
 FILES
 -----
-/etc/ssl/certs::
-	Classic directory, contains individual CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage,
-	which are created by the 'update-ca-trust extract' command. Don't edit files in this directory, because they will be overwritten. 
-	See section <<extractconf,EXTRACTED CONFIGURATION>> for additional details.
-
-/etc/ssl/certs/ca-bundle.trust.crt::
-	Classic filename, file contains a list of CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage.
-	This file is consolidated output created by the update-ca-trust command.
-
-/etc/ssl/certs/ca-certificates.crt::
-	Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information.
-	This file is a symbolic link that refers to consolidated output created by the update-ca-trust command.
-
-/etc/ssl/cert.pem::
-	Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information.
-	This file is a symbolic link that refers to consolidated output created by the update-ca-trust command.
-
-/etc/ssl/java/cacerts::
-	Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the Java keystore file format, without distrust information.
-	This file is consolidated output created by the update-ca-trust command.
-
 /usr/share/ca-certificates/trust-source::
 	Contains multiple, low priority source configuration files as explained in section <<sourceconf,SOURCE CONFIGURATION>>. Please pay attention to the specific meanings of the respective subdirectories.
 
@@ -250,6 +231,35 @@ FILES
 	which are created using the 'update-ca-trust extract' command. Don't edit files in this directory, because they will be overwritten.
 	See section <<extractconf,EXTRACTED CONFIGURATION>> for additional details.
 
+/etc/ca-certificates/extracted/tls-ca-bundle.pem::
+	Contains a list of CA certificates trusted for TLS server authentication, in the simple BEGIN/END CERTIFICATE file format, without distrust information.
+
+/etc/ca-certificates/extracted/email-ca-bundle.pem::
+	Contains a list of CA certificates trusted for E-Mail protection, in the simple BEGIN/END CERTIFICATE file format, without distrust information.
+
+/etc/ca-certificates/extracted/objsign-ca-bundle.pem::
+	Contains a list of CA certificates trusted for code signing, in the simple BEGIN/END CERTIFICATE file format, without distrust information.
+
+/etc/ca-certificates/extracted/ca-bundle.trust.crt::
+	Contains a list of CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage.
+
+/etc/ca-certificates/extracted/cadir::
+	Contains individual CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information.
+        Also includes the necessary hash symlinks expected by OpenSSL.
+
+/etc/ssl/certs::
+	Classic directory, contains symlinks into /etc/ca-certificates/extracted/cadir which are maintained by the update-ca-trust command.
+
+/etc/ssl/certs/ca-certificates.crt::
+	Classic filename, a symlink to /etc/ca-certificates/extracted/tls-ca-bundle.pem.
+
+/etc/ssl/cert.pem::
+	Classic filename, a symlink to /etc/ca-certificates/extracted/tls-ca-bundle.pem.
+
+/etc/ssl/java/cacerts::
+	Classic filename, contains a list of CA certificates trusted for TLS server authentication usage, in the Java keystore file format, without distrust information.
+	This file is consolidated output created by the update-ca-trust command.
+
 AUTHOR
 ------
 Written by Kai Engert and Stef Walter.

crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch

@@ -1,52 +0,0 @@
-From fefefdb2c52c8fbedbb339b4badb8226cad7e7e0 Mon Sep 17 00:00:00 2001
-From: Krishna Chaitanya <chaitanya.mgit@gmail.com>
-Date: Mon, 16 Dec 2013 21:57:39 +0530
-Subject: [PATCH] crda: Fix the linking order to avoid compilation error
-
-While linking the crda.o and libreg.so, first put crda.o
-and then -lreg. This fixed the below error:
-
-  GEN  keys-gcrypt.c
-  Trusted pubkeys: pubkeys/linville.key.pub.pem
-  CC   libreg.so
-  CC   crda.o
-  LD   crda
-crda.o: In function `main':
-crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2'
-collect2: ld returned 1 exit status
-make: *** [crda] Error 1
-
-Note: This still doesn't fix the below error (will send another mail)
-
-  CHK  /usr/lib/crda/regulatory.bin
-Database signature verification failed.
-Invalid or empty regulatory file, note: a binary regulatory file should be used.
-make: *** [verify] Error 234
-
-Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-Signed-off-by: Chaitanya T K <chaitanya.mgit@gmail.com>
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4a351c6..0b2f0d7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
- CFLAGS += -O2 -fpic
- CFLAGS += -std=gnu99 -Wall -Werror -pedantic
- CFLAGS += -Wall -g
--LDLIBS += -lm
- LDLIBREG += -lreg
-+LDLIBS += $(LDLIBREG)
-+LDLIBS += -lm
- LIBREG += libreg.so
--LDFLAGS += -L ./ $(LDLIBREG)
-+LDFLAGS += -L ./
- 
- all: all_noverify verify
- 
--- 
-1.9.0
-

crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch

@@ -1,37 +0,0 @@
-From 2cabb2588da56735369131b709f191453c080be0 Mon Sep 17 00:00:00 2001
-From: "John W. Linville" <linville@tuxdriver.com>
-Date: Fri, 14 Feb 2014 13:58:44 -0500
-Subject: [PATCH 2/2] crda: Add DESTDIR support in install-libreg* rules in
- Makefile
-
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0b2f0d7..1f25509 100644
---- a/Makefile
-+++ b/Makefile
-@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c
- 
- install-libreg-headers:
- 	$(NQ) '  INSTALL  libreg-headers'
--	$(Q)mkdir -p $(INCLUDE_DIR)
--	$(Q)cp *.h $(INCLUDE_DIR)/
-+	$(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR)
-+	$(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/
- 
- install-libreg:
- 	$(NQ) '  INSTALL  libreg'
--	$(Q)mkdir -p $(LIBDIR)
--	$(Q)cp $(LIBREG) $(LIBDIR)/
-+	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
-+	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
- 	$(Q)ldconfig
- 
- %.o: %.c regdb.h $(LIBREG)
--- 
-1.9.0
-

crda/PKGBUILD

@@ -2,33 +2,30 @@
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=crda
-pkgver=3.13
+pkgver=3.18
 pkgrel=1
 pkgdesc="Central Regulatory Domain Agent for wireless networks"
-arch=(i686 x86_64)
+arch=('x86_64')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
 depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw')
 makedepends=('python2-m2crypto')
 install=crda.install
-source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar.xz
+source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar{.xz,.sign}
         set-wireless-regdom
-        0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
-        0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
         0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
         0001-Makefile-Don-t-run-ldconfig.patch)
-sha256sums=('2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59'
+sha256sums=('43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf'
+            'SKIP'
             '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3'
-            '8920b5988eb1befe13f88ce5c0dbbf30c294796d613681a2b0925f6f8534c51b'
-            'ced0a372b06ffd64f90be77d7267c9d8cc10413bc017c3154b7208dbf69be3cb'
             '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520'
             'ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663')
 
+validpgpkeys=('E4053F8D0E7C4B9A0A20AB27DC553250F8FE7407') #Luis R. Rodriguez
+
 prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
-  patch -p1 -i "${srcdir}"/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
-  patch -p1 -i "${srcdir}"/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
   patch -p1 -i "${srcdir}"/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
   patch -p1 -i "${srcdir}"/0001-Makefile-Don-t-run-ldconfig.patch
 }

dbus/30-dbus.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 # launches a session dbus instance
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
+if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then
   eval $(dbus-launch --sh-syntax --exit-with-session)
 fi

dbus/PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
-pkgver=1.8.16
+pkgver=1.8.18
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -12,9 +12,9 @@ arch=('x86_64')
 license=('GPL' 'custom')
 makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
-        30-dbus)
-md5sums=('020824a38850501e7d6ba8307a7c5ac3'
-         '3314d727fa57fc443fce25b5cbeebbcc')
+        30-dbus.sh)
+md5sums=('83e607e9ccb1c921d5b6bbea2376a36c'
+         '6683a05bd749929ef9442816c22c3268')
 
 # note: remember to add the dbus group in the chroot, groupadd -g 81 dbus
 
@@ -52,7 +52,7 @@ package_dbus(){
   rm -rf "${pkgdir}/var/run"
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
 
-  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
+  install -Dm755 ../30-dbus.sh "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
 

dejagnu/PKGBUILD

@@ -1,21 +1,15 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=dejagnu
-pkgver=1.5.1
+pkgver=1.5.3
 pkgrel=1
 pkgdesc="Framework for testing other programs"
 arch=('any')
 url="http://www.gnu.org/software/dejagnu/"
 license=('GPL')
 depends=('sh' 'expect')
-makedepends=('dejagnu')
-options=('!libtool')
 install=dejagnu.install
 source=("http://ftp.gnu.org/gnu/dejagnu/${pkgname}-${pkgver}.tar.gz")    
-md5sums=('8386e04e362345f50ad169f052f4c4ab')
+md5sums=('5bda2cdb1af51a80aecce58d6e42bd2f')
 
 
 build() {

dhcpcd/Makefile_test.patch

@@ -1,11 +0,0 @@
---- dhcpcd-6.4.3/test/Makefile	2014-07-30 17:13:12.000000000 +0200
-+++ test/Makefile	2014-07-31 21:34:43.471109436 +0200
-@@ -3,7 +3,7 @@
- 
- PROG=		test
- SRCS=		test.c
--SRCS+=		test_hmac_md5.c hmac_md5.c ${MD5_SRC}
-+SRCS+=		test_hmac_md5.c ../crypt/hmac_md5.c ../${MD5_SRC}
- 
- CFLAGS?=	-O2
- CSTD?=		c99

dhcpcd/PKGBUILD

@@ -3,8 +3,8 @@
 #
 
 pkgname=dhcpcd
-pkgver=6.5.1
-pkgrel=2
+pkgver=6.9.0
+pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
 arch=('x86_64')
@@ -15,8 +15,8 @@ backup=('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_.service'
-		'dhcpcd.service')
-sha1sums=('e4ffeee13efff17aadbc60d669206819b99d0a74'
+        'dhcpcd.service')
+sha1sums=('0e4900e05c01b795508b51f882e1316aad5ad932'
           '6f1633edde14d29b5cdc09c4f029a450ef2ebc96'
           '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9')
 

dnssec-anchors/PKGBUILD

@@ -1,38 +1,41 @@
 #
 # Maintainer: Weng Xuetian <wengxt@gmail.com>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thomas Mudrunka <harvie@email.cz>
-# Contributor: m4xm4n <max@maxfierke.com>
+
 
 pkgname=dnssec-anchors
-pkgver=20141008
+pkgver=20150403
 pkgrel=1
 pkgdesc='DNSSEC trust anchors for the root zone'
 url='http://data.iana.org/root-anchors/'
 license=('custom:NoCopyright')
 arch=('any')
-source=('LICENSE'
-        'trusted-key.key')
-sha256sums=('dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb'
-            '1fa004d34051182762f1f238268040170dc44c1c242ff7df35ffa39c845c58d9')
+makedepends=('ldns')
+validpgpkeys=('2FBB91BCAAEE0ABE1F8031C7D1AFBCE00F6C91D2')
+source=('http://data.iana.org/root-anchors/root-anchors.xml'
+        'root-anchors.xml.asc::http://data.iana.org/root-anchors/root-anchors.asc'
+        'LICENSE')
+sha256sums=('dfb281b771dc854c18d1cff9d2eecaf184cf7a9668606aaa33e8f01bf4b4d8e4'
+            'SKIP'
+            'dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb')
 
-get_trusted-key() {
-	drill -z -s DNSKEY . > root.key
+build() {
+        cd "${srcdir}"
+        drill -z -s DNSKEY . > root.key
 
-	curl http://data.iana.org/root-anchors/root-anchors.xml |
-	awk 'BEGIN{ORS=" "}(NR>4){gsub(/<[^>]*>/,"");print tolower($0)}' |
-	sed 's/   /\n/' > root.ds
+        cat root-anchors.xml |
+        awk 'BEGIN{ORS=" "}(NR>4){gsub(/<[^>]*>/,"");print tolower($0)}' |
+        sed 's/   /\n/' > root.ds
 
-	# Any of those tests failing is suspicious; check thoroughly!
-	[[ "$(<root.ds)" = '19036 8 2 49aac11d7b6f6446702e54a1607371607a1a41855200fd2ce1cdde32f24e8fb5' ]] &&
-	grep -Pq 'IN\tDS\t'"$(<root.ds)" root.key ||
-	return 1
+        # Any of those tests failing is suspicious; check thoroughly!
+        [[ "$(<root.ds)" = '19036 8 2 49aac11d7b6f6446702e54a1607371607a1a41855200fd2ce1cdde32f24e8fb5' ]] &&
+        grep -Pq 'IN\tDS\t'"$(<root.ds)" root.key ||
+        return 1
 
-	sed '/DNSKEY/s/ ;{id = '"$(cut -d\  -f1<root.ds)"' .*//;t;d' root.key > trusted-key.key
+        sed '/DNSKEY/s/ ;{id = '"$(cut -d\  -f1<root.ds)"' .*//;t;d' root.key > trusted-key.key
 }
 
 package() {
-	cd "${srcdir}"
-	install -Dm644 trusted-key.key "${pkgdir}"/etc/trusted-key.key
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
+        cd "${srcdir}"
+        install -Dm644 trusted-key.key "${pkgdir}"/etc/trusted-key.key
+        install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

efivar/PKGBUILD

@@ -5,7 +5,7 @@
 
 pkgname=efivar
 pkgdesc="Tools and library to manipulate EFI variables"
-pkgver="0.10"
+pkgver="0.15"
 pkgrel="1"
 arch=('x86_64')
 url="https://github.com/vathpela/efivar"

filesystem/PKGBUILD

@@ -6,8 +6,8 @@
 # contributor Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=filesystem
-pkgver=2014.10
-pkgrel=1
+pkgver=2015.05
+pkgrel=4
 pkgdesc='Base filesystem'
 arch=('x86_64')
 license=('GPL')
@@ -16,6 +16,7 @@ groups=('base')
 install='filesystem.install'
 depends=('iana-etc')
 makedepends=('asciidoc')
+conflicts=('filesystem-extra')
 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'

gawk/PKGBUILD

@@ -1,23 +1,19 @@
-#
-# 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>
 
 pkgname=gawk
-pkgver=4.1.1
+pkgver=4.1.3
 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')
+arch=('x86_64')
 url="http://www.gnu.org/software/gawk/"
 license=('GPL')
-groups=('base')
+groups=('base' 'base-devel')
 depends=('sh' 'glibc' 'mpfr')
 provides=('awk')
 install=gawk.install
 source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('45f5b09aa87b4744c4c53bf274e96ed0'
+md5sums=('55d37f4069502677f25d1340df8eec97'
          'SKIP')
+validpgpkeys=('D1967C63788713177D861ED7DF597815937EC0D2') # Arnold Robbins
 
 build() {
   cd ${pkgname}-${pkgver}

gc/PKGBUILD

@@ -3,18 +3,24 @@
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=gc
-pkgver=7.4.0
-pkgrel=3
+pkgver=7.4.2
+pkgrel=1
 pkgdesc="A garbage collector for C and C++"
 arch=('x86_64')
 url="http://www.hboehm.info/gc/"
 license=('GPL')
-source=("http://www.hboehm.info/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
 depends=('gcc-libs' 'libatomic_ops')
-md5sums=('f40d9a47c90d60791eeecb484f8df5ee')
+source=("http://www.hboehm.info/gc/gc_source/${pkgname}-${pkgver}.tar.gz"
+        noelision.patch)
+md5sums=('12c05fd2811d989341d8c6d81f66af87'
+         '0be354bf60cc18363dc4c1601697717b')
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  
+  # https://github.com/ivmai/bdwgc/pull/51
+  patch -p1 -i ../noelision.patch
+  
   sed -i 's#pkgdata#doc#' doc/doc.am
 }
 
@@ -25,6 +31,11 @@ build() {
   make
 }
 
+check() {
+  cd ${pkgname}-${pkgver}
+  make check
+}
+
 package() {
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install

gc/noelision.patch

@@ -0,0 +1,127 @@
+diff --git c/include/private/gc_priv.h w/include/private/gc_priv.h
+index 0ad92fc..b877fac 100644
+--- c/include/private/gc_priv.h
++++ w/include/private/gc_priv.h
+@@ -2368,6 +2368,7 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t p, word sz, const char *str,
+   /* GC_notify_all_builder() is called when GC_fl_builder_count         */
+   /* reaches 0.                                                         */
+ 
++  GC_INNER void GC_setup_mark_lock(void);
+   GC_INNER void GC_acquire_mark_lock(void);
+   GC_INNER void GC_release_mark_lock(void);
+   GC_INNER void GC_notify_all_builder(void);
+diff --git c/include/private/gcconfig.h w/include/private/gcconfig.h
+index c753cc2..b5ed075 100644
+--- c/include/private/gcconfig.h
++++ w/include/private/gcconfig.h
+@@ -1357,6 +1357,11 @@
+ #         define PREFETCH_FOR_WRITE(x) \
+             __asm__ __volatile__ ("prefetchw %0" : : "m"(*(char *)(x)))
+ #       endif
++#       if defined(__GLIBC__)
++          /* Workaround lock elision implementation for some glibc.     */
++#         define GLIBC_2_19_TSX_BUG
++#         include <gnu/libc-version.h> /* for gnu_get_libc_version() */
++#       endif
+ #   endif
+ #   ifdef CYGWIN32
+ #       define OS_TYPE "CYGWIN32"
+@@ -2257,6 +2262,11 @@
+           /* FIXME: This seems to be fixed in GLibc v2.14.              */
+ #         define GETCONTEXT_FPU_EXCMASK_BUG
+ #       endif
++#       if defined(__GLIBC__)
++          /* Workaround lock elision implementation for some glibc.     */
++#         define GLIBC_2_19_TSX_BUG
++#         include <gnu/libc-version.h> /* for gnu_get_libc_version() */
++#       endif
+ #   endif
+ #   ifdef DARWIN
+ #     define OS_TYPE "DARWIN"
+diff --git c/include/private/pthread_support.h w/include/private/pthread_support.h
+index 525a9aa..017f194 100644
+--- c/include/private/pthread_support.h
++++ w/include/private/pthread_support.h
+@@ -148,6 +148,8 @@ GC_INNER_PTHRSTART GC_thread GC_start_rtn_prepare_thread(
+                                         struct GC_stack_base *sb, void *arg);
+ GC_INNER_PTHRSTART void GC_thread_exit_proc(void *);
+ 
++GC_INNER void GC_setup_mark_lock(void);
++
+ #endif /* GC_PTHREADS && !GC_WIN32_THREADS */
+ 
+ #endif /* GC_PTHREAD_SUPPORT_H */
+diff --git c/misc.c w/misc.c
+index df434a1..3aca41d 100644
+--- c/misc.c
++++ w/misc.c
+@@ -875,6 +875,9 @@ GC_API void GC_CALL GC_init(void)
+         /* else */ InitializeCriticalSection (&GC_allocate_ml);
+      }
+ #   endif /* GC_WIN32_THREADS */
++#   if defined(GC_PTHREADS) && !defined(GC_WIN32_THREADS)
++      GC_setup_mark_lock();
++#   endif /* GC_PTHREADS */
+ #   if (defined(MSWIN32) || defined(MSWINCE)) && defined(THREADS)
+       InitializeCriticalSection(&GC_write_cs);
+ #   endif
+diff --git c/pthread_support.c w/pthread_support.c
+index c00b93d..8a7c50b 100644
+--- c/pthread_support.c
++++ w/pthread_support.c
+@@ -1979,6 +1979,55 @@ GC_INNER void GC_lock(void)
+ 
+ static pthread_cond_t builder_cv = PTHREAD_COND_INITIALIZER;
+ 
++#ifdef GLIBC_2_19_TSX_BUG
++  /* Parse string like <major>[.<minor>[<tail>]] and return major value. */
++  static int parse_version(int *pminor, const char *pverstr) {
++    char *endp;
++    unsigned long value = strtoul(pverstr, &endp, 10);
++    int major = (int)value;
++
++    if (major < 0 || (char *)pverstr == endp || (unsigned)major != value) {
++      /* Parse error */
++      return -1;
++    }
++    if (*endp != '.') {
++      /* No minor part. */
++      *pminor = -1;
++    } else {
++      value = strtoul(endp + 1, &endp, 10);
++      *pminor = (int)value;
++      if (*pminor < 0 || (unsigned)(*pminor) != value) {
++        return -1;
++      }
++    }
++    return major;
++  }
++#endif /* GLIBC_2_19_TSX_BUG */
++
++GC_INNER void GC_setup_mark_lock(void)
++{
++# ifdef GLIBC_2_19_TSX_BUG
++    pthread_mutexattr_t mattr;
++    int glibc_minor = -1;
++    int glibc_major = parse_version(&glibc_minor, gnu_get_libc_version());
++
++    if (glibc_major > 2 || (glibc_major == 2 && glibc_minor >= 19)) {
++      /* TODO: disable this workaround for glibc with fixed TSX */
++      /* This disables lock elision to workaround a bug in glibc 2.19+  */
++      if (0 != pthread_mutexattr_init(&mattr)) {
++        ABORT("pthread_mutexattr_init failed");
++      }
++      if (0 != pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_NORMAL)) {
++        ABORT("pthread_mutexattr_settype failed");
++      }
++      if (0 != pthread_mutex_init(&mark_mutex, &mattr)) {
++        ABORT("pthread_mutex_init failed");
++      }
++      pthread_mutexattr_destroy(&mattr);
++    }
++# endif
++}
++
+ GC_INNER void GC_acquire_mark_lock(void)
+ {
+     GC_ASSERT(GC_mark_lock_holder != NUMERIC_THREAD_ID(pthread_self()));

gdbm/PKGBUILD

@@ -1,22 +1,21 @@
-# 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>
 
 pkgname=gdbm
-pkgver=1.10
+pkgver=1.11
 pkgrel=1
 pkgdesc="GNU database library"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
-license=('GPL')
-arch=('i686' 'x86_64')
+license=('GPL3')
+arch=('x86_64')
 depends=('glibc' 'sh')
-source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz
-        gdbm-1.10-zeroheaders.patch)
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=gdbm.install
-md5sums=('88770493c2559dc80b561293e39d3570'
+source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz{,.sig}
+        gdbm-1.10-zeroheaders.patch)
+validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732')
+md5sums=('72c832680cf0999caedbe5b265c8c1bd'
+         'SKIP'
          '2a5979910c338dabda6935263b3d8af9')
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -29,11 +28,9 @@ build() {
   patch -Np1 -i ../gdbm-1.10-zeroheaders.patch
 
   ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --infodir=/usr/share/info \
               --enable-libgdbm-compat
 
-  make prefix=/usr
+  make
 }
 
 check() {
@@ -43,11 +40,7 @@ check() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}"/usr \
-       manprefix="${pkgdir}"/usr/share/man \
-       man3dir="${pkgdir}"/usr/share/man/man3 \
-       infodir="${pkgdir}"/usr/share/info \
-       install
+  make DESTDIR="${pkgdir}" install
 
   # create symlinks for compatibility
   install -dm755 "${pkgdir}"/usr/include/gdbm

git/0001-create-gpg-homedir-on-the-fly.patch

@@ -1,58 +0,0 @@
-From d2c93870da4997abeb2813873878c1a556defde4 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Fri, 12 Dec 2014 07:34:34 +0100
-Subject: [PATCH 1/3] create gpg homedir on the fly
-
-GnuPG 2.1 homedir looks different, so just create it on the fly by
-importing needed private and public keys and ownertrust.
-This solves an issue with gnupg 2.1 running interactive pinentry when
-old secret key is present.
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- t/lib-gpg.sh          |  10 +++++++---
- t/lib-gpg/ownertrust  |   4 ++++
- t/lib-gpg/random_seed | Bin 600 -> 0 bytes
- t/lib-gpg/trustdb.gpg | Bin 1360 -> 0 bytes
- 4 files changed, 11 insertions(+), 3 deletions(-)
- create mode 100644 t/lib-gpg/ownertrust
- delete mode 100644 t/lib-gpg/random_seed
- delete mode 100644 t/lib-gpg/trustdb.gpg
-
-diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
-index cd2baef..4e57942 100755
---- a/t/lib-gpg.sh
-+++ b/t/lib-gpg.sh
-@@ -16,11 +16,15 @@ else
- 		# Type DSA and Elgamal, size 2048 bits, no expiration date.
- 		# Name and email: C O Mitter <committer@example.com>
- 		# No password given, to enable non-interactive operation.
--		cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome
--		chmod 0700 gpghome
--		chmod 0600 gpghome/*
-+		mkdir ./gpghome
-+		chmod 0700 ./gpghome
- 		GNUPGHOME="$(pwd)/gpghome"
- 		export GNUPGHOME
-+		gpg --homedir "${GNUPGHOME}" --import \
-+			"$TEST_DIRECTORY"/lib-gpg/pubring.gpg \
-+			"$TEST_DIRECTORY"/lib-gpg/secring.gpg
-+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-+			"$TEST_DIRECTORY"/lib-gpg/ownertrust
- 		test_set_prereq GPG
- 		;;
- 	esac
-diff --git a/t/lib-gpg/ownertrust b/t/lib-gpg/ownertrust
-new file mode 100644
-index 0000000..b3e3c4f
---- /dev/null
-+++ b/t/lib-gpg/ownertrust
-@@ -0,0 +1,4 @@
-+# List of assigned trustvalues, created Thu 11 Dec 2014 01:26:28 PM CET
-+# (Use "gpg --import-ownertrust" to restore them)
-+73D758744BE721698EC54E8713B6F51ECDDE430D:6:
-+D4BE22311AD3131E5EDA29A461092E85B7227189:3:
-
--- 
-2.2.0
-

git/0002-skip-RFC1991-tests-for-gnupg-2.1.patch

@@ -1,93 +0,0 @@
-From 2bbdf8703ea22b91f6d0b12b8c4ff3b90293b717 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Fri, 12 Dec 2014 07:40:28 +0100
-Subject: [PATCH 2/3] skip RFC1991 tests for gnupg 2.1
-
-GnuPG >= 2.1.0 does not longer support RFC1991, so skip these
-tests.
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- t/lib-gpg.sh   |  3 +++
- t/t7004-tag.sh | 14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
-index 4e57942..b0138ad 100755
---- a/t/lib-gpg.sh
-+++ b/t/lib-gpg.sh
-@@ -26,6 +26,9 @@ else
- 		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
- 			"$TEST_DIRECTORY"/lib-gpg/ownertrust
- 		test_set_prereq GPG
-+		if echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>/dev/null; then
-+			test_set_prereq RFC1991
-+		fi
- 		;;
- 	esac
- fi
-diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
-index 796e9f7..35c805a 100755
---- a/t/t7004-tag.sh
-+++ b/t/t7004-tag.sh
-@@ -1081,7 +1081,7 @@ test_expect_success GPG \
- get_tag_header rfc1991-signed-tag $commit commit $time >expect
- echo "RFC1991 signed tag" >>expect
- echo '-----BEGIN PGP MESSAGE-----' >>expect
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 	'creating a signed tag with rfc1991' '
- 	echo "rfc1991" >gpghome/gpg.conf &&
- 	git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit &&
-@@ -1095,7 +1095,7 @@ cp "$1" actual
- EOF
- chmod +x fakeeditor
- 
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 	'reediting a signed tag body omits signature' '
- 	echo "rfc1991" >gpghome/gpg.conf &&
- 	echo "RFC1991 signed tag" >expect &&
-@@ -1103,13 +1103,13 @@ test_expect_success GPG \
- 	test_cmp expect actual
- '
- 
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 	'verifying rfc1991 signature' '
- 	echo "rfc1991" >gpghome/gpg.conf &&
- 	git tag -v rfc1991-signed-tag
- '
- 
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 	'list tag with rfc1991 signature' '
- 	echo "rfc1991" >gpghome/gpg.conf &&
- 	echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
-@@ -1123,12 +1123,12 @@ test_expect_success GPG \
- 
- rm -f gpghome/gpg.conf
- 
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 	'verifying rfc1991 signature without --rfc1991' '
- 	git tag -v rfc1991-signed-tag
- '
- 
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 	'list tag with rfc1991 signature without --rfc1991' '
- 	echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
- 	git tag -l -n1 rfc1991-signed-tag >actual &&
-@@ -1139,7 +1139,7 @@ test_expect_success GPG \
- 	test_cmp expect actual
- '
- 
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 	'reediting a signed tag body omits signature' '
- 	echo "RFC1991 signed tag" >expect &&
- 	GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&
--- 
-2.2.0
-

git/PKGBUILD

@@ -2,7 +2,7 @@
 # contributor <almack[at]chakraos[dot]org>
 
 pkgname=git
-pkgver=2.3.5
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
 arch=('x86_64')
@@ -20,13 +20,9 @@ replaces=('git-core')
 provides=('git-core')
 install="git.install"
 source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz"
-        0001-create-gpg-homedir-on-the-fly.patch
-        0002-skip-RFC1991-tests-for-gnupg-2.1.patch
         git-daemon@.service
         git-daemon.socket)
-md5sums=('be8c0bbb0c5ee6ab7cdcffd2c9375fe6'
-         '5383e27f24bfd356f24b709ea27f8201'
-         '9bb82b29aee1772a893cc2a0a1584b89'
+md5sums=('aed4a96723f600dfc879a2eb58e6e673'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
 

glibc/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=glibc
 pkgver=2.20
-pkgrel=4
+pkgrel=8
 pkgdesc="GNU C Library"
 arch=('x86_64')
 url="http://www.gnu.org/software/libc"
@@ -20,6 +20,8 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
 	glibc-2.20-getifaddrs_internal-segfault.patch
 	glibc-2.20-linux-3.16-additions.patch
 	glibc-2.20-do_ftell_wide-memleak.patch
+        glibc-2.20-disable-tsx.patch
+        dtv_surplus.patch
         locale.gen.txt
         locale-gen)
 md5sums=('948a6e06419a01bd51e97206861595b0'
@@ -27,6 +29,8 @@ md5sums=('948a6e06419a01bd51e97206861595b0'
          '1c5d5c2017445c75dbc5c6d0c1e45ddb'
          '8f1059f431b842e54b12bde689620df8'
          'b50feeab78fa6ce0a8cfb41ee8dc1fd8'
+         'd7fd951fd0b7d891eefb6b14e5dd2d28'
+         '6469cba12e2252e16e32db0353ed3f21'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
 
@@ -43,6 +47,12 @@ prepare() {
   # plug memory leak - commit 984c0ea9
   patch -p1 -i $srcdir/glibc-2.20-do_ftell_wide-memleak.patch
 
+  # disable tsx to avoid crashes on fw update (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762195#20, https://bbs.archlinux.org/viewtopic.php?id=188879)
+  patch -p1 -i $srcdir/glibc-2.20-disable-tsx.patch
+
+  # http://chakraos.org/bugtracker/index.php?do=details&task_id=1060&project=8
+  patch -p1 -i $srcdir/dtv_surplus.patch
+
   mkdir ${srcdir}/glibc-build
 }
 
@@ -67,8 +77,8 @@ build() {
       --enable-kernel=2.6.32 \
       --enable-bind-now --disable-profile \
       --enable-stackguard-randomization \
-      --enable-lock-elision \
       --enable-multi-arch
+#     --enable-lock-elision \
 
   # build libraries with hardening disabled
   echo "build-programs=no" >> configparms

glibc/dtv_surplus.patch

@@ -0,0 +1,32 @@
+#
+# This is an experimental patch that should go into rawhide and
+# Fedora 21 to fix failures where python applications fail to 
+# load graphics applications because of the slot usages for TLS.
+# This should eventually go upstream.
+#
+# - Carlos O'Donell
+#
+diff -urN glibc-2.19-886-gdd763fd/sysdeps/generic/ldsodefs.h glibc-2.19-886-gdd763fd.mod/sysdeps/generic/ldsodefs.h
+--- glibc-2.19-886-gdd763fd/sysdeps/generic/ldsodefs.h	2014-08-21 01:00:55.000000000 -0400
++++ glibc-2.19-886-gdd763fd.mod/sysdeps/generic/ldsodefs.h	2014-09-04 19:29:42.929692810 -0400
+@@ -388,8 +388,18 @@
+    have to iterate beyond the first element in the slotinfo list.  */
+ #define TLS_SLOTINFO_SURPLUS (62)
+ 
+-/* Number of additional slots in the dtv allocated.  */
+-#define DTV_SURPLUS	(14)
++/* Number of additional allocated dtv slots.  This was initially
++   14, but problems with python, MESA, and X11's uses of static TLS meant
++   that most distributions were very close to this limit when they loaded
++   dynamically interpreted languages that used graphics. The simplest
++   solution was to roughly double the number of slots. The actual static
++   image space usage was relatively small, for example in MESA you
++   had only two dispatch pointers for a total of 16 bytes.  If we hit up
++   against this limit again we should start a campaign with the
++   distributions to coordinate the usage of static TLS.  Any user of this
++   resource is effectively coordinating a global resource since this
++   surplus is allocated for each thread at startup.  */
++#define DTV_SURPLUS	(32)
+ 
+   /* Initial dtv of the main thread, not allocated with normal malloc.  */
+   EXTERN void *_dl_initial_dtv;

glibc/glibc-2.20-disable-tsx.patch

@@ -0,0 +1,88 @@
+Intel TSX is broken on Haswell based processors (erratum HSD136/HSW136)
+and a microcode update is available to simply disable the corresponding
+instructions.
+
+While the responsability to continue or not using TSX should be left to
+the users, a live microcode update will disable the TSX instructions
+causing already started binaries to segfault. This patch simply disable 
+Intel TSX (HLE and RTM) on processors which might receive a microcode
+update, so that it doesn't happen. We might expect newer steppings to
+fix the issue, and if it is not the case the corresponding processors 
+will be shipped with TSX already disabled.
+
+Author: Henrique de Moraes Holschuh <hmh@debian.org>
+
+diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
+index db74d97..6f61ae6 100644
+--- a/sysdeps/x86_64/multiarch/init-arch.c
++++ b/sysdeps/x86_64/multiarch/init-arch.c
+@@ -26,7 +26,7 @@ struct cpu_features __cpu_features attribute_hidden;
+ 
+ 
+ static void
+-get_common_indeces (unsigned int *family, unsigned int *model)
++get_common_indeces (unsigned int *family, unsigned int *model, unsigned int *stepping)
+ {
+   __cpuid (1, __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax,
+ 	   __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ebx,
+@@ -36,6 +36,7 @@ get_common_indeces (unsigned int *family, unsigned int *model)
+   unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
+   *family = (eax >> 8) & 0x0f;
+   *model = (eax >> 4) & 0x0f;
++  *stepping = eax & 0x0f;
+ }
+ 
+ 
+@@ -47,6 +48,7 @@ __init_cpu_features (void)
+   unsigned int edx;
+   unsigned int family = 0;
+   unsigned int model = 0;
++  unsigned int stepping = 0;
+   enum cpu_features_kind kind;
+ 
+   __cpuid (0, __cpu_features.max_cpuid, ebx, ecx, edx);
+@@ -56,7 +58,7 @@ __init_cpu_features (void)
+     {
+       kind = arch_kind_intel;
+ 
+-      get_common_indeces (&family, &model);
++      get_common_indeces (&family, &model, &stepping);
+ 
+       unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
+       unsigned int extended_family = (eax >> 20) & 0xff;
+@@ -131,7 +133,7 @@ __init_cpu_features (void)
+     {
+       kind = arch_kind_amd;
+ 
+-      get_common_indeces (&family, &model);
++      get_common_indeces (&family, &model, &stepping);
+ 
+       ecx = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx;
+ 
+@@ -179,6 +181,14 @@ __init_cpu_features (void)
+ 	}
+     }
+ 
++  /* Disable Intel TSX (HLE and RTM) due to erratum HSD136/HSW136
++     on Haswell processors, to work around outdated microcode that
++     doesn't disable the broken feature by default */
++  if (kind == arch_kind_intel && family == 6 &&
++      ((model == 63 && stepping <= 2) || (model == 60 && stepping <= 3) ||
++       (model == 69 && stepping <= 1) || (model == 70 && stepping <= 1)))
++    __cpu_features.cpuid[COMMON_CPUID_INDEX_7].ebx &= ~(bit_RTM | bit_HLE);
++
+   __cpu_features.family = family;
+   __cpu_features.model = model;
+   atomic_write_barrier ();
+diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
+index 793707a..e2745cb 100644
+--- a/sysdeps/x86_64/multiarch/init-arch.h
++++ b/sysdeps/x86_64/multiarch/init-arch.h
+@@ -41,6 +41,7 @@ #define bit_FMA4	(1 << 16)
+
+ /* COMMON_CPUID_INDEX_7.  */
+ #define bit_RTM		(1 << 11)
++#define bit_HLE		(1 << 4)
+ #define bit_AVX2	(1 << 5)
+ 
+ /* XCR0 Feature flags.  */

heirloom-mailx/PKGBUILD

@@ -1,59 +0,0 @@
-pkgname=heirloom-mailx
-pkgver=12.5
-pkgrel=1
-pkgdesc="A commandline utility for sending and receiving email"
-arch=('x86_64')
-url="http://heirloom.sourceforge.net/mailx.html"
-license=('custom')
-groups=('base')
-depends=('openssl' 'krb5')
-optdepends=('smtp-forwarder: for sending mail')
-replaces=('mailx')
-provides=('mailx')
-conflicts=('mailx')
-backup=(etc/mail.rc)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056')
-options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X>1
-
-# source PKGBUILD && mksource
-mksource() {
-  export CVSROOT=:pserver:anonymous@nail.cvs.sourceforge.net:/cvsroot/nail
-  D=nail
-  [ -d "${D}" ] && cvs up "${D}" || cvs co "${D}"
-  
-  _dirname=${pkgname}-${pkgver}
-  mv $D ${_dirname}
-  tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
-  rm -rf ${_dirname}
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1
-
-  # For Linux and BSD, this should be set.
-  echo "set bsdcompat" >> nail.rc
-
-  sed -i "s/pg/less/" cmd1.c
-
-  echo PREFIX=/usr \
-       MAILRC=/etc/mail.rc \
-       SENDMAIL=/usr/sbin/sendmail \
-       MAILSPOOL=/var/spool/mail \
-       UCBINSTALL=/usr/bin/install > makeflags
-
-  make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" `cat makeflags` install
-
-  # For compatibility with the old mailx program
-  ln -sf mailx "${pkgdir}"/usr/bin/mail
-  ln -sf mailx.1.gz "${pkgdir}"/usr/share/man/man1/mail.1.gz
-
-  install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}

help2man/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: abveritas[at]chakra-project[dot]org>
 
 pkgname=help2man
-pkgver=1.44.1
+pkgver=1.46.4
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('a5dc6530340b41f0e492d400670dd7ae')
+md5sums=('a1b7fe49eddae8a2537ed74ee9ef11cb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

iasl/PKGBUILD

@@ -1,11 +1,6 @@
-#
-# 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>
 
 pkgname=iasl
-pkgver=20140724
+pkgver=20150408
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('x86_64')
@@ -16,7 +11,7 @@ makedepends=('flex' 'bison')
 options=('!makeflags')
 source=(http://acpica.org/sites/acpica/files/acpica-unix-${pkgver}.tar.gz
         LICENSE)
-md5sums=('ae8e83b353510a73f24dc43840f6a662'
+md5sums=('c86b316b3b3ff51528e7c835dc8d5f94'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {

isl3887usb-firmware/PKGBUILD

@@ -1,19 +1,15 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=isl3887usb-firmware
-pkgver=2
-pkgrel=3
+pkgver=2.13.25.0
+pkgrel=1
 pkgdesc="Firmware for wireless cards using isl3887usb"
 arch=('any')
 url="http://wireless.kernel.org/en/users/Drivers/p54/devices"
 license=('GPL')
-source=('http://daemonizer.de/prism54/prism54-fw/fw-usb/2.13.25.0.lm87.arm')
+source=("https://daemonizer.de/prism54/prism54-fw/fw-usb/$pkgver.lm87.arm")
 md5sums=('39be687c87544b892e7a8ffe7ffd9371')
 
-build() {
+package() {
   mkdir -p ${pkgdir}/usr/lib/firmware
   install -m644 * ${pkgdir}/usr/lib/firmware/isl3887usb
 }

isl3890-firmware/PKGBUILD

@@ -1,19 +0,0 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-pkgname=isl3890-firmware
-pkgver=2
-pkgrel=4
-pkgdesc="Firmware for wireless card 3Com 3CRWE154G72"
-arch=('any')
-url="http://wireless.kernel.org/en/users/Drivers/p54/devices"
-license=('GPL')
-source=('http://daemonizer.de/prism54/prism54-fw/fw-softmac/2.13.12.0.arm')
-md5sums=('ff7536af2092b1c4b21315bd103ef4c4')
-
-build() {
-  mkdir -p ${pkgdir}/usr/lib/firmware/isl3890/
-  install -m644 * ${pkgdir}/usr/lib/firmware/isl3890/isl3890
-}

kbd/PKGBUILD

@@ -1,10 +1,6 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=kbd
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
@@ -18,7 +14,7 @@ source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('cc0ee9f2537d8636cae85a8c6541ed2e'
+md5sums=('f1f75f0dd5f7dde89ce47585274366f8'
          '998957c4f815347dcc874c4d7555dc66'
          'd869200acbc0aab6a9cafa43cb140d4e')
 

libarchive/0001-Limit-write-requests-to-at-most-INT_MAX.patch

@@ -0,0 +1,32 @@
+From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001
+From: Tim Kientzle <kientzle@acm.org>
+Date: Fri, 22 Mar 2013 23:48:41 -0700
+Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a
+ certain common programming error (passing -1 to write) from leading to other
+ problems deeper in the library.
+
+---
+ libarchive/archive_write.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index eede5e0..be85621 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -673,8 +673,13 @@ static ssize_t
+ _archive_write_data(struct archive *_a, const void *buff, size_t s)
+ {
+ 	struct archive_write *a = (struct archive_write *)_a;
++	const size_t max_write = INT_MAX;
++
+ 	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
+ 	    ARCHIVE_STATE_DATA, "archive_write_data");
++	/* In particular, this catches attempts to pass negative values. */
++	if (s > max_write)
++		s = max_write;
+ 	archive_clear_error(&a->archive);
+ 	return ((a->format_write_data)(a, buff, s));
+ }
+-- 
+1.9.0
+

libarchive/PKGBUILD

@@ -4,24 +4,45 @@
 
 pkgname=libarchive
 pkgver=3.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('x86_64')
 url="http://libarchive.org/"
 license=('BSD')
 depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2>=2.06' 'openssl' 'xz' 'zlib')
+options=('libtool')
+provides=('libarchive.so')
 source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz"
-        '0001-mtree-fix-line-filename-length-calculation.patch')
+        '0001-mtree-fix-line-filename-length-calculation.patch'
+        '0001-Limit-write-requests-to-at-most-INT_MAX.patch'
+        'libarchive-3.1.2-acl.patch'
+        'libarchive-3.1.2-sparce-mtree.patch')
 md5sums=('efad5a503f66329bb9d2f4308b5de98a'
-         'fda89c145bbcd793a96b06b463ef6a72')
+         'fda89c145bbcd793a96b06b463ef6a72'
+         '9bf80940bd3ce861137a0a8dcacf5705'
+         'a5c995661c62429ceff2c23ea322393b'
+         'cb344a879b3c4550fe3faf86c3826f23')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
   # https://code.google.com/p/libarchive/issues/detail?id=301
   # upstream commit e65bf287f0133426b26611fe3e80b51267987106
   patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch"
 
+  # https://code.google.com/p/libarchive/issues/detail?id=329
+  patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch"
+
+  # CVE-2013-0211
+  patch -Np1 -i "$srcdir/0001-Limit-write-requests-to-at-most-INT_MAX.patch"
+
+  # upstream commit 977bf2a4 - improved mtree support
+  patch -p1 -i $srcdir/libarchive-3.1.2-sparce-mtree.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
   ./configure --prefix=/usr --without-xml2
   make
 }

libarchive/libarchive-3.1.2-acl.patch

@@ -0,0 +1,219 @@
+diff -ruN libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c
+--- libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c	2013-02-08 01:52:07.000000000 +0100
++++ libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c	2013-08-08 10:47:41.000000000 +0200
+@@ -399,7 +399,7 @@
+ #endif
+ 
+ 
+-#if defined(HAVE_POSIX_ACL) && defined(ACL_TYPE_NFS4)
++#ifdef HAVE_POSIX_ACL
+ static int translate_acl(struct archive_read_disk *a,
+     struct archive_entry *entry, acl_t acl, int archive_entry_acl_type);
+ 
+@@ -419,6 +419,7 @@
+ 
+ 	archive_entry_acl_clear(entry);
+ 
++#ifdef ACL_TYPE_NFS4
+ 	/* Try NFS4 ACL first. */
+ 	if (*fd >= 0)
+ 		acl = acl_get_fd(*fd);
+@@ -447,6 +448,7 @@
+ 		acl_free(acl);
+ 		return (ARCHIVE_OK);
+ 	}
++#endif
+ 
+ 	/* Retrieve access ACL from file. */
+ 	if (*fd >= 0)
+@@ -492,6 +494,7 @@
+         {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE},
+         {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE},
+         {ARCHIVE_ENTRY_ACL_READ, ACL_READ},
++#ifdef ACL_TYPE_NFS4
+         {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA},
+         {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY},
+         {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA},
+@@ -508,8 +511,10 @@
+         {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL},
+         {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER},
+         {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE}
++#endif
+ };
+ 
++#ifdef ACL_TYPE_NFS4
+ static struct {
+         int archive_inherit;
+         int platform_inherit;
+@@ -519,21 +524,25 @@
+ 	{ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT},
+ 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}
+ };
+-
++#endif
+ static int
+ translate_acl(struct archive_read_disk *a,
+     struct archive_entry *entry, acl_t acl, int default_entry_acl_type)
+ {
+ 	acl_tag_t	 acl_tag;
++#ifdef ACL_TYPE_NFS4
+ 	acl_entry_type_t acl_type;
+ 	acl_flagset_t	 acl_flagset;
++	int brand, r;
++#endif
+ 	acl_entry_t	 acl_entry;
+ 	acl_permset_t	 acl_permset;
+-	int		 brand, i, r, entry_acl_type;
++	int		 i, entry_acl_type;
+ 	int		 s, ae_id, ae_tag, ae_perm;
+ 	const char	*ae_name;
+ 
+ 
++#ifdef ACL_TYPE_NFS4
+ 	// FreeBSD "brands" ACLs as POSIX.1e or NFSv4
+ 	// Make sure the "brand" on this ACL is consistent
+ 	// with the default_entry_acl_type bits provided.
+@@ -560,6 +569,7 @@
+ 		return ARCHIVE_FAILED;
+ 		break;
+ 	}
++#endif
+ 
+ 
+ 	s = acl_get_entry(acl, ACL_FIRST_ENTRY, &acl_entry);
+@@ -592,9 +602,11 @@
+ 		case ACL_OTHER:
+ 			ae_tag = ARCHIVE_ENTRY_ACL_OTHER;
+ 			break;
++#ifdef ACL_TYPE_NFS4
+ 		case ACL_EVERYONE:
+ 			ae_tag = ARCHIVE_ENTRY_ACL_EVERYONE;
+ 			break;
++#endif
+ 		default:
+ 			/* Skip types that libarchive can't support. */
+ 			s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
+@@ -605,6 +617,7 @@
+ 		// XXX acl_get_entry_type_np on FreeBSD returns EINVAL for
+ 		// non-NFSv4 ACLs
+ 		entry_acl_type = default_entry_acl_type;
++#ifdef ACL_TYPE_NFS4
+ 		r = acl_get_entry_type_np(acl_entry, &acl_type);
+ 		if (r == 0) {
+ 			switch (acl_type) {
+@@ -634,9 +647,10 @@
+ 				ae_perm |= acl_inherit_map[i].archive_inherit;
+ 
+                 }
++#endif
+ 
+ 		acl_get_permset(acl_entry, &acl_permset);
+-                for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) {
++		for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) {
+ 			/*
+ 			 * acl_get_perm() is spelled differently on different
+ 			 * platforms; see above.
+diff -ruN libarchive-3.1.2/libarchive/archive_write_disk_acl.c libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c
+--- libarchive-3.1.2/libarchive/archive_write_disk_acl.c	2013-01-14 02:43:45.000000000 +0100
++++ libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c	2013-08-08 10:31:35.000000000 +0200
+@@ -43,7 +43,7 @@
+ #include "archive_acl_private.h"
+ #include "archive_write_disk_private.h"
+ 
+-#if !defined(HAVE_POSIX_ACL) || !defined(ACL_TYPE_NFS4)
++#ifndef HAVE_POSIX_ACL
+ /* Default empty function body to satisfy mainline code. */
+ int
+ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
+@@ -79,10 +79,12 @@
+ 		ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_DEFAULT,
+ 		    ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default");
+ 		return (ret);
++#ifdef ACL_TYPE_NFS4
+ 	} else if (archive_acl_count(abstract_acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4) > 0) {
+ 		ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_NFS4,
+ 		    ARCHIVE_ENTRY_ACL_TYPE_NFS4, "nfs4");
+ 		return (ret);
++#endif
+ 	} else
+ 		return ARCHIVE_OK;
+ }
+@@ -94,6 +96,7 @@
+ 	{ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE},
+ 	{ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE},
+ 	{ARCHIVE_ENTRY_ACL_READ, ACL_READ},
++#ifdef ACL_TYPE_NFS4
+ 	{ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA},
+ 	{ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY},
+ 	{ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA},
+@@ -110,8 +113,10 @@
+ 	{ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL},
+ 	{ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER},
+ 	{ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE}
++#endif
+ };
+ 
++#ifdef ACL_TYPE_NFS4
+ static struct {
+ 	int archive_inherit;
+ 	int platform_inherit;
+@@ -121,6 +126,7 @@
+ 	{ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT},
+ 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}
+ };
++#endif
+ 
+ static int
+ set_acl(struct archive *a, int fd, const char *name,
+@@ -130,7 +136,9 @@
+ 	acl_t		 acl;
+ 	acl_entry_t	 acl_entry;
+ 	acl_permset_t	 acl_permset;
++#ifdef ACL_TYPE_NFS4
+ 	acl_flagset_t	 acl_flagset;
++#endif
+ 	int		 ret;
+ 	int		 ae_type, ae_permset, ae_tag, ae_id;
+ 	uid_t		 ae_uid;
+@@ -171,14 +179,17 @@
+ 		case ARCHIVE_ENTRY_ACL_OTHER:
+ 			acl_set_tag_type(acl_entry, ACL_OTHER);
+ 			break;
++#ifdef ACL_TYPE_NFS4
+ 		case ARCHIVE_ENTRY_ACL_EVERYONE:
+ 			acl_set_tag_type(acl_entry, ACL_EVERYONE);
+ 			break;
++#endif
+ 		default:
+ 			/* XXX */
+ 			break;
+ 		}
+ 
++#ifdef ACL_TYPE_NFS4
+ 		switch (ae_type) {
+ 		case ARCHIVE_ENTRY_ACL_TYPE_ALLOW:
+ 			acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALLOW);
+@@ -200,6 +211,7 @@
+ 			// XXX error handling here.
+ 			break;
+ 		}
++#endif
+ 
+ 		acl_get_permset(acl_entry, &acl_permset);
+ 		acl_clear_perms(acl_permset);
+@@ -210,6 +222,7 @@
+ 					     acl_perm_map[i].platform_perm);
+ 		}
+ 
++#ifdef ACL_TYPE_NFS4
+ 		acl_get_flagset_np(acl_entry, &acl_flagset);
+ 		acl_clear_flags_np(acl_flagset);
+ 		for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) {
+@@ -217,6 +230,7 @@
+ 				acl_add_flag_np(acl_flagset,
+ 						acl_inherit_map[i].platform_inherit);
+ 		}
++#endif
+ 	}
+ 
+ 	/* Try restoring the ACL through 'fd' if we can. */

libarchive/libarchive-3.1.2-sparce-mtree.patch

@@ -0,0 +1,478 @@
+From 977bf2a49484239f7a7b6ce08bfa9da413a27ead Mon Sep 17 00:00:00 2001
+From: Florian Pritz <bluewind@xinu.at>
+Date: Sat, 1 Mar 2014 17:21:47 +0100
+Subject: [PATCH] mtree: Make reading additional information from the fs
+ optional
+
+This feature is not needed if users just want to read in the content of
+an mtree file and do validation against the file system themselves.
+
+It is needed for `bsdtar cvf out.tar @input.mtree` which is why the
+option is enabled in bsdtar.
+
+Since the mtree tests rely on this feature, this patch also enables it
+there.
+
+Signed-off-by: Florian Pritz <bluewind@xinu.at>
+---
+ libarchive/archive_read_support_format_mtree.c | 290 ++++++++++++++-----------
+ libarchive/test/test_read_format_mtree.c       |  20 ++
+ tar/write.c                                    |   1 +
+ 3 files changed, 179 insertions(+), 132 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
+index 44799df..d82d4c1 100644
+--- a/libarchive/archive_read_support_format_mtree.c
++++ b/libarchive/archive_read_support_format_mtree.c
+@@ -104,6 +104,7 @@ struct mtree {
+ 	struct archive_entry_linkresolver *resolver;
+ 
+ 	int64_t			 cur_size;
++	char checkfs;
+ };
+ 
+ static int	bid_keycmp(const char *, const char *, ssize_t);
+@@ -174,6 +175,29 @@ static int	read_header(struct archive_read *,
+ #endif
+ }
+ 
++static int
++archive_read_format_mtree_options(struct archive_read *a,
++    const char *key, const char *val)
++{
++	struct mtree *mtree;
++
++	mtree = (struct mtree *)(a->format->data);
++	if (strcmp(key, "checkfs")  == 0) {
++		/* Allows to read information missing from the mtree from the file system */
++		if (val == NULL || val[0] == 0) {
++			mtree->checkfs = 0;
++		} else {
++			mtree->checkfs = 1;
++		}
++		return (ARCHIVE_OK);
++	}
++
++	/* Note: The "warn" return is just to inform the options
++	 * supervisor that we didn't handle it.  It will generate
++	 * a suitable error if no one used this option. */
++	return (ARCHIVE_WARN);
++}
++
+ static void
+ free_options(struct mtree_option *head)
+ {
+@@ -206,7 +230,7 @@ static int	read_header(struct archive_read *,
+ 	mtree->fd = -1;
+ 
+ 	r = __archive_read_register_format(a, mtree, "mtree",
+-	    mtree_bid, NULL, read_header, read_data, skip, NULL, cleanup);
++           mtree_bid, archive_read_format_mtree_options, read_header, read_data, skip, NULL, cleanup);
+ 
+ 	if (r != ARCHIVE_OK)
+ 		free(mtree);
+@@ -1104,162 +1128,164 @@ static int	read_header(struct archive_read *,
+ 			mtree->current_dir.length = n;
+ 	}
+ 
+-	/*
+-	 * Try to open and stat the file to get the real size
+-	 * and other file info.  It would be nice to avoid
+-	 * this here so that getting a listing of an mtree
+-	 * wouldn't require opening every referenced contents
+-	 * file.  But then we wouldn't know the actual
+-	 * contents size, so I don't see a really viable way
+-	 * around this.  (Also, we may want to someday pull
+-	 * other unspecified info from the contents file on
+-	 * disk.)
+-	 */
+-	mtree->fd = -1;
+-	if (archive_strlen(&mtree->contents_name) > 0)
+-		path = mtree->contents_name.s;
+-	else
+-		path = archive_entry_pathname(entry);
+-
+-	if (archive_entry_filetype(entry) == AE_IFREG ||
+-	    archive_entry_filetype(entry) == AE_IFDIR) {
+-		mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC);
+-		__archive_ensure_cloexec_flag(mtree->fd);
+-		if (mtree->fd == -1 &&
+-		    (errno != ENOENT ||
+-		     archive_strlen(&mtree->contents_name) > 0)) {
+-			archive_set_error(&a->archive, errno,
+-			    "Can't open %s", path);
+-			r = ARCHIVE_WARN;
++	if (mtree->checkfs) {
++		/*
++		 * Try to open and stat the file to get the real size
++		 * and other file info.  It would be nice to avoid
++		 * this here so that getting a listing of an mtree
++		 * wouldn't require opening every referenced contents
++		 * file.  But then we wouldn't know the actual
++		 * contents size, so I don't see a really viable way
++		 * around this.  (Also, we may want to someday pull
++		 * other unspecified info from the contents file on
++		 * disk.)
++		 */
++		mtree->fd = -1;
++		if (archive_strlen(&mtree->contents_name) > 0)
++			path = mtree->contents_name.s;
++		else
++			path = archive_entry_pathname(entry);
++
++		if (archive_entry_filetype(entry) == AE_IFREG ||
++				archive_entry_filetype(entry) == AE_IFDIR) {
++			mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC);
++			__archive_ensure_cloexec_flag(mtree->fd);
++			if (mtree->fd == -1 &&
++					(errno != ENOENT ||
++					 archive_strlen(&mtree->contents_name) > 0)) {
++				archive_set_error(&a->archive, errno,
++						"Can't open %s", path);
++				r = ARCHIVE_WARN;
++			}
+ 		}
+-	}
+ 
+-	st = &st_storage;
+-	if (mtree->fd >= 0) {
+-		if (fstat(mtree->fd, st) == -1) {
+-			archive_set_error(&a->archive, errno,
+-			    "Could not fstat %s", path);
+-			r = ARCHIVE_WARN;
+-			/* If we can't stat it, don't keep it open. */
+-			close(mtree->fd);
+-			mtree->fd = -1;
++		st = &st_storage;
++		if (mtree->fd >= 0) {
++			if (fstat(mtree->fd, st) == -1) {
++				archive_set_error(&a->archive, errno,
++						"Could not fstat %s", path);
++				r = ARCHIVE_WARN;
++				/* If we can't stat it, don't keep it open. */
++				close(mtree->fd);
++				mtree->fd = -1;
++				st = NULL;
++			}
++		} else if (lstat(path, st) == -1) {
+ 			st = NULL;
+ 		}
+-	} else if (lstat(path, st) == -1) {
+-		st = NULL;
+-	}
+ 
+-	/*
+-	 * Check for a mismatch between the type in the specification and
+-	 * the type of the contents object on disk.
+-	 */
+-	if (st != NULL) {
+-		if (
+-		    ((st->st_mode & S_IFMT) == S_IFREG &&
+-		     archive_entry_filetype(entry) == AE_IFREG)
++		/*
++		 * Check for a mismatch between the type in the specification and
++		 * the type of the contents object on disk.
++		 */
++		if (st != NULL) {
++			if (
++					((st->st_mode & S_IFMT) == S_IFREG &&
++					 archive_entry_filetype(entry) == AE_IFREG)
+ #ifdef S_IFLNK
+-		    || ((st->st_mode & S_IFMT) == S_IFLNK &&
+-			archive_entry_filetype(entry) == AE_IFLNK)
++					|| ((st->st_mode & S_IFMT) == S_IFLNK &&
++						archive_entry_filetype(entry) == AE_IFLNK)
+ #endif
+ #ifdef S_IFSOCK
+-		    || ((st->st_mode & S_IFSOCK) == S_IFSOCK &&
+-			archive_entry_filetype(entry) == AE_IFSOCK)
++					|| ((st->st_mode & S_IFSOCK) == S_IFSOCK &&
++						archive_entry_filetype(entry) == AE_IFSOCK)
+ #endif
+ #ifdef S_IFCHR
+-		    || ((st->st_mode & S_IFMT) == S_IFCHR &&
+-			archive_entry_filetype(entry) == AE_IFCHR)
++					|| ((st->st_mode & S_IFMT) == S_IFCHR &&
++						archive_entry_filetype(entry) == AE_IFCHR)
+ #endif
+ #ifdef S_IFBLK
+-		    || ((st->st_mode & S_IFMT) == S_IFBLK &&
+-			archive_entry_filetype(entry) == AE_IFBLK)
++					|| ((st->st_mode & S_IFMT) == S_IFBLK &&
++						archive_entry_filetype(entry) == AE_IFBLK)
+ #endif
+-		    || ((st->st_mode & S_IFMT) == S_IFDIR &&
+-			archive_entry_filetype(entry) == AE_IFDIR)
++					|| ((st->st_mode & S_IFMT) == S_IFDIR &&
++						archive_entry_filetype(entry) == AE_IFDIR)
+ #ifdef S_IFIFO
+-		    || ((st->st_mode & S_IFMT) == S_IFIFO &&
+-			archive_entry_filetype(entry) == AE_IFIFO)
++					|| ((st->st_mode & S_IFMT) == S_IFIFO &&
++							archive_entry_filetype(entry) == AE_IFIFO)
+ #endif
+-		    ) {
+-			/* Types match. */
+-		} else {
+-			/* Types don't match; bail out gracefully. */
+-			if (mtree->fd >= 0)
+-				close(mtree->fd);
+-			mtree->fd = -1;
+-			if (parsed_kws & MTREE_HAS_OPTIONAL) {
+-				/* It's not an error for an optional entry
+-				   to not match disk. */
+-				*use_next = 1;
+-			} else if (r == ARCHIVE_OK) {
+-				archive_set_error(&a->archive,
+-				    ARCHIVE_ERRNO_MISC,
+-				    "mtree specification has different type for %s",
+-				    archive_entry_pathname(entry));
+-				r = ARCHIVE_WARN;
+-			}
+-			return r;
++					) {
++						/* Types match. */
++					} else {
++						/* Types don't match; bail out gracefully. */
++						if (mtree->fd >= 0)
++							close(mtree->fd);
++						mtree->fd = -1;
++						if (parsed_kws & MTREE_HAS_OPTIONAL) {
++							/* It's not an error for an optional entry
++							   to not match disk. */
++							*use_next = 1;
++						} else if (r == ARCHIVE_OK) {
++							archive_set_error(&a->archive,
++									ARCHIVE_ERRNO_MISC,
++									"mtree specification has different type for %s",
++									archive_entry_pathname(entry));
++							r = ARCHIVE_WARN;
++						}
++						return r;
++					}
+ 		}
+-	}
+ 
+-	/*
+-	 * If there is a contents file on disk, pick some of the metadata
+-	 * from that file.  For most of these, we only set it from the contents
+-	 * if it wasn't already parsed from the specification.
+-	 */
+-	if (st != NULL) {
+-		if (((parsed_kws & MTREE_HAS_DEVICE) == 0 ||
+-		     (parsed_kws & MTREE_HAS_NOCHANGE) != 0) &&
+-		    (archive_entry_filetype(entry) == AE_IFCHR ||
+-		     archive_entry_filetype(entry) == AE_IFBLK))
+-			archive_entry_set_rdev(entry, st->st_rdev);
+-		if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME)) == 0 ||
+-		    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+-			archive_entry_set_gid(entry, st->st_gid);
+-		if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME)) == 0 ||
+-		    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+-			archive_entry_set_uid(entry, st->st_uid);
+-		if ((parsed_kws & MTREE_HAS_MTIME) == 0 ||
+-		    (parsed_kws & MTREE_HAS_NOCHANGE) != 0) {
++		/*
++		 * If there is a contents file on disk, pick some of the metadata
++		 * from that file.  For most of these, we only set it from the contents
++		 * if it wasn't already parsed from the specification.
++		 */
++		if (st != NULL) {
++			if (((parsed_kws & MTREE_HAS_DEVICE) == 0 ||
++						(parsed_kws & MTREE_HAS_NOCHANGE) != 0) &&
++					(archive_entry_filetype(entry) == AE_IFCHR ||
++					 archive_entry_filetype(entry) == AE_IFBLK))
++				archive_entry_set_rdev(entry, st->st_rdev);
++			if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME)) == 0 ||
++					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
++				archive_entry_set_gid(entry, st->st_gid);
++			if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME)) == 0 ||
++					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
++				archive_entry_set_uid(entry, st->st_uid);
++			if ((parsed_kws & MTREE_HAS_MTIME) == 0 ||
++					(parsed_kws & MTREE_HAS_NOCHANGE) != 0) {
+ #if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC
+-			archive_entry_set_mtime(entry, st->st_mtime,
+-			    st->st_mtimespec.tv_nsec);
++				archive_entry_set_mtime(entry, st->st_mtime,
++						st->st_mtimespec.tv_nsec);
+ #elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
+-			archive_entry_set_mtime(entry, st->st_mtime,
+-			    st->st_mtim.tv_nsec);
++				archive_entry_set_mtime(entry, st->st_mtime,
++						st->st_mtim.tv_nsec);
+ #elif HAVE_STRUCT_STAT_ST_MTIME_N
+-			archive_entry_set_mtime(entry, st->st_mtime,
+-			    st->st_mtime_n);
++				archive_entry_set_mtime(entry, st->st_mtime,
++						st->st_mtime_n);
+ #elif HAVE_STRUCT_STAT_ST_UMTIME
+-			archive_entry_set_mtime(entry, st->st_mtime,
+-			    st->st_umtime*1000);
++				archive_entry_set_mtime(entry, st->st_mtime,
++						st->st_umtime*1000);
+ #elif HAVE_STRUCT_STAT_ST_MTIME_USEC
+-			archive_entry_set_mtime(entry, st->st_mtime,
+-			    st->st_mtime_usec*1000);
++				archive_entry_set_mtime(entry, st->st_mtime,
++						st->st_mtime_usec*1000);
+ #else
+-			archive_entry_set_mtime(entry, st->st_mtime, 0);
++				archive_entry_set_mtime(entry, st->st_mtime, 0);
+ #endif
++			}
++			if ((parsed_kws & MTREE_HAS_NLINK) == 0 ||
++					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
++				archive_entry_set_nlink(entry, st->st_nlink);
++			if ((parsed_kws & MTREE_HAS_PERM) == 0 ||
++					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
++				archive_entry_set_perm(entry, st->st_mode);
++			if ((parsed_kws & MTREE_HAS_SIZE) == 0 ||
++					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
++				archive_entry_set_size(entry, st->st_size);
++			archive_entry_set_ino(entry, st->st_ino);
++			archive_entry_set_dev(entry, st->st_dev);
++
++			archive_entry_linkify(mtree->resolver, &entry, &sparse_entry);
++		} else if (parsed_kws & MTREE_HAS_OPTIONAL) {
++			/*
++			 * Couldn't open the entry, stat it or the on-disk type
++			 * didn't match.  If this entry is optional, just ignore it
++			 * and read the next header entry.
++			 */
++			*use_next = 1;
++			return ARCHIVE_OK;
+ 		}
+-		if ((parsed_kws & MTREE_HAS_NLINK) == 0 ||
+-		    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+-			archive_entry_set_nlink(entry, st->st_nlink);
+-		if ((parsed_kws & MTREE_HAS_PERM) == 0 ||
+-		    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+-			archive_entry_set_perm(entry, st->st_mode);
+-		if ((parsed_kws & MTREE_HAS_SIZE) == 0 ||
+-		    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+-			archive_entry_set_size(entry, st->st_size);
+-		archive_entry_set_ino(entry, st->st_ino);
+-		archive_entry_set_dev(entry, st->st_dev);
+-
+-		archive_entry_linkify(mtree->resolver, &entry, &sparse_entry);
+-	} else if (parsed_kws & MTREE_HAS_OPTIONAL) {
+-		/*
+-		 * Couldn't open the entry, stat it or the on-disk type
+-		 * didn't match.  If this entry is optional, just ignore it
+-		 * and read the next header entry.
+-		 */
+-		*use_next = 1;
+-		return ARCHIVE_OK;
+ 	}
+ 
+ 	mtree->cur_size = archive_entry_size(entry);
+diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c
+index 830fa0a..f96529d 100644
+--- a/libarchive/test/test_read_format_mtree.c
++++ b/libarchive/test/test_read_format_mtree.c
+@@ -58,6 +58,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_filename(a, reffile, 11));
+ 
+ 	/*
+@@ -209,6 +211,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_memory(a, archive, sizeof(archive)));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE);
+@@ -246,6 +250,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_memory(a, archive, sizeof(archive)));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString(archive_entry_pathname(ae), "a");
+@@ -299,6 +305,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_memory(a, archive, sizeof(archive)));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString(archive_entry_pathname(ae), "./a");	
+@@ -365,6 +373,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_memory(a, archive, sizeof(archive)));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString(archive_entry_pathname(ae), "./a");
+@@ -402,6 +412,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_memory(a, archive2, sizeof(archive2)));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString(archive_entry_pathname(ae), "./a");
+@@ -449,6 +461,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_filename(a, reffile, 11));
+ 
+ 	/*
+@@ -552,6 +566,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_filename(a, reffile, 11));
+ 
+ 	/*
+@@ -617,6 +633,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_filename(a, reffile, 11));
+ 
+ 	/*
+@@ -680,6 +698,8 @@
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_support_format_all(a));
+ 	assertEqualIntA(a, ARCHIVE_OK,
++	    archive_read_set_options(a, "mtree:checkfs"));
++	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_read_open_memory(a, archive, sizeof(archive)));
+ 	assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
+ 	assert(strlen(archive_error_string(a)) > 0);
+diff --git a/tar/write.c b/tar/write.c
+index 40d2fb0..7e8cb13 100644
+--- a/tar/write.c
++++ b/tar/write.c
+@@ -648,6 +648,7 @@ static void		 write_hierarchy(struct bsdtar *, struct archive *,
+ 	archive_read_support_format_all(ina);
+ 	archive_read_support_filter_all(ina);
+ 	set_reader_options(bsdtar, a);
++	archive_read_set_options(ina, "mtree:checkfs");
+ 	if (archive_read_open_filename(ina, filename,
+ 					bsdtar->bytes_per_block)) {
+ 		lafe_warnc(0, "%s", archive_error_string(ina));
+-- 
+1.8.5.5
+

libevent/PKGBUILD

@@ -1,20 +1,16 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer <inkane@chakra-project.org>
-# contributor <abveritas[at]chakra-project[dot]org>
 
 pkgname=libevent
-pkgver=2.0.21
-pkgrel=4
+pkgver=2.0.22
+pkgrel=1
 pkgdesc="An event notification library"
-license=('GPL2')
+license=('BSD')
 arch=('x86_64')
 url="http://www.monkey.org/~provos/libevent/"
 depends=('openssl')
-source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc})
-md5sums=('b2405cc9ebf264aa47ff615d9de527a2'
-         '31ffa4efc611c452697bd120a3bf8f9e')
+source=(http://sourceforge.net/projects/levent/files/libevent/libevent-${pkgver%.*}/${pkgname}-$pkgver-stable.tar.gz{,.asc})
+md5sums=('c4c56f986aa985677ca1db89630a2e11'
+         'SKIP')
+validpgpkeys=('B35BF85BF19489D04E28C33C21194EBB165733EA')
          
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
@@ -25,13 +21,12 @@ build() {
 
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  # does not work as of 20.07.2013 because of
-  # https://github.com/libevent/libevent/issues/38
-  #make check
+  make check
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
   make DESTDIR="${pkgdir}" install
+  install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/libevent/LICENSE
 }
 

libgudev/PKGBUILD

@@ -0,0 +1,32 @@
+# Maintainer: Weng Xuetian <wengxt@gmail.com>
+# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
+
+pkgname=libgudev
+pkgver=230
+pkgrel=1
+pkgdesc="GObject bindings for libudev"
+arch=('i686' 'x86_64')
+url="https://wiki.gnome.org/Projects/libgudev"
+license=('LGPL2.1')
+depends=('systemd>=221')
+makedepends=('systemd' 'gobject-introspection')
+provides=('libgudev-1.0.so')
+conflicts=('systemd<221')
+source=(https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-gtk-doc
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

libmpc/PKGBUILD

@@ -1,23 +1,17 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=libmpc
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
-# dash the next line if you want to skip the tests
-_test=1
 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
 arch=('x86_64')
 url="http://www.multiprecision.org"
 license=('LGPL')
-depends=('mpfr>=3.1.2')
-options=('!libtool')
+depends=('mpfr')
 install=libmpc.install
 source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig})
-md5sums=('68fadff3358fb3e7976c7a398a0af4c3'
+md5sums=('d6a1d5f8ddea3abd2cc3e98f58352d26'
          'SKIP')
+validpgpkeys=('AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3')  # Andreas Enge
 
 build() {
   cd "${srcdir}/mpc-${pkgver}"

libusb-compat/PKGBUILD

@@ -1,19 +1,14 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer: abveritas@chakra-project.org
 
 pkgname=libusb-compat
-pkgver=0.1.4
+pkgver=0.1.5
 pkgrel=1
 depends=('libusbx' 'sh')
 pkgdesc="Library to enable user space application programs to communicate with USB devices."
-arch=(i686 x86_64)
+arch=('x86_64')
 url="http://libusb.sourceforge.net/"
 license=('LGPL')
 source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('2ca521fffadd0c28fdf174e6ec73865b')
+md5sums=('2780b6a758a1e2c2943bdbf7faf740e4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

licenses/PKGBUILD

@@ -1,13 +1,11 @@
-# $Id: PKGBUILD 79789 2010-05-07 13:49:02Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=licenses
-pkgver=2.6
-pkgrel=2
+pkgver=20150428
+pkgrel=1
 pkgdesc="The standard licenses distribution package"
 arch=('any')
 license=('custom:none')
-url="http://archlinux.org"
+url="http://chakraos.org"
 groups=('base')
 source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         cc-by-3.0.txt
@@ -33,7 +31,8 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         cpl-1.0.txt
         python-2.txt
         LICENSE.ralink-firmware.txt
-        ZopePublicLicense.txt)
+        ZopePublicLicense.txt
+        w3c.txt)
 md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
          'ffb24d1bbf8b83d373f0b8edc3feb0c6'
          '682a5e3b03510ba46c4f566478c871bc'
@@ -51,16 +50,17 @@ md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
          '24ea4c7092233849b4394699333b5c56'
          '10b9de612d532fdeeb7fe8fcd1435cc6'
          '9f4337828d782bdea41f03dd2ad1b808'
-         'bfe1f75d606912a4111c90743d6c7325'
+         'b7426de1c630b269dc95ba20ea82a290'
          'd09c120ca7db95ef2aeecec0cb08293b'
          'a45bb1bbeed9e26b26c5763df1d3913d'
-         '68d59ff8306e3a9f5f1c01462c77a317'
+         '837b32593517ae48b9c3b5c87a5d288c'
          'f083e41c43db25e18f36c91e57750b64'
          'a055911c32fb4ed6e96c453ceaeba857'
          '682eac07428a4e8f138bc082f090ecac'
-         'dc8502850eab9e1ff330a12d7ca18a19')
+         'dc8502850eab9e1ff330a12d7ca18a19'
+         '6f2095b5d61770740852873b195a4d21')
 
-build() {
+package() {
   cd ${pkgdir}
   mkdir -p usr/share/licenses/common
   cd usr/share/licenses/common
@@ -122,6 +122,9 @@ build() {
   mkdir RUBY
   cp ${srcdir}/ruby-license.txt RUBY/license.txt
 
+  mkdir W3C
+  cp "$srcdir"/w3c.txt W3C/license.txt
+  
   mkdir ZPL
   cp ${srcdir}/ZopePublicLicense.txt ZPL/license.txt
 }

licenses/w3c.txt

@@ -0,0 +1,76 @@
+W3C Software Notice and License
+
+This work (and included software, documentation such as READMEs, or
+other related items) is being provided by the copyright holders under
+the following license.  
+
+License
+
+By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following
+terms and conditions.
+
+Permission to copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and
+without fee or royalty is hereby granted, provided that you include
+the following on ALL copies of the software and documentation or
+portions thereof, including modifications:
+
+    - The full text of this NOTICE in a location viewable to users of
+      the redistributed or derivative work.
+
+    - Any pre-existing intellectual property disclaimers, notices, or
+      terms and conditions. If none exist, the W3C Software Short
+      Notice should be included (hypertext is preferred, text is
+      permitted) within the body of any redistributed or derivative
+      code.  
+        *"W3C Software Short Notice" above links to:
+         www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html
+
+    - Notice of any changes or modifications to the files, including
+      the date changes were made. (We recommend you provide URIs to
+      the location from which the code is derived.)
+
+Disclaimers
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without specific,
+written prior permission. Title to copyright in this software and any
+associated documentation will at all times remain with copyright
+holders.  Notes
+
+This version:
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This formulation of W3C's notice and license became active on December
+31 2002. This version removes the copyright ownership notice such that
+this license can be used with materials other than those owned by the
+W3C, reflects that ERCIM is now a host of the W3C, includes references
+to this specific dated version of the license, and removes the
+ambiguous grant of "use". Otherwise, this version is the same as the
+previous version and is written so as to preserve the Free Software
+Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition.
+
+      *"previous version" above links to:
+       http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+      *"Free Software Foundation's assessment of GPL compatibility" links to:
+       http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses
+
+      *"OSI's certification" above links to:
+       http://opensource.org/licenses/W3C.php
+
+      *"Open Source Definition" above links to:
+       http://opensource.org/docs/definition.php

linux-api-headers/PKGBUILD

@@ -1,29 +1,30 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-api-headers
-pkgver=3.16.2
-_basever=3.16
+pkgver=4.0
+_basever=4.0
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
-provides=("kernel-headers=${pkgver}")
-conflicts=('kernel-headers')
-replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
-	http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz)
-md5sums=('5c569ed649a0c9711879f333e90c5386'
-         '926e6e2ee0634ce53730701da749b040')
+source=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basever}.tar.xz
+        http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basever}.tar.sign)
+        #http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz
+        #http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign)
+md5sums=('a86916bd12798220da9eb4a1eec3616d'
+         'SKIP')
+validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886'   # Linus Torvalds
+              '647F28654894E3BD457199BE38DBBDC86092693E')  # Greg Kroah-Hartman
+
+prepare() {
+  cd ${srcdir}/linux-${_basever}
+  [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} || true
+}
 
 build() {
   cd ${srcdir}/linux-${_basever}
-  [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver}
 
   make mrproper
   make headers_check

linux-firmware/PKGBUILD

@@ -3,8 +3,8 @@
 
 
 pkgname=linux-firmware
-_rev=b794c50
-pkgver=20150127.${_rev}
+_rev=8e18132
+pkgver=20150511.${_rev}
 _b43=5.100.138
 _legacy=3.130.20.0
 pkgrel=1
@@ -70,4 +70,9 @@ package() {
 
   # remove asc file from amd-ucode
   rm "${pkgdir}"/usr/lib/firmware/amd-ucode/*.asc
+  
+  # Trigger a microcode reload for configurations not using early updates
+  install -d "${pkgdir}/usr/lib/tmpfiles.d"
+  echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' \
+    >"${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }

linux-lts.order

@@ -0,0 +1,13 @@
+#core_packages
+#linux-lts
+vhba-module-lts
+broadcom-wl-lts
+acpi_call-lts
+ndiswrapper-lts
+
+#platform_packages
+../platform/bbswitch-lts
+../platform/nvidia-lts
+../platform/nvidia-304xx-lts
+../platform/nvidia-340xx-lts
+../platform/catalyst-lts

linux-lts/PKGBUILD

@@ -1,33 +1,32 @@
 #
-# Core Packages for Chakra, part of chakra-project.org
+# Core Packages for Chakra, part of chakraos.org
+#
 
-# ToDo remove the " from "linux-lts" and add on all lts pkgs "extramodules-3.2-CHAKRA-LTS" instead of extramodules-3.2-lts
 pkgbase="linux-lts"
-pkgname=('linux-lts' 'linux-lts-headers' 'linux-lts-docs') # Build stock -CHAKRA-LTS kernel
-# pkgname=linux-custom       # Build kernel with a different name
-_kernelname=${pkgname#linux}
-_basekernel=3.2
-pkgver=3.2.63
-pkgrel=1
-makedepends=('xmlto' 'docbook-xsl')
+pkgname=('linux-lts' 'linux-lts-headers' 'linux-lts-docs')
+_kernelname="-CHAKRA-LTS"
+_basekernel=3.14
+pkgver=3.14.44
+pkgrel=2
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 arch=('x86_64')
 license=('GPL2')
 url="http://www.kernel.org"
 options=(!strip)
-source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_basekernel.tar.bz2"
-        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+source=("https://www.kernel.org/pub/linux/kernel/v3.x/linux-$_basekernel.tar.xz"
+        "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
         # the main kernel config files
         'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         'linux-lts.preset'
         'change-default-console-loglevel.patch')
-md5sums=('7ceb61f87c097fc17509844b71268935'
-         'b0415bfb76e94590e3d0ab68884af8c9'
-         'd73da01f9e20687abda70c10e7e5ea71'
+md5sums=('b621207b3f6ecbb67db18b13258f8ea8'
+         'd522100449d8c3428e2f2fbc0082b045'
+         '9847f68028ea7bc5e249cda4d6d8f1d9'
          '232b52576a62c7a333e9fe7a1e1ca359'
-         '9d3c56a4b999c8bfbd4018089a62f662')
+         '98beb36f9b8cf16e58de2483ea9985e3')
 
-build() {
+prepare() {
   cd ${srcdir}/linux-$_basekernel
 
   # add upstream patch
@@ -46,10 +45,14 @@ build() {
 
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
   fi
 
   # set extraversion to pkgrel
   sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+  
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
 
   # get kernel version
   make prepare
@@ -62,31 +65,38 @@ build() {
   #make oldconfig # using old config from previous kernel version
   # ... or manually edit .config
 
+  # rewrite configuration
+  yes "" | make config >/dev/null
+
+  # save configuration for later reuse
+  cat .config > "${startdir}/config.x86_64.last"
+
   ####################
   # stop here
   # this is useful to configure the kernel
   #msg "Stopping build"
   #return 1
   ####################
+}
 
-  yes "" | make config
+build() {
+  cd ${srcdir}/linux-$_basekernel
 
-  # build!
-  make ${MAKEFLAGS} bzImage modules
+  make ${MAKEFLAGS} LOCALVERSION= bzImage modules
 }
 
 package_linux-lts() {
   pkgdesc="The Linux LTS-Kernel and modules"
   groups=('lts')
-  depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7.5')
+  depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio')
   optdepends=('crda: to set the correct wireless channels of your country')
-  replaces=('kernel26-lts' 'linux-scsi'
+  replaces=('linux-scsi'
             'squashfs' 'unionfs' 'ivtv'
             'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
             'gspcav1' 'atl2' 'wlan-ng26' 'rt2500'
             'aufs3' 'nouveau-drm')
-  provides=("aufs3=$_aufs" 'nouveau-drm-lts' 'kernel26-lts' 'acerhk-lts=0.5.35')
-  conflicts=('kernel26-lts' 'acerhk-lts')
+  provides=("aufs3=$_aufs" 'nouveau-drm-lts' 'acerhk-lts=0.5.35')
+  conflicts=('acerhk-lts')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
 
@@ -95,7 +105,7 @@ package_linux-lts() {
   KARCH=x86
 
   # get kernel version
-  _kernver="$(make kernelrelease)"
+  _kernver="$(make LOCALVERSION= kernelrelease)"
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make INSTALL_MOD_PATH="${pkgdir}" modules_install
@@ -140,9 +150,6 @@ package_linux-lts() {
 
 package_linux-lts-headers() {
   pkgdesc="Header files and scripts for building modules for linux lts-kernel"
-  provides=('kernel26-lts-headers')
-  conflicts=('kernel26-lts-headers')
-  replaces=('kernel26-lts-headers')
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
@@ -160,7 +167,7 @@ package_linux-lts-headers() {
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
 
   for i in acpi asm-generic config crypto drm generated linux math-emu \
-    media mtd net pcmcia scsi sound trace video xen; do
+    media net pcmcia scsi sound trace uapi video xen; do
     cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
   done
 
@@ -182,16 +189,6 @@ package_linux-lts-headers() {
 
   cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
 
-  # add headers for lirc package
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
-  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-  done
-
   # add docbook makefile
   install -D -m644 Documentation/DocBook/Makefile \
     "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
@@ -209,24 +206,31 @@ package_linux-lts-headers() {
   cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
 
   # add dvb headers for external modules
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
-  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/"
   # and...
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
   cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
 
   # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
+  cp drivers/media/i2c/msp3400-driver.h \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
 
   # add dvb headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
-  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
-  cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
-  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners"
+  cp drivers/media/tuners/*.h \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/"
 
   # add xfs and shmem for aufs building
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
@@ -255,14 +259,11 @@ package_linux-lts-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
 }
 
 package_linux-lts-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux lts-kernel."
-  provides=('kernel26-lts-docs')
-  conflicts=('kernel26-lts-docs')
-  replaces=('kernel26-lts-docs')
 
   cd "${srcdir}/linux-${_basekernel}"
 

linux-lts/change-default-console-loglevel.patch

@@ -1,12 +1,12 @@
 diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk.c	2011-07-27 14:43:07.000000000 +0300
+--- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
 @@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
  
  /* We show everything that is MORE important than this.. */
  #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
 -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
  
  DECLARE_WAIT_QUEUE_HEAD(log_wait);
  

linux-lts/linux-lts.install

@@ -1,8 +1,8 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
-KERNEL_NAME=-lts
-KERNEL_VERSION=3.2.63-1-lts
+KERNEL_NAME=-CHAKRA-LTS
+KERNEL_VERSION=3.14.44-1-CHAKRA-LTS
 
 post_install () {
   # updating module dependencies
@@ -10,38 +10,19 @@ post_install () {
   depmod ${KERNEL_VERSION}
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
   mkinitcpio -p linux${KERNEL_NAME}
-
-  
-  # add compat symlinks for the initramfs images
-  ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-  ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \
-    boot/kernel26${KERNEL_NAME}-fallback.img
-  ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub2-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
 
+  if [ $(vercmp $2 3.13) -lt 0 ]; then
+    echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+    echo ">>>          In order to use your keyboard during early init, you MUST"
+    echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
+  fi
+  
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
@@ -51,8 +32,8 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img
 }
 
 

linux.order

@@ -0,0 +1,13 @@
+#core_packages
+#linux
+vhba-module
+broadcom-wl
+acpi_call
+ndiswrapper
+
+#platform_packages
+../platform/bbswitch
+../platform/nvidia
+../platform/nvidia-304xx
+../platform/nvidia-340xx
+../platform/catalyst

linux/PKGBUILD

@@ -5,29 +5,29 @@
 pkgbase=linux
 pkgname=('linux' 'linux-headers' 'linux-docs') 
 _kernelname=${pkgname#linux}
-_basekernel="3.19"
-pkgver=3.19.4
-pkgrel=1
+_basekernel="4.0"
+pkgver=4.0.5
+pkgrel=2
 arch=('x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'bc')
 options=('!strip')
-_aufsver=3.19
-source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+_aufsver=4.0
+source=("http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.xz"
+        "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
         # the main kernel config files
         'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
-        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${_aufsver}"
+        "git://github.com/sfjro/aufs4-standalone.git#branch=aufs${_aufsver}"
         'config.aufs'
         'overlay-multi-layer.patch'
         )
-sha256sums=('be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c'
-            '2b086341154af3e8fd0cb5ded954c239a66ffefb9a8c2bd639249b3786dc52d2'
-            '7b30b8599910a4437a05e159af518a3404b2a39a653ffc597db4861b2cdb01fa'
+sha256sums=('0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991'
+            '60b691210a9e412710e29eac6468d64b6c4d1efc53a6e22878dd51044001adf0'
+            'd64ff4dab41da86ac3fd7323ee17a7b52a7bdcc9ec49571e825b838966dae17a'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             'SKIP'
@@ -55,20 +55,20 @@ prepare() {
 
   #aufs patches for Live:
   msg "starting aufs patches"
-  cp -va "${srcdir}/aufs3-standalone/"{Documentation,fs} .
-  cp -va "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
+  cp -va "${srcdir}/aufs4-standalone/"{Documentation,fs} .
+  cp -va "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
   msg "starting aufs patches: kbuild"
-  patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-kbuild.patch"
+  patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-kbuild.patch"
   msg "starting aufs patches: base"
-  patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-base.patch"
+  patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-base.patch"
   msg "starting aufs patches: loopback"
-  patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-loopback.patch"
+  patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-loopback.patch"
   msg "starting aufs patches: mmap"
-  patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-mmap.patch"
+  patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-mmap.patch"
   msg "starting aufs patches: standalone"
-  patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-standalone.patch"
+  patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-standalone.patch"
 
-  patch -p1 -i "${srcdir}/overlay-multi-layer.patch"
+  #patch -p1 -i "${srcdir}/overlay-multi-layer.patch"
 
   cat "${srcdir}/config.x86_64" > ./.config
 
@@ -163,6 +163,7 @@ package_linux() {
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
+  # we'll get it from the linux-firmware package and we don't want conflicts
   rm -rf "${pkgdir}/lib/firmware"
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;

linux/config.x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.19.1-1 Kernel Configuration
+# Linux/x86 4.0.5-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -127,6 +127,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # RCU Subsystem
 #
 CONFIG_PREEMPT_RCU=y
+CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_RCU_USER_QS is not set
@@ -190,7 +191,6 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
-CONFIG_INIT_FALLBACK=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -361,6 +361,7 @@ CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_ARCH_USE_QUEUE_RWLOCK=y
 CONFIG_QUEUE_RWLOCK=y
 CONFIG_FREEZER=y
@@ -375,6 +376,7 @@ CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
+# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
 CONFIG_IOSF_MBI=m
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
@@ -514,6 +516,7 @@ CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
 CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -549,6 +552,8 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -603,6 +608,7 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
@@ -1255,6 +1261,7 @@ CONFIG_IPDDP_ENCAP=y
 CONFIG_PHONET=m
 CONFIG_6LOWPAN=m
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_SOCKET=m
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
@@ -1317,6 +1324,8 @@ CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
@@ -1442,6 +1451,7 @@ CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_SELFTEST is not set
 
 #
 # Bluetooth device drivers
@@ -1561,7 +1571,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
@@ -1694,6 +1704,7 @@ CONFIG_MTD_NAND_DOCG4=m
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_NAND_HISI504=m
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -1752,7 +1763,6 @@ CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -2156,16 +2166,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_NETDEVICES=y
@@ -2273,6 +2273,7 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
 # CONFIG_NET_XGENE is not set
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -2342,6 +2343,7 @@ CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
+CONFIG_IXGBE_VXLAN=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
@@ -2444,6 +2446,7 @@ CONFIG_NIU=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
+CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2467,6 +2470,7 @@ CONFIG_PHYLIB=m
 #
 CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
+CONFIG_AMD_XGBE_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -2993,6 +2997,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -3119,6 +3124,7 @@ CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
@@ -3136,6 +3142,7 @@ CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
@@ -3201,6 +3208,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
 
 #
@@ -3225,7 +3233,6 @@ CONFIG_SERIAL_8250_FINTEK=m
 #
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_MRST_MAX3110 is not set
 CONFIG_SERIAL_MFD_HSU=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
@@ -3292,8 +3299,9 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
-CONFIG_TCG_ST33_I2C=m
+CONFIG_TCG_TIS_I2C_ST33=m
 CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
@@ -3535,7 +3543,9 @@ CONFIG_TEST_POWER=m
 # CONFIG_CHARGER_BQ24190 is not set
 CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
 CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_AVS=y
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
@@ -3978,6 +3988,7 @@ CONFIG_USB_GSPCA_STV0680=m
 CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
@@ -4213,7 +4224,6 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 # common driver options
 #
 CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_CYPRESS_FIRMWARE=m
 CONFIG_DVB_B2C2_FLEXCOP=m
@@ -4505,6 +4515,7 @@ CONFIG_VGA_SWITCHEROO=y
 # Direct Rendering Manager
 #
 CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
@@ -4517,7 +4528,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_PTN3460=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
@@ -4545,6 +4555,11 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
 CONFIG_HSA_AMD=m
 
 #
@@ -4660,6 +4675,8 @@ CONFIG_HDMI=y
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
@@ -4825,6 +4842,11 @@ CONFIG_SND_USB_US122L=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_DICE=m
@@ -4859,6 +4881,7 @@ CONFIG_HID_APPLE=m
 CONFIG_HID_APPLEIR=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_PRODIKEYS=m
@@ -4987,7 +5010,6 @@ CONFIG_USB_EHCI_PCI=m
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_FUSBH200_HCD=m
 # CONFIG_USB_FOTG210_HCD is not set
@@ -5062,6 +5084,7 @@ CONFIG_MUSB_PIO_ONLY=y
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_ISP1760 is not set
 
 #
 # USB port drivers
@@ -5264,8 +5287,6 @@ CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_PXAV2=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_SPI=m
@@ -5298,6 +5319,7 @@ CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS_FLASH=m
 
 #
 # LED drivers
@@ -5420,6 +5442,7 @@ CONFIG_RTC_DRV_TEST=m
 #
 # I2C RTC drivers
 #
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1374=m
 CONFIG_RTC_DRV_DS1374_WDT=y
@@ -5470,6 +5493,14 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+# CONFIG_RTC_DS1685_PROC_REGS is not set
+CONFIG_RTC_DS1685_SYSFS_REGS=y
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_STK17TA8=m
@@ -5542,6 +5573,7 @@ CONFIG_VIRTIO=m
 # Virtio drivers
 #
 CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@@ -5559,6 +5591,7 @@ CONFIG_HYPERV_BALLOON=m
 CONFIG_XEN_BALLOON=y
 # CONFIG_XEN_SELFBALLOONING is not set
 CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_BACKEND=y
@@ -5711,6 +5744,7 @@ CONFIG_COMEDI_KCOMEDILIB=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
 CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_ISADMA=m
 CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_LABPC_ISADMA=m
 CONFIG_COMEDI_NI_TIO=m
@@ -5728,8 +5762,6 @@ CONFIG_R8723AU=m
 CONFIG_8723AU_AP_MODE=y
 CONFIG_8723AU_BT_COEXIST=y
 CONFIG_RTS5208=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 
@@ -5822,6 +5854,7 @@ CONFIG_SENSORS_HMC5843_SPI=m
 #
 # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_FB_SM7XX is not set
 CONFIG_FB_XGI=m
 CONFIG_FT1000=m
 CONFIG_FT1000_USB=m
@@ -5842,7 +5875,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
@@ -5850,14 +5882,8 @@ CONFIG_DVB_CXD2099=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_DT3155_CCIR=y
 CONFIG_DT3155_STREAMING=y
-CONFIG_VIDEO_TLG2300=m
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_SAA7191=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
@@ -5897,6 +5923,17 @@ CONFIG_DGAP=m
 CONFIG_GS_FPGABOOT=m
 CONFIG_CRYPTO_SKEIN=y
 # CONFIG_UNISYSSPAR is not set
+# CONFIG_FB_TFT is not set
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5961,6 +5998,7 @@ CONFIG_COMMON_CLK=y
 #
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_PXA is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
 
 #
 # Hardware Spinlock drivers
@@ -5980,6 +6018,11 @@ CONFIG_CLKBLD_I8253=y
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IOVA=y
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
 CONFIG_AMD_IOMMU_V2=m
@@ -6016,6 +6059,7 @@ CONFIG_DEVFREQ_GOV_USERSPACE=m
 #
 # DEVFREQ Drivers
 #
+# CONFIG_PM_DEVFREQ_EVENT is not set
 CONFIG_EXTCON=m
 
 #
@@ -6046,6 +6090,8 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 # CONFIG_KXSD9 is not set
 # CONFIG_MMA8452 is not set
 CONFIG_KXCJK1013=m
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
 
 #
 # Analog to digital converters
@@ -6059,12 +6105,14 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
+# CONFIG_CC10001_ADC is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_NAU7802 is not set
 CONFIG_QCOM_SPMI_IADC=m
+# CONFIG_QCOM_SPMI_VADC is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_AM335X_ADC is not set
@@ -6080,6 +6128,11 @@ CONFIG_QCOM_SPMI_IADC=m
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
@@ -6145,6 +6198,7 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 #
 # CONFIG_ADIS16400 is not set
 # CONFIG_ADIS16480 is not set
+# CONFIG_KMX61 is not set
 # CONFIG_INV_MPU6050_IIO is not set
 
 #
@@ -6154,11 +6208,13 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
 # CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_ISL29125 is not set
 CONFIG_HID_SENSOR_ALS=m
 # CONFIG_HID_SENSOR_PROX is not set
+# CONFIG_JSA1212 is not set
 # CONFIG_SENSORS_LM3533 is not set
 # CONFIG_LTR501 is not set
 # CONFIG_TCS3414 is not set
@@ -6205,6 +6261,11 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 #
 # CONFIG_AS3935 is not set
 
+#
+# Proximity sensors
+#
+# CONFIG_SX9500 is not set
+
 #
 # Temperature sensors
 #
@@ -6310,6 +6371,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
 CONFIG_NILFS2_FS=m
+# CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
@@ -6380,6 +6442,7 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
@@ -6436,6 +6499,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
 # CONFIG_SYSV_FS is not set
@@ -6450,7 +6514,27 @@ CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_CHECK_FS=y
-CONFIG_EFIVAR_FS=y
+# CONFIG_F2FS_IO_TRACE is not set
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_SBILIST=y
+CONFIG_AUFS_HNOTIFY=y
+CONFIG_AUFS_HFSNOTIFY=y
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_INO_T_64=y
+CONFIG_AUFS_XATTR=y
+CONFIG_AUFS_FHSM=y
+CONFIG_AUFS_RDU=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+CONFIG_AUFS_BR_FUSE=y
+CONFIG_AUFS_POLL=y
+CONFIG_AUFS_BR_HFSPLUS=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
@@ -6464,6 +6548,7 @@ CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFS_V4_1_MIGRATION=y
 CONFIG_NFS_V4_SECURITY_LABEL=y
@@ -6476,6 +6561,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_GRACE_PERIOD=m
@@ -6628,6 +6714,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_KASAN_SHADOW_OFFSET=0xdffffc0000000000
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
@@ -6749,6 +6837,7 @@ CONFIG_LKDTM=m
 CONFIG_PERCPU_TEST=m
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 CONFIG_TEST_KSTRTOX=m
 # CONFIG_TEST_RHASHTABLE is not set
@@ -6801,7 +6890,6 @@ CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@@ -6973,6 +7061,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
@@ -7000,6 +7089,8 @@ CONFIG_KVM_ASYNC_PF=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -7013,6 +7104,7 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+# CONFIG_HAVE_ARCH_BITREVERSE is not set
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y

linux/linux.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.19.1-1-CHAKRA
+KERNEL_VERSION=4.0.5-1-CHAKRA
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'

logrotate/PKGBUILD

@@ -1,10 +1,6 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=logrotate
-pkgver=3.8.7
+pkgver=3.8.9
 pkgrel=1
 pkgdesc="Rotates system logs automatically"
 arch=('x86_64')
@@ -12,13 +8,12 @@ url="https://fedorahosted.org/logrotate/"
 license=('GPL')
 groups=('base')
 depends=('popt' 'gzip' 'acl')
-optdepends=('cron: scheduled log rotation')
 backup=('etc/logrotate.conf')
 source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
         'paths.patch'
         'logrotate.conf'
         logrotate.{timer,service})
-md5sums=('99e08503ef24c3e2e3ff74cc5f3be213'
+md5sums=('2660f30742da79870d15d042b07829f6'
          'e76526bcd6fc33c9d921e1cb1eff1ffb'
          '94dae4d3eded2fab9ae879533d3680db'
          '287c2ad9b074cb5478db7692f385827c'
@@ -29,7 +24,13 @@ build() {
 
         patch -p0 -i "$srcdir/paths.patch"
 
-        make WITH_ACL=yes RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
+        ./autogen.sh
+        ./configure \
+                --prefix=/usr \
+                --sbindir=/usr/bin \
+                --mandir=/usr/share/man \
+                --with-acl
+        make
 }
 
 check() {
@@ -39,8 +40,7 @@ check() {
 
 package() {
         cd "$srcdir/${pkgname}-${pkgver}"
-        make PREFIX="$pkgdir" MANDIR="/usr/share/man" install
-        mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
+        make DESTDIR="$pkgdir" install
 
         install -dm755 "$pkgdir/etc/logrotate.d"
         install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
@@ -48,5 +48,5 @@ package() {
         install -D -m644 ${srcdir}/logrotate.timer ${pkgdir}/usr/lib/systemd/system/logrotate.timer
         install -D -m644 ${srcdir}/logrotate.service ${pkgdir}/usr/lib/systemd/system/logrotate.service
         install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants
-        ln -s ../logrotate.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/logrotate.timer
+        ln -s ../logrotate.timer ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/logrotate.timer
 }

lvm2/PKGBUILD

@@ -6,7 +6,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.111
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -20,7 +20,7 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2-make-sockets-static.patch)
 sha1sums=('2e7b5d48d55aaf4aba1214c3211a194e4c13aa3e'
           'SKIP'
-          'be3b7db02e76d31d4742dc853b2fa3f898368ff8'
+          '3a00124d40028b278dd7d0b887ef891f43f83e98'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'

lvm2/lvm2_install

@@ -6,9 +6,9 @@ build() {
         add_module "$mod"
     done
 
-    add_binary "/usr/bin/lvm"
-    add_binary "/usr/bin/lvmetad"
-    add_binary "/usr/bin/dmsetup"
+    add_binary "/usr/sbin/lvm"
+    add_binary "/usr/sbin/lvmetad"
+    add_binary "/usr/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"

lzo2/PKGBUILD

@@ -1,6 +1,6 @@
 
 pkgname=lzo2
-pkgver=2.08
+pkgver=2.09
 pkgrel=1
 pkgdesc="Portable lossless data compression library"
 arch=('x86_64')
@@ -8,7 +8,7 @@ url="http://www.oberhumer.com/opensource/lzo"
 license=('GPL')
 depends=('glibc')
 source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
-sha1sums=('64c3e44843a44ffc4533aa89e41516f42bfefa76')
+sha1sums=('e2a60aca818836181e7e6f8c4f2c323aca6ac057')
 
 build() {
   cd "${srcdir}/lzo-${pkgver}"

m4/PKGBUILD

@@ -1,11 +1,7 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=m4
-pkgver=1.4.16
-pkgrel=2
+pkgver=1.4.17
+pkgrel=1
 pkgdesc="m4 macro processor"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -14,11 +10,20 @@ install=m4.install
 groups=('base-devel')
 depends=('glibc' 'bash')
 source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz)
-md5sums=('7548ec061a1ba993790159764f522d0e')
+md5sums=('12a3c829301a4fd6586a57d3fcf196dc')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}/$pkgname-$pkgver  
   ./configure --prefix=/usr
-  make || return 1
-  make prefix=${pkgdir}/usr install || return 1
+  make
 }
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make prefix=${pkgdir}/usr install
+}

man-pages/PKGBUILD

@@ -1,10 +1,9 @@
 #
-# Core Packages for Chakra, part of chakra-project.org
+# Core Packages for Chakra, part of chakra.org
 #
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=man-pages
-pkgver=3.70
+pkgver=4.00
 _posixver=2003-a
 pkgrel=1
 pkgdesc="Linux man pages"
@@ -15,7 +14,7 @@ groups=('base')
 depends=()
 source=(http://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.xz
         http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.bz2)
-md5sums=('e5a3fc1d7ae4f03a27676d7bad725416'
+md5sums=('3401eb0020c56639070d199c3e59a4f8'
          '7c78aff03c0a6767ba483d34f19e4b09')
 
 build() {
@@ -51,4 +50,6 @@ package() {
   rm -f man1/diff.1
   # this is included in xf86-input-mouse
   rm -f man4/mouse.4
+  # this is included in attr
+  rm -f man5/attr.5 
 }

mkinitcpio-busybox/PKGBUILD

@@ -1,36 +1,33 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer abveritas[at]chakra-project[dog]org>
-# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=mkinitcpio-busybox
-pkgver=1.19.4
-pkgrel=2
+pkgver=1.23.2
+pkgrel=1
 pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.busybox.net/"
 license=('GPL')
 depends=('glibc')
 options=('!buildflags')
 source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
         'config')
-sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee'
-            '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a')
+sha256sums=('05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a'
+            '240c9ab805fbf5eb3347b2a42f62d840f160c4999d0f172b28ba50dadad09ada')
+
+prepare() {
+  cd "busybox-$pkgver"
+
+  local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
+
+  sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config
+}
 
 build() {
-  cd "$srcdir/busybox-$pkgver"
-
-  local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
-
-  sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
-    "$srcdir/config" > .config
-
-  make
+  make -C "busybox-$pkgver"
+  
+  # save configuration for later reuse
+  cat busybox-$pkgver/.config > "${startdir}/config.last"
 }
 
 package() {
   install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox"
 }
-
-# vim:set ts=2 sw=2 et:

mkinitcpio-busybox/config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.19.2
-# Sun Oct 16 15:24:19 2011
+# Busybox version: 1.23.2
+# Sun Jun  7 19:05:39 2015
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -36,12 +36,15 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
+# CONFIG_PAM is not set
+CONFIG_FEATURE_USE_SENDFILE=y
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
+CONFIG_PID_FILE_PATH=""
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
@@ -49,7 +52,7 @@ CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
@@ -62,13 +65,17 @@ CONFIG_FEATURE_HAVE_RPC=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
 CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
+CONFIG_SYSROOT=""
+CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
 # CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
@@ -92,7 +99,8 @@ CONFIG_PREFIX="./_install"
 # CONFIG_FEATURE_SYSTEMD is not set
 # CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=0
+CONFIG_MD5_SMALL=0
+CONFIG_SHA3_SMALL=0
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 # CONFIG_FEATURE_USE_TERMIOS is not set
@@ -101,6 +109,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
 # CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
@@ -124,12 +133,19 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 # CONFIG_FEATURE_SEAMLESS_XZ is not set
 # CONFIG_FEATURE_SEAMLESS_LZMA is not set
 # CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-# CONFIG_FEATURE_SEAMLESS_GZ is not set
+CONFIG_FEATURE_SEAMLESS_GZ=y
 # CONFIG_FEATURE_SEAMLESS_Z is not set
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 # CONFIG_FEATURE_AR_CREATE is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_GUNZIP is not set
 # CONFIG_BUNZIP2 is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+# CONFIG_UNXZ is not set
+# CONFIG_XZ is not set
 # CONFIG_BZIP2 is not set
 # CONFIG_CPIO is not set
 # CONFIG_FEATURE_CPIO_O is not set
@@ -137,13 +153,13 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-# CONFIG_GUNZIP is not set
 # CONFIG_GZIP is not set
 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_GZIP_FAST=0
 # CONFIG_LZOP is not set
 # CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
+# CONFIG_RPM2CPIO is not set
 # CONFIG_TAR is not set
 # CONFIG_FEATURE_TAR_CREATE is not set
 # CONFIG_FEATURE_TAR_AUTODETECT is not set
@@ -156,12 +172,6 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 # CONFIG_FEATURE_TAR_UNAME_GNAME is not set
 # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
 # CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-# CONFIG_UNXZ is not set
-# CONFIG_XZ is not set
 # CONFIG_UNZIP is not set
 
 #
@@ -173,14 +183,19 @@ CONFIG_CAT=y
 # CONFIG_FEATURE_DATE_ISOFMT is not set
 # CONFIG_FEATURE_DATE_NANO is not set
 # CONFIG_FEATURE_DATE_COMPAT is not set
+# CONFIG_HOSTID is not set
 # CONFIG_ID is not set
 # CONFIG_GROUPS is not set
+CONFIG_SHUF=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_NODEREF=y
+# CONFIG_FEATURE_TOUCH_SUSV3 is not set
 # CONFIG_TR is not set
 # CONFIG_FEATURE_TR_CLASSES is not set
 # CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_UNLINK=y
 # CONFIG_BASE64 is not set
 # CONFIG_WHO is not set
 # CONFIG_USERS is not set
@@ -220,7 +235,6 @@ CONFIG_FALSE=y
 # CONFIG_FSYNC is not set
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
 CONFIG_INSTALL=y
 CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
 CONFIG_LN=y
@@ -257,6 +271,7 @@ CONFIG_SEQ=y
 CONFIG_SHA1SUM=y
 CONFIG_SHA256SUM=y
 CONFIG_SHA512SUM=y
+# CONFIG_SHA3SUM is not set
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -268,7 +283,7 @@ CONFIG_STAT=y
 CONFIG_FEATURE_STAT_FORMAT=y
 # CONFIG_STTY is not set
 # CONFIG_SUM is not set
-# CONFIG_SYNC is not set
+CONFIG_SYNC=y
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -288,6 +303,11 @@ CONFIG_FEATURE_WC_LARGE=y
 # CONFIG_WHOAMI is not set
 CONFIG_YES=y
 
+#
+# Common options
+#
+CONFIG_FEATURE_VERBOSE=y
+
 #
 # Common options for cp and mv
 #
@@ -304,7 +324,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
 #
 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
@@ -313,7 +333,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 #
 # CONFIG_CHVT is not set
 # CONFIG_FGCONSOLE is not set
-# CONFIG_CLEAR is not set
+CONFIG_CLEAR=y
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
 CONFIG_KBD_MODE=y
@@ -354,7 +374,16 @@ CONFIG_MKTEMP=y
 #
 # Editors
 #
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
 # CONFIG_PATCH is not set
+CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
@@ -369,15 +398,9 @@ CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
+CONFIG_FEATURE_VI_UNDO=y
+CONFIG_FEATURE_VI_UNDO_QUEUE=y
+CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
@@ -394,6 +417,7 @@ CONFIG_SED=y
 # CONFIG_FEATURE_FIND_NEWER is not set
 # CONFIG_FEATURE_FIND_INUM is not set
 # CONFIG_FEATURE_FIND_EXEC is not set
+# CONFIG_FEATURE_FIND_EXEC_PLUS is not set
 # CONFIG_FEATURE_FIND_USER is not set
 # CONFIG_FEATURE_FIND_GROUP is not set
 # CONFIG_FEATURE_FIND_NOT is not set
@@ -415,6 +439,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
 # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
 # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set
 
 #
 # Init Utilities
@@ -451,6 +476,7 @@ CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_ADDUSER is not set
 # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
 # CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_LAST_ID=0
 CONFIG_FIRST_SYSTEM_ID=0
 CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_ADDGROUP is not set
@@ -461,7 +487,7 @@ CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
 # CONFIG_GETTY is not set
 # CONFIG_LOGIN is not set
-# CONFIG_PAM is not set
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
 # CONFIG_LOGIN_SCRIPTS is not set
 # CONFIG_FEATURE_NOLOGIN is not set
 # CONFIG_FEATURE_SECURETTY is not set
@@ -469,6 +495,7 @@ CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
 # CONFIG_CRYPTPW is not set
 # CONFIG_CHPASSWD is not set
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
 # CONFIG_SU is not set
 # CONFIG_FEATURE_SU_SYSLOG is not set
 # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
@@ -511,13 +538,21 @@ CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
 # CONFIG_FEATURE_MODUTILS_ALIAS is not set
 # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-# CONFIG_DEFAULT_MODULES_DIR is not set
-# CONFIG_DEFAULT_DEPMOD_FILE is not set
+CONFIG_DEFAULT_MODULES_DIR=""
+CONFIG_DEFAULT_DEPMOD_FILE=""
 
 #
 # Linux System Utilities
 #
 # CONFIG_BLOCKDEV is not set
+CONFIG_FATATTR=y
+CONFIG_FSTRIM=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 # CONFIG_REV is not set
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
@@ -561,12 +596,6 @@ CONFIG_HEXDUMP=y
 CONFIG_LOSETUP=y
 # CONFIG_LSPCI is not set
 # CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 # CONFIG_MORE is not set
@@ -588,6 +617,7 @@ CONFIG_LOSETUP=y
 # CONFIG_SCRIPTREPLAY is not set
 # CONFIG_SETARCH is not set
 # CONFIG_SWAPONOFF is not set
+# CONFIG_FEATURE_SWAPON_DISCARD is not set
 # CONFIG_FEATURE_SWAPON_PRI is not set
 # CONFIG_SWITCH_ROOT is not set
 CONFIG_UMOUNT=y
@@ -600,32 +630,36 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
 # CONFIG_VOLUMEID is not set
-
-#
-# Filesystem/Volume identification
-#
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_F2FS is not set
 # CONFIG_FEATURE_VOLUMEID_FAT is not set
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
 # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_NILFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
 
 #
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
@@ -638,13 +672,17 @@ CONFIG_FEATURE_LESS_FLAGS=y
 # CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+# CONFIG_RFKILL is not set
 # CONFIG_SETSERIAL is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
 # CONFIG_UBIMKVOL is not set
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
+# CONFIG_WALL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -660,10 +698,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
 # CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
 # CONFIG_FEATURE_DC_LIBM is not set
@@ -697,22 +731,18 @@ CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MAN is not set
 # CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
+CONFIG_MOUNTPOINT=y
 # CONFIG_MT is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 # CONFIG_SETSID is not set
 CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_TIME is not set
 # CONFIG_TIMEOUT is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
 # CONFIG_WATCHDOG is not set
 
 #
@@ -744,13 +774,13 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_FTPD is not set
 # CONFIG_FEATURE_FTP_WRITE is not set
 # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FEATURE_FTP_AUTHENTICATION is not set
 # CONFIG_FTPGET is not set
 # CONFIG_FTPPUT is not set
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 # CONFIG_HOSTNAME is not set
 # CONFIG_HTTPD is not set
 # CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
@@ -807,6 +837,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y
 CONFIG_NSLOOKUP=y
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_FEATURE_NTPD_CONF is not set
 # CONFIG_PSCAN is not set
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
@@ -835,6 +866,7 @@ CONFIG_FEATURE_TFTP_GET=y
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
 # CONFIG_TUNCTL is not set
 # CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPC6 is not set
 # CONFIG_UDHCPD is not set
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
@@ -843,6 +875,7 @@ CONFIG_FEATURE_TFTP_GET=y
 CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
@@ -881,6 +914,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # Process Utilities
 #
 # CONFIG_IOSTAT is not set
+# CONFIG_LSOF is not set
 # CONFIG_MPSTAT is not set
 # CONFIG_NMETER is not set
 # CONFIG_PMAP is not set
@@ -888,6 +922,13 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_PSTREE is not set
 # CONFIG_PWDX is not set
 # CONFIG_SMEMCAP is not set
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
 CONFIG_UPTIME=y
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
@@ -902,18 +943,12 @@ CONFIG_FEATURE_PIDOF_OMIT=y
 # CONFIG_PKILL is not set
 CONFIG_PS=y
 CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_LONG=y
 # CONFIG_FEATURE_PS_TIME is not set
 # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 # CONFIG_RENICE is not set
 # CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_FEATURE_SHOW_THREADS is not set
 # CONFIG_WATCH is not set
 
@@ -959,6 +994,7 @@ CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_HELP=y
 CONFIG_ASH_CMDCMD=y
 # CONFIG_ASH_MAIL is not set
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
@@ -1008,6 +1044,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+# CONFIG_FEATURE_KMSG_SYSLOG is not set
 # CONFIG_KLOGD is not set
 # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
 # CONFIG_LOGGER is not set

mpfr/PKGBUILD

@@ -1,11 +1,7 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=mpfr
 _pkgver=3.1.2
-_patchlevel=p10
+_patchlevel=p11
 pkgver=${_pkgver}.${_patchlevel}
 #pkgver=${_pkgver}
 pkgrel=1
@@ -19,7 +15,7 @@ source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
         mpfr-${_pkgver}-${_patchlevel}.patch)
 md5sums=('e3d203d188b8fe60bb6578dd3152e05c'
          'SKIP'
-         '43121795ef12f1b29ada4508d9186ea9')
+         '9f96a5c7cac1d6cd983ed9cf7d997074')
 validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D')
 
 build() {

mpfr/mpfr-3.1.2-p11.patch

@@ -1575,3 +1575,52 @@ diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
  
  #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
    locale_da_DK ();
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2014-12-04 01:41:57.131789485 +0000
++++ mpfr-3.1.2-b/PATCHES	2014-12-04 01:41:57.339791833 +0000
+@@ -0,0 +1 @@
++strtofr
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2014-12-04 01:41:57.127789443 +0000
++++ mpfr-3.1.2-b/VERSION	2014-12-04 01:41:57.339791833 +0000
+@@ -1 +1 @@
+-3.1.2-p10
++3.1.2-p11
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2014-12-04 01:41:57.127789443 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2014-12-04 01:41:57.335791790 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p10"
++#define MPFR_VERSION_STRING "3.1.2-p11"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/strtofr.c mpfr-3.1.2-b/src/strtofr.c
+--- mpfr-3.1.2-a/src/strtofr.c	2013-03-13 15:37:32.000000000 +0000
++++ mpfr-3.1.2-b/src/strtofr.c	2014-12-04 01:41:57.287791246 +0000
+@@ -473,8 +473,10 @@
+       /* prec bits corresponds to ysize limbs */
+       ysize_bits = ysize * GMP_NUMB_BITS;
+       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
+-      y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 1);
+-      y += ysize; /* y has (ysize+1) allocated limbs */
++      /* we need to allocate one more limb to work around bug
++         https://gmplib.org/list-archives/gmp-bugs/2013-December/003267.html */
++      y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 2);
++      y += ysize; /* y has (ysize+2) allocated limbs */
+ 
+       /* pstr_size is the number of characters we read in pstr->mant
+          to have at least ysize full limbs.
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2014-12-04 01:41:57.131789485 +0000
++++ mpfr-3.1.2-b/src/version.c	2014-12-04 01:41:57.339791833 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p10";
++  return "3.1.2-p11";
+ }

ndiswrapper-lts/PKGBUILD

@@ -1,15 +1,14 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
-# contributor: abveritas@chakra-project.org
 
-# Find the kernel name inside the chroot
-_extramodules=extramodules-3.2-lts
+_extramodules=extramodules-3.14-CHAKRA-LTS
 _kver="$(cat /lib/modules/${_extramodules}/version)"
-_kernelver=3.2.63
+_kernelver=3.14.44
+_rootOfSourceTree=/usr/src/linux-${_kver}
 
 pkgname=ndiswrapper-lts
 _pkgname=ndiswrapper
 pkgver=1.59
-pkgrel=4
+pkgrel=6
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
 license=('GPL')
 arch=('x86_64')
@@ -17,25 +16,32 @@ url="http://ndiswrapper.sourceforge.net"
 install="ndiswrapper.install"
 depends=("linux-lts=${_kernelver}")
 makedepends=("linux-lts-headers=${_kernelver}")
-source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz")
-md5sums=('e26a7213468ccd6b0bb4c211c7aadeaa')
+source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz"
+        "ndiswrapper-1.59.patch")
+sha1sums=('75fbbda677fe91ee07a6f6a8e19b1f3e2479540f'
+          'f120e96fa9abab45e1c724aaac29da7b892820f0')
+
+prepare() {
+  [ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false
+  msg "Found kernel version: $_kver"
+
+  cd "$srcdir/$_pkgname-$pkgver" 
+  patch -p1 -i ../ndiswrapper-1.59.patch
+  sed -i "/modinfo/s/s/usr\//" driver/Makefile
+}
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  sed -i "/modinfo/s/s/usr\//" driver/Makefile
-  
-  make KBUILD=/usr/src/linux-$_kver KVERS=$_kver
+  cd "$srcdir/$_pkgname-$pkgver"        
+  make -C driver KVERS_UNAME=${_kver}
+  make -C utils
 }
 
 package() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  make KBUILD=/usr/src/linux-$_kver INST_DIR="usr/lib/modules/$_extramodules" \
-    KVERS=$_kver DESTDIR="$pkgdir/" install
+  make sbindir=/usr/sbin usrsbindir=/usr/sbin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \
+        KVERS=$_kver DESTDIR="$pkgdir/" install
 
-  # rm ndiswrapper
-  rm -r "$pkgdir/usr/share" "$pkgdir/usr/sbin" "$pkgdir/sbin"
-
-  gzip "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko"
-}
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
+          "${startdir}/ndiswrapper.install"
+}

ndiswrapper-lts/ndiswrapper-1.59.patch

@@ -0,0 +1,35 @@
+diff -aur ndiswrapper-1.59.old/driver/crt.c ndiswrapper-1.59.new/driver/crt.c
+--- ndiswrapper-1.59.old/driver/crt.c	2013-11-28 20:42:35.000000000 +0100
++++ ndiswrapper-1.59.new/driver/crt.c	2014-04-11 20:39:22.384962602 +0200
+@@ -467,7 +467,7 @@
+ noregparm void WIN_FUNC(_win_srand,1)
+ 	(UINT seed)
+ {
+-	net_srandom(seed);
++	prandom_seed((__force u32)(seed));
+ }
+ 
+ noregparm int WIN_FUNC(rand,0)
+diff -aur ndiswrapper-1.59.old/driver/ntoskernel.h ndiswrapper-1.59.new/driver/ntoskernel.h
+--- ndiswrapper-1.59.old/driver/ntoskernel.h	2013-11-28 20:42:36.000000000 +0100
++++ ndiswrapper-1.59.new/driver/ntoskernel.h	2014-04-11 20:44:03.491617236 +0200
+@@ -347,7 +347,7 @@
+ #define netdev_notifier_info_to_dev(x) ((struct net_device *)(x))
+ #endif
+ 
+-#ifdef INIT_COMPLETION
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
+ static inline void reinit_completion(struct completion *x)
+ {
+ 	INIT_COMPLETION(*x);
+@@ -797,9 +797,8 @@
+ #define nt_spin_unlock_irqrestore(lock, flags)				\
+ do {									\
+ 	nt_spin_unlock(lock);						\
+-	preempt_enable_no_resched();					\
++	preempt_enable();					\
+ 	local_irq_restore(flags);					\
+-	preempt_check_resched();					\
+ } while (0)
+ 
+ static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)

ndiswrapper-lts/ndiswrapper.install

@@ -5,7 +5,7 @@ post_install()
 
 post_upgrade()
 {
-  EXTRAMODULES='extramodules-3.2-lts'
+  EXTRAMODULES='extramodules-3.14-CHAKRA-LTS'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 

ndiswrapper/PKGBUILD

@@ -1,13 +1,13 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
 
-_extramodules=extramodules-3.19-CHAKRA
+_extramodules=extramodules-4.0-CHAKRA
 _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-_kernelver=3.19.4
+_kernelver=4.0.5
 _rootOfSourceTree=/usr/src/linux-${_kver}
 
 pkgname=ndiswrapper
 pkgver=1.59
-pkgrel=17
+pkgrel=18
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
 license=('GPL')
 arch=('x86_64')
@@ -20,32 +20,35 @@ replaces=('ndiswrapper-utils')
 conflicts=('ndiswrapper-utils')
 makedepends=('linux-headers')
 source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz"
-        "ndiswrapper-1.59.patch"
-)
+        "ndiswrapper-1.59.patch")
 
 sha1sums=('75fbbda677fe91ee07a6f6a8e19b1f3e2479540f'
           'f120e96fa9abab45e1c724aaac29da7b892820f0')
 
 
 prepare() {
-	[ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false
-	msg "Found kernel version: $_kver"
+  [ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false
+  msg "Found kernel version: $_kver"
+
+  cd "$srcdir/$pkgname-$pkgver" 
+  patch -p1 -i ../ndiswrapper-1.59.patch
+
+  sed -i -e 's|strnicmp|strncasecmp|' driver/ndis.c
+  sed -i "/modinfo/s/s/usr\//" driver/Makefile
 }
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i ../ndiswrapper-1.59.patch
-        sed -i "/modinfo/s/s/usr\//" driver/Makefile
-	make -C driver KVERS_UNAME=${_kver}
-	make -C utils
+  cd "$srcdir/$pkgname-$pkgver"        
+  make -C driver KVERS_UNAME=${_kver}
+  make -C utils
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-        make sbindir=/usr/sbin usrsbindir=/usr/sbin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \
-             KVERS=$_kver DESTDIR="$pkgdir/" install
+  make sbindir=/usr/sbin usrsbindir=/usr/sbin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \
+        KVERS=$_kver DESTDIR="$pkgdir/" install
 
-        sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
-               "${startdir}/ndiswrapper.install"
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
+          "${startdir}/ndiswrapper.install"
 }

ndiswrapper/kernel-3.10.patch

@@ -1,701 +0,0 @@
-From 89857ddd1aecc262c03b00e66baa1126707a962d Mon Sep 17 00:00:00 2001
-From: Christian Weber <ChristianWeber802@gmx.net>
-Date: Sat, 3 Aug 2013 22:11:04 +0200
-Subject: [PATCH] - API change of 'add_taint()' as of kernel 3.9 - procfs API
- change as of kernel 3.10
-
-TODO:
- - 'proc.c':443 and 'wrapndis.c':1775
-     Are wnd->net_dev->name and wnd->procfs_iface->name always equal?
- - 'proc.c':
-     Commented out error checking in procfs-callback-functions.
-     Seem to make no sense to me with the new API, maybe they are handled by seq_file internally?
----
- driver/loader.c   |   2 +-
- driver/proc.c     | 355 ++++++++++++++++++++++++++++++------------------------
- driver/wrapndis.c |   7 +-
- driver/wrapper.c  |   2 +-
- 4 files changed, 208 insertions(+), 158 deletions(-)
-
-diff --git a/driver/loader.c b/driver/loader.c
-index 406e6ba..8ae53c1 100644
---- a/driver/loader.c
-+++ b/driver/loader.c
-@@ -575,7 +575,7 @@ static int load_user_space_driver(struct load_driver *load_driver)
- 	} else {
- 		printk(KERN_INFO "%s: driver %s (%s) loaded\n",
- 		       DRIVER_NAME, wrap_driver->name, wrap_driver->version);
--		add_taint(TAINT_PROPRIETARY_MODULE);
-+		add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_STILL_OK);
- 		EXIT1(return 0);
- 	}
- }
-diff --git a/driver/proc.c b/driver/proc.c
-index 60ed0e0..11f0f8b 100644
---- a/driver/proc.c
-+++ b/driver/proc.c
-@@ -13,6 +13,7 @@
-  *
-  */
- #include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
- #include <linux/module.h>
- #include <asm/uaccess.h>
- 
-@@ -24,116 +25,144 @@
- 
- #define MAX_PROC_STR_LEN 32
- 
--static struct proc_dir_entry *wrap_procfs_entry;
-+static struct proc_dir_entry *procfs_hw,
-+                             *procfs_stats,
-+                             *procfs_encr,
-+                             *procfs_settings,
-+                             *procfs_debug,
-+                             *wrap_procfs_entry;
- 
--static int procfs_read_ndis_stats(char *page, char **start, off_t off,
--				  int count, int *eof, void *data)
-+/* stats */
-+
-+static int procfs_ndis_stats_show( struct seq_file *seqf, void *data)
- {
--	char *p = page;
- 	struct ndis_device *wnd = (struct ndis_device *)data;
- 	struct ndis_wireless_stats stats;
- 	NDIS_STATUS res;
- 	ndis_rssi rssi;
- 
--	if (off != 0) {
-+	/*if (off != 0) {
- 		*eof = 1;
- 		return 0;
--	}
-+	}*/
- 
- 	res = mp_query(wnd, OID_802_11_RSSI, &rssi, sizeof(rssi));
- 	if (!res)
--		p += sprintf(p, "signal_level=%d dBm\n", (s32)rssi);
-+		seq_printf(seqf, "signal_level=%d dBm\n", (s32)rssi);
- 
- 	res = mp_query(wnd, OID_802_11_STATISTICS, &stats, sizeof(stats));
- 	if (!res) {
- 
--		p += sprintf(p, "tx_frames=%llu\n", stats.tx_frag);
--		p += sprintf(p, "tx_multicast_frames=%llu\n",
--			     stats.tx_multi_frag);
--		p += sprintf(p, "tx_failed=%llu\n", stats.failed);
--		p += sprintf(p, "tx_retry=%llu\n", stats.retry);
--		p += sprintf(p, "tx_multi_retry=%llu\n", stats.multi_retry);
--		p += sprintf(p, "tx_rtss_success=%llu\n", stats.rtss_succ);
--		p += sprintf(p, "tx_rtss_fail=%llu\n", stats.rtss_fail);
--		p += sprintf(p, "ack_fail=%llu\n", stats.ack_fail);
--		p += sprintf(p, "frame_duplicates=%llu\n", stats.frame_dup);
--		p += sprintf(p, "rx_frames=%llu\n", stats.rx_frag);
--		p += sprintf(p, "rx_multicast_frames=%llu\n",
--			     stats.rx_multi_frag);
--		p += sprintf(p, "fcs_errors=%llu\n", stats.fcs_err);
-+		seq_printf(seqf, "tx_frames=%llu\n", stats.tx_frag);
-+		seq_printf(seqf, "tx_multicast_frames=%llu\n", stats.tx_multi_frag);
-+		seq_printf(seqf, "tx_failed=%llu\n", stats.failed);
-+		seq_printf(seqf, "tx_retry=%llu\n", stats.retry);
-+		seq_printf(seqf, "tx_multi_retry=%llu\n", stats.multi_retry);
-+		seq_printf(seqf, "tx_rtss_success=%llu\n", stats.rtss_succ);
-+		seq_printf(seqf, "tx_rtss_fail=%llu\n", stats.rtss_fail);
-+		seq_printf(seqf, "ack_fail=%llu\n", stats.ack_fail);
-+		seq_printf(seqf, "frame_duplicates=%llu\n", stats.frame_dup);
-+		seq_printf(seqf, "rx_frames=%llu\n", stats.rx_frag);
-+		seq_printf(seqf, "rx_multicast_frames=%llu\n", stats.rx_multi_frag);
-+		seq_printf(seqf, "fcs_errors=%llu\n", stats.fcs_err);
- 	}
- 
--	if (p - page > count) {
-+	/* if (p - page > count) {
- 		ERROR("wrote %td bytes (limit is %u)\n",
- 		      p - page, count);
- 		*eof = 1;
--	}
-+	}*/
- 
--	return p - page;
-+	return 0;
- }
- 
--static int procfs_read_ndis_encr(char *page, char **start, off_t off,
--				 int count, int *eof, void *data)
-+static int procfs_ndis_stats_open( struct inode *ino, struct file *f)
-+{
-+	return single_open( f, procfs_ndis_stats_show, PDE_DATA( ino));
-+};
-+
-+static struct file_operations procfs_ndis_stats_ops = {
-+	.open    = procfs_ndis_stats_open,
-+	.read    = seq_read,
-+	.llseek  = seq_lseek,
-+	.release = seq_release
-+};
-+
-+
-+/* encr */
-+static int procfs_ndis_encr_show( struct seq_file *seqf, void *data)
- {
--	char *p = page;
- 	struct ndis_device *wnd = (struct ndis_device *)data;
- 	int i, encr_status, auth_mode, infra_mode;
- 	NDIS_STATUS res;
- 	struct ndis_essid essid;
- 	mac_address ap_address;
- 
--	if (off != 0) {
-+	/*if (off != 0) {
- 		*eof = 1;
- 		return 0;
--	}
-+	}*/
- 
- 	res = mp_query(wnd, OID_802_11_BSSID,
- 		       &ap_address, sizeof(ap_address));
- 	if (res)
- 		memset(ap_address, 0, ETH_ALEN);
--	p += sprintf(p, "ap_address=%2.2X", ap_address[0]);
-+	seq_printf(seqf, "ap_address=%2.2X", ap_address[0]);
- 	for (i = 1; i < ETH_ALEN; i++)
--		p += sprintf(p, ":%2.2X", ap_address[i]);
--	p += sprintf(p, "\n");
-+		seq_printf(seqf, ":%2.2X", ap_address[i]);
-+	seq_printf(seqf, "\n");
- 
- 	res = mp_query(wnd, OID_802_11_SSID, &essid, sizeof(essid));
- 	if (!res)
--		p += sprintf(p, "essid=%.*s\n", essid.length, essid.essid);
-+		seq_printf(seqf, "essid=%.*s\n", essid.length, essid.essid);
- 
- 	res = mp_query_int(wnd, OID_802_11_ENCRYPTION_STATUS, &encr_status);
- 	if (!res) {
- 		typeof(&wnd->encr_info.keys[0]) tx_key;
--		p += sprintf(p, "tx_key=%u\n", wnd->encr_info.tx_key_index);
--		p += sprintf(p, "key=");
-+		seq_printf(seqf, "tx_key=%u\n", wnd->encr_info.tx_key_index);
-+		seq_printf(seqf, "key=");
- 		tx_key = &wnd->encr_info.keys[wnd->encr_info.tx_key_index];
- 		if (tx_key->length > 0)
- 			for (i = 0; i < tx_key->length; i++)
--				p += sprintf(p, "%2.2X", tx_key->key[i]);
-+				seq_printf(seqf, "%2.2X", tx_key->key[i]);
- 		else
--			p += sprintf(p, "off");
--		p += sprintf(p, "\n");
--		p += sprintf(p, "encr_mode=%d\n", encr_status);
-+			seq_printf(seqf, "off");
-+		seq_printf(seqf, "\n");
-+		seq_printf(seqf, "encr_mode=%d\n", encr_status);
- 	}
- 	res = mp_query_int(wnd, OID_802_11_AUTHENTICATION_MODE, &auth_mode);
- 	if (!res)
--		p += sprintf(p, "auth_mode=%d\n", auth_mode);
-+		seq_printf(seqf, "auth_mode=%d\n", auth_mode);
- 	res = mp_query_int(wnd, OID_802_11_INFRASTRUCTURE_MODE, &infra_mode);
--	p += sprintf(p, "mode=%s\n", (infra_mode == Ndis802_11IBSS) ?
-+	seq_printf(seqf, "mode=%s\n", (infra_mode == Ndis802_11IBSS) ?
- 		     "adhoc" : (infra_mode == Ndis802_11Infrastructure) ?
- 		     "managed" : "auto");
--	if (p - page > count) {
-+	/*if (p - page > count) {
- 		WARNING("wrote %td bytes (limit is %u)",
- 			p - page, count);
- 		*eof = 1;
--	}
-+	}*/
- 
--	return p - page;
-+	return 0;
- }
- 
--static int procfs_read_ndis_hw(char *page, char **start, off_t off,
--			       int count, int *eof, void *data)
-+static int procfs_ndis_encr_open( struct inode *ino, struct file *f)
-+{
-+	return single_open( f, procfs_ndis_encr_show, PDE_DATA( ino));
-+};
-+
-+static struct file_operations procfs_ndis_encr_ops = {
-+	.open    = procfs_ndis_encr_open,
-+	.read    = seq_read,
-+	.llseek  = seq_lseek,
-+	.release = seq_release
-+};
-+
-+
-+/* hw */
-+
-+static int procfs_ndis_hw_show( struct seq_file *seqf, void *data)
- {
--	char *p = page;
- 	struct ndis_device *wnd = (struct ndis_device *)data;
- 	struct ndis_configuration config;
- 	enum ndis_power power_mode;
-@@ -149,54 +178,51 @@ static int procfs_read_ndis_hw(char *page, char **start, off_t off,
- 	char *hw_status[] = {"ready", "initializing", "resetting", "closing",
- 			     "not ready"};
- 
--	if (off != 0) {
-+	/*if (off != 0) {
- 		*eof = 1;
- 		return 0;
--	}
-+	}*/
- 
- 	res = mp_query_int(wnd, OID_GEN_HARDWARE_STATUS, &n);
- 	if (res == NDIS_STATUS_SUCCESS && n >= 0 && n < ARRAY_SIZE(hw_status))
--		p += sprintf(p, "status=%s\n", hw_status[n]);
-+		seq_printf(seqf, "status=%s\n", hw_status[n]);
- 
- 	res = mp_query(wnd, OID_802_3_CURRENT_ADDRESS, mac, sizeof(mac));
- 	if (!res)
--		p += sprintf(p, "mac: " MACSTRSEP "\n", MAC2STR(mac));
-+		seq_printf(seqf, "mac: " MACSTRSEP "\n", MAC2STR(mac));
- 	res = mp_query(wnd, OID_802_11_CONFIGURATION, &config, sizeof(config));
- 	if (!res) {
--		p += sprintf(p, "beacon_period=%u msec\n",
-+		seq_printf(seqf, "beacon_period=%u msec\n",
- 			     config.beacon_period);
--		p += sprintf(p, "atim_window=%u msec\n", config.atim_window);
--		p += sprintf(p, "frequency=%u kHz\n", config.ds_config);
--		p += sprintf(p, "hop_pattern=%u\n",
--			     config.fh_config.hop_pattern);
--		p += sprintf(p, "hop_set=%u\n",
--			     config.fh_config.hop_set);
--		p += sprintf(p, "dwell_time=%u msec\n",
--			     config.fh_config.dwell_time);
-+		seq_printf(seqf, "atim_window=%u msec\n", config.atim_window);
-+		seq_printf(seqf, "frequency=%u kHz\n", config.ds_config);
-+		seq_printf(seqf, "hop_pattern=%u\n", config.fh_config.hop_pattern);
-+		seq_printf(seqf, "hop_set=%u\n", config.fh_config.hop_set);
-+		seq_printf(seqf, "dwell_time=%u msec\n", config.fh_config.dwell_time);
- 	}
- 
- 	res = mp_query(wnd, OID_802_11_TX_POWER_LEVEL,
- 		       &tx_power, sizeof(tx_power));
- 	if (!res)
--		p += sprintf(p, "tx_power=%u mW\n", tx_power);
-+		seq_printf(seqf, "tx_power=%u mW\n", tx_power);
- 
- 	res = mp_query(wnd, OID_GEN_LINK_SPEED, &bit_rate, sizeof(bit_rate));
- 	if (!res)
--		p += sprintf(p, "bit_rate=%u kBps\n", (u32)bit_rate / 10);
-+		seq_printf(seqf, "bit_rate=%u kBps\n", (u32)bit_rate / 10);
- 
- 	res = mp_query(wnd, OID_802_11_RTS_THRESHOLD,
- 		       &rts_threshold, sizeof(rts_threshold));
- 	if (!res)
--		p += sprintf(p, "rts_threshold=%u bytes\n", rts_threshold);
-+		seq_printf(seqf, "rts_threshold=%u bytes\n", rts_threshold);
- 
- 	res = mp_query(wnd, OID_802_11_FRAGMENTATION_THRESHOLD,
- 		       &frag_threshold, sizeof(frag_threshold));
- 	if (!res)
--		p += sprintf(p, "frag_threshold=%u bytes\n", frag_threshold);
-+		seq_printf(seqf, "frag_threshold=%u bytes\n", frag_threshold);
- 
- 	res = mp_query_int(wnd, OID_802_11_POWER_MODE, &power_mode);
- 	if (!res)
--		p += sprintf(p, "power_mode=%s\n",
-+		seq_printf(seqf, "power_mode=%s\n",
- 			     (power_mode == NDIS_POWER_OFF) ? "always_on" :
- 			     (power_mode == NDIS_POWER_MAX) ?
- 			     "max_savings" : "min_savings");
-@@ -204,19 +230,19 @@ static int procfs_read_ndis_hw(char *page, char **start, off_t off,
- 	res = mp_query(wnd, OID_802_11_NUMBER_OF_ANTENNAS,
- 		       &antenna, sizeof(antenna));
- 	if (!res)
--		p += sprintf(p, "num_antennas=%u\n", antenna);
-+		seq_printf(seqf, "num_antennas=%u\n", antenna);
- 
- 	res = mp_query(wnd, OID_802_11_TX_ANTENNA_SELECTED,
- 		       &antenna, sizeof(antenna));
- 	if (!res)
--		p += sprintf(p, "tx_antenna=%u\n", antenna);
-+		seq_printf(seqf, "tx_antenna=%u\n", antenna);
- 
- 	res = mp_query(wnd, OID_802_11_RX_ANTENNA_SELECTED,
- 		       &antenna, sizeof(antenna));
- 	if (!res)
--		p += sprintf(p, "rx_antenna=%u\n", antenna);
-+		seq_printf(seqf, "rx_antenna=%u\n", antenna);
- 
--	p += sprintf(p, "encryption_modes=%s%s%s%s%s%s%s\n",
-+	seq_printf(seqf, "encryption_modes=%s%s%s%s%s%s%s\n",
- 		     test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr) ?
- 		     "WEP" : "none",
- 
-@@ -239,57 +265,70 @@ static int procfs_read_ndis_hw(char *page, char **start, off_t off,
- 		if (packet_filter != wnd->packet_filter)
- 			WARNING("wrong packet_filter? 0x%08x, 0x%08x\n",
- 				packet_filter, wnd->packet_filter);
--		p += sprintf(p, "packet_filter: 0x%08x\n", packet_filter);
-+		seq_printf(seqf, "packet_filter: 0x%08x\n", packet_filter);
- 	}
--	if (p - page > count) {
-+	/*if (p - page > count) {
- 		WARNING("wrote %td bytes (limit is %u)",
- 			p - page, count);
- 		*eof = 1;
--	}
-+	}*/
- 
--	return p - page;
-+	return 0;
- }
- 
--static int procfs_read_ndis_settings(char *page, char **start, off_t off,
--				     int count, int *eof, void *data)
-+static int procfs_ndis_hw_open( struct inode *ino, struct file *f)
-+{
-+	return single_open( f, procfs_ndis_hw_show, PDE_DATA( ino));
-+};
-+
-+static struct file_operations procfs_ndis_hw_ops = {
-+	.open    = procfs_ndis_hw_open,
-+	.read    = seq_read,
-+	.llseek  = seq_lseek,
-+	.release = seq_release
-+};
-+
-+
-+/* settings */
-+
-+static int procfs_ndis_settings_show( struct seq_file *seqf, void *data)
- {
--	char *p = page;
- 	struct ndis_device *wnd = (struct ndis_device *)data;
- 	struct wrap_device_setting *setting;
- 
--	if (off != 0) {
-+	/*if (off != 0) {
- 		*eof = 1;
- 		return 0;
--	}
-+	}*/
- 
--	p += sprintf(p, "hangcheck_interval=%d\n",
-+	seq_printf(seqf, "hangcheck_interval=%d\n",
- 		     hangcheck_interval == 0 ?
- 		     (wnd->hangcheck_interval / HZ) : -1);
- 
- 	list_for_each_entry(setting, &wnd->wd->settings, list) {
--		p += sprintf(p, "%s=%s\n", setting->name, setting->value);
-+		seq_printf(seqf, "%s=%s\n", setting->name, setting->value);
- 	}
- 
- 	list_for_each_entry(setting, &wnd->wd->driver->settings, list) {
--		p += sprintf(p, "%s=%s\n", setting->name, setting->value);
-+		seq_printf(seqf, "%s=%s\n", setting->name, setting->value);
- 	}
- 
--	return p - page;
-+	return 0;
- }
- 
- static int procfs_write_ndis_settings(struct file *file, const char __user *buf,
--				      unsigned long count, void *data)
-+				      size_t size, loff_t *ppos)
- {
--	struct ndis_device *wnd = (struct ndis_device *)data;
-+	struct ndis_device *wnd = (struct ndis_device *)PDE_DATA( file->f_inode);
- 	char setting[MAX_PROC_STR_LEN], *p;
- 	unsigned int i;
- 	NDIS_STATUS res;
- 
--	if (count > MAX_PROC_STR_LEN)
-+	if (size > MAX_PROC_STR_LEN)
- 		return -EINVAL;
- 
- 	memset(setting, 0, sizeof(setting));
--	if (copy_from_user(setting, buf, count))
-+	if (copy_from_user(setting, buf, size))
- 		return -EFAULT;
- 
- 	if ((p = strchr(setting, '\n')))
-@@ -377,18 +416,35 @@ static int procfs_write_ndis_settings(struct file *file, const char __user *buf,
- 		if (res != NDIS_STATUS_SUCCESS)
- 			return -EFAULT;
- 	}
--	return count;
-+	return size;
- }
- 
--int wrap_procfs_add_ndis_device(struct ndis_device *wnd)
-+static int procfs_ndis_settings_open( struct inode *ino, struct file *f)
- {
--	struct proc_dir_entry *procfs_entry;
-+	return single_open( f, procfs_ndis_settings_show, PDE_DATA( ino));
-+};
-+
-+static struct file_operations procfs_ndis_settings_ops = {
-+	.open    = procfs_ndis_settings_open,
-+	.read    = seq_read,
-+	.write   = procfs_write_ndis_settings,
-+	.llseek  = seq_lseek,
-+	.release = seq_release
-+};
-+
- 
-+int wrap_procfs_add_ndis_device(struct ndis_device *wnd)
-+{
- 	if (wrap_procfs_entry == NULL)
- 		return -ENOMEM;
- 
- 	if (wnd->procfs_iface) {
--		ERROR("%s already registered?", wnd->procfs_iface->name);
-+		ERROR("%s already registered?", wnd->net_dev->name);
-+/* NEEDS CLARIFICATION:
-+ * 'wnd->procfs_iface->name' changed to 'wnd->net_dev_name', as the 'proc_dir_entry'-struct
-+ * is now opaque.
-+ * Are they always the same?
-+ */
- 		return -EINVAL;
- 	}
- 	wnd->procfs_iface = proc_mkdir(wnd->net_dev->name, wrap_procfs_entry);
-@@ -396,68 +452,51 @@ int wrap_procfs_add_ndis_device(struct ndis_device *wnd)
- 		ERROR("couldn't create proc directory");
- 		return -ENOMEM;
- 	}
--	wnd->procfs_iface->uid = proc_uid;
--	wnd->procfs_iface->gid = proc_gid;
-+	proc_set_user( wnd->procfs_iface, proc_uid, proc_gid);
- 
--	procfs_entry = create_proc_entry("hw", S_IFREG | S_IRUSR | S_IRGRP,
--					 wnd->procfs_iface);
--	if (procfs_entry == NULL) {
-+	procfs_hw = proc_create_data("hw", S_IFREG | S_IRUSR | S_IRGRP, wnd->procfs_iface, &procfs_ndis_hw_ops, wnd);
-+	if (procfs_hw == NULL) {
- 		ERROR("couldn't create proc entry for 'hw'");
- 		goto err_hw;
- 	} else {
--		procfs_entry->uid = proc_uid;
--		procfs_entry->gid = proc_gid;
--		procfs_entry->data = wnd;
--		procfs_entry->read_proc = procfs_read_ndis_hw;
-+		proc_set_user( procfs_hw, proc_uid, proc_gid);
- 	}
- 
--	procfs_entry = create_proc_entry("stats", S_IFREG | S_IRUSR | S_IRGRP,
--					 wnd->procfs_iface);
--	if (procfs_entry == NULL) {
-+	procfs_stats = proc_create_data("stats", S_IFREG | S_IRUSR | S_IRGRP, wnd->procfs_iface, &procfs_ndis_stats_ops, wnd);
-+	if (procfs_stats == NULL) {
- 		ERROR("couldn't create proc entry for 'stats'");
- 		goto err_stats;
- 	} else {
--		procfs_entry->uid = proc_uid;
--		procfs_entry->gid = proc_gid;
--		procfs_entry->data = wnd;
--		procfs_entry->read_proc = procfs_read_ndis_stats;
-+		proc_set_user( procfs_stats, proc_uid, proc_gid);
- 	}
- 
--	procfs_entry = create_proc_entry("encr", S_IFREG | S_IRUSR | S_IRGRP,
--					 wnd->procfs_iface);
--	if (procfs_entry == NULL) {
-+	procfs_encr = proc_create_data("encr", S_IFREG | S_IRUSR | S_IRGRP, wnd->procfs_iface, &procfs_ndis_encr_ops, wnd);
-+	if (procfs_encr == NULL) {
- 		ERROR("couldn't create proc entry for 'encr'");
- 		goto err_encr;
- 	} else {
--		procfs_entry->uid = proc_uid;
--		procfs_entry->gid = proc_gid;
--		procfs_entry->data = wnd;
--		procfs_entry->read_proc = procfs_read_ndis_encr;
-+		proc_set_user( procfs_encr, proc_uid, proc_gid);
- 	}
- 
--	procfs_entry = create_proc_entry("settings", S_IFREG |
-+	procfs_settings = proc_create_data("settings", S_IFREG |
- 					 S_IRUSR | S_IRGRP |
--					 S_IWUSR | S_IWGRP, wnd->procfs_iface);
--	if (procfs_entry == NULL) {
-+					 S_IWUSR | S_IWGRP, wnd->procfs_iface, &procfs_ndis_settings_ops, wnd);
-+	if (procfs_settings == NULL) {
- 		ERROR("couldn't create proc entry for 'settings'");
- 		goto err_settings;
- 	} else {
--		procfs_entry->uid = proc_uid;
--		procfs_entry->gid = proc_gid;
--		procfs_entry->data = wnd;
--		procfs_entry->read_proc = procfs_read_ndis_settings;
--		procfs_entry->write_proc = procfs_write_ndis_settings;
-+		proc_set_user( procfs_settings, proc_uid, proc_gid);
- 	}
- 	return 0;
- 
- err_settings:
--	remove_proc_entry("encr", wnd->procfs_iface);
-+	proc_remove( procfs_encr);
- err_encr:
--	remove_proc_entry("stats", wnd->procfs_iface);
-+	proc_remove( procfs_stats);
- err_stats:
--	remove_proc_entry("hw", wnd->procfs_iface);
-+	proc_remove( procfs_hw);
- err_hw:
--	remove_proc_entry(wnd->procfs_iface->name, wrap_procfs_entry);
-+	proc_remove( wnd->procfs_iface);
- 	wnd->procfs_iface = NULL;
- 	return -ENOMEM;
- }
-@@ -468,46 +507,45 @@ void wrap_procfs_remove_ndis_device(struct ndis_device *wnd)
- 
- 	if (procfs_iface == NULL)
- 		return;
--	remove_proc_entry("hw", procfs_iface);
--	remove_proc_entry("stats", procfs_iface);
--	remove_proc_entry("encr", procfs_iface);
--	remove_proc_entry("settings", procfs_iface);
-+	proc_remove( procfs_hw);
-+	proc_remove( procfs_stats);
-+	proc_remove( procfs_encr);
-+	proc_remove( procfs_settings);
- 	if (wrap_procfs_entry)
--		remove_proc_entry(procfs_iface->name, wrap_procfs_entry);
-+		proc_remove( procfs_iface);
- }
- 
--static int procfs_read_debug(char *page, char **start, off_t off,
--			     int count, int *eof, void *data)
-+/* debug */
-+static int procfs_debug_show( struct seq_file *seqf, void *data)
- {
--	char *p = page;
- #if ALLOC_DEBUG
- 	enum alloc_type type;
- #endif
- 
--	if (off != 0) {
-+	/*if (off != 0) {
- 		*eof = 1;
- 		return 0;
--	}
--	p += sprintf(p, "%d\n", debug);
-+	}*/
-+	seq_printf(seqf, "%d\n", debug);
- #if ALLOC_DEBUG
- 	for (type = 0; type < ALLOC_TYPE_MAX; type++)
--		p += sprintf(p, "total size of allocations in %s: %d\n",
-+		seq_printf(seqf, "total size of allocations in %s: %d\n",
- 			     alloc_type_name[type], alloc_size(type));
- #endif
--	return p - page;
-+	return 0;
- }
- 
- static int procfs_write_debug(struct file *file, const char __user *buf,
--			      unsigned long count, void *data)
-+				      size_t size, loff_t *ppos)
- {
- 	int i;
- 	char setting[MAX_PROC_STR_LEN], *p;
- 
--	if (count > MAX_PROC_STR_LEN)
-+	if (size > MAX_PROC_STR_LEN)
- 		return -EINVAL;
- 
- 	memset(setting, 0, sizeof(setting));
--	if (copy_from_user(setting, buf, count))
-+	if (copy_from_user(setting, buf, size))
- 		return -EFAULT;
- 
- 	if ((p = strchr(setting, '\n')))
-@@ -521,31 +559,38 @@ static int procfs_write_debug(struct file *file, const char __user *buf,
- 		debug = i;
- 	else
- 		return -EINVAL;
--	return count;
-+	return size;
- }
- 
--int wrap_procfs_init(void)
-+static int procfs_debug_open( struct inode *ino, struct file *f)
- {
--	struct proc_dir_entry *procfs_entry;
-+	return single_open( f, procfs_debug_show, NULL);
-+};
-+
-+static struct file_operations procfs_debug_ops = {
-+	.open    = procfs_debug_open,
-+	.read    = seq_read,
-+	.write   = procfs_write_debug,
-+	.llseek  = seq_lseek,
-+	.release = seq_release
-+};
- 
-+int wrap_procfs_init(void)
-+{
- 	wrap_procfs_entry = proc_mkdir(DRIVER_NAME, proc_net_root);
- 	if (wrap_procfs_entry == NULL) {
- 		ERROR("couldn't create procfs directory");
- 		return -ENOMEM;
- 	}
--	wrap_procfs_entry->uid = proc_uid;
--	wrap_procfs_entry->gid = proc_gid;
-+	proc_set_user( wrap_procfs_entry, proc_uid, proc_gid);
- 
--	procfs_entry = create_proc_entry("debug", S_IFREG | S_IRUSR | S_IRGRP,
--					 wrap_procfs_entry);
--	if (procfs_entry == NULL) {
-+	procfs_debug = proc_create("debug", S_IFREG | S_IRUSR | S_IRGRP,
-+					 wrap_procfs_entry, &procfs_debug_ops);
-+	if (procfs_debug == NULL) {
- 		ERROR("couldn't create proc entry for 'debug'");
- 		return -ENOMEM;
- 	} else {
--		procfs_entry->uid = proc_uid;
--		procfs_entry->gid = proc_gid;
--		procfs_entry->read_proc = procfs_read_debug;
--		procfs_entry->write_proc = procfs_write_debug;
-+		proc_set_user( procfs_debug, proc_uid, proc_gid);
- 	}
- 	return 0;
- }
-@@ -554,6 +599,6 @@ void wrap_procfs_remove(void)
- {
- 	if (wrap_procfs_entry == NULL)
- 		return;
--	remove_proc_entry("debug", wrap_procfs_entry);
--	remove_proc_entry(DRIVER_NAME, proc_net_root);
-+	proc_remove( procfs_debug);
-+	proc_remove( wrap_procfs_entry);
- }
-diff --git a/driver/wrapndis.c b/driver/wrapndis.c
-index 7bb9568..43074f4 100644
---- a/driver/wrapndis.c
-+++ b/driver/wrapndis.c
-@@ -1771,7 +1771,12 @@ static int notifier_event(struct notifier_block *notifier, unsigned long event,
- 		if (likely(wnd->procfs_iface)) {
- 			printk(KERN_INFO "%s: changing interface name from "
- 			       "'%s' to '%s'\n", DRIVER_NAME,
--			       wnd->procfs_iface->name, net_dev->name);
-+			       wnd->net_dev->name, net_dev->name);
-+/* NEEDS CLARIFICATION:
-+ * 'wnd->procfs_iface->name' changed to 'wnd->net_dev_name', as the 'proc_dir_entry'-struct
-+ * is now opaque.
-+ * Are they always the same?
-+ */
- 			wrap_procfs_remove_ndis_device(wnd);
- 			wrap_procfs_add_ndis_device(wnd);
- 		}
-diff --git a/driver/wrapper.c b/driver/wrapper.c
-index f77c879..19a3249 100644
---- a/driver/wrapper.c
-+++ b/driver/wrapper.c
-@@ -72,7 +72,7 @@ static void module_cleanup(void)
- static int __init wrapper_init(void)
- {
- #ifdef TAINT_OOT_MODULE
--	add_taint(TAINT_OOT_MODULE);
-+	add_taint(TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
- #endif
- 	printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n",
- 	       DRIVER_NAME, DRIVER_VERSION,
--- 
-1.8.3.4
-

ndiswrapper/ndiswrapper-1.58-add_taint.patch

@@ -1,24 +0,0 @@
-diff -ur ndiswrapper-1.58.orig/driver/loader.c ndiswrapper-1.58/driver/loader.c
---- ndiswrapper-1.58.orig/driver/loader.c	2013-05-01 09:48:34.910000000 +0900
-+++ ndiswrapper-1.58/driver/loader.c	2013-05-01 09:48:59.870000000 +0900
-@@ -575,7 +575,7 @@
- 	} else {
- 		printk(KERN_INFO "%s: driver %s (%s) loaded\n",
- 		       DRIVER_NAME, wrap_driver->name, wrap_driver->version);
--		add_taint(TAINT_PROPRIETARY_MODULE);
-+		add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_STILL_OK);
- 		EXIT1(return 0);
- 	}
- }
-diff -ur ndiswrapper-1.58.orig/driver/wrapper.c ndiswrapper-1.58/driver/wrapper.c
---- ndiswrapper-1.58.orig/driver/wrapper.c	2013-02-20 03:00:37.000000000 +0900
-+++ ndiswrapper-1.58/driver/wrapper.c	2013-05-01 09:54:30.140000000 +0900
-@@ -72,7 +72,7 @@
- static int __init wrapper_init(void)
- {
- #ifdef TAINT_OOT_MODULE
--	add_taint(TAINT_OOT_MODULE);
-+	add_taint(TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
- #endif
- 	printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n",
- 	       DRIVER_NAME, DRIVER_VERSION,

ndiswrapper/ndiswrapper.install

@@ -5,7 +5,7 @@ post_install()
 
 post_upgrade()
 {
-  EXTRAMODULES='extramodules-3.19-CHAKRA'
+  EXTRAMODULES='extramodules-4.0-CHAKRA'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 

nfs-utils/PKGBUILD

@@ -1,63 +1,79 @@
 #
-# Core Packages for Chakra, part of chakra-project.org
+# Core Packages for Chakra, part of chakraos.org
 #
 # maintainer Samir Benmendil <ram-z[at]chakra-project[dot]org>
-# maintainer abveritas[at]chakra-project[dot]org>
+
 
 pkgname=nfs-utils
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
 pkgdesc="Support programs for Network File Systems"
 arch=('x86_64')
 url='http://nfs.sourceforge.net'
 license=('GPL')
 backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
-depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent' 'device-mapper')
+depends=('glibc' 'e2fsprogs' 'rpcbind' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent' 'device-mapper')
 makedepends=('pkg-config' 'autoconf' 'automake' 'sqlite3')
 source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	nfs-common.conf
-	nfs-server.conf
-	exports
-	idmapd.conf
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils.conf
+        nfs-common.conf
+        nfs-server.conf
+        exports
+        idmapd.conf
+        nfs-utils.conf
         id_resolver.conf
-        nfs-utils_env.sh)
+        nfs-utils_env.sh
+        nfs-utils-1.3.2-statd-bg.patch
+        nfs-utils-1.3.2-statd-nowait.patch)
 install=nfs-utils.install
-optdepends=('sqlite: for nfsdcltrack usage')
-md5sums=('97f157f954edb6d4d4385a0c5986f36f'
+optdepends=('sqlite3: for nfsdcltrack usage'
+            'python2: for nfsiostat and mountstats usage')
+md5sums=('1e2f3c1ed468dee02d00c534c002ea10'
          '21510b0b30e71c8d6679c7c23f3b78eb'
          'c1fe8dd9581c1df788d8965f4f1479f3'
          'e6ad3c7a59c7e4c24965a0e7da35026c'
          'eb4f4027fab6fc1201f1ca04f5954c76'
-         '7674106eaaa4c149bccd4f05fe3604e9'
          '8ac484023d786766d287ccbe878ae4ba'
          'a43aabf0b8d02406b1babc3a206d952a'
-         'c6c9c32f153dfa6c0477ea6b99354288')
+         'c6c9c32f153dfa6c0477ea6b99354288'
+         '45f55a5d581b2527b453c3a0816add24'
+         'dde4e23776a2425d2a1241eb2daf8b7c')
 
 prepare() {
-  cd $srcdir/${pkgname}-${pkgver}
-  patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
-  ./autogen.sh
+  cd ${pkgname}-${pkgver}
+  # fix rpc.statd starting
+  patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-bg.patch
+  # don't wait for online target on statd
+  patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-nowait.patch
+
+  # fix hardcoded sbin path to our needs
+  sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+  autoreconf -vfi
 }
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sbindir=/usr/sbin --enable-nfsv4 --enable-nfsv41 --enable-gss \
-              --without-tcp-wrappers --with-statedir=/var/lib/nfs \
-              --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
-              --enable-mountconfig --with-start-statd=/usr/bin/start-statd
-  # move mount helpers to /usr/sbin
-  sed -i -e 's#sbindir = /sbin#sbindir = /usr/sbin#g' utils/mount/Makefile
-  # move osd_login to /usr/sbin
-  sed -i -e 's#sbindir = /sbin#sbindir = /usr/sbin#g' utils/osd_login/Makefile
-  # move nfsdcltrack to /usr/sbin
-  sed -i -e 's#sbindir = /sbin#sbindir = /usr/sbin#g' utils/nfsdcltrack/Makefile
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sbindir=/usr/sbin \
+    --sysconfdir=/etc \
+    --enable-nfsv4 \
+    --enable-nfsv41 \
+    --enable-gss \
+    --without-tcp-wrappers \
+    --with-statedir=/var/lib/nfs \
+    --enable-ipv6 \
+    --enable-libmount-mount \
+    --enable-mountconfig \
+    --with-start-statd=/usr/bin/start-statd
   make 
 }
 
+check() {
+  cd ${pkgname}-${pkgver}
+  make -k check
+}
+
 package() {
-  cd $srcdir/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR="$pkgdir" install
   sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}

nfs-utils/nfs-utils-1.1.4-mtab-sym.patch

@@ -1,39 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- 	return var_mtab_does_not_exist;
- }
- 
--static int
-+int
- mtab_is_a_symlink(void) {
-         get_mtab_info();
-         return var_mtab_is_a_symlink;
---- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
- 
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
---- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
- 	int flags;
- 	mntFILE *mfp;
- 
-+	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+	   that would create a file /proc/mounts in case the proc filesystem
-+	   is not mounted, and the fchmod below would also fail. */
-+	if (mtab_is_a_symlink()) {
-+		return EX_SUCCESS;
-+	}
-+
- 	lock_mtab();
- 
- 	mfp = nfs_setmntent (MOUNTED, "a+");

nfs-utils/nfs-utils-1.3.2-statd-bg.patch

@@ -0,0 +1,25 @@
+commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50
+Author: Chris Mayo <aklhfex@gmail.com>
+Date:   Sun Feb 1 12:03:46 2015 -0500
+
+    statd: Fix test for foreground mode
+    
+    daemon_init parameter has the opposite sense
+    to code removed in commit 7addf9d
+    
+    Signed-off-by: Chris Mayo <aklhfex@gmail.com>
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ 		simulator (--argc, ++argv);	/* simulator() does exit() */
+ #endif
+ 
+-	daemon_init(!(run_mode & MODE_NODAEMON));
++	daemon_init((run_mode & MODE_NODAEMON));
+ 
+ 	if (run_mode & MODE_LOG_STDERR) {
+ 		xlog_syslog(0);

nfs-utils/nfs-utils-1.3.2-statd-nowait.patch

@@ -0,0 +1,35 @@
+From 650633d4e956dc6b628da30c868e39fba76a0b29 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Mon, 9 Feb 2015 08:54:54 -0500
+Subject: [PATCH] rpc-statd-notify: Don't wait for the network to come up
+
+rpc-statd-notify only needs to wait for the network
+interface to be configured not to be connected since
+it forks into background and will wait 15mins for
+the network to come up.
+
+This decrease boot times when networks are not
+and will not be connected.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+Reported-By: Eric Work <work.eric@gmail.com>
+---
+ systemd/rpc-statd-notify.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service
+index 941afe5..a655445 100644
+--- a/systemd/rpc-statd-notify.service
++++ b/systemd/rpc-statd-notify.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Notify NFS peers of a restart
+ Requires=network-online.target
+-After=network-online.target nss-lookup.target
++After=network.target nss-lookup.target
+ 
+ # if we run an nfs server, it needs to be running before we
+ # tell clients that it has restarted.
+-- 
+2.1.0
+

nfsidmap/PKGBUILD

@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 52311 2009-09-17 07:29:57Z allan $
-# Maintainer: 
-# Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=nfsidmap
-pkgver=0.23
-pkgrel=4
+pkgver=0.26
+pkgrel=1
 pkgdesc="Library to help mapping IDs, mainly for NFSv4"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 depends=('glibc' 'libldap>=2.4.18')
 license=('custom:nfsidmap')
-options=(!libtool)
-source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz)
-md5sums=('28f3ece648c1dc5d25e8d623d55f8bd6')
+source=(https://fedorapeople.org/~steved/libnfsidmap/$pkgver/libnfsidmap-$pkgver.tar.bz2)
+md5sums=('2c0cf0e2b1665d51fa9a783679494888')
 
 build() {
   cd $srcdir/lib$pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  # remove idmap manpage provided by nfs-utils!
-  rm $pkgdir/usr/share/man/man5/idmapd.conf.5 || return 1
-  # install license
-  install -Dm644 COPYING \
-	$pkgdir/usr/share/licenses/nfsidmap/LICENSE || return 1
+  make
 }
 
+package() {
+  cd $srcdir/lib$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE
+}

openmpi/PKGBUILD

@@ -1,30 +1,23 @@
-# Maintainer: Manuel Tortosa
 
 pkgname=openmpi
-pkgver=1.8.2
+pkgver=1.8.5
 pkgmin="${pkgver%.*}"
 pkgrel=1
 pkgdesc='High performance message passing library (MPI)'
-arch=(i686 x86_64)
+arch=('x86_64')
 url='http://www.open-mpi.org'
 license=(custom)
-depends=(libltdl 'hwloc>=1.9')
-makedepends=(inetutils valgrind gcc-fortran)
+depends=('libltdl' 'hwloc>=1.9')
+makedepends=('inetutils' 'valgrind' 'gcc-fortran')
 optdepends=('gcc-fortran: fortran support')
 options=(staticlibs)
 source=(http://www.open-mpi.org/software/ompi/v${pkgmin}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('55067856b351cbeb5ebe8a430bfe0656115a04ed')
-
-prepare() {
-   cd $pkgname-$pkgver
-
-   # Make sure we use the system ltdl library rather than the ones in the tarball
-   rm -r opal/libltdl
-}
+sha1sums=('2e0408dbb033b0df21d1f95fffb872f2a8237de6')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd $pkgname-$pkgver
 
+   ./autogen.pl
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
                --enable-mpi-fortran=all \
@@ -33,7 +26,6 @@ build() {
                --enable-smp-locks \
                --with-valgrind \
                --enable-memchecker \
-               --enable-debug \
                --enable-pretty-print-stacktrace \
                --without-slurm \
                --with-hwloc=/usr \
@@ -44,6 +36,12 @@ build() {
    make
 }
 
+check() {
+   cd $pkgname-$pkgver
+
+   make check
+}
+
 package() {
    cd $pkgname-$pkgver
    make DESTDIR="$pkgdir" install

openssl/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=openssl
-_ver=1.0.1m
+_ver=1.0.1p
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -15,11 +15,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
         'no-rpath.patch'
         'ca-dir.patch')
-md5sums=('d143d1555d842a069cb7cc34ba745a06'
+md5sums=('7563e92327199e0067ccd0f79f436976'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90')
 
+# Matt Caswell
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
+
 prepare() {
 	cd $srcdir/$pkgname-$_ver
 

p11-kit/PKGBUILD

@@ -1,14 +1,29 @@
 pkgname=p11-kit
-pkgver=0.22.1
+pkgver=0.23.1
 pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=('x86_64')
 url="http://p11-glue.freedesktop.org"
 license=('BSD')
 depends=('glibc' 'libtasn1' 'libffi')
-source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('4e9bea1106628ffb820bdad24a819fac'
-         'SKIP')
+source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}
+        libnssckbi-compat.patch)
+md5sums=('96f073270c489c9a594e1c9413f42db8'
+         'SKIP'
+         '8c3f119005908cf4a3e0ef0a0a310f14')
+validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Build and install an additional library (libnssckbi-p11-kit.so) which
+  # is a copy of p11-kit-trust.so but uses the same label for root certs as
+  # libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
+  # https://bugs.freedesktop.org/show_bug.cgi?id=66161
+  patch -Np1 -i ../libnssckbi-compat.patch
+
+  autoreconf -vi
+}
 
 build() {
   cd $pkgname-$pkgver

p11-kit/libnssckbi-compat.patch

@@ -0,0 +1,57 @@
+diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am
+--- p11-kit-0.23.1.orig/trust/Makefile.am	2014-11-12 12:58:50.000000000 +0200
++++ p11-kit-0.23.1/trust/Makefile.am	2015-03-30 16:43:35.275993032 +0300
+@@ -61,6 +61,20 @@ p11_kit_trust_la_LDFLAGS = \
+ 
+ p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
+ 
++libnssckbi_compatdir = $(libdir)
++libnssckbi_compat_LTLIBRARIES = \
++	libnssckbi-p11-kit.la
++
++libnssckbi_p11_kit_la_CFLAGS = \
++	-DLIBNSSCKBI_COMPAT \
++	$(p11_kit_trust_la_CFLAGS)
++
++libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD)
++
++libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS)
++
++libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES)
++
+ libtrust_testable_la_LDFLAGS = \
+ 	-no-undefined
+ 
+diff -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c
+--- p11-kit-0.23.1.orig/trust/module.c	2014-12-16 12:24:01.000000000 +0200
++++ p11-kit-0.23.1/trust/module.c	2015-03-30 16:48:41.370360130 +0300
+@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens,
+ 		const char *label;
+ 	} labels[] = {
+ 		{ "~/", "User Trust" },
++#ifdef LIBNSSCKBI_COMPAT
++		{ DATA_DIR, "Builtin Object Token" },
++#else
+ 		{ DATA_DIR, "Default Trust" },
++#endif
+ 		{ SYSCONFDIR, "System Trust" },
+ 		{ NULL },
+ 	};
+@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
+ 		info->flags = CKF_TOKEN_PRESENT;
+ 		strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
+ 
+-		/* If too long, copy the first 64 characters into buffer */
+-		path = p11_token_get_path (token);
++#ifdef LIBNSSCKBI_COMPAT
++		/* Change description to match libnssckbi so HPKP works in Chromium */
++		if (strcmp (p11_token_get_label (token), "Builtin Object Token" ) == 0)
++			path = "NSS Builtin Objects";
++		else
++#endif
++			path = p11_token_get_path (token);
+ 		length = strlen (path);
++		/* If too long, copy the first 64 characters into buffer */
+ 		if (length > sizeof (info->slotDescription))
+ 			length = sizeof (info->slotDescription);
+ 		memset (info->slotDescription, ' ', sizeof (info->slotDescription));

patch/PKGBUILD

@@ -1,10 +1,6 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer: abveritas@chakra-project.org
 
 pkgname=patch
-pkgver=2.7.1
+pkgver=2.7.5
 pkgrel=1
 pkgdesc="A utility to apply patch files to original sources"
 arch=('x86_64')
@@ -14,7 +10,7 @@ groups=('base-devel')
 depends=('glibc')
 optdepends=('ed: Interpret the patch as an ed script')
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz")
-md5sums=('e9ae5393426d3ad783a300a338c09b72')
+md5sums=('e3da7940431633fb65a01b91d3b7a27a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

pciutils/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=pciutils
-pkgver=3.3.0
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="PCI bus configuration space access library and tools"
 arch=('x86_64')
 license=('GPL2')
@@ -10,7 +10,7 @@ optdepends=('sh: required by update-pciids')
 makedepends=('wget')
 depends=('glibc' 'hwids')
 source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('3c19adf32a8457983b71ff376ef7dafe')
+md5sums=('4c340a317987d61a11ee2cf139ef1191')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

pcre/001-fix-heap-overflow.patch

@@ -1,16 +0,0 @@
---- a/code/trunk/pcre_exec.c	2014/11/05 15:08:03	1510
-+++ b/code/trunk/pcre_exec.c	2014/11/19 20:57:13	1513
-@@ -1404,8 +1404,11 @@
-         condition = TRUE;
- 
-         /* Advance ecode past the assertion to the start of the first branch,
--        but adjust it so that the general choosing code below works. */
--
-+        but adjust it so that the general choosing code below works. If the 
-+        assertion has a quantifier that allows zero repeats we must skip over 
-+        the BRAZERO. This is a lunatic thing to do, but somebody did! */
-+        
-+        if (*ecode == OP_BRAZERO) ecode++; 
-         ecode += GET(ecode, 1);
-         while (*ecode == OP_ALT) ecode += GET(ecode, 1);
-         ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];

pcre/PKGBUILD

@@ -4,20 +4,22 @@
 # maintainer (x86_64): AlmAck <almack[at]chakraos[dot]org>
 
 pkgname=pcre
-pkgver=8.36
-pkgrel=1
+pkgver=8.37
+pkgrel=2
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('x86_64')
 url="http://www.pcre.org/"
 license=('BSD')
 depends=('gcc-libs' 'readline' 'zlib' 'bzip2')
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2"
-'001-fix-heap-overflow.patch')
-md5sums=('b767bc9af0c20bc9c1fe403b0d41ad97'
-         '44a7e4fca07eff04d07bef65c982de9a')
+validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}
+        '01-seven-security-patches.patch')
+md5sums=('ed91be292cb01d21bc7e526816c26981'
+         'SKIP'
+         '45df6737e61738cc8bb061e0b9c0fbb2')
 
-prepare(){
-  patch -d $pkgname-$pkgver < 001-fix-heap-overflow.patch
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 01-seven-security-patches.patch
 }
 
 build() {

perl-yaml-syck/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=perl-yaml-syck
 _realname=YAML-Syck
-pkgver=1.27
+pkgver=1.29
 pkgrel=1
 pkgdesc="Fast, lightweight YAML loader and dumper"
 arch=('x86_64')
@@ -11,7 +11,7 @@ url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz)
-md5sums=('8920091e68a078cfa9c42041e5759162')
+md5sums=('0f906ae8b3747039b26c29c481cda607')
 
 build() {
   cd "${srcdir}/${_realname}-$pkgver"

python2/PKGBUILD

@@ -4,8 +4,8 @@
 #               A Boersma (abveritas) <abveritas@chakra-project.org>
 
 pkgname=python2
-pkgver=2.7.9
-pkgrel=2
+pkgver=2.7.10
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
@@ -21,7 +21,7 @@ replaces=('python-elementtree' 'python-ctypes' 'python')
 conflicts=('python')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
         'add-chakra-support.patch')
-md5sums=('38d530f7efc373d64a8fb1637e3baaa7'
+md5sums=('c685ef0b8e9f27b5e3db5db12b268ac6'
          '9b47a96ffa3d18cdc864481c178aef28')
 
 build() {

quota-tools/PKGBUILD

@@ -1,15 +1,15 @@
 pkgname=quota-tools
-pkgver=4.01
+pkgver=4.02
 pkgrel=1
 pkgdesc="Tools to manage kernel-level quotas in Linux"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://sourceforge.net/projects/linuxquota/"
 license=('GPL' 'BSD')
 depends=('e2fsprogs')
 backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz)
-sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf')
+sha1sums=('0b82c28033abc60cdfd00dabfe0313bbd5f7b9af')
 
 build() {
   cd ${pkgname}