Revision: 6175
http://ipcop.svn.sourceforge.net/ipcop/?rev=6175&view=rev
Author: gespinasse
Date: 2011-12-22 23:30:23 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Upgrade sqlite to 3.7.9, DBD-SQLite to 1.35
Change DBD-SQLite to compile against system libsqlite, so sqlite code is
include only once.
For that, sqlite compilation need to be tweaked, adding needed options to
CFLAGS that DBD-SQLite need.
As core perl is not compiled with thread support, that support is not required
for sqlite used by DBD-SQLite.
sqlite now use different compilation options, so empty db are different (as
they include the options used during compilation).
That should not hurt, but I haven't yet run the db.
Remove the headers DBD-SQLite install even when using system libsqlite.
Compile again DBD-SQLite and ulogd when sqlite is recompiled
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/DBD-SQLite
ipcop/trunk/config/rootfiles/common/sqlite
ipcop/trunk/lfs/DBD-SQLite
ipcop/trunk/lfs/sqlite
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Modified: ipcop/trunk/config/rootfiles/common/DBD-SQLite
===================================================================
--- ipcop/trunk/config/rootfiles/common/DBD-SQLite 2011-12-22 09:04:26 UTC
(rev 6174)
+++ ipcop/trunk/config/rootfiles/common/DBD-SQLite 2011-12-22 23:30:23 UTC
(rev 6175)
@@ -1,4 +1,4 @@
-## DBD-SQLite-1.31
+## DBD-SQLite-1.35
##
#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/DBD/SQLite
usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/DBD/SQLite.pm
@@ -10,8 +10,5 @@
usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/DBD/SQLite/SQLite.so
#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/share
#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/share/dist
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/share/dist/DBD-SQLite
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/share/dist/DBD-SQLite/sqlite3.c
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/share/dist/DBD-SQLite/sqlite3.h
#usr/share/man/man3/DBD::SQLite.3
#usr/share/man/man3/DBD::SQLite::Cookbook.3
Modified: ipcop/trunk/config/rootfiles/common/sqlite
===================================================================
--- ipcop/trunk/config/rootfiles/common/sqlite 2011-12-22 09:04:26 UTC (rev
6174)
+++ ipcop/trunk/config/rootfiles/common/sqlite 2011-12-22 23:30:23 UTC (rev
6175)
@@ -1,4 +1,4 @@
-## sqlite 3.6.22
+## sqlite 3.7.9
##
usr/bin/sqlite3
#usr/include/sqlite3.h
Modified: ipcop/trunk/lfs/DBD-SQLite
===================================================================
--- ipcop/trunk/lfs/DBD-SQLite 2011-12-22 09:04:26 UTC (rev 6174)
+++ ipcop/trunk/lfs/DBD-SQLite 2011-12-22 23:30:23 UTC (rev 6175)
@@ -33,7 +33,8 @@
include Config
PKG_NAME = DBD-SQLite
-VER = 1.33
+# Odd minor is production, even is development
+VER = 1.35
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 623e1340f98d4df1d2f313b49489471c
+$(DL_FILE)_MD5 = d9752e4a26fa54e74aa893dafd02ceda
install : $(TARGET)
@@ -82,9 +83,19 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && yes 'n' | perl Makefile.PL
+ # DBD-SQLite-1.35 include sqlite-3.7.9 (as the test show when using
unmodified code)
+ # Use system libsqlite code like debian, fedora : less code, smaller
size
+ cd $(DIR_APP) && sed -i 's/^if ( 0 ) /if ( 1 ) /' Makefile.PL
+ cd $(DIR_APP) && perl Makefile.PL
cd $(DIR_APP) && make
+ifeq "$(RUNNING_TEST)" "yes"
+ # If a symbol is missing during test, the symbol need to be added
during sqlite package compilation
+ # In case of other test error, try adding TEST_VERBOSE=1
+ cd $(DIR_APP) && make test &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
cd $(DIR_APP) && make install
+ # remove sqlite embedded headers that are installed even when system
sqlite is used
+ rm -r /usr/lib/perl5/site_perl/*/*-linux/auto/share/dist/DBD-SQLite
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/lfs/sqlite
===================================================================
--- ipcop/trunk/lfs/sqlite 2011-12-22 09:04:26 UTC (rev 6174)
+++ ipcop/trunk/lfs/sqlite 2011-12-22 23:30:23 UTC (rev 6175)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = sqlite
-VER = 3070800
+VER = 3070900
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,6 +43,12 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+# When compiling DBD-SQLite against system libsql3, DBD-SQLite require a
sqlite configuration that is different from
+# sqlite package default or DBD-SQLite tests fail.
+# Needed configuration with some comments could be found in DBD-SQLite
Makefile.PL (we haven't compiled core perl with thread support)
+# Only adding SQLITE_ENABLE_COLUMN_METADATA is enought for DBD-SQLite test
success
+CFLAGS += -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_COLUMN_METADATA -DNDEBUG=1 -DHAVE_USLEEP=1
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -51,7 +57,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6bfb46d73caaa1bbbcd2b52184b6c542
+$(DL_FILE)_MD5 = dce303524736fe89a76b8ed29d566352
install : $(TARGET)
@@ -81,24 +87,30 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
# remove database(s) in case of a partial build
rm -f /var/ipcop/traffic/empty-aggregate.db
rm -f /var/log/traffic/aggregate.db
+ # Beware there is 2 differents sqlite packages (-autoconf tar.gz and
-src .zip) that support different extensions/features
+ # -autoconf package does not support 'configure --enable-extension' and
does not support 'make test' target
+ # but is smaller and open with tar zxf
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
cd $(DIR_APP) && make
- cd $(DIR_APP) && make install
ifeq "$(RUNNING_TEST)" "yes"
- # Running the tests require using the src zip package
- # as of version 3070800, tests fail on big-endian
+ # Tests require the -src zip package, and we don't want to require
unzip just for that. So not run tests for now.
+ # Running test require on configure --enable-load-extension
--with-tcl=/$TOOLS_DIR/lib (need something else to find libtcl)
+ # As of version 3070800, tests fail on big-endian
#-cd $(DIR_APP) && make test &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
+ cd $(DIR_APP) && make install
# Create database
mkdir -p /var/log/traffic/
sqlite3 /var/ipcop/traffic/empty-aggregate.db <
$(DIR_SRC)/config/cfgroot/aggregate.table
cp /var/ipcop/traffic/empty-aggregate.db /var/log/traffic/aggregate.db
+ rm -f $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/{DBD-SQLite-*,ulogd-*}
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-12-22 09:04:26 UTC
(rev 6174)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-12-22 23:30:23 UTC
(rev 6175)
@@ -24,6 +24,10 @@
/usr/lib/pppd/2.4.5/capiplugin.so
/usr/lib/pppd/2.4.5/userpass.so
##
+## DBD-SQLite-1.35 (using system libsqlite3)
+/usr/lib/perl5/site_perl/5.10.1/i486-linux/DBD/SQLite.pm
+/usr/lib/perl5/site_perl/5.10.1/i486-linux/auto/DBD/SQLite/SQLite.so
+##
## diffutils-3.2
/usr/bin/cmp
/usr/bin/diff
@@ -78,6 +82,11 @@
/lib/modules/2.6.32-6/extra/solos-pci.ko.gz
/lib/modules/2.6.32-6/kernel
##
+## sqlite-3.7.9
+/usr/bin/sqlite3
+/usr/lib/libsqlite3.so.0
+/usr/lib/libsqlite3.so.0.8.6
+##
## usb-modeswitch-1.9.2 fix to 'call to __builtin___strncat_chk might overflow
destination buffer'
/usr/sbin/usb_modeswitch_dispatcher
##
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-12-22 09:04:26 UTC (rev
6174)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-12-22 23:30:23 UTC (rev
6175)
@@ -7,10 +7,10 @@
Disable traffic accounting with detail level High, always use
Low.<br />
Fix _builtin___strncat_chk might overflow in
usb-modemswitch-1.2.0.<br />
Language updates.<br />
- Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2,
+ Upgrade acpid to 2.0.13, bash to 4.2.20, DBD-SQLite to 1.35,
diffutils to 3.2,
gmp to 5.0.2, grep to 2.10, iproute2 to 3.1.0,
kbd to 1.15.3, kernel to 2.6.32.51, libpcap to 1.2.0,
- smartmontools to 5.42, Solos PCI to 1.03, tcpdump to 4.2.0.
+ smartmontools to 5.42, sqlite to 3.7.9, Solos PCI to 1.03, tcpdump
to 4.2.0.
</description>
<previousversion>2.0.2</previousversion>
<installdate>INSTALLDATE</installdate>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
