Revision: 7785
http://sourceforge.net/p/ipcop/svn/7785
Author: owes
Date: 2015-01-07 12:12:56 +0000 (Wed, 07 Jan 2015)
Log Message:
-----------
Merge latest trunk changes to branches/toolchain
Modified Paths:
--------------
ipcop/branches/toolchain/config/rootfiles/common/automake
ipcop/branches/toolchain/config/rootfiles/common/db
ipcop/branches/toolchain/lfs/automake
ipcop/branches/toolchain/lfs/db
ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8
ipcop/branches/toolchain/updates/2.1.8/information.xml
ipcop/branches/toolchain/updates/2.1.8/setup
Property Changed:
----------------
ipcop/branches/toolchain/
ipcop/branches/toolchain/config/cfgroot/nic-modules-list
ipcop/branches/toolchain/config/etc/modprobe.d/aliases.conf
ipcop/branches/toolchain/config/gcc/startfiles
ipcop/branches/toolchain/config/rootfiles/arch_i486/CnxADSL
ipcop/branches/toolchain/config/rootfiles/arch_i486/wanpipe_SKIP
ipcop/branches/toolchain/config/rootfiles/common/capi4k-utils
ipcop/branches/toolchain/config/rootfiles/common/usb-modeswitch
ipcop/branches/toolchain/config/ssl/openvpn.cnf
ipcop/branches/toolchain/doc/base.cgi
ipcop/branches/toolchain/html/cgi-bin/logconfig.cgi
ipcop/branches/toolchain/html/cgi-bin/logfirewall.cgi
ipcop/branches/toolchain/html/cgi-bin/logproxy.cgi
ipcop/branches/toolchain/html/cgi-bin/logsummary.cgi
ipcop/branches/toolchain/html/cgi-bin/logsystem.cgi
ipcop/branches/toolchain/html/cgi-bin/openvpn.cgi
ipcop/branches/toolchain/html/html/images/openvpnzip.gif
ipcop/branches/toolchain/lfs/check_files
ipcop/branches/toolchain/lfs/usb-modeswitch
ipcop/branches/toolchain/src/libs/multilines.pl
ipcop/branches/toolchain/src/patches/glibc-2.11.1_notimestamp.patch
ipcop/branches/toolchain/src/patches/klibc-1.5.17_Kbuild-install.patch
ipcop/branches/toolchain/src/patches/klibc-1.5.17_insmod.patch
ipcop/branches/toolchain/src/patches/ntp-4.2.6_droproot.patch
ipcop/branches/toolchain/src/patches/rsyslog-5.8.9_stack-size.patch
ipcop/branches/toolchain/src/progs/ipcoprestore.c
ipcop/branches/toolchain/src/scripts/disk-partition.sh
ipcop/branches/toolchain/src/scripts/upgrade.sh
ipcop/branches/toolchain/updates/template/ROOTFILES.i486
Index: ipcop/branches/toolchain
===================================================================
--- ipcop/branches/toolchain 2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain 2015-01-07 12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/ipcop/tags/release-2.0.3:6791-6796,6799-6804
+/ipcop/trunk:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/config/cfgroot/nic-modules-list
===================================================================
--- ipcop/branches/toolchain/config/cfgroot/nic-modules-list 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/config/cfgroot/nic-modules-list 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/config/cfgroot/nic-modules-list
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/cfgroot/nic-modules-list:7773-7775
+/ipcop/trunk/config/cfgroot/nic-modules-list:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/config/etc/modprobe.d/aliases.conf
===================================================================
--- ipcop/branches/toolchain/config/etc/modprobe.d/aliases.conf 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/config/etc/modprobe.d/aliases.conf 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/config/etc/modprobe.d/aliases.conf
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/etc/modprobe.d/aliases.conf:7773-7775
+/ipcop/trunk/config/etc/modprobe.d/aliases.conf:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/config/gcc/startfiles
===================================================================
--- ipcop/branches/toolchain/config/gcc/startfiles 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/config/gcc/startfiles 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/config/gcc/startfiles
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/gcc/startfiles:7773-7775
+/ipcop/trunk/config/gcc/startfiles:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/config/rootfiles/arch_i486/CnxADSL
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/arch_i486/CnxADSL 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/config/rootfiles/arch_i486/CnxADSL 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/config/rootfiles/arch_i486/CnxADSL
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/rootfiles/arch_i486/CnxADSL:7773-7775
+/ipcop/trunk/config/rootfiles/arch_i486/CnxADSL:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/config/rootfiles/arch_i486/wanpipe_SKIP
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/arch_i486/wanpipe_SKIP
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/config/rootfiles/arch_i486/wanpipe_SKIP
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/config/rootfiles/arch_i486/wanpipe_SKIP
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/rootfiles/arch_i486/wanpipe_SKIP:7773-7775
+/ipcop/trunk/config/rootfiles/arch_i486/wanpipe_SKIP:7773-7784
\ No newline at end of property
Modified: ipcop/branches/toolchain/config/rootfiles/common/automake
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/common/automake 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/config/rootfiles/common/automake 2015-01-07
12:12:56 UTC (rev 7785)
@@ -1,130 +1,129 @@
#usr/bin/aclocal
-#usr/bin/aclocal-1.14
+#usr/bin/aclocal-1.15
#usr/bin/automake
-#usr/bin/automake-1.14
-#usr/share/aclocal-1.14
-#usr/share/aclocal-1.14/amversion.m4
-#usr/share/aclocal-1.14/ar-lib.m4
-#usr/share/aclocal-1.14/as.m4
-#usr/share/aclocal-1.14/auxdir.m4
-#usr/share/aclocal-1.14/cond-if.m4
-#usr/share/aclocal-1.14/cond.m4
-#usr/share/aclocal-1.14/depend.m4
-#usr/share/aclocal-1.14/depout.m4
-#usr/share/aclocal-1.14/dmalloc.m4
-#usr/share/aclocal-1.14/extra-recurs.m4
-#usr/share/aclocal-1.14/gcj.m4
-#usr/share/aclocal-1.14/init.m4
-#usr/share/aclocal-1.14/install-sh.m4
-#usr/share/aclocal-1.14/internal
-#usr/share/aclocal-1.14/internal/ac-config-macro-dirs.m4
-#usr/share/aclocal-1.14/lead-dot.m4
-#usr/share/aclocal-1.14/lex.m4
-#usr/share/aclocal-1.14/lispdir.m4
-#usr/share/aclocal-1.14/maintainer.m4
-#usr/share/aclocal-1.14/make.m4
-#usr/share/aclocal-1.14/missing.m4
-#usr/share/aclocal-1.14/mkdirp.m4
-#usr/share/aclocal-1.14/obsolete.m4
-#usr/share/aclocal-1.14/options.m4
-#usr/share/aclocal-1.14/protos.m4
-#usr/share/aclocal-1.14/python.m4
-#usr/share/aclocal-1.14/runlog.m4
-#usr/share/aclocal-1.14/sanity.m4
-#usr/share/aclocal-1.14/silent.m4
-#usr/share/aclocal-1.14/strip.m4
-#usr/share/aclocal-1.14/substnot.m4
-#usr/share/aclocal-1.14/tar.m4
-#usr/share/aclocal-1.14/upc.m4
-#usr/share/aclocal-1.14/vala.m4
+#usr/bin/automake-1.15
+#usr/share/aclocal-1.15
+#usr/share/aclocal-1.15/amversion.m4
+#usr/share/aclocal-1.15/ar-lib.m4
+#usr/share/aclocal-1.15/as.m4
+#usr/share/aclocal-1.15/auxdir.m4
+#usr/share/aclocal-1.15/cond-if.m4
+#usr/share/aclocal-1.15/cond.m4
+#usr/share/aclocal-1.15/depend.m4
+#usr/share/aclocal-1.15/depout.m4
+#usr/share/aclocal-1.15/dmalloc.m4
+#usr/share/aclocal-1.15/extra-recurs.m4
+#usr/share/aclocal-1.15/gcj.m4
+#usr/share/aclocal-1.15/init.m4
+#usr/share/aclocal-1.15/install-sh.m4
+#usr/share/aclocal-1.15/internal
+#usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4
+#usr/share/aclocal-1.15/lead-dot.m4
+#usr/share/aclocal-1.15/lex.m4
+#usr/share/aclocal-1.15/lispdir.m4
+#usr/share/aclocal-1.15/maintainer.m4
+#usr/share/aclocal-1.15/make.m4
+#usr/share/aclocal-1.15/missing.m4
+#usr/share/aclocal-1.15/mkdirp.m4
+#usr/share/aclocal-1.15/obsolete.m4
+#usr/share/aclocal-1.15/options.m4
+#usr/share/aclocal-1.15/prog-cc-c-o.m4
+#usr/share/aclocal-1.15/python.m4
+#usr/share/aclocal-1.15/runlog.m4
+#usr/share/aclocal-1.15/sanity.m4
+#usr/share/aclocal-1.15/silent.m4
+#usr/share/aclocal-1.15/strip.m4
+#usr/share/aclocal-1.15/substnot.m4
+#usr/share/aclocal-1.15/tar.m4
+#usr/share/aclocal-1.15/upc.m4
+#usr/share/aclocal-1.15/vala.m4
#usr/share/aclocal/README
-#usr/share/automake-1.14
-#usr/share/automake-1.14/Automake
-#usr/share/automake-1.14/Automake/ChannelDefs.pm
-#usr/share/automake-1.14/Automake/Channels.pm
-#usr/share/automake-1.14/Automake/Condition.pm
-#usr/share/automake-1.14/Automake/Config.pm
-#usr/share/automake-1.14/Automake/Configure_ac.pm
-#usr/share/automake-1.14/Automake/DisjConditions.pm
-#usr/share/automake-1.14/Automake/FileUtils.pm
-#usr/share/automake-1.14/Automake/General.pm
-#usr/share/automake-1.14/Automake/Getopt.pm
-#usr/share/automake-1.14/Automake/Item.pm
-#usr/share/automake-1.14/Automake/ItemDef.pm
-#usr/share/automake-1.14/Automake/Language.pm
-#usr/share/automake-1.14/Automake/Location.pm
-#usr/share/automake-1.14/Automake/Options.pm
-#usr/share/automake-1.14/Automake/Rule.pm
-#usr/share/automake-1.14/Automake/RuleDef.pm
-#usr/share/automake-1.14/Automake/VarDef.pm
-#usr/share/automake-1.14/Automake/Variable.pm
-#usr/share/automake-1.14/Automake/Version.pm
-#usr/share/automake-1.14/Automake/Wrap.pm
-#usr/share/automake-1.14/Automake/XFile.pm
-#usr/share/automake-1.14/COPYING
-#usr/share/automake-1.14/INSTALL
-#usr/share/automake-1.14/am
-#usr/share/automake-1.14/am/check.am
-#usr/share/automake-1.14/am/check2.am
-#usr/share/automake-1.14/am/clean-hdr.am
-#usr/share/automake-1.14/am/clean.am
-#usr/share/automake-1.14/am/compile.am
-#usr/share/automake-1.14/am/configure.am
-#usr/share/automake-1.14/am/data.am
-#usr/share/automake-1.14/am/dejagnu.am
-#usr/share/automake-1.14/am/depend.am
-#usr/share/automake-1.14/am/depend2.am
-#usr/share/automake-1.14/am/distdir.am
-#usr/share/automake-1.14/am/footer.am
-#usr/share/automake-1.14/am/header-vars.am
-#usr/share/automake-1.14/am/header.am
-#usr/share/automake-1.14/am/inst-vars.am
-#usr/share/automake-1.14/am/install.am
-#usr/share/automake-1.14/am/java.am
-#usr/share/automake-1.14/am/lang-compile.am
-#usr/share/automake-1.14/am/lex.am
-#usr/share/automake-1.14/am/library.am
-#usr/share/automake-1.14/am/libs.am
-#usr/share/automake-1.14/am/libtool.am
-#usr/share/automake-1.14/am/lisp.am
-#usr/share/automake-1.14/am/ltlib.am
-#usr/share/automake-1.14/am/ltlibrary.am
-#usr/share/automake-1.14/am/mans-vars.am
-#usr/share/automake-1.14/am/mans.am
-#usr/share/automake-1.14/am/program.am
-#usr/share/automake-1.14/am/progs.am
-#usr/share/automake-1.14/am/python.am
-#usr/share/automake-1.14/am/remake-hdr.am
-#usr/share/automake-1.14/am/scripts.am
-#usr/share/automake-1.14/am/subdirs.am
-#usr/share/automake-1.14/am/tags.am
-#usr/share/automake-1.14/am/texi-vers.am
-#usr/share/automake-1.14/am/texibuild.am
-#usr/share/automake-1.14/am/texinfos.am
-#usr/share/automake-1.14/am/vala.am
-#usr/share/automake-1.14/am/yacc.am
-#usr/share/automake-1.14/ar-lib
-#usr/share/automake-1.14/compile
-#usr/share/automake-1.14/config.guess
-#usr/share/automake-1.14/config.sub
-#usr/share/automake-1.14/depcomp
-#usr/share/automake-1.14/install-sh
-#usr/share/automake-1.14/mdate-sh
-#usr/share/automake-1.14/missing
-#usr/share/automake-1.14/mkinstalldirs
-#usr/share/automake-1.14/py-compile
-#usr/share/automake-1.14/tap-driver.pl
-#usr/share/automake-1.14/tap-driver.sh
-#usr/share/automake-1.14/test-driver
-#usr/share/automake-1.14/texinfo.tex
-#usr/share/automake-1.14/ylwrap
+#usr/share/automake-1.15
+#usr/share/automake-1.15/Automake
+#usr/share/automake-1.15/Automake/ChannelDefs.pm
+#usr/share/automake-1.15/Automake/Channels.pm
+#usr/share/automake-1.15/Automake/Condition.pm
+#usr/share/automake-1.15/Automake/Config.pm
+#usr/share/automake-1.15/Automake/Configure_ac.pm
+#usr/share/automake-1.15/Automake/DisjConditions.pm
+#usr/share/automake-1.15/Automake/FileUtils.pm
+#usr/share/automake-1.15/Automake/General.pm
+#usr/share/automake-1.15/Automake/Getopt.pm
+#usr/share/automake-1.15/Automake/Item.pm
+#usr/share/automake-1.15/Automake/ItemDef.pm
+#usr/share/automake-1.15/Automake/Language.pm
+#usr/share/automake-1.15/Automake/Location.pm
+#usr/share/automake-1.15/Automake/Options.pm
+#usr/share/automake-1.15/Automake/Rule.pm
+#usr/share/automake-1.15/Automake/RuleDef.pm
+#usr/share/automake-1.15/Automake/VarDef.pm
+#usr/share/automake-1.15/Automake/Variable.pm
+#usr/share/automake-1.15/Automake/Version.pm
+#usr/share/automake-1.15/Automake/Wrap.pm
+#usr/share/automake-1.15/Automake/XFile.pm
+#usr/share/automake-1.15/COPYING
+#usr/share/automake-1.15/INSTALL
+#usr/share/automake-1.15/am
+#usr/share/automake-1.15/am/check.am
+#usr/share/automake-1.15/am/check2.am
+#usr/share/automake-1.15/am/clean-hdr.am
+#usr/share/automake-1.15/am/clean.am
+#usr/share/automake-1.15/am/compile.am
+#usr/share/automake-1.15/am/configure.am
+#usr/share/automake-1.15/am/data.am
+#usr/share/automake-1.15/am/dejagnu.am
+#usr/share/automake-1.15/am/depend.am
+#usr/share/automake-1.15/am/depend2.am
+#usr/share/automake-1.15/am/distdir.am
+#usr/share/automake-1.15/am/footer.am
+#usr/share/automake-1.15/am/header-vars.am
+#usr/share/automake-1.15/am/header.am
+#usr/share/automake-1.15/am/inst-vars.am
+#usr/share/automake-1.15/am/install.am
+#usr/share/automake-1.15/am/java.am
+#usr/share/automake-1.15/am/lang-compile.am
+#usr/share/automake-1.15/am/lex.am
+#usr/share/automake-1.15/am/library.am
+#usr/share/automake-1.15/am/libs.am
+#usr/share/automake-1.15/am/libtool.am
+#usr/share/automake-1.15/am/lisp.am
+#usr/share/automake-1.15/am/ltlib.am
+#usr/share/automake-1.15/am/ltlibrary.am
+#usr/share/automake-1.15/am/mans-vars.am
+#usr/share/automake-1.15/am/mans.am
+#usr/share/automake-1.15/am/program.am
+#usr/share/automake-1.15/am/progs.am
+#usr/share/automake-1.15/am/python.am
+#usr/share/automake-1.15/am/remake-hdr.am
+#usr/share/automake-1.15/am/scripts.am
+#usr/share/automake-1.15/am/subdirs.am
+#usr/share/automake-1.15/am/tags.am
+#usr/share/automake-1.15/am/texi-vers.am
+#usr/share/automake-1.15/am/texibuild.am
+#usr/share/automake-1.15/am/texinfos.am
+#usr/share/automake-1.15/am/vala.am
+#usr/share/automake-1.15/am/yacc.am
+#usr/share/automake-1.15/ar-lib
+#usr/share/automake-1.15/compile
+#usr/share/automake-1.15/config.guess
+#usr/share/automake-1.15/config.sub
+#usr/share/automake-1.15/depcomp
+#usr/share/automake-1.15/install-sh
+#usr/share/automake-1.15/mdate-sh
+#usr/share/automake-1.15/missing
+#usr/share/automake-1.15/mkinstalldirs
+#usr/share/automake-1.15/py-compile
+#usr/share/automake-1.15/tap-driver.sh
+#usr/share/automake-1.15/test-driver
+#usr/share/automake-1.15/texinfo.tex
+#usr/share/automake-1.15/ylwrap
#usr/share/doc/automake
#usr/share/doc/automake/amhello-1.0.tar.gz
#usr/share/info/automake-history.info
#usr/share/info/automake.info
#usr/share/info/automake.info-1
#usr/share/info/automake.info-2
-#usr/share/man/man1/aclocal-1.14.1
+#usr/share/man/man1/aclocal-1.15.1
#usr/share/man/man1/aclocal.1
-#usr/share/man/man1/automake-1.14.1
+#usr/share/man/man1/automake-1.15.1
#usr/share/man/man1/automake.1
Index: ipcop/branches/toolchain/config/rootfiles/common/capi4k-utils
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/common/capi4k-utils
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/config/rootfiles/common/capi4k-utils
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/config/rootfiles/common/capi4k-utils
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/rootfiles/common/capi4k-utils:7773-7775
+/ipcop/trunk/config/rootfiles/common/capi4k-utils:7773-7784
\ No newline at end of property
Modified: ipcop/branches/toolchain/config/rootfiles/common/db
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/common/db 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/config/rootfiles/common/db 2015-01-07 12:12:56 UTC
(rev 7785)
@@ -14,9 +14,9 @@
#usr/bin/db_verify
#usr/include/db.h
#usr/include/db_cxx.h
-#usr/lib/libdb-6.0.a
-#usr/lib/libdb-6.0.la
-usr/lib/libdb-6.0.so
+#usr/lib/libdb-6.1.a
+#usr/lib/libdb-6.1.la
+usr/lib/libdb-6.1.so
usr/lib/libdb-6.so
#usr/lib/libdb.a
#usr/lib/libdb.so
Index: ipcop/branches/toolchain/config/rootfiles/common/usb-modeswitch
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/common/usb-modeswitch
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/config/rootfiles/common/usb-modeswitch
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/config/rootfiles/common/usb-modeswitch
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/rootfiles/common/usb-modeswitch:7773-7775
+/ipcop/trunk/config/rootfiles/common/usb-modeswitch:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/config/ssl/openvpn.cnf
===================================================================
--- ipcop/branches/toolchain/config/ssl/openvpn.cnf 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/config/ssl/openvpn.cnf 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/config/ssl/openvpn.cnf
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/config/ssl/openvpn.cnf:7773-7775
+/ipcop/trunk/config/ssl/openvpn.cnf:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/doc/base.cgi
===================================================================
--- ipcop/branches/toolchain/doc/base.cgi 2015-01-07 12:08:48 UTC (rev
7784)
+++ ipcop/branches/toolchain/doc/base.cgi 2015-01-07 12:12:56 UTC (rev
7785)
Property changes on: ipcop/branches/toolchain/doc/base.cgi
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/doc/base.cgi:7773-7775
+/ipcop/trunk/doc/base.cgi:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/html/cgi-bin/logconfig.cgi
===================================================================
--- ipcop/branches/toolchain/html/cgi-bin/logconfig.cgi 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/html/cgi-bin/logconfig.cgi 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/html/cgi-bin/logconfig.cgi
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/html/cgi-bin/logconfig.cgi:7773-7775
+/ipcop/trunk/html/cgi-bin/logconfig.cgi:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/html/cgi-bin/logfirewall.cgi
===================================================================
--- ipcop/branches/toolchain/html/cgi-bin/logfirewall.cgi 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/html/cgi-bin/logfirewall.cgi 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/html/cgi-bin/logfirewall.cgi
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/html/cgi-bin/logfirewall.cgi:7773-7775
+/ipcop/trunk/html/cgi-bin/logfirewall.cgi:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/html/cgi-bin/logproxy.cgi
===================================================================
--- ipcop/branches/toolchain/html/cgi-bin/logproxy.cgi 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/html/cgi-bin/logproxy.cgi 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/html/cgi-bin/logproxy.cgi
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/html/cgi-bin/logproxy.cgi:7773-7775
+/ipcop/trunk/html/cgi-bin/logproxy.cgi:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/html/cgi-bin/logsummary.cgi
===================================================================
--- ipcop/branches/toolchain/html/cgi-bin/logsummary.cgi 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/html/cgi-bin/logsummary.cgi 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/html/cgi-bin/logsummary.cgi
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/html/cgi-bin/logsummary.cgi:7773-7775
+/ipcop/trunk/html/cgi-bin/logsummary.cgi:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/html/cgi-bin/logsystem.cgi
===================================================================
--- ipcop/branches/toolchain/html/cgi-bin/logsystem.cgi 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/html/cgi-bin/logsystem.cgi 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/html/cgi-bin/logsystem.cgi
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/html/cgi-bin/logsystem.cgi:7773-7775
+/ipcop/trunk/html/cgi-bin/logsystem.cgi:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/html/cgi-bin/openvpn.cgi
===================================================================
--- ipcop/branches/toolchain/html/cgi-bin/openvpn.cgi 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/html/cgi-bin/openvpn.cgi 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/html/cgi-bin/openvpn.cgi
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/html/cgi-bin/openvpn.cgi:7773-7775
+/ipcop/trunk/html/cgi-bin/openvpn.cgi:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/html/html/images/openvpnzip.gif
===================================================================
--- ipcop/branches/toolchain/html/html/images/openvpnzip.gif 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/html/html/images/openvpnzip.gif 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/html/html/images/openvpnzip.gif
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/html/html/images/openvpnzip.gif:7773-7775
+/ipcop/trunk/html/html/images/openvpnzip.gif:7773-7784
\ No newline at end of property
Modified: ipcop/branches/toolchain/lfs/automake
===================================================================
--- ipcop/branches/toolchain/lfs/automake 2015-01-07 12:08:48 UTC (rev
7784)
+++ ipcop/branches/toolchain/lfs/automake 2015-01-07 12:12:56 UTC (rev
7785)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = automake
-VER = 1.14.1
+VER = 1.15
HOST_ARCH = all
OTHER_SRC = yes
@@ -52,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7fc29854c520f56b07aa232a0f880292
+$(DL_FILE)_MD5 = 9a1ddb0e053474d9d1105cfe39b0c48d
install : $(TARGET)
Index: ipcop/branches/toolchain/lfs/check_files
===================================================================
--- ipcop/branches/toolchain/lfs/check_files 2015-01-07 12:08:48 UTC (rev
7784)
+++ ipcop/branches/toolchain/lfs/check_files 2015-01-07 12:12:56 UTC (rev
7785)
Property changes on: ipcop/branches/toolchain/lfs/check_files
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/lfs/check_files:7773-7775
+/ipcop/trunk/lfs/check_files:7773-7784
\ No newline at end of property
Modified: ipcop/branches/toolchain/lfs/db
===================================================================
--- ipcop/branches/toolchain/lfs/db 2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/lfs/db 2015-01-07 12:12:56 UTC (rev 7785)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = db
-VER = 6.0.30
+VER = 6.1.19
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ad28eb86ad3203b5422844db179c585b
+$(DL_FILE)_MD5 = bfea581b42dc0fc247041e7d48cfd7fb
install : $(TARGET)
Index: ipcop/branches/toolchain/lfs/usb-modeswitch
===================================================================
--- ipcop/branches/toolchain/lfs/usb-modeswitch 2015-01-07 12:08:48 UTC (rev
7784)
+++ ipcop/branches/toolchain/lfs/usb-modeswitch 2015-01-07 12:12:56 UTC (rev
7785)
Property changes on: ipcop/branches/toolchain/lfs/usb-modeswitch
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/lfs/usb-modeswitch:7773-7775
+/ipcop/trunk/lfs/usb-modeswitch:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/libs/multilines.pl
===================================================================
--- ipcop/branches/toolchain/src/libs/multilines.pl 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/src/libs/multilines.pl 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/src/libs/multilines.pl
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/libs/multilines.pl:7773-7775
+/ipcop/trunk/src/libs/multilines.pl:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/patches/glibc-2.11.1_notimestamp.patch
===================================================================
--- ipcop/branches/toolchain/src/patches/glibc-2.11.1_notimestamp.patch
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/src/patches/glibc-2.11.1_notimestamp.patch
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/src/patches/glibc-2.11.1_notimestamp.patch
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/patches/glibc-2.11.1_notimestamp.patch:7773-7775
+/ipcop/trunk/src/patches/glibc-2.11.1_notimestamp.patch:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/patches/klibc-1.5.17_Kbuild-install.patch
===================================================================
--- ipcop/branches/toolchain/src/patches/klibc-1.5.17_Kbuild-install.patch
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/src/patches/klibc-1.5.17_Kbuild-install.patch
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/src/patches/klibc-1.5.17_Kbuild-install.patch
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/patches/klibc-1.5.17_Kbuild-install.patch:7773-7775
+/ipcop/trunk/src/patches/klibc-1.5.17_Kbuild-install.patch:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/patches/klibc-1.5.17_insmod.patch
===================================================================
--- ipcop/branches/toolchain/src/patches/klibc-1.5.17_insmod.patch
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/src/patches/klibc-1.5.17_insmod.patch
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/src/patches/klibc-1.5.17_insmod.patch
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/patches/klibc-1.5.17_insmod.patch:7773-7775
+/ipcop/trunk/src/patches/klibc-1.5.17_insmod.patch:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/patches/ntp-4.2.6_droproot.patch
===================================================================
--- ipcop/branches/toolchain/src/patches/ntp-4.2.6_droproot.patch
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/src/patches/ntp-4.2.6_droproot.patch
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/src/patches/ntp-4.2.6_droproot.patch
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/patches/ntp-4.2.6_droproot.patch:7773-7775
+/ipcop/trunk/src/patches/ntp-4.2.6_droproot.patch:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/patches/rsyslog-5.8.9_stack-size.patch
===================================================================
--- ipcop/branches/toolchain/src/patches/rsyslog-5.8.9_stack-size.patch
2015-01-07 12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/src/patches/rsyslog-5.8.9_stack-size.patch
2015-01-07 12:12:56 UTC (rev 7785)
Property changes on:
ipcop/branches/toolchain/src/patches/rsyslog-5.8.9_stack-size.patch
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/patches/rsyslog-5.8.9_stack-size.patch:7773-7775
+/ipcop/trunk/src/patches/rsyslog-5.8.9_stack-size.patch:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/progs/ipcoprestore.c
===================================================================
--- ipcop/branches/toolchain/src/progs/ipcoprestore.c 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/src/progs/ipcoprestore.c 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/src/progs/ipcoprestore.c
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/progs/ipcoprestore.c:7773-7775
+/ipcop/trunk/src/progs/ipcoprestore.c:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/scripts/disk-partition.sh
===================================================================
--- ipcop/branches/toolchain/src/scripts/disk-partition.sh 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/src/scripts/disk-partition.sh 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/src/scripts/disk-partition.sh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/scripts/disk-partition.sh:7773-7775
+/ipcop/trunk/src/scripts/disk-partition.sh:7773-7784
\ No newline at end of property
Index: ipcop/branches/toolchain/src/scripts/upgrade.sh
===================================================================
--- ipcop/branches/toolchain/src/scripts/upgrade.sh 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/src/scripts/upgrade.sh 2015-01-07 12:12:56 UTC
(rev 7785)
Property changes on: ipcop/branches/toolchain/src/scripts/upgrade.sh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/src/scripts/upgrade.sh:7773-7775
+/ipcop/trunk/src/scripts/upgrade.sh:7773-7784
\ No newline at end of property
Modified: ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8
===================================================================
--- ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8 2015-01-07
12:12:56 UTC (rev 7785)
@@ -38,6 +38,10 @@
/usr/lib/libcairo.so.2
/usr/lib/libcairo.so.2.11400.0
##
+## db-6.1.19
+/usr/lib/libdb-6.1.so
+/usr/lib/libdb-6.so
+##
## dhcpcd-6.6.7
/usr/sbin/dhcpcd
##
Modified: ipcop/branches/toolchain/updates/2.1.8/information.xml
===================================================================
--- ipcop/branches/toolchain/updates/2.1.8/information.xml 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/updates/2.1.8/information.xml 2015-01-07
12:12:56 UTC (rev 7785)
@@ -5,7 +5,7 @@
<size>0</size>
<isoimages>no</isoimages>
<description>
- Upgrade acpid to 2.0.23, apache to 2.2.29, bind to 9.10.1-P1, cairo to
1.14.0, dhcpcd to 6.6.7,
+ Upgrade acpid to 2.0.23, apache to 2.2.29, bind to 9.10.1-P1, cairo to
1.14.0, db to 6.1.19, dhcpcd to 6.6.7,
ethtool to 3.16, fontconfig to 2.11.1, freetype to 2.5.5, grep to 2.21,
harfbuzz to 0.9.37, hdparm to 9.45, iproute2 to 3.18.0, iw to 3.17,
krb5 to 1.12.2,
libpcap to 1.6.2, libpng to 1.6.16, libxml2 to 2.9.2, lsof to 4.88,
ntp to 4.2.8, openvpn to 2.3.6,
Modified: ipcop/branches/toolchain/updates/2.1.8/setup
===================================================================
--- ipcop/branches/toolchain/updates/2.1.8/setup 2015-01-07 12:08:48 UTC
(rev 7784)
+++ ipcop/branches/toolchain/updates/2.1.8/setup 2015-01-07 12:12:56 UTC
(rev 7785)
@@ -99,6 +99,7 @@
/bin/rm -f /usr/lib/liblwres.so.90
/bin/rm -f /usr/lib/liblwres.so.90.0.7
/bin/rm -f /usr/lib/libcairo.so.2.11200.16
+/bin/rm -f /usr/lib/libdb-6.0.so
/bin/rm -f /usr/lib/libfreetype.so.6.11.2
/bin/rm -f /usr/lib/libharfbuzz.so.0.927.0
/bin/rm -f /usr/lib/libgssrpc.so.4
Index: ipcop/branches/toolchain/updates/template/ROOTFILES.i486
===================================================================
--- ipcop/branches/toolchain/updates/template/ROOTFILES.i486 2015-01-07
12:08:48 UTC (rev 7784)
+++ ipcop/branches/toolchain/updates/template/ROOTFILES.i486 2015-01-07
12:12:56 UTC (rev 7785)
Property changes on: ipcop/branches/toolchain/updates/template/ROOTFILES.i486
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/ipcop/trunk/updates/template/ROOTFILES.i486:7773-7775
+/ipcop/trunk/updates/template/ROOTFILES.i486:7773-7784
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
