From b047da059a1042a27ba68b1bdc50dd187bd362f4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 4 Dec 2009 18:10:24 +0100
Subject: update kernel to 2.6.32

- update some applications
  asterisk, curl, strace, radvd, rpm
- fix allconfig
- /dev for full build seems to need more than 64k
---
 package/curl/Makefile                | 12 ++++++------
 package/curl/patches/patch-configure | 11 +++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'package/curl')

diff --git a/package/curl/Makefile b/package/curl/Makefile
index a0e27d77c..69768dc63 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.19.6
+PKG_VERSION:=		7.19.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6625de9d42d1b8d3af372d3241a576fd
+PKG_MD5SUM:=		ecb2e37e45c9933e2a963cabe03670ab
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		net
 PKG_URL:=		http://curl.haxx.se
@@ -28,7 +28,7 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
 $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
 CONFIGURE_ARGS+=	--disable-thread \
 			--enable-cookies \
@@ -50,14 +50,14 @@ CONFIGURE_ARGS+=	--disable-thread \
 			--without-ca-bundle \
 			--without-gnutls \
 			--without-libidn
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
-	${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
 	${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure
index 3cb59e18e..21c0b095d 100644
--- a/package/curl/patches/patch-configure
+++ b/package/curl/patches/patch-configure
@@ -1,6 +1,6 @@
---- curl-7.19.6.orig/configure	2009-07-22 22:11:25.000000000 +0200
-+++ curl-7.19.6/configure	2009-10-01 14:05:37.578930054 +0200
-@@ -25479,16 +25479,6 @@ fi
+--- curl-7.19.7.orig/configure	2009-11-04 13:26:02.000000000 +0100
++++ curl-7.19.7/configure	2009-12-03 21:07:01.000000000 +0100
+@@ -19233,15 +19233,6 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    fi
  
@@ -9,11 +9,10 @@
 -
 -       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
 -       export LD_LIBRARY_PATH
--       { $as_echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
 -$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
 -    fi
 -  fi
--
- fi
  
+ fi
  
-- 
cgit v1.2.3