Merge branch 'master' into perl_5.12.2

Conflicts:
	config/rootfiles/core/47/filelists/files
	config/rootfiles/core/47/update.sh

diff --git a/config/backup/include b/config/backup/include
index 87abb071e37e5ce5ffd31b3909364ffb95895c72..8806640cffa645e4945db4be0adcac1405435482 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -7,6 +7,7 @@
 /etc/passwd
 /etc/shadow
 /etc/group
+/etc/ipsec.user.*
 /etc/sysconfig/*
 /etc/hosts*
 /etc/httpd/*
@@ -14,6 +15,7 @@
 /var/ipfire/auth/users
 /var/ipfire/dhcp/*
 /var/ipfire/main/*
+/var/ipfire/outgoing/groups
 /var/ipfire/outgoing/rules
 /var/ipfire/outgoing/p2protocols
 /var/ipfire/ovpn

diff --git a/config/php/php.ini b/config/php/php.ini
index ca675a46e9d7d15dfb0936a1f32c448b70bdc51a..6e820949663007bb3be7f4e8a413693b461d0925 100644 (file)
--- a/config/php/php.ini
+++ b/config/php/php.ini
@@ -533,7 +533,7 @@ doc_root =
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20060613/"
+extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20090626/"
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -808,7 +808,7 @@ mysql.default_port =
 
 ; Default socket name for local MySQL connects.  If empty, uses the built-in
 ; MySQL defaults.
-mysql.default_socket =
+mysql.default_socket = /var/run/mysql/mysql.sock
 
 ; Default host for mysql_connect() (doesn't apply in safe mode).
 mysql.default_host =

diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh
index faae91839f5cca2683c8f04462a412d0951a8f82..6737b6cca37d08fecf477d2ca289c07e24e68871 100644 (file)
--- a/config/rootfiles/common/openssh
+++ b/config/rootfiles/common/openssh
@@ -3,6 +3,8 @@ etc/ssh/moduli
 etc/ssh/ssh_config
 #etc/ssh/ssh_host_dsa_key
 #etc/ssh/ssh_host_dsa_key.pub
+#etc/ssh/ssh_host_ecdsa_key
+#etc/ssh/ssh_host_ecdsa_key.pub
 #etc/ssh/ssh_host_key
 #etc/ssh/ssh_host_key.pub
 #etc/ssh/ssh_host_rsa_key

diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index c075845f628211dc342a7090fecc8f143c2fbea0..bc1ac49f0b86720f71602acacfb0d6292dff825b 100644 (file)
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -1116,6 +1116,7 @@ usr/lib/libssl.so.0.9.8
 #usr/share/man/man3/dsa.3
 #usr/share/man/man3/ecdsa.3
 #usr/share/man/man3/engine.3
+#usr/share/man/man3/err.3
 #usr/share/man/man3/evp.3
 #usr/share/man/man3/hmac.3
 #usr/share/man/man3/i2d_ASN1_OBJECT.3

diff --git a/config/rootfiles/common/php b/config/rootfiles/common/php
index 18499baa0b4a72a5e2cf8b32490411cb28635aea..693a4b2fb2d4f34a2455bda2d8a1d09baf5f3276 100644 (file)
--- a/config/rootfiles/common/php
+++ b/config/rootfiles/common/php
@@ -1,9 +1,10 @@
-etc/httpd/conf/conf.d/php5.conf
 etc/pear.conf
 etc/php.ini
 #usr/bin/pear
 #usr/bin/peardev
 #usr/bin/pecl
+usr/bin/phar
+usr/bin/phar.phar
 usr/bin/php
 #usr/bin/php-config
 #usr/bin/phpize
@@ -20,12 +21,13 @@ usr/bin/php
 #usr/include/php/TSRM/tsrm_virtual_cwd.h
 #usr/include/php/TSRM/tsrm_win32.h
 #usr/include/php/Zend
-#usr/include/php/Zend/FlexLexer.h
 #usr/include/php/Zend/acconfig.h
 #usr/include/php/Zend/zend.h
 #usr/include/php/Zend/zend_API.h
 #usr/include/php/Zend/zend_alloc.h
+#usr/include/php/Zend/zend_build.h
 #usr/include/php/Zend/zend_builtin_functions.h
+#usr/include/php/Zend/zend_closures.h
 #usr/include/php/Zend/zend_compile.h
 #usr/include/php/Zend/zend_config.h
 #usr/include/php/Zend/zend_config.nw.h
@@ -37,6 +39,8 @@ usr/bin/php
 #usr/include/php/Zend/zend_execute.h
 #usr/include/php/Zend/zend_extensions.h
 #usr/include/php/Zend/zend_fast_cache.h
+#usr/include/php/Zend/zend_float.h
+#usr/include/php/Zend/zend_gc.h
 #usr/include/php/Zend/zend_globals.h
 #usr/include/php/Zend/zend_globals_macros.h
 #usr/include/php/Zend/zend_hash.h
@@ -45,11 +49,13 @@ usr/bin/php
 #usr/include/php/Zend/zend_ini.h
 #usr/include/php/Zend/zend_ini_parser.h
 #usr/include/php/Zend/zend_ini_scanner.h
+#usr/include/php/Zend/zend_ini_scanner_defs.h
 #usr/include/php/Zend/zend_interfaces.h
 #usr/include/php/Zend/zend_istdiostream.h
 #usr/include/php/Zend/zend_iterators.h
 #usr/include/php/Zend/zend_language_parser.h
 #usr/include/php/Zend/zend_language_scanner.h
+#usr/include/php/Zend/zend_language_scanner_defs.h
 #usr/include/php/Zend/zend_list.h
 #usr/include/php/Zend/zend_llist.h
 #usr/include/php/Zend/zend_modules.h
@@ -81,11 +87,19 @@ usr/bin/php
 #usr/include/php/ext/date/php_date.h
 #usr/include/php/ext/dom
 #usr/include/php/ext/dom/xml_common.h
+#usr/include/php/ext/ereg
+#usr/include/php/ext/ereg/php_ereg.h
+#usr/include/php/ext/ereg/php_regex.h
+#usr/include/php/ext/ereg/regex
+#usr/include/php/ext/ereg/regex/cclass.h
+#usr/include/php/ext/ereg/regex/cname.h
+#usr/include/php/ext/ereg/regex/regex.h
+#usr/include/php/ext/ereg/regex/regex2.h
+#usr/include/php/ext/ereg/regex/utils.h
 #usr/include/php/ext/filter
 #usr/include/php/ext/filter/php_filter.h
 #usr/include/php/ext/gd
 #usr/include/php/ext/gd/gdcache.h
-#usr/include/php/ext/gd/gdttf.h
 #usr/include/php/ext/gd/php_gd.h
 #usr/include/php/ext/hash
 #usr/include/php/ext/hash/php_hash.h
@@ -95,6 +109,7 @@ usr/bin/php
 #usr/include/php/ext/hash/php_hash_haval.h
 #usr/include/php/ext/hash/php_hash_md.h
 #usr/include/php/ext/hash/php_hash_ripemd.h
+#usr/include/php/ext/hash/php_hash_salsa.h
 #usr/include/php/ext/hash/php_hash_sha.h
 #usr/include/php/ext/hash/php_hash_snefru.h
 #usr/include/php/ext/hash/php_hash_tiger.h
@@ -103,12 +118,16 @@ usr/bin/php
 #usr/include/php/ext/iconv
 #usr/include/php/ext/iconv/php_have_bsd_iconv.h
 #usr/include/php/ext/iconv/php_have_glibc_iconv.h
+#usr/include/php/ext/iconv/php_have_ibm_iconv.h
 #usr/include/php/ext/iconv/php_have_iconv.h
 #usr/include/php/ext/iconv/php_have_libiconv.h
 #usr/include/php/ext/iconv/php_iconv.h
+#usr/include/php/ext/iconv/php_iconv_aliased_libiconv.h
 #usr/include/php/ext/iconv/php_iconv_supports_errno.h
 #usr/include/php/ext/iconv/php_php_iconv_h_path.h
 #usr/include/php/ext/iconv/php_php_iconv_impl.h
+#usr/include/php/ext/json
+#usr/include/php/ext/json/php_json.h
 #usr/include/php/ext/libxml
 #usr/include/php/ext/libxml/php_libxml.h
 #usr/include/php/ext/mbstring
@@ -133,8 +152,8 @@ usr/bin/php
 #usr/include/php/ext/mbstring/mbstring.h
 #usr/include/php/ext/mbstring/oniguruma
 #usr/include/php/ext/mbstring/oniguruma/oniguruma.h
-#usr/include/php/ext/mbstring/oniguruma/php_onig_compat.h
 #usr/include/php/ext/mbstring/php_mbregex.h
+#usr/include/php/ext/mbstring/php_onig_compat.h
 #usr/include/php/ext/pcre
 #usr/include/php/ext/pcre/pcrelib
 #usr/include/php/ext/pcre/pcrelib/config.h
@@ -142,8 +161,6 @@ usr/bin/php
 #usr/include/php/ext/pcre/pcrelib/pcre_internal.h
 #usr/include/php/ext/pcre/pcrelib/pcreposix.h
 #usr/include/php/ext/pcre/pcrelib/ucp.h
-#usr/include/php/ext/pcre/pcrelib/ucpinternal.h
-#usr/include/php/ext/pcre/pcrelib/ucptable.h
 #usr/include/php/ext/pcre/php_pcre.h
 #usr/include/php/ext/pdo
 #usr/include/php/ext/pdo/php_pdo.h
@@ -152,20 +169,27 @@ usr/bin/php
 #usr/include/php/ext/session/mod_files.h
 #usr/include/php/ext/session/mod_user.h
 #usr/include/php/ext/session/php_session.h
+#usr/include/php/ext/sockets
+#usr/include/php/ext/sockets/php_sockets.h
 #usr/include/php/ext/spl
 #usr/include/php/ext/spl/php_spl.h
 #usr/include/php/ext/spl/spl_array.h
 #usr/include/php/ext/spl/spl_directory.h
+#usr/include/php/ext/spl/spl_dllist.h
 #usr/include/php/ext/spl/spl_engine.h
 #usr/include/php/ext/spl/spl_exceptions.h
+#usr/include/php/ext/spl/spl_fixedarray.h
 #usr/include/php/ext/spl/spl_functions.h
+#usr/include/php/ext/spl/spl_heap.h
 #usr/include/php/ext/spl/spl_iterators.h
 #usr/include/php/ext/spl/spl_observer.h
-#usr/include/php/ext/spl/spl_sxe.h
 #usr/include/php/ext/sqlite
 #usr/include/php/ext/sqlite/libsqlite
 #usr/include/php/ext/sqlite/libsqlite/src
 #usr/include/php/ext/sqlite/libsqlite/src/sqlite.h
+#usr/include/php/ext/sqlite3
+#usr/include/php/ext/sqlite3/libsqlite
+#usr/include/php/ext/sqlite3/libsqlite/sqlite3.h
 #usr/include/php/ext/standard
 #usr/include/php/ext/standard/base64.h
 #usr/include/php/ext/standard/basic_functions.h
@@ -173,11 +197,11 @@ usr/bin/php
 #usr/include/php/ext/standard/credits.h
 #usr/include/php/ext/standard/credits_ext.h
 #usr/include/php/ext/standard/credits_sapi.h
+#usr/include/php/ext/standard/crypt_freesec.h
 #usr/include/php/ext/standard/css.h
 #usr/include/php/ext/standard/cyr_convert.h
 #usr/include/php/ext/standard/datetime.h
 #usr/include/php/ext/standard/dl.h
-#usr/include/php/ext/standard/dns.h
 #usr/include/php/ext/standard/exec.h
 #usr/include/php/ext/standard/file.h
 #usr/include/php/ext/standard/flock_compat.h
@@ -193,7 +217,9 @@ usr/bin/php
 #usr/include/php/ext/standard/php_assert.h
 #usr/include/php/ext/standard/php_browscap.h
 #usr/include/php/ext/standard/php_crypt.h
+#usr/include/php/ext/standard/php_crypt_r.h
 #usr/include/php/ext/standard/php_dir.h
+#usr/include/php/ext/standard/php_dns.h
 #usr/include/php/ext/standard/php_ext_syslog.h
 #usr/include/php/ext/standard/php_filestat.h
 #usr/include/php/ext/standard/php_fopen_wrappers.h
@@ -218,14 +244,13 @@ usr/bin/php
 #usr/include/php/ext/standard/php_versioning.h
 #usr/include/php/ext/standard/proc_open.h
 #usr/include/php/ext/standard/quot_print.h
-#usr/include/php/ext/standard/reg.h
 #usr/include/php/ext/standard/scanf.h
 #usr/include/php/ext/standard/sha1.h
 #usr/include/php/ext/standard/streamsfuncs.h
 #usr/include/php/ext/standard/uniqid.h
 #usr/include/php/ext/standard/url.h
-#usr/include/php/ext/standard/url_scanner.h
 #usr/include/php/ext/standard/url_scanner_ex.h
+#usr/include/php/ext/standard/winver.h
 #usr/include/php/ext/xml
 #usr/include/php/ext/xml/expat_compat.h
 #usr/include/php/ext/xml/php_xml.h
@@ -233,7 +258,6 @@ usr/bin/php
 #usr/include/php/main
 #usr/include/php/main/SAPI.h
 #usr/include/php/main/build-defs.h
-#usr/include/php/main/config.w32.h
 #usr/include/php/main/fopen_wrappers.h
 #usr/include/php/main/logos.h
 #usr/include/php/main/php.h
@@ -241,6 +265,7 @@ usr/bin/php
 #usr/include/php/main/php_compat.h
 #usr/include/php/main/php_config.h
 #usr/include/php/main/php_content_types.h
+#usr/include/php/main/php_getopt.h
 #usr/include/php/main/php_globals.h
 #usr/include/php/main/php_ini.h
 #usr/include/php/main/php_logos.h
@@ -250,7 +275,6 @@ usr/bin/php
 #usr/include/php/main/php_open_temporary_file.h
 #usr/include/php/main/php_output.h
 #usr/include/php/main/php_reentrancy.h
-#usr/include/php/main/php_regex.h
 #usr/include/php/main/php_scandir.h
 #usr/include/php/main/php_streams.h
 #usr/include/php/main/php_syslog.h
@@ -264,26 +288,23 @@ usr/bin/php
 #usr/include/php/main/streams
 #usr/include/php/main/streams/php_stream_context.h
 #usr/include/php/main/streams/php_stream_filter_api.h
+#usr/include/php/main/streams/php_stream_glob_wrapper.h
 #usr/include/php/main/streams/php_stream_mmap.h
 #usr/include/php/main/streams/php_stream_plain_wrapper.h
 #usr/include/php/main/streams/php_stream_transport.h
 #usr/include/php/main/streams/php_stream_userspace.h
 #usr/include/php/main/streams/php_streams_int.h
+#usr/include/php/main/win32_internal_function_disabled.h
 #usr/include/php/main/win95nt.h
-#usr/include/php/regex
-#usr/include/php/regex/cclass.h
-#usr/include/php/regex/cname.h
-#usr/include/php/regex/regex.h
-#usr/include/php/regex/regex2.h
-#usr/include/php/regex/regex_extra.h
-#usr/include/php/regex/utils.h
 usr/lib/apache/libphp5.so
 #usr/lib/php
 #usr/lib/php/.channels
 #usr/lib/php/.channels/.alias
 #usr/lib/php/.channels/.alias/pear.txt
 #usr/lib/php/.channels/.alias/pecl.txt
+#usr/lib/php/.channels/.alias/phpdocs.txt
 #usr/lib/php/.channels/__uri.reg
+#usr/lib/php/.channels/doc.php.net.reg
 #usr/lib/php/.channels/pear.php.net.reg
 #usr/lib/php/.channels/pecl.php.net.reg
 #usr/lib/php/.depdb
@@ -292,11 +313,13 @@ usr/lib/apache/libphp5.so
 #usr/lib/php/.lock
 #usr/lib/php/.registry
 #usr/lib/php/.registry/.channel.__uri
+#usr/lib/php/.registry/.channel.doc.php.net
 #usr/lib/php/.registry/.channel.pecl.php.net
 #usr/lib/php/.registry/archive_tar.reg
 #usr/lib/php/.registry/console_getopt.reg
 #usr/lib/php/.registry/pear.reg
 #usr/lib/php/.registry/structures_graph.reg
+#usr/lib/php/.registry/xml_util.reg
 #usr/lib/php/Archive
 usr/lib/php/Archive/Tar.php
 #usr/lib/php/Console
@@ -355,7 +378,6 @@ usr/lib/php/PEAR/Command/Test.php
 usr/lib/php/PEAR/Command/Test.xml
 usr/lib/php/PEAR/Common.php
 usr/lib/php/PEAR/Config.php
-usr/lib/php/PEAR/Dependency.php
 usr/lib/php/PEAR/Dependency2.php
 usr/lib/php/PEAR/DependencyDB.php
 #usr/lib/php/PEAR/Downloader
@@ -363,6 +385,7 @@ usr/lib/php/PEAR/Downloader.php
 usr/lib/php/PEAR/Downloader/Package.php
 usr/lib/php/PEAR/ErrorStack.php
 usr/lib/php/PEAR/Exception.php
+usr/lib/php/PEAR/FixPHP5PEARWarnings.php
 #usr/lib/php/PEAR/Frontend
 usr/lib/php/PEAR/Frontend.php
 usr/lib/php/PEAR/Frontend/CLI.php
@@ -370,6 +393,8 @@ usr/lib/php/PEAR/Frontend/CLI.php
 usr/lib/php/PEAR/Installer.php
 #usr/lib/php/PEAR/Installer/Role
 usr/lib/php/PEAR/Installer/Role.php
+usr/lib/php/PEAR/Installer/Role/Cfg.php
+usr/lib/php/PEAR/Installer/Role/Cfg.xml
 usr/lib/php/PEAR/Installer/Role/Common.php
 usr/lib/php/PEAR/Installer/Role/Data.php
 usr/lib/php/PEAR/Installer/Role/Data.xml
@@ -385,6 +410,8 @@ usr/lib/php/PEAR/Installer/Role/Src.php
 usr/lib/php/PEAR/Installer/Role/Src.xml
 usr/lib/php/PEAR/Installer/Role/Test.php
 usr/lib/php/PEAR/Installer/Role/Test.xml
+usr/lib/php/PEAR/Installer/Role/Www.php
+usr/lib/php/PEAR/Installer/Role/Www.xml
 #usr/lib/php/PEAR/PackageFile
 usr/lib/php/PEAR/PackageFile.php
 #usr/lib/php/PEAR/PackageFile/Generator
@@ -405,7 +432,6 @@ usr/lib/php/PEAR/REST/10.php
 usr/lib/php/PEAR/REST/11.php
 usr/lib/php/PEAR/REST/13.php
 usr/lib/php/PEAR/Registry.php
-usr/lib/php/PEAR/Remote.php
 usr/lib/php/PEAR/RunTest.php
 #usr/lib/php/PEAR/Task
 usr/lib/php/PEAR/Task/Common.php
@@ -425,6 +451,7 @@ usr/lib/php/PEAR/Validate.php
 #usr/lib/php/PEAR/Validator
 usr/lib/php/PEAR/Validator/PECL.php
 usr/lib/php/PEAR/XMLParser.php
+usr/lib/php/PEAR5.php
 #usr/lib/php/Structures
 #usr/lib/php/Structures/Graph
 usr/lib/php/Structures/Graph.php
@@ -433,6 +460,8 @@ usr/lib/php/Structures/Graph/Manipulator/AcyclicTest.php
 usr/lib/php/Structures/Graph/Manipulator/TopologicalSorter.php
 usr/lib/php/Structures/Graph/Node.php
 usr/lib/php/System.php
+#usr/lib/php/XML
+usr/lib/php/XML/Util.php
 #usr/lib/php/build
 #usr/lib/php/build/Makefile.global
 #usr/lib/php/build/acinclude.m4
@@ -451,15 +480,13 @@ usr/lib/php/System.php
 #usr/lib/php/data/PEAR/template.spec
 #usr/lib/php/data/Structures_Graph
 #usr/lib/php/data/Structures_Graph/LICENSE
-#usr/lib/php/data/Structures_Graph/genpackage.xml.pl
-#usr/lib/php/data/Structures_Graph/package.sh
-#usr/lib/php/data/Structures_Graph/publish.sh
 #usr/lib/php/doc
 #usr/lib/php/doc/Archive_Tar
 #usr/lib/php/doc/Archive_Tar/docs
 #usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
 #usr/lib/php/doc/PEAR
 #usr/lib/php/doc/PEAR/INSTALL
+#usr/lib/php/doc/PEAR/LICENSE
 #usr/lib/php/doc/PEAR/README
 #usr/lib/php/doc/Structures_Graph
 #usr/lib/php/doc/Structures_Graph/docs
@@ -489,19 +516,44 @@ usr/lib/php/System.php
 #usr/lib/php/doc/Structures_Graph/docs/tutorials
 #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph
 #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
+#usr/lib/php/doc/XML_Util
+#usr/lib/php/doc/XML_Util/examples
+usr/lib/php/doc/XML_Util/examples/example.php
+usr/lib/php/doc/XML_Util/examples/example2.php
 #usr/lib/php/extensions
-#usr/lib/php/extensions/no-debug-non-zts-20060613
-#usr/lib/php/extensions/no-debug-non-zts-20060613/dba.so
-usr/lib/php/extensions/no-debug-non-zts-20060613/idn.so
+#usr/lib/php/extensions/no-debug-non-zts-20090626
+usr/lib/php/extensions/no-debug-non-zts-20090626/dba.so
+usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so
 #usr/lib/php/pearcmd.php
 #usr/lib/php/peclcmd.php
 #usr/lib/php/test
 #usr/lib/php/test/Structures_Graph
 #usr/lib/php/test/Structures_Graph/tests
-#usr/lib/php/test/Structures_Graph/tests/README
-#usr/lib/php/test/Structures_Graph/tests/all-tests.php
+#usr/lib/php/test/Structures_Graph/tests/AllTests.php
 #usr/lib/php/test/Structures_Graph/tests/testCase
 #usr/lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php
+#usr/lib/php/test/XML_Util
+#usr/lib/php/test/XML_Util/tests
+#usr/lib/php/test/XML_Util/tests/AllTests.php
+#usr/lib/php/test/XML_Util/tests/testBasic_apiVersion.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_attributesToString.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_collapseEmptyTags.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_createCDataSection.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_createComment.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_createEndElement.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_createStartElement.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_createTag.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_createTagFromArray.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_getDocTypeDeclaration.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_getXmlDeclaration.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_isValidName.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_raiseError.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_replaceEntities.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_reverseEntities.phpt
+#usr/lib/php/test/XML_Util/tests/testBasic_splitQualifiedName.phpt
+#usr/lib/php/test/XML_Util/tests/testBug_4950.phpt
+#usr/lib/php/test/XML_Util/tests/testBug_5392.phpt
 #usr/man/man1/php-config.1
 #usr/man/man1/php.1
 #usr/man/man1/phpize.1
+etc/httpd/conf/conf.d/php5.conf

diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/core/46/exclude
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01b7a7f2ae19f30fe926138af409e181b810dcc4 100644 (file)
--- a/config/rootfiles/core/46/exclude
+++ b/config/rootfiles/core/46/exclude
@@ -0,0 +1,3 @@
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf

diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files
index 5f4605e5009f635406e2f5ad5903ff85bf56a407..956e06e572fd21780640fc058d8417747bb09e89 100644 (file)
--- a/config/rootfiles/core/46/filelists/files
+++ b/config/rootfiles/core/46/filelists/files
@@ -1,2 +1,11 @@
 etc/system-release
 boot/ipfirerd-2.6.32.28.img
+opt/pakfire/lib/functions.pl
+var/ipfire/backup/include
+srv/web/ipfire/cgi-bin/system.cgi
+srv/web/ipfire/cgi-bin/ddns.cgi
+usr/local/bin/setddns.pl
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+var/ipfire/langs/es.pl
+var/ipfire/langs/fr.pl

diff --git a/config/rootfiles/core/46/filelists/openssh b/config/rootfiles/core/46/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/46/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/46/filelists/openssl b/config/rootfiles/core/46/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/46/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file

diff --git a/config/rootfiles/core/46/filelists/squid b/config/rootfiles/core/46/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/46/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh
index 4034160d3734d11954bed03477a640b3e09b4d86..95c200c0be263a1a5112320bdf3b4ef85c2c8637 100644 (file)
--- a/config/rootfiles/core/46/update.sh
+++ b/config/rootfiles/core/46/update.sh
@@ -36,10 +36,11 @@ extract_files
 
 #
 #Start services
+/etc/init.d/squid restart
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 # Rebuild initrd of optional pae and xen kernel
 KVER=2.6.32.28
@@ -53,5 +54,7 @@ depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
 
 #
 #Finish
+/etc/init.d/fireinfo start
+sendprofile
 #Don't report the exitcode last command
 exit 0

diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files
index 0037af183326a74f3cbb5f65b2cf4c007eea7bed..d63f86187046ccdffb5f8091b6f8101546d03812 100644 (file)
--- a/config/rootfiles/core/47/filelists/files
+++ b/config/rootfiles/core/47/filelists/files
@@ -1 +1,8 @@
 etc/system-release
+etc/rc.d/init.d/sshd
+etc/rc.d/init.d/networking/red
+srv/web/ipfire/cgi-bin/pppsetup.cgi
+srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/remote.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+var/ipfire/backup/include

diff --git a/config/rootfiles/core/47/filelists/fireinfo b/config/rootfiles/core/47/filelists/fireinfo
new file mode 120000 (symlink)
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/47/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file

diff --git a/config/rootfiles/core/47/filelists/php b/config/rootfiles/core/47/filelists/php
new file mode 120000 (symlink)
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/core/47/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file

diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh
index d545f1db4000b9141aea6913ac17bdcbc092b489..ef10f558bb79c9bc9c018d51bdd8847dd0fca9d6 100644 (file)
--- a/config/rootfiles/core/47/update.sh
+++ b/config/rootfiles/core/47/update.sh
@@ -34,6 +34,11 @@ rm -f /var/cache/pakfire/core-upgrade-*.ipfire
 #Extract files
 extract_files
 
+#Generate ssh ecdsa host key if not present
+if [ ! -e /etc/ssh/ssh_host_ecdsa_key ]; then
+   ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
+fi
+
 #
 #Start services
 
@@ -48,5 +53,7 @@ extract_files
 
 #
 #Finish
+/etc/init.d/fireinfo start
+sendprofile
 #Don't report the exitcode last command
 exit 0

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 17b99fdf6386c95d9254647573b03e8ddeb81929..fae43b8c41df449497478e603eff7f5d32aea114 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.7
+usr/lib/libclamav.so.6.1.9
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.7
+usr/lib/libclamunrar.so.6.1.9
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.7
+usr/lib/libclamunrar_iface.so.6.1.9
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index b2f0d8c1d39f9c36959cbe9fc09af8165fe07272..d83113c2f07913175db1e89e956772192431c86d 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -106,7 +106,7 @@ usr/lib/libcupsmime.so
 usr/lib/libcupsmime.so.1
 usr/lib/libcupsppdc.so
 usr/lib/libcupsppdc.so.1
-#usr/lib/php/extensions/no-debug-non-zts-20060613/phpcups.so
+#usr/lib/php/extensions/no-debug-non-zts-20090626/phpcups.so
 usr/sbin/accept
 usr/sbin/cupsaccept
 usr/sbin/cupsaddsmb
@@ -1047,4 +1047,4 @@ var/run/cups
 var/run/cups/certs
 var/spool/cups
 var/spool/cups/tmp
-etc/rc.d/init.d/cups
\ No newline at end of file
+etc/rc.d/init.d/cups

diff --git a/config/rootfiles/packages/icecc b/config/rootfiles/packages/icecc
index 8e41873552b8132b0f80708435c0bf64762e06b9..d27df6505c49150409b7b7567e3d74c748769644 100644 (file)
--- a/config/rootfiles/packages/icecc
+++ b/config/rootfiles/packages/icecc
@@ -1,6 +1,11 @@
 #opt/icecream
 #opt/icecream/bin
+#opt/icecream/bin/c++
+#opt/icecream/bin/cc
+#opt/icecream/bin/g++
+#opt/icecream/bin/gcc
 #opt/icecream/bin/icecc
+#opt/icecream/bin/icerun
 #opt/icecream/include
 #opt/icecream/include/icecc
 #opt/icecream/include/icecc/comm.h

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 49390042348ab03d1a1fc398ea5ccfd3e808505b..8b4f00f7f21bf05876eb0b15d906f8e470ed1a79 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core45.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core46.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 4dba22f535a058949936ce7f83c9b7c77d4da879..f7ae56852d8b4da6cb3c2513ecb6c7eca034dc47 100644 (file)
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -243,12 +243,12 @@ $checked{'SERVICE'}{'easydns.com'} = '';
 $checked{'SERVICE'}{'enom.com'} = '';
 $checked{'SERVICE'}{'freedns.afraid.org'} = '';
 $checked{'SERVICE'}{'hn.org'} = '';
-$checked{'SERVICE'}{'mydyn.de'} = '';
 $checked{'SERVICE'}{'no-ip.com'} = '';
 $checked{'SERVICE'}{'nsupdate'} = '';
 $checked{'SERVICE'}{'ovh.com'} = '';
 $checked{'SERVICE'}{'regfish.com'} = '';
 $checked{'SERVICE'}{'selfhost.de'} = '';
+$checked{'SERVICE'}{'strato.com'} = '';
 $checked{'SERVICE'}{'tzo.com'} = '';
 $checked{'SERVICE'}{'zoneedit.com'} = '';
 $checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'";
@@ -336,12 +336,12 @@ print <<END
     <option $checked{'SERVICE'}{'enom.com'}>enom.com</option>
     <option $checked{'SERVICE'}{'freedns.afraid.org'}>freedns.afraid.org</option>
     <option $checked{'SERVICE'}{'hn.org'}>hn.org</option>
-    <option $checked{'SERVICE'}{'mydyn.de'}>mydyn.de</option>
     <option $checked{'SERVICE'}{'no-ip.com'}>no-ip.com</option>
     <option $checked{'SERVICE'}{'nsupdate'}>nsupdate</option>
     <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option>
     <option $checked{'SERVICE'}{'regfish.com'}>regfish.com</option>
     <option $checked{'SERVICE'}{'selfhost.de'}>selfhost.de</option>
+    <option $checked{'SERVICE'}{'strato.com'}>strato.com</option>
 <!--    <option $checked{'SERVICE'}{'tzo.com'}>tzo.com</option>        comment this service out until a working fix is developed -->
     <option $checked{'SERVICE'}{'zoneedit.com'}>zoneedit.com</option>
     </select></td>

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 734e7dc8868d5d81d278dfe0102a2566eaf77675..7da270c97ecd23f1e2598fca216245703760d239 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") {
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
        #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902_s.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsettings{'OINKCODE'}";
        #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
        #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettings{'OINKCODE'}";
        #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
 } else {
        $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index e2af0a08870aa529bea4c12cb849ecef5bd5752d..4c7bb8c77240c52fc38209deb5a8cea842e0af63 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -200,6 +200,16 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
         delete $pppsettings{'ENCAP_RFC1483'};
         delete $pppsettings{'ENCAP_RFC2364'};
 
+        if ((!($pppsettings{'INET_VLAN'} =~ /^\d+$/)) ||
+               ($pppsettings{'INET_VLAN'} eq '') ||
+               ($pppsettings{'INET_VLAN'} > 4095) ) {
+                       $errormessage = 'INET_VLAN - '.$Lang::tr{'invalid input'}; }
+
+        if ((!($pppsettings{'IPTV_VLAN'} =~ /^\d+$/)) ||
+               ($pppsettings{'IPTV_VLAN'} eq '') ||
+               ($pppsettings{'IPTV_VLAN'} > 4095) ) {
+                       $errormessage = 'IPTV_VLAN - '.$Lang::tr{'invalid input'}; }
+
 ERROR:
         if ($errormessage) {
                 $pppsettings{'VALID'} = 'no'; }
@@ -413,6 +423,9 @@ $checked{'IPTV'}{'enable'} = '';
 $checked{'IPTV'}{'disable'} = '';
 $checked{'IPTV'}{$pppsettings{'IPTV'}} = "checked='checked'";
 
+if ($pppsettings{'INET_VLAN'} eq '') { $pppsettings{'INET_VLAN'}='7'; }
+if ($pppsettings{'IPTV_VLAN'} eq '') { $pppsettings{'IPTV_VLAN'}='8'; }
+
 &Header::openpage($Lang::tr{'ppp setup'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
@@ -696,6 +709,11 @@ print <<END
         <td width='25%'>My Netconfig</td>
         <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td>
 </tr>
+<tr>
+        <td width='25%'>PPTP Route&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td>
+</tr>
+
 END
 ;
 }
@@ -747,7 +765,14 @@ print <<END
                </tr>
                <tr>
                        <td colspan='3' width='100%'><input type='radio' name='IPTV' value='disable' $checked{'IPTV'}{'disable'}>$Lang::tr{'off'}</td>
-                </tr>
+               </tr>
+               <tr>
+                       <td>INET_VLAN</td>
+                       <td><input size=5 type='number' name='INET_VLAN' value='$pppsettings{'INET_VLAN'}' /></td>
+                       <td>IPTV_VLAN</td>
+                       <td><input size=5 type='number' name='IPTV_VLAN' value='$pppsettings{'IPTV_VLAN'}' /></td>
+               </tr>
+
 END
 ;
        }
@@ -907,6 +932,7 @@ sub initprofile
         $pppsettings{'VCI'} = '32';
         $pppsettings{'PPTP_PEER'} = '10.0.0.138';
        $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
+       $pppsettings{'PPTP_ROUTE'} = '';
         $pppsettings{'PROTOCOL'} = 'RFC2364';
         $pppsettings{'MTU'} = '1492';
         $pppsettings{'MRU'} = '1492';
@@ -921,6 +947,8 @@ sub initprofile
         $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'};
         $pppsettings{'IPTVSERVERS'} = '192.168.2.51/32';
         $pppsettings{'IPTV'} = 'disable';
+        $pppsettings{'INET_VLAN'} = '7';
+        $pppsettings{'IPTV_VLAN'} = '8';
 
        if ( -e '/usr/local/bin/igmpproxy'){
                $pppsettings{'IPTV'} = 'enable';

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 9737b078dde0739e947dfbd0c6f2f1da7ba01bb2..ed8a94d246877251648acbaa63a85ee0069e9790 100644 (file)
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -180,6 +180,7 @@ END
 &viewkey("/etc/ssh/ssh_host_key.pub","RSA1");
 &viewkey("/etc/ssh/ssh_host_rsa_key.pub","RSA2");
 &viewkey("/etc/ssh/ssh_host_dsa_key.pub","DSA");
+&viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA");
 
 print "</table>\n";
 

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 424ca868f15161e1694d55217032080ddbc99ace..b6efe095849431c112ab8d36bd488833aaa829d5 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -279,6 +279,7 @@ sub isrunningaddon{
 
        if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
                $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+               $testcmd =~ s/.* //gi;
                $testcmd =~ s/[a-z_]//gi;
                $testcmd =~ s/\[[0-1]\;[0-9]+//gi;
                $testcmd =~ s/[\(\)\.]//gi;

diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index 4b8ee47e69a4ec3e42e03fe7d4ffc46879913af3..a0e7655ab95e1b62aec711eb501b68f626f3fa4c 100644 (file)
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -56,16 +56,16 @@ if ( $querry[0] =~ "cpufreq"){
        &Header::openpage($Lang::tr{'status information'}, 1, '');
        &Header::openbigbox('100%', 'left');
 
+       &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
+       &Graphs::makegraphbox("system.cgi","cpu","day","325");
+       &Header::closebox();
+
        if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
                &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
                &Graphs::makegraphbox("system.cgi","cpufreq","day","325");
                &Header::closebox();
        }
 
-       &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
-       &Graphs::makegraphbox("system.cgi","cpu","day","325");
-       &Header::closebox();
-
        &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
        &Graphs::makegraphbox("system.cgi","load","day");
        &Header::closebox();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b4db1feee23336fac3fe5109718c62fc412489de..808092e2492d71fb67362b93a70a68e107e71c1b 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -18,6 +18,7 @@
 'ConnSched ipsecstart' => 'IPSec (neu)starten',
 'ConnSched ipsecstop' => 'IPSec stop',
 'ConnSched reconnect' => 'Neu verbinden',
+'cpu frequency per' => 'CPU Frequenz pro',
 'ConnSched scheduled actions' => 'Geplante Aktionen',
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Wähle Profil',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a1d687d05fd25aa3401110f0c9d419de88f61f73..26349e1925a93f9b01422db16c5bcefe0f272ca3 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -17,6 +17,7 @@
 'ConnSched down' => 'Down',
 'ConnSched ipsecstart' => 'IPSec (re)start',
 'ConnSched ipsecstop' => 'IPSec stop',
+'cpu frequency per' => 'CPU frequency per',
 'ConnSched reconnect' => 'Reconnect',
 'ConnSched scheduled actions' => 'Scheduled actions',
 'ConnSched scheduler' => 'Scheduler',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index f5640cf538652572858a4ffed7afbc4f8599a569..cad4406acbf88ae2469e337a5776182a8c0b552b 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -535,6 +535,7 @@
 'cpu idle usage' => 'Uso de CPU inactivo',
 'cpu interrupt usage' => 'Uso de interrupción de CPU',
 'cpu iowait usage' => 'CPU esperando IO',
+'cpu frequency per' => 'CPU frecuencia por',
 'cpu irq usage' => 'Uso de IRQ del CPU',
 'cpu nice usage' => 'Buen uso de CPU',
 'cpu steal usage' => 'uso de CPU steal',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 6ccb4d507c3a70697e081999e609976a6fcc9360..eb81c5227e39525a57df662272cdb9fd9e3e4b53 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -16,6 +16,7 @@
 'ConnSched days' => 'Jours :',
 'ConnSched down' => 'Arrêt',
 'ConnSched ipsecstart' => 'IPSec (re)démarrage',
+'cpu frequency per' => 'CPU fréquence par',
 'ConnSched ipsecstop' => 'IPSec arrêt',
 'ConnSched reconnect' => 'Reconnecter',
 'ConnSched scheduled actions' => 'Actions planifiées',

diff --git a/lfs/clamav b/lfs/clamav
index e5a0512adb4847d387ace82f630ea7e73e0b4919..a9d97098d0c963be0e04e34adc35a524c54301b6 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.96.5
+VER        = 0.97
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 202e51d47298779e5babacc443102c6a
+$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b
 
 install : $(TARGET)
 

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 6c502e1ff5fe29e26d471d03cc7e89b5613f52d3..6c2177a5f837d2d2dfcd854bc31016281843abd3 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.4
+VER        = 2.0.5
 
 THISAPP    = fireinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7433e108cce180980189339886621539
+$(DL_FILE)_MD5 = e0e959a6891262f45fc1cedc225a662b
 
 install : $(TARGET)
 

diff --git a/lfs/icecc b/lfs/icecc
index a5b7af411d4da6aab1dc4d65aab53e5edd3e8b56..d661b193b4f0a9b2d7bb8f4dce97e118eb8df210 100644 (file)
--- a/lfs/icecc
+++ b/lfs/icecc
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.9.4.8
+VER        = 0.9.6
 
-THISAPP    = icecream-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = icecc-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icecc
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f304865d3f68d0d5ee2c2084571b7b28
+$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd
 
 install : $(TARGET)
 
@@ -76,7 +76,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch
        cd $(DIR_APP) && ./configure \
                                --prefix=/opt/icecream
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 4fea43d1b288e2112fa47b1ec820e75bab631b30..d333fc3c015fb9a9dbbd14f2a2c2dad164e17d63 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.9.i586-full-core45.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core46.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 21
+PAK_VER    = 22
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3e68353572b67ba3837e15134b124a22
+$(DL_FILE)_MD5 = 8484574559180f14f9c98d7d3140c3ed
 
 install : $(TARGET)
 

diff --git a/lfs/openssh b/lfs/openssh
index c9ce7148bb842fe775087a7de1c26a32d9cf3908..9f1c280503d46c7420efc1a92769e8b20518fd2a 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.6p1
+VER        = 5.8p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0
+$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d
 
 install : $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index dc65ef5bc1960449cca36e0507ae6bf9f5d53271..285cae343bf1b7f7f56fa6d8320c75163d43c738 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8q
+VER        = 0.9.8r
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
+$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79
 
 install : $(TARGET)
 

diff --git a/lfs/php b/lfs/php
index a679a071d5638e207e071663f264fd71268d706f..e8073ff1309b8e2c51b9265c5b9938058f51a95d 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2.4
+VER        = 5.3.5
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
 Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
 
-$(DL_FILE)_MD5 = 55c97a671fdabf462cc7a82971a656d2
+$(DL_FILE)_MD5 = 8aaf20c95e91f25c5b6a591e5d6d61b9
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 
@@ -83,7 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
                cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' ext/dba/dba_db4.c
        cd $(DIR_APP) && ./configure --prefix=/usr \
                                                                                            --sysconfdir=/etc \
                                                                                            --with-apxs2 \

diff --git a/lfs/squid b/lfs/squid
index 9bb8b50b8a0a5af0242bd0b399eafdc77d656ea2..16df6210109aa01ce0f309b90e6dcdd2a67e6373 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -87,7 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-referer-log \
              --enable-snmp \
           --with-pthreads --with-dl \
-          --with-maxfd="16384"
+          --with-maxfd="16384" \
+          --with-large-files
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/make.sh b/make.sh
index 389c825b79c9d09e19dd551650307b47a448162c..2a8abc8a6b9dec866aa72f0ed00d029ebd1ea37e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.9"                                                  # Version number
-CORE="46"                                                      # Core Level (Filename)
-PAKFIRE_CORE="45"                                              # Core Level (PAKFIRE)
+CORE="47"                                                      # Core Level (Filename)
+PAKFIRE_CORE="46"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir

diff --git a/src/initscripts/init.d/icecream b/src/initscripts/init.d/icecream
index 6ce466003d2d5a11583ef78ea26af84f35e06c2e..f8fa4e3330d567cb86cc8994383631b9ed70e437 100644 (file)
--- a/src/initscripts/init.d/icecream
+++ b/src/initscripts/init.d/icecream
@@ -15,24 +15,32 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-SCHEDULER=minerva.ipfire.org
+#SCHEDULER=minerva.ipfire.org
+ENABLE_SCHEDULER=on
 JOBS=8
-PORT=10244
 
 case "${1}" in
        start)
                boot_mesg "Starting Icecream Daemon..."
-               /opt/icecream/sbin/iceccd -d -s ${SCHEDULER} -m ${JOBS} -p ${PORT}
+               ARGS="-d -m ${JOBS}"
+               if [ -n "${SCHEDULER}" ]; then
+                       ARGS="${ARGS} -s ${SCHEDULER}"
+               fi
+               /opt/icecream/sbin/iceccd ${ARGS}
                evaluate_retval
-               if ! grep -q "${PORT}" /var/ipfire/xtaccess/config ; then
-                       echo "tcp,0.0.0.0/0,${PORT},on,0.0.0.0,Icecream" >> /var/ipfire/xtaccess/config
-                       /usr/local/bin/setxtaccess
+
+               if [ "${ENABLE_SCHEDULER}" = "on" ]; then
+                       /opt/icecream/sbin/icecc-scheduler -d
                fi
                ;;
                
        stop)
                boot_mesg "Stopping Icecream Daemon..."
                killproc /opt/icecream/sbin/iceccd
+
+               if [ "${ENABLE_SCHEDULER}" = "on" ]; then
+                       killproc /opt/icecream/sbin/icecc-scheduler
+               fi
                ;;
 
        restart)

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index f29884b941d22ab6db899dc5f8a624b1533d507d..1e4af55af812f3520196d270674c37ab78be6f51 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -19,9 +19,8 @@
 . ${rc_functions}
 
 #Define some defaults
-RED_VDSL_INET_VLAN=7
-RED_VDSL_IPTV_VLAN=8
-RED_VDSL_IPTV_DISABLE=0
+INET_VLAN=7
+IPTV_VLAN=8
 
 eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
 if [ "$RRDLOG" == "" ]; then
@@ -252,48 +251,48 @@ case "${1}" in
                        fi
 
                        if [ "$TYPE" == "vdsl" ]; then
-                               boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..."
+                               boot_mesg "Createing VLAN Interface ${DEVICE}.${INET_VLAN} ..."
                                modprobe 8021q
-                               vconfig add ${DEVICE} ${RED_VDSL_INET_VLAN}
+                               vconfig add ${DEVICE} ${INET_VLAN}
                                if [ -n "$MAC1" ]; then
-                                       boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_INET_VLAN} to ${MAC1}"   
-                                       ip link set dev ${DEVICE}.${RED_VDSL_INET_VLAN} address ${MAC1}
+                                       boot_mesg "Setting mac address on ${DEVICE}.${INET_VLAN} to ${MAC1}"    
+                                       ip link set dev ${DEVICE}.${INET_VLAN} address ${MAC1}
                                        evaluate_retval
                                fi
-                               PPP_NIC=${DEVICE}.${RED_VDSL_INET_VLAN}
+                               PPP_NIC=${DEVICE}.${INET_VLAN}
                                sleep 0.2
                                ip link set ${PPP_NIC} up
                                TYPE="pppoe"
                        fi
                        if [ "${IPTV}" == "enable" ]; then
-                               PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
-                               LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
+                               PIDFILE="/var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid"
+                               LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info"
                                # Test to see if there is a stale pid file
                                if [ -f "$PIDFILE" ]; then
                                        ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
                                        if [ $? != 0 ]; then
-                                               rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
+                                               rm -f /var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid > /dev/null
                                        fi
                                fi
 
                                if [ ! -f "$PIDFILE" ]; then
-                                       boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
+                                       boot_mesg "Createing VLAN Interface ${DEVICE}.${IPTV_VLAN} ..."
                                        modprobe 8021q
-                                       vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
+                                       vconfig add ${DEVICE} ${IPTV_VLAN}
                                        if [ -n "$MAC2" ]; then
-                                               boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"   
-                                               ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
+                                               boot_mesg "Setting mac address on ${DEVICE}.${IPTV_VLAN} to ${MAC2}"    
+                                               ip link set dev ${DEVICE}.${IPTV_VLAN} address ${MAC2}
                                                evaluate_retval
                                        fi
-                                       boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
-                                       /sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
+                                       boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${IPTV_VLAN} interface..."
+                                       /sbin/dhcpcd ${DEVICE}.${IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
                                        RET="$?"
 
                                        if [ "$RET" = "0" ]; then
-                                               . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info
+                                               . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info
                                                echo ""
                                                echo_ok
-                                               boot_mesg "           DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
+                                               boot_mesg "           DHCP Assigned Settings for ${DEVICE}.${IPTV_VLAN}:"
                                                boot_mesg_flush
                                                boot_mesg "           IP Address:      $ip_address"
                                                boot_mesg_flush
@@ -364,6 +363,10 @@ case "${1}" in
                                        fi
                                fi
                                ip link set ${PPP_NIC} up
+                               if [ -n "${PPTP_ROUTE}" ]; then
+                                       boot_mesg "Set route ${PPTP_ROUTE} to pptp server..."
+                                       route add ${PPTP_ROUTE}
+                               fi
                        else
                                boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."
                        fi
@@ -552,13 +555,17 @@ case "${1}" in
                        fi
                fi
 
+               if [ -n "${PPTP_ROUTE}" ]; then
+                       route del ${PPTP_ROUTE}
+               fi
+
                if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
-                       link_status=`ip link show $DEVICE.${RED_VDSL_INET_VLAN} 2> /dev/null`
+                       link_status=`ip link show $DEVICE.${INET_VLAN} 2> /dev/null`
                        if [ -n "${link_status}" ]; then
                                if echo "${link_status}" | grep -q UP; then
-                                       boot_mesg "Bringing down the ${DEVICE}.${RED_VDSL_INET_VLAN} interface..."
-                                       ip link set ${DEVICE}.${RED_VDSL_INET_VLAN} down
-                                       vconfig rem ${DEVICE}.${RED_VDSL_INET_VLAN}
+                                       boot_mesg "Bringing down the ${DEVICE}.${INET_VLAN} interface..."
+                                       ip link set ${DEVICE}.${INET_VLAN} down
+                                       vconfig rem ${DEVICE}.${INET_VLAN}
                                        evaluate_retval
                                fi
                        else

diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd
index 1bd23460a89cff6de8d8e30576bf80d25cc0deba..e99e6940562f310c20fd79a1e1ec86a167bda768 100644 (file)
--- a/src/initscripts/init.d/sshd
+++ b/src/initscripts/init.d/sshd
@@ -17,6 +17,7 @@ case "$1" in
        ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
        ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
        ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa
+       ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
     fi
 
         [ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index ba0242367fdfa6e571515b426f53e95db5cba6b4..133b4950f49a860557f3492edfea7bf5802906fc 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -865,7 +865,7 @@ sub checkcryptodb {
        unless ( "$ret" eq "0" ) {
                message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
                message("CRYPTO WARN: It's normal to see this on first execution.");
-               my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fd 2";
+               my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
                system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
                system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
        } else {

diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh
index 5e4b7b988670917a116db49144b55507f752891e..3b7610cd42c17574e90595afcf0da95e7dc469b9 100644 (file)
--- a/src/paks/clamav/install.sh
+++ b/src/paks/clamav/install.sh
@@ -23,4 +23,4 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
-/usr/local/bin/clamavctrl enable
+/usr/local/bin/clamavctrl enable &

diff --git a/src/patches/icecream-rename-scheduler.patch b/src/patches/icecream-rename-scheduler.patch
new file mode 100644 (file)
index 0000000..5de7738
--- /dev/null
+++ b/src/patches/icecream-rename-scheduler.patch
@@ -0,0 +1,107 @@
+Index: icecc-0.9.6/doc/man-scheduler.1.docbook
+===================================================================
+--- icecc-0.9.6.orig/doc/man-scheduler.1.docbook
++++ icecc-0.9.6/doc/man-scheduler.1.docbook
+@@ -23,13 +23,13 @@
+ </refmeta>
+ 
+ <refnamediv>
+-      <refname>scheduler</refname>
++      <refname>icecc-scheduler</refname>
+       <refpurpose>Icecream scheduler</refpurpose>
+ </refnamediv>
+ 
+ <refsynopsisdiv>
+ <cmdsynopsis>
+-<command>scheduler</command>
++<command>icecc-scheduler</command>
+ <group>
+   <arg choice="opt">
+     <option>-n</option>
+@@ -151,7 +151,7 @@ need to run the scheduler with root righ
+ 
+ <refsect1>
+ <title>See Also</title>
+-<para>icecream, scheduler, iceccd, icemon</para>
++<para>icecream, icecc-scheduler, iceccd, icemon</para>
+ </refsect1>
+ 
+ <refsect1>
+Index: icecc-0.9.6/services/Makefile.am
+===================================================================
+--- icecc-0.9.6.orig/services/Makefile.am
++++ icecc-0.9.6/services/Makefile.am
+@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h
+ noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
+ icedir = $(includedir)/icecc
+ 
+-sbin_PROGRAMS = scheduler
+-scheduler_SOURCES = scheduler.cpp
+-scheduler_LDADD = libicecc.la
++sbin_PROGRAMS = icecc-scheduler
++icecc_scheduler_SOURCES = scheduler.cpp
++icecc_scheduler_LDADD = libicecc.la
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = icecc.pc
+Index: icecc-0.9.6/services/Makefile.in
+===================================================================
+--- icecc-0.9.6.orig/services/Makefile.in
++++ icecc-0.9.6/services/Makefile.in
+@@ -37,7 +37,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-sbin_PROGRAMS = scheduler$(EXEEXT)
++sbin_PROGRAMS = icecc-scheduler$(EXEEXT)
+ subdir = services
+ DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in $(srcdir)/icecc.pc.in
+@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX 
+       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ PROGRAMS = $(sbin_PROGRAMS)
+-am_scheduler_OBJECTS = scheduler.$(OBJEXT)
+-scheduler_OBJECTS = $(am_scheduler_OBJECTS)
+-scheduler_DEPENDENCIES = libicecc.la
++am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT)
++icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS)
++icecc_scheduler_DEPENDENCIES = libicecc.la
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -107,8 +107,8 @@ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
+-SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
+-DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
++SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
++DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
+ DATA = $(pkgconfig_DATA)
+ HEADERS = $(ice_HEADERS) $(noinst_HEADERS)
+ ETAGS = etags
+@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC
+ ice_HEADERS = job.h comm.h
+ noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
+ icedir = $(includedir)/icecc
+-scheduler_SOURCES = scheduler.cpp
+-scheduler_LDADD = libicecc.la
++icecc_scheduler_SOURCES = scheduler.cpp
++icecc_scheduler_LDADD = libicecc.la
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = icecc.pc
+ all: all-am
+@@ -358,9 +358,9 @@ clean-sbinPROGRAMS:
+       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+       echo " rm -f" $$list; \
+       rm -f $$list
+-scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) 
+-      @rm -f scheduler$(EXEEXT)
+-      $(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
++icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) 
++      @rm -f icecc-scheduler$(EXEEXT)
++      $(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl
index beb9af8b884ee7d530cb7a6cdf28992384ee9f5c..2c7c947f548d68f903e2034e0d93f7125d232cdc 100644 (file)
--- a/src/scripts/setddns.pl
+++ b/src/scripts/setddns.pl
@@ -174,33 +174,6 @@ if ($ip ne $ipcache) {
                                &General::log("Dynamic DNS ip-update for cjb.net ($settings{'LOGIN'}) : failure (could not connect to server)");
                            }
                        }
-                       elsif ($settings{'SERVICE'} eq 'mydyn') {
-                           # use proxy ?
-                           my %proxysettings;
-                           &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
-                           if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
-                               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
-                               Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
-                           }
-
-                           my ($out, $response) = Net::SSLeay::get_http(  'www.mydyn.de',
-                                                                           80,
-                                                                           "/cgi-bin/update.pl?$settings{'LOGIN'}-$settings{'PASSWORD'}",
-                                                                           Net::SSLeay::make_headers('User-Agent' => 'IPFire' )
-                                                                       );
-
-                           if ($response =~ m%HTTP/1\.. 200 OK%) {
-                               if ( $out !~ m/The IP address of the subdomain/ ) {
-                                   &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (bad password or login)");
-                               } else {
-                                   &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : success");
-                                   $success++;
-                               }
-                           } else {
-                               &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (could not connect to server)");
-                           }
-
-                       }
                        elsif ($settings{'SERVICE'} eq 'selfhost') {
                            # use proxy ?
                            my %proxysettings;
@@ -390,7 +363,7 @@ if ($ip ne $ipcache) {
                                &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)");
                            }
                        }
-                       elsif ($settings{'SERVICE'} eq 'regfish') {
+                       elsif ($settings{'SERVICE'} eq 'strato') {
                                # use proxy ?
                                my %proxysettings;
                                &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
@@ -398,25 +371,62 @@ if ($ip ne $ipcache) {
                                        my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
                                        Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
                                }
-                               my ($out, $response) = Net::SSLeay::get_https(  'dyndns.regfish.de',
-                                                                               443,
-                                                                               "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}",
-                                                                               Net::SSLeay::make_headers('User-Agent' => 'Ipfire' )
-                                                                               );
-                               #Valid responses from service are:
-                               # success|100|update succeeded!
-                               # success|101|no update needed at this time..
+
+                               if ($settings{'HOSTNAME'} eq '') {
+                                       $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'};
+                               } else {
+                                       $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}";
+                               }
+
+                               my ($out, $response) = Net::SSLeay::get_https(  'dyndns.strato.com',
+                                                                           443,
+                                                                           "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip",
+                                                                           Net::SSLeay::make_headers('User-Agent' => 'IPFire',
+                                                                            'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}") )
+                                                                        );
+
                                if ($response =~ m%HTTP/1\.. 200 OK%) {
-                                       if ( $out !~ m/(success\|(100|101)\|)/ig ) {
-                                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)");
+                                       #Valid responses from update => ErrCount=0
+                                       if ( $out =~ m/good |nochg /ig) {
+                                               &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success");
+                                               $success++;
                                        } else {
-                                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success");
+                                               &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure1 ($out)");
                                                $success++;
                                        }
+                               } elsif ( $out =~ m/<title>(.*)<\/title>/ig ) {
+                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure2 ($1)");
                                } else {
-                                       &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)");
+                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure3 ($response)");
                                }
                        }
+                       elsif ($settings{'SERVICE'} eq 'regfish') {
+                           # use proxy ?
+                           my %proxysettings;
+                           &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
+                           if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
+                               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+                               Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
+                           }
+                                       my ($out, $response) = Net::SSLeay::get_https(  'dyndns.regfish.de',
+                                                                               443,
+                                                                               "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}",
+                                                                               Net::SSLeay::make_headers('User-Agent' => 'Ipfire' )
+                                                                               );
+                           #Valid responses from service are:
+                           #success|100|update succeeded!
+                           #success|101|no update needed at this time..
+                           if ($response =~ m%HTTP/1\.. 200 OK%) {
+                               if ( $out !~ m/(success\|(100|101)\|)/ig ) {
+                                   &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)");
+                               } else {
+                                   &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success");
+                                   $success++;
+                               }
+                           } else {
+                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)");
+                           }
+                       }
                        elsif ($settings{'SERVICE'} eq 'ovh') {
                                my %proxysettings;
                                &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);