Drop pycurl

This was used by urlgrabber

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/pycurl b/config/rootfiles/packages/pycurl
deleted file mode 100644 (file)
index ddbe585..0000000
--- a/config/rootfiles/packages/pycurl
+++ /dev/null
@@ -1,53 +0,0 @@
-usr/lib/python2.7/site-packages/curl
-usr/lib/python2.7/site-packages/curl/__init__.py
-usr/lib/python2.7/site-packages/curl/__init__.pyc
-#usr/lib/python2.7/site-packages/pycurl-7.19.0-py2.7.egg-info
-usr/lib/python2.7/site-packages/pycurl.so
-#usr/share/doc/pycurl
-#usr/share/doc/pycurl/COPYING
-#usr/share/doc/pycurl/COPYING2
-#usr/share/doc/pycurl/ChangeLog
-#usr/share/doc/pycurl/INSTALL
-#usr/share/doc/pycurl/README
-#usr/share/doc/pycurl/TODO
-#usr/share/doc/pycurl/examples
-#usr/share/doc/pycurl/examples/basicfirst.py
-#usr/share/doc/pycurl/examples/file_upload.py
-#usr/share/doc/pycurl/examples/linksys.py
-#usr/share/doc/pycurl/examples/retriever-multi.py
-#usr/share/doc/pycurl/examples/retriever.py
-#usr/share/doc/pycurl/examples/sfquery.py
-#usr/share/doc/pycurl/examples/xmlrpc_curl.py
-#usr/share/doc/pycurl/html
-#usr/share/doc/pycurl/html/callbacks.html
-#usr/share/doc/pycurl/html/curlmultiobject.html
-#usr/share/doc/pycurl/html/curlobject.html
-#usr/share/doc/pycurl/html/curlshareobject.html
-#usr/share/doc/pycurl/html/pycurl.html
-#usr/share/doc/pycurl/tests
-#usr/share/doc/pycurl/tests/test.py
-#usr/share/doc/pycurl/tests/test_cb.py
-#usr/share/doc/pycurl/tests/test_debug.py
-#usr/share/doc/pycurl/tests/test_ftp.py
-#usr/share/doc/pycurl/tests/test_getinfo.py
-#usr/share/doc/pycurl/tests/test_gtk.py
-#usr/share/doc/pycurl/tests/test_internals.py
-#usr/share/doc/pycurl/tests/test_memleak.py
-#usr/share/doc/pycurl/tests/test_multi.py
-#usr/share/doc/pycurl/tests/test_multi2.py
-#usr/share/doc/pycurl/tests/test_multi3.py
-#usr/share/doc/pycurl/tests/test_multi4.py
-#usr/share/doc/pycurl/tests/test_multi5.py
-#usr/share/doc/pycurl/tests/test_multi6.py
-#usr/share/doc/pycurl/tests/test_multi_socket.py
-#usr/share/doc/pycurl/tests/test_multi_socket_select.py
-#usr/share/doc/pycurl/tests/test_multi_timer.py
-#usr/share/doc/pycurl/tests/test_multi_vs_thread.py
-#usr/share/doc/pycurl/tests/test_post.py
-#usr/share/doc/pycurl/tests/test_post2.py
-#usr/share/doc/pycurl/tests/test_post3.py
-#usr/share/doc/pycurl/tests/test_share.py
-#usr/share/doc/pycurl/tests/test_socketopen.py
-#usr/share/doc/pycurl/tests/test_stringio.py
-#usr/share/doc/pycurl/tests/test_xmlrpc.py
-#usr/share/doc/pycurl/tests/util.py

diff --git a/lfs/pycurl b/lfs/pycurl
deleted file mode 100644 (file)
index 4733c4c..0000000
--- a/lfs/pycurl
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 7.19.0
-
-THISAPP    = pycurl-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = pycurl
-PAK_VER    = 2
-
-DEPS       =
-
-CFLAGS    += -DHAVE_CURL_OPENSSL
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 919d58fe37e69fe87ce4534d8b6a1c7b
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/python-pycurl-no-static-libs.patch
-       cd $(DIR_APP) && python setup.py install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index e56f2c2cbd802dd6f3c1646e810c54917375ef2a..550c2a2b34ddc7a2ddedf36ef4e6226853615d26 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1510,7 +1510,6 @@ buildipfire() {
   lfsmake2 iw
   lfsmake2 wpa_supplicant
   lfsmake2 hostapd
-  lfsmake2 pycurl
   lfsmake2 syslinux
   lfsmake2 tftpd
   lfsmake2 cpufrequtils

diff --git a/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch b/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
deleted file mode 100644 (file)
index 7e20b15..0000000
--- a/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/pycurl.c     
-+++ a/src/pycurl.c     
-@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self)
-         }
-     }
- 
-+    Py_INCREF(Py_None);
-     return Py_None;
- }
- 
---- a/tests/test_internals.py  
-+++ a/tests/test_internals.py  
-@@ -245,6 +245,11 @@ if 1 and gc:
-     if opts.verbose >= 1:
-         print "Tracked objects:", len(gc.get_objects())
- 
-+if 1:
-+    # Ensure that the refcounting error in "reset" is fixed:
-+    for i in xrange(100000):
-+        c = Curl()
-+        c.reset()
- 
- # /***********************************************************************
- # // done