From: Schantl Stefan <Stevee@ipfire.org>
Date: Sun, 28 Nov 2010 12:42:56 +0000 (+0100)
Subject: curl: Update to 7.21.2.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb8520458bc1ae4b2f827072506157eafad81c2;p=ipfire-3.x.git

curl: Update to 7.21.2.
---

diff --git a/pkgs/core/curl/curl.nm b/pkgs/core/curl/curl.nm
index 3f049f0eb..9085941b7 100644
--- a/pkgs/core/curl/curl.nm
+++ b/pkgs/core/curl/curl.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = curl
-PKG_VER        = 7.21.1
+PKG_VER        = 7.21.2
 PKG_REL        = 0
 
 PKG_MAINTAINER =
diff --git a/pkgs/core/curl/patches/curl-7.20.0-lrt.patch b/pkgs/core/curl/patches/curl-7.20.0-lrt.patch
deleted file mode 100644
index 775f18302..000000000
--- a/pkgs/core/curl/patches/curl-7.20.0-lrt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- src/Makefile.am           |    2 +-
- tests/libtest/Makefile.am |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3672458..890893d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -49,7 +49,7 @@ include Makefile.inc
- # This might hold -Werror
- CFLAGS += @CURL_CFLAG_EXTRAS@
- 
--curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
-+curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -lrt
- curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
- BUILT_SOURCES = hugehelp.c
- CLEANFILES = hugehelp.c
-diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
-index 70b0f12..6512ce4 100644
---- a/tests/libtest/Makefile.am
-+++ b/tests/libtest/Makefile.am
-@@ -54,7 +54,7 @@ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
- test1022.pl Makefile.inc
- 
- # Dependencies (may need to be overriden)
--LDADD = $(top_builddir)/lib/libcurl.la
-+LDADD = $(top_builddir)/lib/libcurl.la -lrt
- DEPENDENCIES = $(top_builddir)/lib/libcurl.la
- 
- # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES,