diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/curl/PKGBUILD | 64 | ||||
| -rw-r--r-- | testing/curl/curlbuild.h | 9 | ||||
| -rw-r--r-- | testing/systemd/PKGBUILD | 9 | ||||
| -rw-r--r-- | testing/systemd/use-split-usr-path.patch | 14 |
4 files changed, 93 insertions, 3 deletions
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..218b910f8 --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 164228 2012-07-27 22:56: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.27.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('f0e48fdb635b5939e02a9291b89e5336' + 'b5d6d54f97adcaf5c871174e5460f081' + '751bd433ede935c8fae727377625a8ae') + +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; +esac + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + 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/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/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/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index e8f6573ff..82ac3b88f 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=187 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,19 +16,22 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - 'locale.sh') + 'locale.sh' + 'use-split-usr-path.patch') md5sums=('26606e3c84448800ef0b3ffd57e6e8b6' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - 'f15956945052bb911e5df81cf5e7e5dc') + 'f15956945052bb911e5df81cf5e7e5dc' + '482dba45a783f06c2239f1355f4ce72f') build() { cd "$pkgname-$pkgver" # still waiting on ipw2x00 to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + patch -Np1 < "$srcdir/use-split-usr-path.patch" ./configure \ --libexecdir=/usr/lib \ diff --git a/testing/systemd/use-split-usr-path.patch b/testing/systemd/use-split-usr-path.patch new file mode 100644 index 000000000..057045bf1 --- /dev/null +++ b/testing/systemd/use-split-usr-path.patch @@ -0,0 +1,14 @@ +--- a/src/core/main.c 2012-07-17 19:46:24.000000000 -0400 ++++ b/src/core/main.c 2012-07-27 10:04:13.000000000 -0400 +@@ -1379,11 +1379,7 @@ + + /* Set up PATH unless it is already set */ + setenv("PATH", +-#ifdef HAVE_SPLIT_USR + "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", +-#else +- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", +-#endif + arg_running_as == MANAGER_SYSTEM); + + if (arg_running_as == MANAGER_SYSTEM) { |