IPFire-SCM February 2011

ipfire-scm@lists.ipfire.org

1 participants
67 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bf8416a2ca1d27ce00d5520e19b875511166b8f6
by git＠ipfire.org 20 Feb '11

20 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via bf8416a2ca1d27ce00d5520e19b875511166b8f6 (commit) via a408c745d77ed569da9066ca2c95cda587f327e7 (commit) from bf5a6d9a69ec584faff4fbb9c74359a48f0601d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bf8416a2ca1d27ce00d5520e19b875511166b8f6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 20 15:55:49 2011 +0100 rootfile update: cups. commit a408c745d77ed569da9066ca2c95cda587f327e7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 20 15:51:15 2011 +0100 Updated php (5.3.5). ----------------------------------------------------------------------- Summary of changes: config/php/php.ini | 4 +- config/rootfiles/common/php | 110 +++++++++++++++++++++++-------- config/rootfiles/core/47/filelists/php | 1 + config/rootfiles/packages/cups | 4 +- lfs/php | 7 +- 5 files changed, 89 insertions(+), 37 deletions(-) create mode 120000 config/rootfiles/core/47/filelists/php Difference in files: diff --git a/config/php/php.ini b/config/php/php.ini index ca675a4..6e82094 100644 --- 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/php b/config/rootfiles/common/php index 18499ba..693a4b2 100644 --- 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/47/filelists/php b/config/rootfiles/core/47/filelists/php new file mode 120000 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/packages/cups b/config/rootfiles/packages/cups index b2f0d8c..d83113c 100644 --- 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/lfs/php b/lfs/php index a679a07..e8073ff 100644 --- 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(a)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 \ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a1ed3ea485ccd4350bbe67c8881ab9bbe3965cff
by git＠ipfire.org 20 Feb '11

20 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via a1ed3ea485ccd4350bbe67c8881ab9bbe3965cff (commit) via fa1e0a86126fb3c15dc2be121721ceccb6fdcf29 (commit) via c02b69c71cf84e24680d30c0aff7e3104d68197a (commit) via f8715df7e45837aaac466b6b9a35fe818939cac0 (commit) via 555c7ed4dbe7c605547d766386d61ab879e12b72 (commit) via 2f27143a7a01edaa7dc8a74795c1698a721ac951 (commit) via 5ab51b6d060319309df503694b76d027d8c2bce8 (commit) via 399d947e0f92a9c3e80121de0255bf08907f5082 (commit) via 7e16c71a65cfda5f33c8e4a9e0930fe87886d7dc (commit) via cf9165bde252b130adf01054b36d7697d4af5911 (commit) via e2b8cb21b780b9c902cd549cebac145400b945ef (commit) via 766c34e574bd106e44713b2607b30ec757a571fc (commit) via f52ac5fcbbacd30e467504885d6784fbed5f51cd (commit) via 40693384bbce2c914c31fe24b7a38321f5082de7 (commit) via 96a09b0b66b80962912ea07e52cc7ec3bf6f6160 (commit) via d7ac278b67b19c2a6dbad39c0b33bde0640ac124 (commit) via d085cbe5647af89a91d3851afc49bf7f459e5afd (commit) via 1556693dfe774ce82ace0cc8fc9317da6de26db3 (commit) via 2ac4bd6ff8ec7dd91012d764a426a50da6f4e718 (commit) via e444983708509c7073d9cb09ad96f68455679fe2 (commit) via 45e5219cebd0c7b1c8663ec30dd4de093a000d43 (commit) via 50bacb0466ea1b6dba813e1a8bfef234686f9846 (commit) via 103739e68a597873b4ecea74610be885915feafe (commit) via e038260a3a2b5950e6a2397e6b47a7f1a478b8d8 (commit) via 11c3b5e8a682bb5b3a42b2cd7ffa07d7a63da1fc (commit) via 8ffa5459be348b55e8254279df8ed9463f0c100a (commit) via 48b85dd0819a00795e616f8f36e5559e5468bba5 (commit) via 7302824aea4031831c06db7dba8c669eae4900e3 (commit) from 0bd748430c71d32862cb2bcf9182c38d6357b833 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a1ed3ea485ccd4350bbe67c8881ab9bbe3965cff Merge: e038260 fa1e0a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 20 13:30:46 2011 +0100 Merge remote-tracking branch 'stevee/noarch' commit fa1e0a86126fb3c15dc2be121721ceccb6fdcf29 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:26:48 2011 +0100 Revert "dbus: Make package (or parts) noarch." This reverts commit 45e5219cebd0c7b1c8663ec30dd4de093a000d43. commit c02b69c71cf84e24680d30c0aff7e3104d68197a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:23:04 2011 +0100 xorg-x11-xtrans-devel: Make package (or parts) noarch. commit f8715df7e45837aaac466b6b9a35fe818939cac0 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:23:04 2011 +0100 xorg-x11-util-macros: Make package (or parts) noarch. commit 555c7ed4dbe7c605547d766386d61ab879e12b72 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:23:03 2011 +0100 xorg-x11-proto-devel: Make package (or parts) noarch. commit 2f27143a7a01edaa7dc8a74795c1698a721ac951 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:23:03 2011 +0100 xorg-x11-fonts: Make package (or parts) noarch. commit 5ab51b6d060319309df503694b76d027d8c2bce8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:23:03 2011 +0100 xkeyboard-config: Make package (or parts) noarch. commit 399d947e0f92a9c3e80121de0255bf08907f5082 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:23:02 2011 +0100 xcb-proto: Make package (or parts) noarch. commit 7e16c71a65cfda5f33c8e4a9e0930fe87886d7dc Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:59 2011 +0100 python-urlgrabber: Make package (or parts) noarch. commit cf9165bde252b130adf01054b36d7697d4af5911 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:59 2011 +0100 python-tornado: Make package (or parts) noarch. commit e2b8cb21b780b9c902cd549cebac145400b945ef Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:59 2011 +0100 python-setuptools: Make package (or parts) noarch. commit 766c34e574bd106e44713b2607b30ec757a571fc Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:58 2011 +0100 python-IPy: Make package (or parts) noarch. commit f52ac5fcbbacd30e467504885d6784fbed5f51cd Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:58 2011 +0100 python-decorator: Make package (or parts) noarch. commit 40693384bbce2c914c31fe24b7a38321f5082de7 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:58 2011 +0100 pychecker: Make package (or parts) noarch. commit 96a09b0b66b80962912ea07e52cc7ec3bf6f6160 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:57 2011 +0100 perl: Make package (or parts) noarch. commit d7ac278b67b19c2a6dbad39c0b33bde0640ac124 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:53 2011 +0100 man-pages: Make package (or parts) noarch. commit d085cbe5647af89a91d3851afc49bf7f459e5afd Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:47 2011 +0100 intltool: Make package (or parts) noarch. commit 1556693dfe774ce82ace0cc8fc9317da6de26db3 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:46 2011 +0100 hwdata: Make package (or parts) noarch. commit 2ac4bd6ff8ec7dd91012d764a426a50da6f4e718 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:43 2011 +0100 dracut: Make package (or parts) noarch. commit e444983708509c7073d9cb09ad96f68455679fe2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:43 2011 +0100 dejagnu: Make package (or parts) noarch. commit 45e5219cebd0c7b1c8663ec30dd4de093a000d43 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:43 2011 +0100 dbus: Make package (or parts) noarch. commit 50bacb0466ea1b6dba813e1a8bfef234686f9846 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:41 2011 +0100 automake: Make package (or parts) noarch. commit 103739e68a597873b4ecea74610be885915feafe Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 20 13:22:40 2011 +0100 autoconf: Make package (or parts) noarch. commit e038260a3a2b5950e6a2397e6b47a7f1a478b8d8 Merge: 11c3b5e 0bd7484 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 20 12:49:00 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 11c3b5e8a682bb5b3a42b2cd7ffa07d7a63da1fc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 20 01:10:04 2011 +0100 build-essentials: Make CFLAGS and CXXFLAGS independent. commit 8ffa5459be348b55e8254279df8ed9463f0c100a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 20 00:54:35 2011 +0100 cmake: Build fix - LTO. commit 48b85dd0819a00795e616f8f36e5559e5468bba5 Merge: c5843aa 7302824 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 12:51:56 2011 +0100 Merge remote-tracking branch 'trikolon/qemu-kvm' commit 7302824aea4031831c06db7dba8c669eae4900e3 Author: Ben Schweikert <trikolon(a)ipfire.org> Date: Sat Feb 19 12:49:01 2011 +0100 Package: qemu corrected author and email after update to 0.14.0-rc1. ----------------------------------------------------------------------- Summary of changes: pkgs/core/autoconf/autoconf.nm | 3 +- pkgs/core/automake/automake.nm | 3 +- pkgs/core/build-essentials/build-essentials.nm | 2 +- pkgs/core/build-essentials/buildsystem/Constants | 4 +- pkgs/core/cmake/cmake.nm | 8 ++++- pkgs/core/dejagnu/dejagnu.nm | 3 +- pkgs/core/dracut/dracut.nm | 3 +- pkgs/core/hwdata/hwdata.nm | 2 +- pkgs/core/intltool/intltool.nm | 3 +- pkgs/core/man-pages/man-pages.nm | 3 +- pkgs/core/perl/perl.nm | 31 ++++++++++++++++++++ pkgs/core/pychecker/pychecker.nm | 3 +- pkgs/core/python-IPy/python-IPy.nm | 3 +- pkgs/core/python-decorator/python-decorator.nm | 3 +- pkgs/core/python-setuptools/python-setuptools.nm | 3 +- pkgs/core/python-tornado/python-tornado.nm | 3 +- pkgs/core/python-urlgrabber/python-urlgrabber.nm | 3 +- pkgs/core/qemu/qemu.nm | 10 ++++-- pkgs/core/xcb-proto/xcb-proto.nm | 3 +- pkgs/core/xkeyboard-config/xkeyboard-config.nm | 3 +- pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm | 3 +- .../xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 3 +- .../xorg-x11-util-macros/xorg-x11-util-macros.nm | 3 +- .../xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm | 3 +- 24 files changed, 84 insertions(+), 27 deletions(-) Difference in files: diff --git a/pkgs/core/autoconf/autoconf.nm b/pkgs/core/autoconf/autoconf.nm index 90b84c2..010e87d 100644 --- a/pkgs/core/autoconf/autoconf.nm +++ b/pkgs/core/autoconf/autoconf.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = autoconf PKG_VER = 2.68 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Development/Tools diff --git a/pkgs/core/automake/automake.nm b/pkgs/core/automake/automake.nm index 975bfcd..40f83bb 100644 --- a/pkgs/core/automake/automake.nm +++ b/pkgs/core/automake/automake.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = automake PKG_VER = 1.11.1 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Development/Tools diff --git a/pkgs/core/build-essentials/build-essentials.nm b/pkgs/core/build-essentials/build-essentials.nm index 9ea5643..d383d4e 100644 --- a/pkgs/core/build-essentials/build-essentials.nm +++ b/pkgs/core/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 4 +PKG_REL = 5 PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> diff --git a/pkgs/core/build-essentials/buildsystem/Constants b/pkgs/core/build-essentials/buildsystem/Constants index 6eb6dfb..0eb9c85 100644 --- a/pkgs/core/build-essentials/buildsystem/Constants +++ b/pkgs/core/build-essentials/buildsystem/Constants @@ -38,8 +38,8 @@ GLOBAL_CFLAGS = -O2 -g -pipe -Wall -fexceptions --param=ssp-buffer-size=4 CFLAGS_i686 = -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables CFLAGS_x86_64 = -m64 -mtune=generic -export CFLAGS = $(GLOBAL_CFLAGS) $(CFLAGS_$(DISTRO_ARCH)) -export CXXFLAGS = $(CFLAGS) +export CFLAGS := $(GLOBAL_CFLAGS) $(CFLAGS_$(DISTRO_ARCH)) +export CXXFLAGS := $(CFLAGS) # Options that get passed to configure by default CONFIGURE_OPTIONS = \ diff --git a/pkgs/core/cmake/cmake.nm b/pkgs/core/cmake/cmake.nm index b42cd1d..d56ccf5 100644 --- a/pkgs/core/cmake/cmake.nm +++ b/pkgs/core/cmake/cmake.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = cmake PKG_VER = 2.8.2 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -34,7 +34,11 @@ PKG_URL = http://www.cmake.org PKG_LICENSE = BSD PKG_SUMMARY = Cross-platform make system. -PKG_BUILD_DEPS+= expat-devel gcc-c++ libcurl-devel ncurses-devel zlib-devel +PKG_BUILD_DEPS+= expat-devel gcc-c++ libcurl-devel ncurses-devel openssl-devel zlib-devel + +# Add some fixes to work with lto. +CFLAGS += -Wl,-lpthread +CXXFLAGS += -Wl,-lpthread define PKG_DESCRIPTION CMake is used to control the software compilation process using simple \ diff --git a/pkgs/core/dejagnu/dejagnu.nm b/pkgs/core/dejagnu/dejagnu.nm index bbd74ac..17292be 100644 --- a/pkgs/core/dejagnu/dejagnu.nm +++ b/pkgs/core/dejagnu/dejagnu.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = dejagnu PKG_VER = 1.4.4 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Development/Tools diff --git a/pkgs/core/dracut/dracut.nm b/pkgs/core/dracut/dracut.nm index 02b974e..4c6e227 100644 --- a/pkgs/core/dracut/dracut.nm +++ b/pkgs/core/dracut/dracut.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = dracut PKG_VER = 007 -PKG_REL = 3 +PKG_REL = 4 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = System/Boot diff --git a/pkgs/core/hwdata/hwdata.nm b/pkgs/core/hwdata/hwdata.nm index 4e8276c..514851c 100644 --- a/pkgs/core/hwdata/hwdata.nm +++ b/pkgs/core/hwdata/hwdata.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = hwdata PKG_VER = 0.232 -PKG_REL = 0 +PKG_REL = 1 PKG_ARCH = noarch PKG_MAINTAINER = diff --git a/pkgs/core/intltool/intltool.nm b/pkgs/core/intltool/intltool.nm index 816d748..ecbf249 100644 --- a/pkgs/core/intltool/intltool.nm +++ b/pkgs/core/intltool/intltool.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = intltool PKG_VER = 0.40.5 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Localization/Tools diff --git a/pkgs/core/man-pages/man-pages.nm b/pkgs/core/man-pages/man-pages.nm index d68d415..121a0d6 100644 --- a/pkgs/core/man-pages/man-pages.nm +++ b/pkgs/core/man-pages/man-pages.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = man-pages PKG_VER = 3.23 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Documentation diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm index c64b826..16145f2 100644 --- a/pkgs/core/perl/perl.nm +++ b/pkgs/core/perl/perl.nm @@ -175,6 +175,7 @@ PKG_PACKAGES += perl-Archive-Extract PKG_EPOCH-perl-Archive-Extract = 0 PKG_VER-perl-Archive-Extract = 0.38 +PKG_ARCH-perl-Archive-Extract = noarch PKG_SUMMARY-perl-Archive-Extract = Generic archive extracting mechanism. define PKG_DESCRIPTION-perl-Archive-Extract @@ -192,6 +193,7 @@ PKG_PACKAGES += perl-Archive-Tar PKG_EPOCH-perl-Archive-Tar = 0 PKG_VER-perl-Archive-Tar = 1.54 +PKG_ARCH-perl-Archive-Tar = noarch PKG_SUMMARY-perl-Archive-Tar = A module for Perl manipulation of .tar files. define PKG_DESCRIPTION-perl-Archive-Tar @@ -238,6 +240,7 @@ PKG_PACKAGES += perl-CPAN PKG_EPOCH-perl-CPAN = 0 PKG_VER-perl-CPAN = 1.9402 +PKG_ARCH-perl-CPAN = noarch PKG_SUMMARY-perl-CPAN = \ Query, download and build perl modules from CPAN sites. @@ -260,6 +263,7 @@ PKG_PACKAGES += perl-CPANPLUS PKG_EPOCH-perl-CPANPLUS = 0 PKG_VER-perl-CPANPLUS = 0.9 +PKG_ARCH-perl-CPANPLUS = noarch PKG_SUMMARY-perl-CPANPLUS = \ API & CLI access to the CPAN mirrors. @@ -311,6 +315,7 @@ PKG_PACKAGES += perl-ExtUtils-CBuilder PKG_EPOCH-perl-ExtUtils-CBuilder = 0 PKG_VER-perl-ExtUtils-CBuilder = 0.27 +PKG_ARCH-perl-ExtUtils-CBuilder = noarch PKG_SUMMARY-perl-ExtUtils-CBuilder = \ Compile and link C code for Perl modules. @@ -333,6 +338,7 @@ PKG_PACKAGES += perl-ExtUtils-Embed PKG_EPOCH-perl-ExtUtils-Embed = 0 PKG_VER-perl-ExtUtils-Embed = 1.28 +PKG_ARCH-perl-ExtUtils-Embed = noarch PKG_SUMMARY-perl-ExtUtils-Embed = \ Utilities for embedding Perl in C/C++ applications. @@ -352,6 +358,7 @@ PKG_PACKAGES += perl-ExtUtils-MakeMaker PKG_EPOCH-perl-ExtUtils-MakeMaker = 0 PKG_VER-perl-ExtUtils-MakeMaker = 6.56 +PKG_ARCH-perl-ExtUtils-MakeMaker = noarch PKG_SUMMARY-perl-ExtUtils-MakeMaker = Create a module Makefile. define PKG_DESCRIPTION-perl-ExtUtils-MakeMaker @@ -397,6 +404,7 @@ PKG_PACKAGES += perl-ExtUtils-ParseXS PKG_EPOCH-perl-ExtUtils-ParseXS = 0 PKG_VER-perl-ExtUtils-ParseXS = 2.21 +PKG_ARCH-perl-ExtUtils-ParseXS = noarch PKG_SUMMARY-perl-ExtUtils-ParseXS = \ Module and a script for converting Perl XS code into C code. @@ -419,6 +427,7 @@ PKG_PACKAGES += perl-File-Fetch PKG_EPOCH-perl-File-Fetch = 0 PKG_VER-perl-File-Fetch = 6.56 +PKG_ARCH-perl-File-Fetch = noarch PKG_SUMMARY-perl-File-Fetch = Generic file fetching mechanism. define PKG_DESCRIPTION-perl-File-Fetch @@ -469,6 +478,7 @@ PKG_PACKAGES += perl-IO-Zlib PKG_EPOCH-perl-IO-Zlib = 0 PKG_VER-perl-IO-Zlib = 1.10 +PKG_ARCH-perl-IO-Zlib = noarch PKG_SUMMARY-perl-IO-Zlib = Perl IO:: style interface to Compress::Zlib. define PKG_DESCRIPTION-perl-IO-Zlib @@ -490,6 +500,7 @@ PKG_PACKAGES += perl-IPC-Cmd PKG_EPOCH-perl-IPC-Cmd = 0 PKG_VER-perl-IPC-Cmd = 0.54 +PKG_ARCH-perl-IPC-Cmd = noarch PKG_SUMMARY-perl-IPC-Cmd = Finding and running system commands made easy. define PKG_DESCRIPTION-perl-IPC-Cmd @@ -509,6 +520,7 @@ PKG_PACKAGES += perl-Locale-Maketext-Simple PKG_EPOCH-perl-Locale-Maketext-Simple = 0 PKG_VER-perl-Locale-Maketext-Simple = 0.21 +PKG_ARCH-perl-Locale-Maketext-Simple = noarch PKG_LICENSE-perl-Locale-Maketext-Simple = MIT PKG_SUMMARY-perl-Locale-Maketext-Simple = \ @@ -530,6 +542,7 @@ PKG_PACKAGES += perl-Log-Message PKG_EPOCH-perl-Log-Message = 0 PKG_VER-perl-Log-Message = 0.02 +PKG_ARCH-perl-Log-Message = noarch PKG_SUMMARY-perl-Log-Message = Generic message storage mechanism. define PKG_DESCRIPTION-perl-Log-Message @@ -560,6 +573,7 @@ PKG_PACKAGES += perl-Log-Message-Simple PKG_EPOCH-perl-Log-Message-Simple = 0 PKG_VER-perl-Log-Message-Simple = 0.06 +PKG_ARCH-perl-LogMessage-Simple = noarch PKG_SUMMARY-perl-Log-Message-Simple = Simplified frontend to Log::Message. define PKG_DESCRIPTION-perl-Log-Message-Simple @@ -579,6 +593,7 @@ PKG_PACKAGES += perl-Module-Build PKG_EPOCH-perl-Module-Build = 0 PKG_VER-perl-Module-Build = 0.3603 +PKG_ARCH-perl-Module-Build = noarch PKG_SUMMARY-perl-Module-Build = \ Perl module for building and installing Perl modules. @@ -611,6 +626,7 @@ PKG_PACKAGES += perl-Module-CoreList PKG_EPOCH-perl-Module-CoreList = 0 PKG_VER-perl-Module-CoreList = 2.29 +PKG_ARCH-perl-Module-CoreList = noarch PKG_SUMMARY-perl-Module-CoreList = \ Perl core modules indexed by perl versions. @@ -634,6 +650,7 @@ PKG_PACKAGES += perl-Module-Load PKG_EPOCH-perl-Module-Load = 0 PKG_VER-perl-Module-Load = 0.16 +PKG_ARCH-perl-Module-Load = noarch PKG_SUMMARY-perl-Module-Load = \ Runtime require of both modules and files. @@ -654,6 +671,7 @@ PKG_PACKAGES += perl-Module-Load-Conditional PKG_EPOCH-perl-Module-Load-Conditional = 0 PKG_VER-perl-Module-Load-Conditional = 0.34 +PKG_ARCH-perl-Module-Load-Conditional = noarch PKG_SUMMARY-perl-Module-Load-Conditional = \ Looking up module information / loading at runtime. @@ -674,6 +692,7 @@ PKG_PACKAGES += perl-Module-Loaded PKG_EPOCH-perl-Module-Loaded = 0 PKG_VER-perl-Module-Loaded = 0.06 +PKG_ARCH-perl-Module-Loaded = noarch PKG_SUMMARY-perl-Module-Loaded = \ Mark modules as loaded or unloaded. @@ -697,6 +716,7 @@ PKG_PACKAGES += perl-Module-Plugable PKG_EPOCH-perl-Module-Plugable = 0 PKG_VER-perl-Module-Plugable = 3.90 +PKG_ARCH-perl-Module-Plugable = noarch PKG_SUMMARY-perl-Module-Plugable = \ Automatically give your module the ability to have plugins. @@ -720,6 +740,7 @@ PKG_PACKAGES += perl-Object-Accessor PKG_EPOCH-perl-Object-Accessor = 0 PKG_VER-perl-Object-Accessor = 0.36 +PKG_ARCH-perl-Object-Accessor = noarch PKG_SUMMARY-perl-Object-Accessor = \ Perl module that allows per object accessors. @@ -740,6 +761,7 @@ PKG_PACKAGES += perl-Package-Constants PKG_EPOCH-perl-Package-Constants = 0 PKG_VER-perl-Package-Constants = 0.02 +PKG_ARCH-perl-Package-Constants = noarch PKG_SUMMARY-perl-Package-Constants = \ List all constants declared in a package. @@ -761,6 +783,7 @@ PKG_PACKAGES += perl-Params-Check PKG_EPOCH-perl-Params-Check = 0 PKG_VER-perl-Params-Check = 0.26 +PKG_ARCH-perl-Params-Check = noarch PKG_SUMMARY-perl-Params-Check = \ Generic input parsing/checking mechanism. @@ -780,6 +803,7 @@ PKG_PACKAGES += perl-Parse-CPAN-Meta PKG_EPOCH-perl-Parse-CPAN-Meta = 0 PKG_VER-perl-Parse-CPAN-Meta = 1.40 +PKG_ARCH-perl-Parse-CPAN-Meta = noarch PKG_SUMMARY-perl-Parse-CPAN-Meta = \ Parse META.yml and other similar CPAN metadata files. @@ -800,6 +824,7 @@ PKG_PACKAGES += perl-Pod-Escapes PKG_EPOCH-perl-Pod-Escapes = 0 PKG_VER-perl-Pod-Escapes = 1.04 +PKG_ARCH-perl-Pod-Escapes = noarch PKG_SUMMARY-perl-Pod-Escapes = \ Perl module for resolving POD escape sequences. @@ -820,6 +845,7 @@ PKG_PACKAGES += perl-Pod-Simple PKG_EPOCH-perl-Pod-Simple = 0 PKG_VER-perl-Pod-Simple = 3.13 +PKG_ARCH-perl-Pod-Simple = noarch PKG_SUMMARY-perl-Pod-Simple = \ Framework for parsing POD documentation. @@ -843,6 +869,7 @@ PKG_PACKAGES += perl-Term-UI PKG_EPOCH-perl-Term-UI = 0 PKG_VER-perl-Term-UI = 0.20 +PKG_ARCH-perl-Term-UI = noarch PKG_SUMMARY-perl-Term-UI = \ Term::ReadLine UI made easy. @@ -865,6 +892,7 @@ PKG_PACKAGES += perl-Test-Harness PKG_EPOCH-perl-Test-Harness = 0 PKG_VER-perl-Test-Harness = 3.17 +PKG_ARCH-perl-Test-Harness = noarch PKG_SUMMARY-perl-Test-Harness = \ Run Perl standard test scripts with statistics. @@ -891,6 +919,7 @@ PKG_PACKAGES += perl-Test-Simple PKG_EPOCH-perl-Test-Simple = 0 PKG_VER-perl-Test-Simple = 0.94 +PKG_ARCH-perl-Test-Simple = noarch PKG_SUMMARY-perl-Test-Simple = \ Basic utilities for writing tests. @@ -941,6 +970,7 @@ PKG_PACKAGES += perl-parent PKG_EPOCH-perl-parent = 0 PKG_VER-perl-parent = 0.223 +PKG_ARCH-perl-parent = noarch PKG_SUMMARY-perl-parent = \ Establish an ISA relationship with base classes at compile time. @@ -1012,6 +1042,7 @@ PKG_PACKAGES += perl-version PKG_EPOCH-perl-version = 0 PKG_VER-perl-version = 0.82 +PKG_ARCH-perl-version = noarch PKG_SUMMARY-perl-version = \ Perl extension for Version Objects. diff --git a/pkgs/core/pychecker/pychecker.nm b/pkgs/core/pychecker/pychecker.nm index 439fb9d..108491e 100644 --- a/pkgs/core/pychecker/pychecker.nm +++ b/pkgs/core/pychecker/pychecker.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = pychecker PKG_VER = 0.8.17 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Development/Debuggers diff --git a/pkgs/core/python-IPy/python-IPy.nm b/pkgs/core/python-IPy/python-IPy.nm index 77258b0..4e0788a 100644 --- a/pkgs/core/python-IPy/python-IPy.nm +++ b/pkgs/core/python-IPy/python-IPy.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = IPy PKG_VER = 0.62 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = System/Libraries diff --git a/pkgs/core/python-decorator/python-decorator.nm b/pkgs/core/python-decorator/python-decorator.nm index ba81c96..1886465 100644 --- a/pkgs/core/python-decorator/python-decorator.nm +++ b/pkgs/core/python-decorator/python-decorator.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = decorator PKG_VER = 3.1.2 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Development/Languages diff --git a/pkgs/core/python-setuptools/python-setuptools.nm b/pkgs/core/python-setuptools/python-setuptools.nm index 7b508a0..d8ffdfa 100644 --- a/pkgs/core/python-setuptools/python-setuptools.nm +++ b/pkgs/core/python-setuptools/python-setuptools.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = setuptools PKG_VER = 0.6c9 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Libraries diff --git a/pkgs/core/python-tornado/python-tornado.nm b/pkgs/core/python-tornado/python-tornado.nm index c210cec..1509cfb 100644 --- a/pkgs/core/python-tornado/python-tornado.nm +++ b/pkgs/core/python-tornado/python-tornado.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = tornado PKG_VER = 0.2 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Libraries diff --git a/pkgs/core/python-urlgrabber/python-urlgrabber.nm b/pkgs/core/python-urlgrabber/python-urlgrabber.nm index 54290ce..358de7f 100644 --- a/pkgs/core/python-urlgrabber/python-urlgrabber.nm +++ b/pkgs/core/python-urlgrabber/python-urlgrabber.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = urlgrabber PKG_VER = 3.1.0 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = System/Libraries diff --git a/pkgs/core/qemu/qemu.nm b/pkgs/core/qemu/qemu.nm index c960b6c..9aee432 100644 --- a/pkgs/core/qemu/qemu.nm +++ b/pkgs/core/qemu/qemu.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = qemu-kvm -PKG_VER = 0.12.4 +PKG_VER = 0.14.0-rc1 PKG_REL = 0 PKG_MAINTAINER = @@ -48,15 +48,19 @@ PKG_TARBALL = $(THISAPP).tar.gz CFLAGS := $(filter-out -pipe,$(CFLAGS)) CFLAGS := -O1 $(filter-out -O2,$(CFLAGS)) + define QUALITY_AGENT_WHITELIST_EXECSTACK /usr/share/qemu/openbios* endef -CONFIGURE_OPTIONS += \ +CONFIGURE_OPTIONS = \ + --prefix=/usr \ --enable-kvm \ --extra-cflags="$(CFLAGS)" \ --disable-strip \ - --disable-xen + --disable-xen \ + --sysconfdir=/etc + define STAGE_CONFIGURE_CMDS cd $(DIR_APP) && sed -e "s@-Wl,-rpath,/usr/lib@@g" -i */config-target.mak diff --git a/pkgs/core/xcb-proto/xcb-proto.nm b/pkgs/core/xcb-proto/xcb-proto.nm index 5b45d50..e7f790b 100644 --- a/pkgs/core/xcb-proto/xcb-proto.nm +++ b/pkgs/core/xcb-proto/xcb-proto.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = xcb-proto PKG_VER = 1.6 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Headers diff --git a/pkgs/core/xkeyboard-config/xkeyboard-config.nm b/pkgs/core/xkeyboard-config/xkeyboard-config.nm index 1a18ace..884f491 100644 --- a/pkgs/core/xkeyboard-config/xkeyboard-config.nm +++ b/pkgs/core/xkeyboard-config/xkeyboard-config.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = xkeyboard-config PKG_VER = 1.9 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Utils diff --git a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm index 5cb1a41..302c8ae 100644 --- a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm +++ b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = xorg-x11-fonts PKG_VER = 7.2 -PKG_REL = 1 +PKG_REL = 2 +PKG_ARCH = noarch PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Fonts diff --git a/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm index 66b22dd..61e0ed5 100644 --- a/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm +++ b/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = xorg-x11-proto-devel PKG_VER = 7.4 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = Development/System diff --git a/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm b/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm index 92cfbe8..6ea01f8 100644 --- a/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm +++ b/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = xorg-x11-util-macros PKG_VER = 1.10.0 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries diff --git a/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm index c549b10..a490c52 100644 --- a/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm +++ b/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = xorg-xtrans PKG_VER = 1.2.5 -PKG_REL = 0 +PKG_REL = 1 +PKG_ARCH = noarch PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bf5a6d9a69ec584faff4fbb9c74359a48f0601d2
by git＠ipfire.org 19 Feb '11

19 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via bf5a6d9a69ec584faff4fbb9c74359a48f0601d2 (commit) from 164a3b51a9891690695547fe84c8d7eef16af444 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bf5a6d9a69ec584faff4fbb9c74359a48f0601d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 19 20:03:36 2011 +0100 Updated ipfireseeder to core46. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 4939004..8b4f00f 100644 --- 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/lfs/ipfireseeder b/lfs/ipfireseeder index 4fea43d..d333fc3 100644 --- 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) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 164a3b51a9891690695547fe84c8d7eef16af444
by git＠ipfire.org 19 Feb '11

19 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 164a3b51a9891690695547fe84c8d7eef16af444 (commit) from ff7a39506abf741d8e57647453a6171a0cc563fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 164a3b51a9891690695547fe84c8d7eef16af444 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 19 20:47:38 2011 +0100 Add optional route to pptp server. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/pppsetup.cgi | 6 ++++++ src/initscripts/init.d/networking/red | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) Difference in files: diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 443c201..4c7bb8c 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -709,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 <img src='/blob.gif' alt='*' /></td> + <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td> +</tr> + END ; } @@ -927,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'; diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index 0c41663..1e4af55 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -363,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 @@ -551,6 +555,10 @@ 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.${INET_VLAN} 2> /dev/null` if [ -n "${link_status}" ]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0bd748430c71d32862cb2bcf9182c38d6357b833
by git＠ipfire.org 19 Feb '11

19 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 0bd748430c71d32862cb2bcf9182c38d6357b833 (commit) via cb62294b9ee603bc4b2fff409b5b1d2909cd27e5 (commit) via ad9bd41a2d0f58f0b6067699177998fc61ee7fb4 (commit) via 12b499ea2ce460c4e5304f56fd36c62abf71a13c (commit) via 8f8381e9e790fb02d08980e51dac73941b010fd1 (commit) via ab77959c7db75e137c527e2f3e2204a103d6344d (commit) from 161c115fe6d6b831a4a9c92fe1b51b27cdbdaaee (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0bd748430c71d32862cb2bcf9182c38d6357b833 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 18:11:46 2011 +0100 icecream: Fix symlinks that contained the machine tuple. commit cb62294b9ee603bc4b2fff409b5b1d2909cd27e5 Merge: ad9bd41 161c115 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 18:11:34 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit ad9bd41a2d0f58f0b6067699177998fc61ee7fb4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 12:58:46 2011 +0100 cloog: Update to 0.15.9. commit 12b499ea2ce460c4e5304f56fd36c62abf71a13c Merge: 8f8381e c5843aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 12:58:30 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 8f8381e9e790fb02d08980e51dac73941b010fd1 Merge: ab77959 8ab7049 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 18 15:21:03 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit ab77959c7db75e137c527e2f3e2204a103d6344d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 18 14:01:52 2011 +0100 network: Make package noarch. ----------------------------------------------------------------------- Summary of changes: pkgs/core/cloog/cloog.nm | 2 +- pkgs/core/icecream/icecream.nm | 6 ++++-- pkgs/core/network/network.nm | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) Difference in files: diff --git a/pkgs/core/cloog/cloog.nm b/pkgs/core/cloog/cloog.nm index 31684cb..06f3bc2 100644 --- a/pkgs/core/cloog/cloog.nm +++ b/pkgs/core/cloog/cloog.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = cloog -PKG_VER = 0.15.8 +PKG_VER = 0.15.9 PKG_REL = 0 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> diff --git a/pkgs/core/icecream/icecream.nm b/pkgs/core/icecream/icecream.nm index 223f05b..ab1e2ee 100644 --- a/pkgs/core/icecream/icecream.nm +++ b/pkgs/core/icecream/icecream.nm @@ -29,7 +29,7 @@ include $(PKGROOT)/Include PKG_NAME = icecream PKG_VER = 0.9.6 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Compilers @@ -40,6 +40,8 @@ PKG_SUMMARY = Distributed compiler. PKG_DEPS += gcc-c++ /usr/bin/ldd PKG_BUILD_DEPS+= gcc-c++ +ICECREAM_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE)) + define PKG_DESCRIPTION Icecream is a distributed compile system. It allows parallel compiling by \ distributing the compile jobs to several nodes of a compile network running the \ @@ -63,7 +65,7 @@ define STAGE_INSTALL_CMDS mkdir -pv $(BUILDROOT)/usr/lib/icecc/bin for i in gcc g++ cc c++; do \ ln -svf ../../../bin/icecc $(BUILDROOT)/usr/lib/icecc/bin/$${i}; \ - ln -svf ../../../bin/icecc $(BUILDROOT)/usr/lib/icecc/bin/$(DISTRO_MACHINE)-$${i}; \ + ln -svf ../../../bin/icecc $(BUILDROOT)/usr/lib/icecc/bin/$(ICECREAM_TARGET_PLATFORM)-$${i}; \ done sed -e 's|^#!.*|#!/bin/bash|' -i $(BUILDROOT)/usr/lib/icecc/icecc-create-env diff --git a/pkgs/core/network/network.nm b/pkgs/core/network/network.nm index 87618bb..e4e9a7a 100644 --- a/pkgs/core/network/network.nm +++ b/pkgs/core/network/network.nm @@ -27,6 +27,7 @@ include $(PKGROOT)/Include PKG_NAME = network PKG_VER = 0.99.0 PKG_REL = 2 +PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Networking/Tools hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 161c115fe6d6b831a4a9c92fe1b51b27cdbdaaee
by git＠ipfire.org 19 Feb '11

19 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 161c115fe6d6b831a4a9c92fe1b51b27cdbdaaee (commit) via 046a3c18d70a649eea8ccaff378c29f95a4e829a (commit) via ea08336ea34fc97ff8c501ad8bbe941dbf222d43 (commit) via 60ee2bfaf478cd9e236dbc5a4e9ff169fa1349bd (commit) via 5a71f323d7b2dffd80f53b6cac5c946d45d42d89 (commit) via 1b231184422d400769902dff5e34890ec0024bb4 (commit) via 94b1fa72fa69b81da34dccd8aa04a450f0237a21 (commit) from c5843aabcfc7df42bd3622b3e59509e58956a2e6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 161c115fe6d6b831a4a9c92fe1b51b27cdbdaaee Merge: 046a3c1 c5843aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 16:53:31 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 046a3c18d70a649eea8ccaff378c29f95a4e829a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 14:24:57 2011 +0100 Revert "gcc: Update PIE patches." This reverts commit 1b231184422d400769902dff5e34890ec0024bb4. Conflicts: pkgs/core/gcc/gcc.nm commit ea08336ea34fc97ff8c501ad8bbe941dbf222d43 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 12:56:32 2011 +0100 gcc: Fix CFLAGS that confused the hardening. There were some options on the CFLAGS that had to be removed to make the hardening (SSP, PIC, etc.) working. Additionally, I fixed the --with-arch flags that did not work, lately. commit 60ee2bfaf478cd9e236dbc5a4e9ff169fa1349bd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 00:31:21 2011 +0100 binutils: Remove unapplyable patch. commit 5a71f323d7b2dffd80f53b6cac5c946d45d42d89 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 00:30:28 2011 +0100 glibc: Configure glibc independently from rest of the system. This fixes a build error that we have been experiencing. Yeah. commit 1b231184422d400769902dff5e34890ec0024bb4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 19 00:29:50 2011 +0100 gcc: Update PIE patches. commit 94b1fa72fa69b81da34dccd8aa04a450f0237a21 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 18 23:42:44 2011 +0100 ccache: Fix vendor tuple. ----------------------------------------------------------------------- Summary of changes: .../binutils-2.20.1-gentoo-flexible-tests.patch | 82 -------------------- pkgs/core/ccache/ccache.nm | 6 +- pkgs/core/gcc/gcc.nm | 30 +++++-- pkgs/core/glibc/glibc.nm | 34 +++++---- .../patches/glibc-2.10.1-undefine-__i686.patch | 44 ----------- 5 files changed, 44 insertions(+), 152 deletions(-) delete mode 100644 pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch delete mode 100644 pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch Difference in files: diff --git a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch b/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch deleted file mode 100644 index c95e369..0000000 --- a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -making some of the address matches more flexible fixes tests when using -pax/relro/hash patches - ---- binutils/ld/testsuite/ld-i386/hidden2.d -+++ binutils/ld/testsuite/ld-i386/hidden2.d -@@ -8,6 +8,6 @@ - Disassembly of section .text: - - [a-f0-9]+ <bar>: --[ ]*[a-f0-9]+: e8 af fe ff ff call 0 <bar-0x[a-f0-9]+> -+[ ]*[a-f0-9]+: e8 ([a-f0-9]{2} ){2}ff ff call 0 <bar-0x[a-f0-9]+> - [ ]*[a-f0-9]+: c3 ret - #pass ---- binutils/ld/testsuite/ld-x86-64/hidden2.d -+++ binutils/ld/testsuite/ld-x86-64/hidden2.d -@@ -8,6 +8,6 @@ - Disassembly of section .text: - - [a-f0-9]+ <bar>: --[ ]*[a-f0-9]+: e8 33 fe ff ff callq 0 <bar-0x[a-f0-9]+> -+[ ]*[a-f0-9]+: e8 ([a-f0-9]{2} ){2}ff ff callq 0 <bar-0x[a-f0-9]+> - [ ]*[a-f0-9]+: c3 retq - #pass ---- binutils/ld/testsuite/ld-x86-64/protected3.d -+++ binutils/ld/testsuite/ld-x86-64/protected3.d -@@ -8,6 +8,6 @@ - Disassembly of section .text: - - 0+[a-f0-9]+ <bar>: --[ ]*[a-f0-9]+: 8b 05 ce 00 20 00 mov 0x[a-f0-9]+$%rip$,%eax # [a-f0-9]+ <foo> -+[ ]*[a-f0-9]+: 8b 05 ([a-f0-9]{2} ){2}20 00 mov 0x[a-f0-9]+$%rip$,%eax # [a-f0-9]+ <foo> - [ ]*[a-f0-9]+: c3 retq - #pass ---- binutils/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d -+++ binutils/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d -@@ -3,5 +3,5 @@ - #target: x86_64-*-* i?86-*-* - - #... --[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x200|)@plt> -+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x[a-f0-9]+|)@plt> - #pass ---- binutils/ld/testsuite/ld-ifunc/ifunc-1-x86.d -+++ binutils/ld/testsuite/ld-ifunc/ifunc-1-x86.d -@@ -3,5 +3,5 @@ - #target: x86_64-*-* i?86-*-* - - #... --[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x220|)@plt> -+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x[a-f0-9]+|)@plt> - #pass ---- binutils/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d -+++ binutils/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d -@@ -4,6 +4,6 @@ - #target: x86_64-*-* - - #... --[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x220@plt> --[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*$%rip$,%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x220@plt> -+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt> -+[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*$%rip$,%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt> - #pass ---- binutils/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d -+++ binutils/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d -@@ -4,6 +4,6 @@ - #target: x86_64-*-* - - #... --[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x220@plt> --[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*$%rip$,%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x220@plt> -+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt> -+[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*$%rip$,%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt> - #pass ---- binutils/ld/testsuite/ld-ifunc/ifunc-3a-x86.d -+++ binutils/ld/testsuite/ld-ifunc/ifunc-3a-x86.d -@@ -4,5 +4,5 @@ - #target: x86_64-*-* i?86-*-* - - #... --[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x258|)@plt> -+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x[a-f0-9]+|)@plt> - #pass diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm index 375d23b..3ebfbc3 100644 --- a/pkgs/core/ccache/ccache.nm +++ b/pkgs/core/ccache/ccache.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = ccache PKG_VER = 3.1.4 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUP = Development/Compilers @@ -36,6 +36,8 @@ PKG_SUMMARY = C/C++ compiler cache. PKG_BUILD_DEPS+= perl zlib-devel +CCACHE_PLATFORM_TARGET = $(subst -gnu,,$(DISTRO_MACHINE)) + define PKG_DESCRIPTION ccache is a compiler cache. It acts as a caching pre-processor to \ C/C++ compilers, using the -E compiler switch and a hash to detect \ @@ -66,7 +68,7 @@ define STAGE_INSTALL_CMDS mkdir -pv $(BUILDROOT)/usr/lib/ccache for i in gcc g++ cc c++; do \ ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$${i}; \ - ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$(DISTRO_MACHINE)-$${i}; \ + ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$(CCACHE_PLATFORM_TARGET)-$${i}; \ done -mkdir -pv $(BUILDROOT)/etc/profile.d diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm index 3a01b15..145ad4e 100644 --- a/pkgs/core/gcc/gcc.nm +++ b/pkgs/core/gcc/gcc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = gcc PKG_VER = 4.5.2 -PKG_REL = 3 +PKG_REL = 6 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Compilers @@ -40,22 +40,30 @@ define PKG_DESCRIPTION endef PKG_BUILD_DEPS+= autogen cloog-devel dejagnu elfutils-devel expect gmp-devel \ - libffi-devel mpc-devel mpfr-devel pkg-config ppl-devel zlib-devel + libffi-devel mpc-devel mpfr-devel pkg-config ppl-devel texinfo zlib-devel PKG_DEPS-gcc += binutils libgcc-devel # Make the GCC target platform GCC_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE)) -ifeq "$(MACHINE)" "i586" - CONFIGURE_ARGS = --disable-decimal-float +ifeq "$(DISTRO_ARCH)" "x86_64" + CONFIGURE_ARGS = --disable-multilib endif -ifeq "$(MACHINE)" "x86_64" - CONFIGURE_ARGS = --disable-multilib -else - CONFIG_CPU = --with-cpu=$(TARGET_MACHINE) --with-arch=$(TARGET_MACHINE) +ifeq "$(DISTRO_ARCH)" "i686" + CONFIGURE_ARGS = --with-arch=$(DISTRO_ARCH) --with-tune=generic endif +# Modify CFLAGS +# Remove -m32 and -m64 +CFLAGS := $(subst -m32,,$(CFLAGS)) +CFLAGS := $(subst -m64,,$(CFLAGS)) +# Remove -march=i686 +CFLAGS := $(subst -march=i686,,$(CFLAGS)) + +export CFLAGS +export CXXFLAGS = $(subst -Wall,,$(CFLAGS)) + PKG_TARBALL += $(THISAPP).tar.gz # A package for C++ @@ -141,14 +149,18 @@ define STAGE_PREPARE_CMDS # are known to not require fixing, issue the following command to prevent # the fixincludes script from running: cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + cd $(DIR_APP) && sed -i gcc/Makefile.in \ + -e "s/-fno-exceptions/& -fno-asynchronous-unwind-tables/" endef define STAGE_BUILD cd $(DIR_SRC)/gcc-build && \ + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" \ XCFLAGS="$(CFLAGS)" \ TCFLAGS="$(CFLAGS)" \ ../$(THISAPP)/configure \ - $(CONFIG_CPU) \ --build=$(GCC_TARGET_PLATFORM) \ --prefix=/usr \ --libexecdir=/usr/lib \ diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm index 271260d..cd51bc3 100644 --- a/pkgs/core/glibc/glibc.nm +++ b/pkgs/core/glibc/glibc.nm @@ -49,11 +49,21 @@ define PKG_DESCRIPTION Linux system will not function. endef -GLIBC_FLAGS += -fno-strict-aliasing -mno-tls-direct-seg-refs -DNDEBUG +# Build glibc with custom cflags +GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -DPIC -CFLAGS += $(GLIBC_FLAGS) -CXXFLAGS += $(GLIBC_FLAGS) +ifeq "$(DISTRO_ARCH)" "i686" + GLIBC_FLAGS += -march=i686 -mtune=generic +endif +ifeq "$(DISTRO_ARCH)" "x86_64" + GLIBC_FLAGS += -mtune=generic +endif + +export CFLAGS = $(GLIBC_FLAGS) +export CXXFLAGS = $(GLIBC_FLAGS) + +GLIBC_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE)) OPTIMIZED_KERNEL = 2.6.32 PKG_OBJECTS += $(THISAPP).tar.xz @@ -209,21 +219,17 @@ define STAGE_PREPARE cd $(DIR_APP) && sed -i signal/Makefile \ -e "s/tst-sigset2//g" + + #cd $(DIR_APP) && sed -i configure \ + # -e "s/-Werror -fstack-protector/-fstack-protector/" endef define STAGE_BUILD - # --enable-stackguard-randomization could be added here, but this is primarily - # for attacks by local users, and we shouldn't have those in the rebooted - # system. Adding this will empty the /dev/random entropy pool (via - # /dev/urandom), unless the system is running a Random Number Gathering Daemon - # (rngd). This version of Glibc uses high precision timing with SSP, so the - # canary value changes at run-time. This is not as good as /dev/urandom, but - # it's better than nothing and has very good performance. - cd $(DIR_SRC)/glibc-build && \ - CFLAGS= \ - CXXFLAGS= \ + CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \ ../$(THISAPP)/configure \ + --build=$(GLIBC_TARGET_PLATFORM) \ + --host=$(GLIBC_TARGET_PLATFORM) \ --prefix=/usr \ --libexecdir=/usr/lib/glibc \ --disable-profile \ @@ -232,8 +238,6 @@ define STAGE_BUILD --with-selinux \ --disable-werror \ --enable-bind-now \ - --enable-stackguard-randomization \ - --with-stack-protector=all \ --enable-__thread \ --enable-tls \ --enable-experimental-malloc \ diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch b/pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch deleted file mode 100644 index ce0ebd4..0000000 --- a/pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch +++ /dev/null @@ -1,44 +0,0 @@ -If gcc is configured to generate i686 code or better by default (like -when using the --with-arch=pentium3 configure option), then the __i686 -macro will always be defined automatically and thus screw up the -compilation of some .S files. -http://bugs.gentoo.org/131108 - -2006-04-25 Mike Frysinger <vapier(a)gentoo.org> - - * sysdeps/i386/sysdep.h (__i686): Undefine. - ---- glibc-2.10.1/sysdeps/i386/sysdep.h -+++ glibc-2.10.1/sysdeps/i386/sysdep.h -@@ -17,6 +17,14 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+/* -+ * When building for i686 targets or better, gcc automatically defines -+ * '__i686' to '1' for us which causes trouble when using section names -+ * like '__i686.get_pc_thunk.reg'. Since we check for __i686__ in the -+ * code, killing '__i686' shouldn't be a problem. -+ */ -+#undef __i686 -+ - #include <sysdeps/generic/sysdep.h> - - #ifdef __ASSEMBLER__ - -2006-04-25 Mike Frysinger <vapier(a)gentoo.org> - - * sysdeps/pthread/pt-initfini.c: Include sysdep.h. - ---- glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c -+++ glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c -@@ -45,6 +45,9 @@ - /* Embed an #include to pull in the alignment and .end directives. */ - asm ("\n#include \"defs.h\""); - -+/* Embed an #include to pull in asm settings. */ -+asm ("\n#include <sysdep.h>"); -+ - /* The initial common code ends here. */ - asm ("\n/*@HEADER_ENDS*/"); - hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ff7a39506abf741d8e57647453a6171a0cc563fd
by git＠ipfire.org 19 Feb '11

19 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via ff7a39506abf741d8e57647453a6171a0cc563fd (commit) from fc9d164bfece5cecc99110f61c19b20be78dacbc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ff7a39506abf741d8e57647453a6171a0cc563fd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 19 15:07:54 2011 +0100 Add iptv/inet vlan settings to webif. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/47/filelists/files | 2 + html/cgi-bin/pppsetup.cgi | 24 +++++++++++++++- src/initscripts/init.d/networking/red | 45 ++++++++++++++--------------- 3 files changed, 47 insertions(+), 24 deletions(-) Difference in files: diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index adbbd29..d63f861 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,5 +1,7 @@ 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 diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index e2af0a0..443c201 100644 --- 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); @@ -747,7 +760,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 ; } @@ -921,6 +941,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/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index f29884b..0c41663 100644 --- 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 @@ -553,12 +552,12 @@ case "${1}" in 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c5843aabcfc7df42bd3622b3e59509e58956a2e6
by git＠ipfire.org 19 Feb '11

19 Feb '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fc9d164bfece5cecc99110f61c19b20be78dacbc
by git＠ipfire.org 18 Feb '11

18 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via fc9d164bfece5cecc99110f61c19b20be78dacbc (commit) from 5c0dc418e4c4d280c7555c731eb4d24dc8979378 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fc9d164bfece5cecc99110f61c19b20be78dacbc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 18 22:14:38 2011 +0100 rootfile update: icecc. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/icecc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/icecc b/config/rootfiles/packages/icecc index 8e41873..d27df65 100644 --- 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5c0dc418e4c4d280c7555c731eb4d24dc8979378
by git＠ipfire.org 18 Feb '11

18 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 5c0dc418e4c4d280c7555c731eb4d24dc8979378 (commit) from 48a2495afd78163adfd984689ab1c08091fdd2d3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5c0dc418e4c4d280c7555c731eb4d24dc8979378 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 18 20:34:08 2011 +0100 Add fireinfo to core47. ----------------------------------------------------------------------- Summary of changes: .../rootfiles/core/{44 => 47}/filelists/fireinfo | 0 1 files changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/core/{44 => 47}/filelists/fireinfo (100%) Difference in files: diff --git a/config/rootfiles/core/47/filelists/fireinfo b/config/rootfiles/core/47/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/core/47/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2011