Permalink
Browse files

pycurl:

 * bump version to 7.19.0.2


git-svn-id: file:///var/svn/freetz/trunk@11143 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent dc31a76 commit 475827c98cd895218f15b20869bd72bd7323110c er13 committed Oct 26, 2013
View
@@ -83,6 +83,7 @@ Latest changes:
* php 5.3.27/5.4.21
* polarssl 1.2.10
* Python 2.7.5
+ * pycurl 7.19.0.2
* pyOpenSSL 0.13.1
* radvd 1.9.3
* samba 3.6.19
@@ -1,5 +1,5 @@
config FREETZ_PACKAGE_PYTHON_PYCURL
- bool "pycurl 7.19.0"
+ bool "pycurl 7.19.0.2"
depends on FREETZ_PACKAGE_PYTHON
select FREETZ_LIB_libpython2 if !FREETZ_PACKAGE_PYTHON_STATIC
select FREETZ_LIB_libcurl
@@ -0,0 +1,28 @@
+--- setup.py
++++ setup.py
+@@ -9,7 +9,7 @@
+ PY_PACKAGE = "curl"
+ VERSION = "7.19.0.2"
+
+-import glob, os, re, sys, string, subprocess
++import glob, os, re, sys, string
+ import distutils
+ from distutils.core import setup
+ from distutils.extension import Extension
+@@ -100,6 +100,7 @@
+ # Run curl-config --libs and --static-libs. Some platforms may not
+ # support one or the other of these curl-config options, so gracefully
+ # tolerate failure of either, but not both.
++ '''
+ optbuf = ""
+ for option in ["--libs", "--static-libs"]:
+ p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True,
+@@ -111,6 +112,8 @@
+ raise Exception("Neither curl-config --libs nor curl-config --static-libs" +
+ " produced output")
+ libs = split_quoted(optbuf)
++ '''
++ libs = split_quoted(os.popen("'%s' --libs" % CURL_CONFIG).read())
+
+ for e in libs:
+ if e[:2] == "-l":
@@ -1,12 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -97,8 +97,7 @@
- else:
- extra_compile_args.append(e)
- libs = split_quoted(
-- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
-- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+ os.popen("'%s' --libs" % CURL_CONFIG).read())
- for e in libs:
- if e[:2] == "-l":
- libraries.append(e[2:])
@@ -1,6 +1,6 @@
--- setup.py
+++ setup.py
-@@ -147,6 +147,7 @@
+@@ -164,6 +164,7 @@
def get_data_files():
# a list of tuples with (path to install to, a list of local files)
data_files = []
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 7.19.0)
+$(call PKG_INIT_BIN, 7.19.0.2)
$(PKG)_SOURCE:=pycurl-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=919d58fe37e69fe87ce4534d8b6a1c7b
+$(PKG)_SOURCE_MD5:=518be33976dbc6838e42495ada64b43f
$(PKG)_SITE:=http://pycurl.sourceforge.net/download
$(PKG)_DIR:=$($(PKG)_SOURCE_DIR)/pycurl-$($(PKG)_VERSION)

0 comments on commit 475827c

Please sign in to comment.