From 469e7cfcfccc3041b64ccc6e15e830b65817aae9 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Tue, 20 May 2014 04:11:19 +0000
Subject: Tue May 20 04:04:22 UTC 2014

---
 core/pam/PKGBUILD | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'core/pam/PKGBUILD')

diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 9f4968505..426f91d3f 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205604 2014-02-09 10:29:31Z andyrtr $
+# $Id: PKGBUILD 213313 2014-05-19 17:03:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.8
-pkgrel=3
+pkgrel=4
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -13,13 +13,28 @@ depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
 makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
 backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
 source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
-        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
         ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
-        pam_unix2-glibc216.patch)
-options=('!emptydirs')
+        pam_unix2-glibc216.patch
+        pam-1.1.8-cve-2013-7041.patch
+        pam-1.1.8-cve-2014-2583.patch)
 md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
          'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
-         'dac109f68e04a4df37575fda6001ea17')
+         'dac109f68e04a4df37575fda6001ea17'
+         '653661bea920de3bb2713bb85b408bc2'
+         '144ea8e2f9d49a0f4021027ca2c1558f')
+
+options=('!emptydirs')
+
+prepare () {
+  cd $srcdir/Linux-PAM-$pkgver
+  # fix CVEs in pam
+  patch -Np1 -i  "${srcdir}/pam-1.1.8-cve-2013-7041.patch"
+  patch -Np1 -i  "${srcdir}/pam-1.1.8-cve-2014-2583.patch"
+
+  # fix pam_unix2 building
+  cd $srcdir/pam_unix2-2.9.1
+  patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch"
+}
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
@@ -27,8 +42,6 @@ build() {
   make
 
   cd $srcdir/pam_unix2-2.9.1
-  patch -Np1 -i ../pam_unix2-glibc216.patch
-
   # modify flags to build against the pam compiled here, not a system lib.
   ./configure \
       CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
-- 
cgit v1.2.3-54-g00ecf