Thu Sep 15 23:14:42 UTC 2011

5 files changed, 148 insertions, 4 deletions

diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
new file mode 100644
index 000000000..72cb1194c
--- /dev/null
+++ b/core/curl/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 138015 2011-09-14 11:16:01Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=curl
+pkgver=7.22.0
+pkgrel=1
+pkgdesc="An URL retrival utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
+options=('!libtool')
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        curlbuild.h)
+md5sums=('e8c36126d21c893f085aca233906b5cc'
+         '1b061c348b63ea3e90c3f2c3af6a08d6'
+         '751bd433ede935c8fae727377625a8ae')
+
+
+case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in
+  8) _curlbuild=curlbuild-64.h ;;
+  4) _curlbuild=curlbuild-32.h ;;
+  *) error "unsupported architecture: %s" "$CARCH"
+    exit 1
+    ;;
+esac
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+      --with-random=/dev/urandom \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-dependency-tracking \
+      --enable-ipv6 \
+      --disable-ldaps \
+      --disable-ldap \
+      --enable-manual \
+      --enable-versioned-symbols \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+      --without-libidn \
+      --enable-threaded-resolver
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
+  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
diff --git a/core/curl/curlbuild.h b/core/curl/curlbuild.h
new file mode 100644
index 000000000..b48862696
--- /dev/null
+++ b/core/curl/curlbuild.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD
new file mode 100644
index 000000000..3fcc6eccd
--- /dev/null
+++ b/core/libssh2/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 138017 2011-09-14 11:16:24Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+
+pkgname=libssh2
+pkgver=1.3.0
+pkgrel=1
+pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
+url="http://www.libssh2.org/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('openssl')
+makedepends=('zlib')
+options=('!libtool')
+source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('6425331899ccf1015f1ed79448cb4709'
+         '6ddcc9f2b37941f8291d7494ee8f89b7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 2db407582..3f38c53f3 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129849 2011-06-29 04:28:30Z allan $
+# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=make
 pkgver=3.82
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
@@ -15,11 +15,13 @@ install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         bug30612.patch
         bug30723.patch
-        make-3.82-sort-blank.patch)
+        make-3.82-sort-blank.patch
+        make-3.82-makeflags.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
          'c8f496b22191f9fb9420ab14c1a19a47'
          '662e6450e19a5acdaa5c9fcb8ad78dea'
-         '7d01a99f389d8f08dec93ed479071ee4')
+         '7d01a99f389d8f08dec93ed479071ee4'
+         'bc12ad4d0c6e6c0e72d9fb61054f446b')
 
 
 build() {
@@ -34,6 +36,10 @@ build() {
   # https://bugs.archlinux.org/task/22733 (fix from Fedora)
   patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
   
+  # https://savannah.gnu.org/support/index.php?107487
+  # https://savannah.gnu.org/bugs/?33873
+  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
+  
   ./configure --prefix=/usr
   make
 }
diff --git a/core/make/make-3.82-makeflags.patch b/core/make/make-3.82-makeflags.patch
new file mode 100644
index 000000000..3cba3c402
--- /dev/null
+++ b/core/make/make-3.82-makeflags.patch
@@ -0,0 +1,36 @@
+Index: main.c
+===================================================================
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.246
+diff -u -r1.246 main.c
+--- main.c	29 Aug 2010 23:05:27 -0000	1.246
++++ main.c	27 Jul 2011 22:03:12 -0000
+@@ -2091,10 +2095,16 @@
+ 
+           /* Reset makeflags in case they were changed.  */
+           {
++            if (master_job_slots)
++              {
++                assert (job_slots == default_job_slots);
++                job_slots = master_job_slots;
++              }
+             const char *pv = define_makeflags (1, 1);
+             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+             sprintf (p, "MAKEFLAGS=%s", pv);
+             putenv (allocated_variable_expand (p));
++            job_slots = default_job_slots;
+           }
+ 
+ 	  if (ISDB (DB_BASIC))
+@@ -2825,9 +2852,11 @@
+ 		       && (*(unsigned int *) cs->value_ptr ==
+ 			   *(unsigned int *) cs->noarg_value))
+ 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
++#if 0
+ 	      else if (cs->c == 'j')
+ 		/* Special case for `-j'.  */
+ 		ADD_FLAG ("1", 1);
++#endif
+ 	      else
+ 		{
+ 		  char *buf = alloca (30);