[arch-commits] Commit in curl/trunk (2 files)

[Dave Reisner]

    Date: Thursday, March 22, 2012 @ 19:51:26
  Author: dreisner
Revision: 154087

upgpkg: curl 7.25.0-1

Modified:
  curl/trunk/PKGBUILD
Deleted:
  curl/trunk/0001-include-headers-for-tcp-keepalives.patch

-----------------------------------------------+
 0001-include-headers-for-tcp-keepalives.patch |   31 ------------------------
 PKGBUILD                                      |   12 +++------
 2 files changed, 4 insertions(+), 39 deletions(-)

Deleted: 0001-include-headers-for-tcp-keepalives.patch
===================================================================
--- 0001-include-headers-for-tcp-keepalives.patch	2012-03-22 22:09:51 UTC (rev 154086)
+++ 0001-include-headers-for-tcp-keepalives.patch	2012-03-22 23:51:26 UTC (rev 154087)
@@ -1,31 +0,0 @@
-From d906981b20d41466d040e6cc2570099c8d665f7f Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner at 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-22 22:09:51 UTC (rev 154086)
+++ PKGBUILD	2012-03-22 23:51:26 UTC (rev 154087)
@@ -6,8 +6,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=curl
-pkgver=7.24.0
-pkgrel=2
+pkgver=7.25.0
+pkgrel=1
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
@@ -15,11 +15,9 @@
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-include-headers-for-tcp-keepalives.patch
         curlbuild.h)
-md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
-         '710242df6bc318d16eea611e7d1b1410'
-         '84833972c2ff36abb2bfdd4ac065c2e5'
+md5sums=('a56cbe2778b09769f8a5ba17d8f4d92a'
+         '0e0fd2da19bde6f7be687667e2fac02f'
          '751bd433ede935c8fae727377625a8ae')
 
 ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
@@ -34,8 +32,6 @@
 build() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch"
-
   ./configure \
       --prefix=/usr \
       --mandir=/usr/share/man \