Add sqlite support in python and add pycurl addon.

diff --git a/config/rootfiles/common/pycurl b/config/rootfiles/common/pycurl
new file mode 100644 (file)
index 0000000..9438875
--- /dev/null
+++ b/config/rootfiles/common/pycurl
@@ -0,0 +1,42 @@
+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/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/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/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/config/rootfiles/common/python b/config/rootfiles/common/python
index 5f4b6a8797c18eb29f6006fec7c6fc544a16c9b3..b32425a7c3e4e7488cdacb12e430f9a91133a544 100644 (file)
--- a/config/rootfiles/common/python
+++ b/config/rootfiles/common/python
@@ -1843,6 +1843,7 @@ usr/lib/python2.7/lib-dynload/_multibytecodec.so
 usr/lib/python2.7/lib-dynload/_multiprocessing.so
 usr/lib/python2.7/lib-dynload/_random.so
 usr/lib/python2.7/lib-dynload/_socket.so
+usr/lib/python2.7/lib-dynload/_sqlite3.so
 usr/lib/python2.7/lib-dynload/_ssl.so
 usr/lib/python2.7/lib-dynload/_struct.so
 usr/lib/python2.7/lib-dynload/_testcapi.so
@@ -2515,38 +2516,55 @@ usr/lib/python2.7/sqlite3/dbapi2.pyc
 #usr/lib/python2.7/sqlite3/dbapi2.pyo
 #usr/lib/python2.7/sqlite3/dump.py
 usr/lib/python2.7/sqlite3/dump.pyc
-#usr/lib/python2.7/sqlite3/dump.pyo
-#usr/lib/python2.7/sqlite3/test
-#usr/lib/python2.7/sqlite3/test/__init__.py
-#usr/lib/python2.7/sqlite3/test/__init__.pyc
-#usr/lib/python2.7/sqlite3/test/__init__.pyo
-#usr/lib/python2.7/sqlite3/test/dbapi.py
-#usr/lib/python2.7/sqlite3/test/dbapi.pyc
-#usr/lib/python2.7/sqlite3/test/dbapi.pyo
-#usr/lib/python2.7/sqlite3/test/dump.py
-#usr/lib/python2.7/sqlite3/test/dump.pyc
-#usr/lib/python2.7/sqlite3/test/dump.pyo
-#usr/lib/python2.7/sqlite3/test/factory.py
-#usr/lib/python2.7/sqlite3/test/factory.pyc
-#usr/lib/python2.7/sqlite3/test/factory.pyo
-#usr/lib/python2.7/sqlite3/test/hooks.py
-#usr/lib/python2.7/sqlite3/test/hooks.pyc
-#usr/lib/python2.7/sqlite3/test/hooks.pyo
-#usr/lib/python2.7/sqlite3/test/py25tests.py
-#usr/lib/python2.7/sqlite3/test/py25tests.pyc
-#usr/lib/python2.7/sqlite3/test/py25tests.pyo
-#usr/lib/python2.7/sqlite3/test/regression.py
-#usr/lib/python2.7/sqlite3/test/regression.pyc
-#usr/lib/python2.7/sqlite3/test/regression.pyo
-#usr/lib/python2.7/sqlite3/test/transactions.py
-#usr/lib/python2.7/sqlite3/test/transactions.pyc
-#usr/lib/python2.7/sqlite3/test/transactions.pyo
-#usr/lib/python2.7/sqlite3/test/types.py
-#usr/lib/python2.7/sqlite3/test/types.pyc
-#usr/lib/python2.7/sqlite3/test/types.pyo
-#usr/lib/python2.7/sqlite3/test/userfunctions.py
-#usr/lib/python2.7/sqlite3/test/userfunctions.pyc
-#usr/lib/python2.7/sqlite3/test/userfunctions.pyo
+#usr/lib/python2.7/sqlite3
+usr/lib/python2.7/sqlite3/__init__.py
+usr/lib/python2.7/sqlite3/__init__.pyc
+usr/lib/python2.7/sqlite3/__init__.pyo
+usr/lib/python2.7/sqlite3/dbapi2.py
+usr/lib/python2.7/sqlite3/dbapi2.pyc
+usr/lib/python2.7/sqlite3/dbapi2.pyo
+usr/lib/python2.7/sqlite3/dump.py
+usr/lib/python2.7/sqlite3/dump.pyc
+usr/lib/python2.7/sqlite3/dump.pyo
+usr/lib/python2.7/sqlite3/__init__.py
+usr/lib/python2.7/sqlite3/__init__.pyc
+usr/lib/python2.7/sqlite3/__init__.pyo
+usr/lib/python2.7/sqlite3/dbapi2.py
+usr/lib/python2.7/sqlite3/dbapi2.pyc
+usr/lib/python2.7/sqlite3/dbapi2.pyo
+usr/lib/python2.7/sqlite3/dump.py
+usr/lib/python2.7/sqlite3/dump.pyc
+usr/lib/python2.7/sqlite3/dump.pyo
+usr/lib/python2.7/sqlite3/test/__init__.py
+usr/lib/python2.7/sqlite3/test/__init__.pyc
+usr/lib/python2.7/sqlite3/test/__init__.pyo
+usr/lib/python2.7/sqlite3/test/dbapi.py
+usr/lib/python2.7/sqlite3/test/dbapi.pyc
+usr/lib/python2.7/sqlite3/test/dbapi.pyo
+usr/lib/python2.7/sqlite3/test/dump.py
+usr/lib/python2.7/sqlite3/test/dump.pyc
+usr/lib/python2.7/sqlite3/test/dump.pyo
+usr/lib/python2.7/sqlite3/test/factory.py
+usr/lib/python2.7/sqlite3/test/factory.pyc
+usr/lib/python2.7/sqlite3/test/factory.pyo
+usr/lib/python2.7/sqlite3/test/hooks.py
+usr/lib/python2.7/sqlite3/test/hooks.pyc
+usr/lib/python2.7/sqlite3/test/hooks.pyo
+usr/lib/python2.7/sqlite3/test/py25tests.py
+usr/lib/python2.7/sqlite3/test/py25tests.pyc
+usr/lib/python2.7/sqlite3/test/py25tests.pyo
+usr/lib/python2.7/sqlite3/test/regression.py
+usr/lib/python2.7/sqlite3/test/regression.pyc
+usr/lib/python2.7/sqlite3/test/regression.pyo
+usr/lib/python2.7/sqlite3/test/transactions.py
+usr/lib/python2.7/sqlite3/test/transactions.pyc
+usr/lib/python2.7/sqlite3/test/transactions.pyo
+usr/lib/python2.7/sqlite3/test/types.py
+usr/lib/python2.7/sqlite3/test/types.pyc
+usr/lib/python2.7/sqlite3/test/types.pyo
+usr/lib/python2.7/sqlite3/test/userfunctions.py
+usr/lib/python2.7/sqlite3/test/userfunctions.pyc
+usr/lib/python2.7/sqlite3/test/userfunctions.pyo
 #usr/lib/python2.7/sre.py
 usr/lib/python2.7/sre.pyc
 #usr/lib/python2.7/sre.pyo

diff --git a/lfs/pycurl b/lfs/pycurl
new file mode 100644 (file)
index 0000000..c06cef4
--- /dev/null
+++ b/lfs/pycurl
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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    = http://pycurl.sourceforge.net/download
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = pycurl
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# 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) && python setup.py install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 2a8abc8a6b9dec866aa72f0ed00d029ebd1ea37e..a727fc96e2759b50f5c8a1689444f77a33540189 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -416,6 +416,7 @@ buildipfire() {
   ipfiremake pam
   ipfiremake openssl
   ipfiremake curl
+  ipfiremake sqlite
   ipfiremake python
   ipfiremake fireinfo
   ipfiremake libnet
@@ -649,7 +650,6 @@ buildipfire() {
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
-  ipfiremake sqlite
   ipfiremake taglib
   ipfiremake mediatomb
   ipfiremake sslh
@@ -689,6 +689,7 @@ buildipfire() {
   ipfiremake swig
   ipfiremake python-m2crypto
   ipfiremake crda
+  ipfiremake pycurl
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild