From 5b61391a1f529402997664f72579543c8164ae64 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 14 May 2013 11:34:53 +0200
Subject: [PATCH] curl: update to curl-7.30.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/web/curl/build                         |  2 +-
 packages/web/curl/meta                          |  2 +-
 .../patches/curl-7.28.1-automake_1.13.patch     | 12 ------------
 packages/web/curl/patches/curl-7.28.1-m4.patch  | 17 -----------------
 4 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 packages/web/curl/patches/curl-7.28.1-automake_1.13.patch
 delete mode 100644 packages/web/curl/patches/curl-7.28.1-m4.patch

diff --git a/packages/web/curl/build b/packages/web/curl/build
index cb75753c8c..37ac96092a 100755
--- a/packages/web/curl/build
+++ b/packages/web/curl/build
@@ -23,7 +23,7 @@
 . config/options $1
 
 # link against librt because of undefined reference to 'clock_gettime'
-  LDFLAGS="$LDFLAGS -lrt -lm -lrtmp"
+export LIBS="-lrt -lm -lrtmp"
 
 cd $PKG_BUILD
 ac_cv_lib_rtmp_RTMP_Init=yes \
diff --git a/packages/web/curl/meta b/packages/web/curl/meta
index a487b8c7e5..5b35df7b54 100644
--- a/packages/web/curl/meta
+++ b/packages/web/curl/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="curl"
-PKG_VERSION="7.28.1"
+PKG_VERSION="7.30.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
diff --git a/packages/web/curl/patches/curl-7.28.1-automake_1.13.patch b/packages/web/curl/patches/curl-7.28.1-automake_1.13.patch
deleted file mode 100644
index e09b6376ee..0000000000
--- a/packages/web/curl/patches/curl-7.28.1-automake_1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur curl-7.28.1-old/configure.ac curl-7.28.1-new/configure.ac
---- curl-7.28.1-old/configure.ac	2012-09-08 13:39:18.000000000 -0700
-+++ curl-7.28.1-new/configure.ac	2012-12-29 10:47:09.000000000 -0800
-@@ -35,7 +35,7 @@
- terms of the curl license; see COPYING for more details])
- 
- AC_CONFIG_SRCDIR([lib/urldata.h])
--AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h)
-+AC_CONFIG_HEADERS(lib/curl_config.h include/curl/curlbuild.h)
- AC_CONFIG_MACRO_DIR([m4])
- AM_MAINTAINER_MODE
- 
diff --git a/packages/web/curl/patches/curl-7.28.1-m4.patch b/packages/web/curl/patches/curl-7.28.1-m4.patch
deleted file mode 100644
index ef81cb3182..0000000000
--- a/packages/web/curl/patches/curl-7.28.1-m4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur curl-7.28.1/m4/curl-override.m4 curl-7.28.1.patch/m4/curl-override.m4
---- curl-7.28.1/m4/curl-override.m4	2012-03-08 20:35:25.000000000 +0100
-+++ curl-7.28.1.patch/m4/curl-override.m4	2013-01-12 02:57:05.467821530 +0100
-@@ -88,13 +88,3 @@
- m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
- [CURL_CHECK_PATH_SEPARATOR
- m4_define([$0],[])])
--
--dnl Override Autoconf's AC_CONFIG_MACRO_DIR (DIR)
--dnl -------------------------------------------------
--dnl This is an emulation of Autoconf's 2.61 macro.
--dnl This is done to use fixed macro across Autoconf
--dnl versions, and avoid warnings from modern libtool
--dnl which traces usage of this macro.
--
--AC_DEFUN([AC_CONFIG_MACRO_DIR],[:])
--