diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-01 10:33:01 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-01 10:33:01 +0100 |
| commit | 59b32159d6180c35a742ced756dc139659dc1dd5 (patch) | |
| tree | 4f03740ae853d27d51d69666d511ffb527d27a9e /core | |
| parent | 5330206481631dda2c1e585b758c58f90ab807ee (diff) | |
| parent | c34f78dd37c2a2015d43de5d89748a2f8147ba1b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/openscenegraph/PKGBUILD
community-testing/speed-dreams/PKGBUILD
community-testing/speed-dreams/speed-dreams.desktop
community-testing/xemacs/PKGBUILD
community/ibus/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/virtuoso/PKGBUILD
multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
multilib-testing/lib32-pango/PKGBUILD
multilib-testing/wine/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-gmp/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-pixman/PKGBUILD
testing/fontforge/PKGBUILD
testing/java7-openjdk/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdegraphics-okular/PKGBUILD
testing/kdegraphics-strigi-analyzer/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/PKGBUILD.next_stable
testing/opencv/PKGBUILD
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xine-ui/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/curl/0001-include-headers-for-tcp-keepalives.patch | 31 | ||||
| -rw-r--r-- | core/curl/PKGBUILD | 10 |
2 files changed, 37 insertions, 4 deletions
diff --git a/core/curl/0001-include-headers-for-tcp-keepalives.patch b/core/curl/0001-include-headers-for-tcp-keepalives.patch new file mode 100644 index 000000000..780fb5b82 --- /dev/null +++ b/core/curl/0001-include-headers-for-tcp-keepalives.patch @@ -0,0 +1,31 @@ +From d906981b20d41466d040e6cc2570099c8d665f7f Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Sat, 28 Jan 2012 08:05:02 -0500 +Subject: [PATCH] include headers for tcp-keepalives + +--- + src/tool_cb_skt.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/src/tool_cb_skt.c b/src/tool_cb_skt.c +index 156c110..e74d5e4 100644 +--- a/src/tool_cb_skt.c ++++ b/src/tool_cb_skt.c +@@ -27,6 +27,14 @@ + # include <sys/socket.h> + #endif + ++#ifdef HAVE_NETINET_TCP_H ++# include <netinet/tcp.h> ++#endif ++ ++#ifdef HAVE_NETINET_IN_H ++# include <netinet/in.h> ++#endif ++ + #define ENABLE_CURLX_PRINTF + /* use our own printf() functions */ + #include "curlx.h" +-- +1.7.8.4 + diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index f8653faad..2d51b93c4 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147269 2012-01-25 13:57:06Z dreisner $ +# $Id: PKGBUILD 148373 2012-01-30 19:14:16Z ibiru $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ pkgname=curl pkgver=7.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" @@ -15,11 +15,11 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - fix-J-with-O-regression.patch + 0001-include-headers-for-tcp-keepalives.patch curlbuild.h) md5sums=('b93420f80a2baaa61a0f45214eddc2ba' '710242df6bc318d16eea611e7d1b1410' - 'aa4539ec4f4a2dad1663dc22dd3ab0a1' + '84833972c2ff36abb2bfdd4ac065c2e5' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') @@ -34,6 +34,8 @@ esac build() { cd "$pkgname-$pkgver" + patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch" + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ |