Fri Jun 20 03:54:27 UTC 2014

3 files changed, 52 insertions, 18 deletions

diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 79ee624cb..966598e09 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213861 2014-05-30 16:36:55Z bpiotrowski $
+# $Id: PKGBUILD 215305 2014-06-19 12:33:38Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -7,7 +7,7 @@ pkgname=bash
 _basever=4.3
 _patchlevel=018
 pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=3
 pkgdesc='The GNU Bourne Again shell'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -22,7 +22,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
         dot.bash_profile
         dot.bash_logout
         system.bashrc
-        system.bash_logout)
+        system.bash_logout
+        privmode-setuid-fail.patch)
 
 if [[ $((10#${_patchlevel})) -gt 0 ]]; then
     for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do
@@ -37,6 +38,9 @@ prepare() {
     msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)"
     patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p)
   done
+
+  # http://hmarco.org/bugs/bash_4.3-setuid-bug.html (FS#40663)
+  patch -p0 -i ../privmode-setuid-fail.patch
 }
 
 build() {
@@ -79,6 +83,7 @@ md5sums=('81348932d5da294953e15d4814c74dd1'
          '42f4400ed2314bd7519c020d0187edc5'
          '561949793177116b7be29a07c385ba8b'
          '472f536d7c9e8250dc4568ec4cfaf294'
+         'a577d42e38249d298d6a8d4bf2823883'
          '1ab682b4e36afa4cf1b426aa7ac81c0d'
          'SKIP'
          '8fc22cf50ec85da00f6af3d66f7ddc1b'
diff --git a/core/bash/privmode-setuid-fail.patch b/core/bash/privmode-setuid-fail.patch
new file mode 100644
index 000000000..059857d0b
--- /dev/null
+++ b/core/bash/privmode-setuid-fail.patch
@@ -0,0 +1,29 @@
+*** ../bash-4.3-patched/shell.c	2014-01-14 08:04:32.000000000 -0500
+--- shell.c	2014-06-06 16:29:01.000000000 -0400
+***************
+*** 1227,1232 ****
+  disable_priv_mode ()
+  {
+!   setuid (current_user.uid);
+!   setgid (current_user.gid);
+    current_user.euid = current_user.uid;
+    current_user.egid = current_user.gid;
+--- 1229,1246 ----
+  disable_priv_mode ()
+  {
+!   int e;
+! 
+!   if (setuid (current_user.uid) < 0)
+!     {
+!       e = errno;
+!       sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid);
+! #if defined (EXIT_ON_SETUID_FAILURE)
+!       if (e == EAGAIN)
+!	exit (e);
+! #endif
+!     }
+!   if (setgid (current_user.gid) < 0)
+!     sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid);
+! 
+    current_user.euid = current_user.uid;
+    current_user.egid = current_user.gid;
diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD
index 2dabc1e4b..0c75ae162 100644
--- a/core/libusb/PKGBUILD
+++ b/core/libusb/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 206056 2014-02-16 12:47:08Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 215304 2014-06-19 12:33:36Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
 pkgname=libusb
-pkgver=1.0.18
+pkgver=1.0.19
 pkgrel=1
-depends=('glibc' 'systemd')
-pkgdesc="Library that provides generic access to USB device"
-arch=(i686 x86_64)
-url="http://libusbx.org"
+pkgdesc='Library that provides generic access to USB devices'
+arch=('i686' 'x86_64')
+url='http://libusb.info/'
 license=('LGPL')
-source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+depends=('glibc' 'systemd')
 replaces=('libusb1' 'libusbx')
 provides=("libusbx=$pkgver")
-conflicts=("libusbx")
-md5sums=('4a6d049923efc6496f1d383054dac1a6')
+conflicts=('libusbx')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('f9e2bb5879968467e5ca756cb4e1fa7e')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
+  make -C $pkgname-$pkgver check
 }
 
 package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
 }