Mon Oct 21 01:07:41 PDT 2013

6 files changed, 18 insertions, 84 deletions

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 6676edc88..b3cdebc2f 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193064 2013-08-15 12:08:13Z allan $
+# $Id: PKGBUILD 196835 2013-10-20 12:06:12Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -13,7 +13,7 @@ license=('GPL')
 groups=('base-devel')
 depends=('glibc>=2.18' 'zlib')
 checkdepends=('dejagnu' 'bc')
-options=('!libtool' '!distcc' '!ccache')
+options=('staticlibs' '!distcc' '!ccache')
 install=binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
         binutils-2.23.2-texinfo-5.0.patch)
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index d8ead584f..27ad9c6ae 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191960 2013-08-02 00:55:04Z allan $
+# $Id: PKGBUILD 196831 2013-10-20 11:52:24Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 
@@ -11,6 +11,7 @@ license=('GPL3')
 url="http://www.gnu.org/software/bison/bison.html"
 depends=('glibc' 'm4' 'sh')
 groups=('base-devel')
+options=('staticlibs')
 install=bison.install
 source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
 md5sums=('a2624994561aa69f056c904c1ccb2880'
diff --git a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch b/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
deleted file mode 100644
index 73b23ea12..000000000
--- a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 84f3b3dd448399f9548468676e1bd1475dba8de5 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 29 Aug 2013 22:08:01 +0200
-Subject: [PATCH] curl_multi_remove_handle: allow multiple removes
-
-When removing an already removed handle, avoid that to ruin the
-internals and just return OK instead.
----
- lib/multi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fb495e0..e723a3e 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -483,6 +483,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-   if(!GOOD_EASY_HANDLE(curl_handle))
-     return CURLM_BAD_EASY_HANDLE;
- 
-+  /* Prevent users from trying to remove same easy handle more than once */
-+  if(!data->multi)
-+    return CURLM_OK; /* it is already removed so let's say it is fine! */
-+
-   if(easy) {
-     bool premature = (data->mstate < CURLM_STATE_COMPLETED) ? TRUE : FALSE;
-     bool easy_owns_conn = (data->easy_conn &&
--- 
-1.8.4
-
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index d8454eb34..9ca623a0e 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193944 2013-09-07 15:30:07Z dreisner $
+# $Id: PKGBUILD 196882 2013-10-20 21:20:05Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,29 +6,21 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=curl
-pkgver=7.32.0
-pkgrel=2
+pkgver=7.33.0
+pkgrel=1
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
 license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 provides=('libcurl.so')
-options=('!libtool')
+options=('!libtool' 'strip' 'debug')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-curl_multi_remove_handle-allow-multiple-removes.patch
         curlbuild.h)
-md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
          'SKIP'
-         '589a2ccdf90e198fca398809e9d16128'
          '751bd433ede935c8fae727377625a8ae')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch 
-}
-
 build() {
   cd "$pkgname-$pkgver"
 
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index 2d1ef4adf..1fbcaf1c8 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164810 2012-08-06 13:29:17Z allan $
+# $Id: PKGBUILD 196829 2013-10-20 11:50:22Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -11,6 +11,7 @@ url="http://flex.sourceforge.net"
 license=('custom')
 groups=('base-devel')
 depends=('glibc' 'm4' 'sh')
+options=('staticlibs')
 install=flex.install
 source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
         lex.sh)
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 45a85307b..9b88e89d9 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,54 +1,23 @@
-# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $
+# $Id: PKGBUILD 196827 2013-10-20 11:42:36Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=make
-pkgver=3.82
-pkgrel=6
+pkgver=4.0
+pkgrel=1
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
 license=('GPL3')
 groups=('base-devel')
-depends=('glibc' 'sh')
+depends=('glibc' 'sh' 'guile')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        make-3.82-bug30612.patch
-        make-3.82-bug30723.patch
-        make-3.82-sort-blank.patch
-        make-3.82-makeflags.patch
-        make-3.82-expensive_glob.patch
-        make-3.82-dont-prune-intermediate.patch)
-md5sums=('1a11100f3c63fcf5753818e59d63088f'
-         'SKIP'
-         '8714ba22911a58ab3eb42ac3f4c6c3bd'
-         '662e6450e19a5acdaa5c9fcb8ad78dea'
-         '7d01a99f389d8f08dec93ed479071ee4'
-         'bc12ad4d0c6e6c0e72d9fb61054f446b'
-         'e58d4211c5b29d7d927a304d082849e7'
-         '45ac9e987f4bf16c0d7e1685db943917')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('571d470a7647b455e3af3f92d79f1c18'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # http://savannah.gnu.org/bugs/?30612
-  patch -Np1 -i $srcdir/make-3.82-bug30612.patch
-  
-  # http://savannah.gnu.org/bugs/?30723
-  patch -Np1 -i $srcdir/make-3.82-bug30723.patch
-  
-  # https://bugs.archlinux.org/task/22733 (fix from Fedora)
-  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
-  
-  # https://savannah.gnu.org/bugs/?33873
-  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
-  
-  # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
-  patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
- 
-  # https://savannah.gnu.org/bugs/?30653
-  patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
-
   ./configure --prefix=/usr
   make
 }