IPFire-SCM April 2010

ipfire-scm@lists.ipfire.org

1 participants
83 discussions

[IPFire-SCM] [git.ipfire.org] Cappie detects new hosts on a network. branch, master, updated. 74e192ba1c9f30f6e5072e5532a2e766b28869b5
by git＠ipfire.org 22 Apr '10

22 Apr '10

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 "Cappie detects new hosts on a network.". The branch, master has been updated via 74e192ba1c9f30f6e5072e5532a2e766b28869b5 (commit) from 17a6cf4e2af6f220ac0049803ce173a275f5dac3 (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 74e192ba1c9f30f6e5072e5532a2e766b28869b5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 22 20:05:36 2010 +0200 Use old API of threading code to be compatible with python 2.5. ----------------------------------------------------------------------- Summary of changes: cappie/__init__.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/cappie/__init__.py b/cappie/__init__.py index 2fea5e0..1cf1e8d 100644 --- a/cappie/__init__.py +++ b/cappie/__init__.py @@ -92,12 +92,12 @@ class Cappie(object): iface.start() while True: - if not self.queue.is_alive(): + if not self.queue.isAlive(): self.log.critical("Queue thread died unexpectedly.") return for iface in self.__interfaces: - if not iface.is_alive(): + if not iface.isAlive(): self.log.critical("Thread died unexpectedly. %s" % iface.dev) return time.sleep(60) hooks/post-receive -- Cappie detects new hosts on a network.

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fff4b24f4f5c64511559a0d71fa709ce81ecee39
by git＠ipfire.org 22 Apr '10

22 Apr '10

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 fff4b24f4f5c64511559a0d71fa709ce81ecee39 (commit) via b8d83f4159d72419104b270b82c9fd3e0b7e9fdd (commit) via 4be1f1154da036b9f4f443ceb11cdad6b10fb3cd (commit) via e9a48cc7081a4d8183935f95163d5d2d97debce8 (commit) from b15f209f2c10203c1891d3e9c577efb7eb71149d (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 fff4b24f4f5c64511559a0d71fa709ce81ecee39 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 22 19:55:50 2010 +0200 naoki: Implemented ./make.sh batch cron. This will randomly build packages and report errors. commit b8d83f4159d72419104b270b82c9fd3e0b7e9fdd Merge: 4be1f1154da036b9f4f443ceb11cdad6b10fb3cd b15f209f2c10203c1891d3e9c577efb7eb71149d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 22 19:13:58 2010 +0200 Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x commit 4be1f1154da036b9f4f443ceb11cdad6b10fb3cd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 22 19:12:14 2010 +0200 naoki: Naoki will be able to send mails on errors. You need to configure: [smtp] server = 1.2.3.4 user = me # Optional login user password = *** # Password that belongs to user [error_report] recipient = <user>@ipfire.org commit e9a48cc7081a4d8183935f95163d5d2d97debce8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 22 19:11:52 2010 +0200 perl-xml-parser: Fix rpath whitelist. ----------------------------------------------------------------------- Summary of changes: naoki/__init__.py | 38 ++++++++++++ naoki/backend.py | 82 ++++++++++++++++++++++++++ naoki/chroot.py | 3 + naoki/constants.py | 13 ++++ pkgs/core/perl-xml-parser/perl-xml-parser.nm | 3 +- 5 files changed, 137 insertions(+), 2 deletions(-) Difference in files: diff --git a/naoki/__init__.py b/naoki/__init__.py index a3c4a9a..239d8f5 100644 --- a/naoki/__init__.py +++ b/naoki/__init__.py @@ -2,6 +2,7 @@ import ConfigParser import os.path +import random import sys import time @@ -42,6 +43,7 @@ class Naoki(object): "shell" : self.call_shell, "repository" : self.call_repository, "generate" : self.call_generate, + "batch" : self.call_batch, } return actionmap[args.action.name](args.action) @@ -319,3 +321,39 @@ Release : %(release)s gen = chroot.Generator(self, arches.current, args.type) return gen.run() + + def call_batch(self, args): + actionmap = { + "cron" : self.call_batch_cron, + } + + return actionmap[args.action.name](args.action) + + def call_batch_cron(self, args): + packages = [] + packages_must = [] + packages_may = [] + for package in backend.parse_package_info(backend.get_package_names()): + if not package.built and package.buildable: + packages_must.append(package) + continue + + if package.buildable: + packages_may.append(package) + + packages += packages_must + + while len(packages) < 10 and packages_may: + package = random.choice(packages_may) + packages_may.remove(package) + packages.append(package) + + random.shuffle(packages) + + # Bad hack because we lack a _build method + args.packages = [p.name for p in packages] + args.onlydeps = False + args.withdeps = False + args.shell = False + + self.call_build(args) diff --git a/naoki/backend.py b/naoki/backend.py index 4005f1e..9129cc3 100644 --- a/naoki/backend.py +++ b/naoki/backend.py @@ -1,7 +1,10 @@ #!/usr/bin/python +import email.mime.multipart +import email.mime.text import os import shutil +import smtplib import urlgrabber import urlgrabber.progress import urllib @@ -259,6 +262,7 @@ class PackageInfo(object): "fingerprint" : self.fingerprint, "files" : self.package_files, "group" : self.group, + "id" : self.id, "license" : self.license, "maintainer" : self.maintainer, "name" : self.name, @@ -553,3 +557,81 @@ class BinaryRepository(object): @property def path(self): return os.path.join(REPOSDIR, self.name, self.arch["name"]) + +def report_error_by_mail(package): + log = package.naoki.log + + # Do not send a report if no recipient is configured + if not config["error_report_recipient"]: + return + + try: + connection = smtplib.SMTP(config["smtp_server"]) + #connection.set_debuglevel(1) + + if config["smtp_user"] and config["smtp_password"]: + connection.login(config["smtp_user"], config["smtp_password"]) + + except SMTPConnectError, e: + log.error("Could not establish a connection to the smtp server: %s" % e) + return + except SMTPAuthenticationError, e: + log.error("Could not successfully login to the smtp server: %s" % e) + return + + msg = email.mime.multipart.MIMEMultipart() + msg["From"] = config["error_report_sender"] + msg["To"] = config["error_report_recipient"] + msg["Subject"] = config["error_report_subject"] % package.all + msg.preamble = 'You will not see this in a MIME-aware mail reader.\n' + + body = """\ +The package %(name)s had a difficulty to build itself. +This email will give you a short report about the error. + +Package information: + Name : %(name)s - %(summary)s + Version : %(version)s + Release : %(release)s + + This package in maintained by %(maintainer)s. + + +A detailed logfile is attached. + +Sincerely, + Naoki + """ % package.all + + msg.attach(email.mime.text.MIMEText(body)) + + # Read log and append it to mail + logfile = os.path.join(LOGDIR, package.id + ".log") + if os.path.exists(logfile): + log = [] + f = open(logfile) + line = f.readline() + while line: + line = line.rstrip("\n") + if line.endswith(LOG_MARKER): + # Reset log + log = [] + + log.append(line) + line = f.readline() + + f.close() + + log = email.mime.text.MIMEText("\n".join(log), _subtype="plain") + log.add_header('Content-Disposition', 'attachment', + filename="%s.log" % package.id) + msg.attach(log) + + try: + connection.sendmail(config["error_report_sender"], + config["error_report_recipient"], msg.as_string()) + except Exception, e: + log.error("Could not send error report: %s: %s" % (e.__class__.__name__, e)) + return + + connection.quit() diff --git a/naoki/chroot.py b/naoki/chroot.py index 35c01b0..a1888fd 100644 --- a/naoki/chroot.py +++ b/naoki/chroot.py @@ -333,6 +333,8 @@ class PackageEnvironment(Environment): Environment.__init__(self, naoki=package.naoki, *args, **kwargs) def build(self): + self.log.debug(LOG_MARKER) + self.package.download() # Save start time @@ -343,6 +345,7 @@ class PackageEnvironment(Environment): except Error: if config["cleanup_on_failure"]: self.clean() + backend.report_error_by_mail(self.package) raise time_end = time.time() diff --git a/naoki/constants.py b/naoki/constants.py index 48238aa..f77b00c 100644 --- a/naoki/constants.py +++ b/naoki/constants.py @@ -3,6 +3,7 @@ import ConfigParser import math import os +import socket BASEDIR = os.getcwd() @@ -26,6 +27,8 @@ CONFIGFILE = os.path.join(CONFIGDIR, "naoki.conf") CHROOT_PATH = "/sbin:/bin:/usr/sbin:/usr/bin" +LOG_MARKER = "### LOG MARKER ###" + def calc_parallelism(): """ Calculate how many processes to run @@ -67,6 +70,16 @@ class Config(object): # Logging "log_config_file" : os.path.join(CONFIGDIR, "logging.ini"), "log_file" : os.path.join(LOGDIR, "naoki.log"), + # + # Reporting + "error_report_recipient" : None, + "error_report_sender" : "buildsystem@%s" % socket.gethostname(), + "error_report_subject" : "[NAOKI] %(id)s got a build failure", + # + # SMTP + "smtp_server" : None, + "smtp_user" : None, + "smtp_password" : None, } def __init__(self): diff --git a/pkgs/core/perl-xml-parser/perl-xml-parser.nm b/pkgs/core/perl-xml-parser/perl-xml-parser.nm index e1b5d20..41dbf40 100644 --- a/pkgs/core/perl-xml-parser/perl-xml-parser.nm +++ b/pkgs/core/perl-xml-parser/perl-xml-parser.nm @@ -44,9 +44,8 @@ endef PKG_TARBALL = $(THISAPP).tar.gz -# XXX has to be removed define QUALITY_AGENT_WHITELIST_RPATH - /usr/lib/perl5/site_perl/*/auto/XML/Parser/Expat/Expat.so + /lib endef define STAGE_BUILD hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b1d6635994673c9da5bba8e6b982c9227ed87cc8
by git＠ipfire.org 22 Apr '10

22 Apr '10

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 b1d6635994673c9da5bba8e6b982c9227ed87cc8 (commit) from ea61e29cdbb4b50d43403c8ebb4af4c3d61ea391 (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 b1d6635994673c9da5bba8e6b982c9227ed87cc8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 22 17:31:07 2010 +0200 Updated kvm-kmod (2.6.33.1). ----------------------------------------------------------------------- Summary of changes: lfs/kvm-kmod | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod index 2b0e24e..c5ca871 100644 --- a/lfs/kvm-kmod +++ b/lfs/kvm-kmod @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.33 +VER = 2.6.33.1 THISAPP = kvm-kmod-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 814ab17655bc0db909246677d3d68f81 +$(DL_FILE)_MD5 = 18d61c6d95cc7b1c545577836aadbc13 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. ea61e29cdbb4b50d43403c8ebb4af4c3d61ea391
by git＠ipfire.org 22 Apr '10

22 Apr '10

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 ea61e29cdbb4b50d43403c8ebb4af4c3d61ea391 (commit) via 331699d57658e651126bcbde4eb2e0753bbce1b1 (commit) via 525793ac7df9d9e6aafc3210494fe10ea56f7d23 (commit) from 71a8f9af7197c3e7cbbcc9d754a49fa752798ae1 (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 ea61e29cdbb4b50d43403c8ebb4af4c3d61ea391 Merge: 331699d57658e651126bcbde4eb2e0753bbce1b1 71a8f9af7197c3e7cbbcc9d754a49fa752798ae1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 22 07:42:57 2010 +0200 Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x commit 331699d57658e651126bcbde4eb2e0753bbce1b1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 22 07:41:28 2010 +0200 Change ipsecctrl Tunnel up and down. commit 525793ac7df9d9e6aafc3210494fe10ea56f7d23 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 22 07:40:20 2010 +0200 Add Vodafone K3765 and K4505 usbids to option driver. ----------------------------------------------------------------------- Summary of changes: doc/packages-list.txt | 1 - lfs/linux | 3 ++ src/misc-progs/ipsecctrl.c | 22 ++++++------------- ...inux-2.6.32.11-option_add_vodafone_usbids.patch | 23 ++++++++++++++++++++ 4 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch Difference in files: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index d5ed0ef..ea1498d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,7 +62,6 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 -* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 diff --git a/lfs/linux b/lfs/linux index 47f0458..646b093 100644 --- a/lfs/linux +++ b/lfs/linux @@ -152,6 +152,9 @@ endif # Add some more LED triggers cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch + # Huawei (Vodafone) K3765 & K4505 Usbids + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch + # Cleanup kernel source cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index d443edc..7205afb 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -138,33 +138,25 @@ int decode_line (char *s, void turn_connection_on (char *name, char *type) { char command[STRING_SIZE]; - safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null"); + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec auto --replace %s >/dev/null", name); + "/usr/sbin/ipsec down %s >/dev/null", name); + safe_system(command); + memset(command, 0, STRING_SIZE); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec up %s >/dev/null", name); safe_system(command); - if (strcmp(type, "net") == 0) { - memset(command, 0, STRING_SIZE); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --asynchronous --name %s --initiate >/dev/null", name); - safe_system(command); - } } /* issue ipsec commmands to turn off connection 'name' */ void turn_connection_off (char *name) { char command[STRING_SIZE]; - - memset(command, 0, STRING_SIZE); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --name %s --terminate >/dev/null", name); - safe_system(command); memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --delete --name %s >/dev/null", name); + "/usr/sbin/ipsec down %s >/dev/null", name); safe_system(command); - safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null"); } diff --git a/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch b/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch new file mode 100644 index 0000000..b102380 --- /dev/null +++ b/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch @@ -0,0 +1,23 @@ +diff -Naur linux-2.6.32.11.org/drivers/usb/serial/option.c linux-2.6.32.11/drivers/usb/serial/option.c +--- linux-2.6.32.11.org/drivers/usb/serial/option.c 2010-04-02 00:59:14.000000000 +0200 ++++ linux-2.6.32.11/drivers/usb/serial/option.c 2010-04-21 21:56:56.000000000 +0200 +@@ -165,6 +165,10 @@ + #define HUAWEI_PRODUCT_E143D 0x143D + #define HUAWEI_PRODUCT_E143E 0x143E + #define HUAWEI_PRODUCT_E143F 0x143F ++/* Vodafone K4505-H */ ++#define HUAWEI_PRODUCT_E1464 0x1464 ++/* Vodafone K3765-H */ ++#define HUAWEI_PRODUCT_E1465 0x1465 + #define HUAWEI_PRODUCT_E14AC 0x14AC + + #define QUANTA_VENDOR_ID 0x0408 +@@ -443,6 +447,8 @@ + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1464, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1465, 0xff, 0xff, 0xff) }, + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) }, + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) }, + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 71a8f9af7197c3e7cbbcc9d754a49fa752798ae1
by git＠ipfire.org 22 Apr '10

22 Apr '10

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 71a8f9af7197c3e7cbbcc9d754a49fa752798ae1 (commit) from 6411b32c6e1c6ffa066d27b8acbb2178ec33578d (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 71a8f9af7197c3e7cbbcc9d754a49fa752798ae1 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Apr 22 07:07:58 2010 +0200 Added e2fsck.conf, this should fix manual superblock correction. This fixes bug #0000623 ----------------------------------------------------------------------- Summary of changes: config/etc/e2fsck.conf | 13 +++++++++++++ config/rootfiles/common/stage2 | 1 + 2 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 config/etc/e2fsck.conf Difference in files: diff --git a/config/etc/e2fsck.conf b/config/etc/e2fsck.conf new file mode 100644 index 0000000..61aee5d --- /dev/null +++ b/config/etc/e2fsck.conf @@ -0,0 +1,13 @@ +[problems] + +# Superblock last mount time is in the future (PR_0_FUTURE_SB_LAST_MOUNT). +0x000031 = { + preen_ok = true + preen_nomessage = true +} + +# Superblock last write time is in the future (PR_0_FUTURE_SB_LAST_WRITE). +0x000032 = { + preen_ok = true + preen_nomessage = true +} \ No newline at end of file diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 6a7a099..3856d7f 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -8,6 +8,7 @@ dev/null dev/console etc/bashrc etc/certparams +etc/e2fsck.conf etc/fstab etc/group etc/hddtemp.db hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6411b32c6e1c6ffa066d27b8acbb2178ec33578d
by git＠ipfire.org 21 Apr '10

21 Apr '10

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 6411b32c6e1c6ffa066d27b8acbb2178ec33578d (commit) from 071df633cd1fb02057ea8ab6c27c609d5f993401 (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 6411b32c6e1c6ffa066d27b8acbb2178ec33578d Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Apr 21 07:15:44 2010 +0200 Some little bugfixes to current codebase ----------------------------------------------------------------------- Summary of changes: config/outgoingfw/outgoingfw.pl | 1 - doc/packages-list.txt | 1 + html/cgi-bin/outgoingfw.cgi | 10 +++++----- html/cgi-bin/outgoinggrp.cgi | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index dd42415..58c97bc 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -145,7 +145,6 @@ foreach $configentry (sort @configs) } elsif ($configline[2] eq 'ip') { @SOURCE = ("$configline[5]"); $DEV = ""; - } } elsif ($configline[2] eq 'all') { @SOURCE = ("0/0"); $DEV = ""; diff --git a/doc/packages-list.txt b/doc/packages-list.txt index ea1498d..d5ed0ef 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,6 +62,7 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 +* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index e2bfcfd..be16beb 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -656,13 +656,13 @@ END <optgroup label='---'> <option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option> <optgroup label='$Lang::tr{'ip address'}'> - <option value='ip' $selected{'SNET'}{'ip'}>IPSEC $Lang::tr{'interface'}</option> - <option value='red' $selected{'SNET'}{'red'}>OpenVPN $Lang::tr{'interface'}</option> + <option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip'}</option> + <option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option> </optgroup> + <optgroup label='$Lang::tr{'alt vpns'}'> + <option value='ipsec' $selected{'SNET'}{'ipsec'}>IPSEC $Lang::tr{'interface'}</option> + <option value='ovpn' $selected{'SNET'}{'ovpn'}>OpenVPN $Lang::tr{'interface'}</option> </optgroup> - <option value='ipsec' $selected{'SNET'}{'ipsec'}>$Lang::tr{'source ip'}</option> - <option value='ovpn' $selected{'SNET'}{'ovpn'}>$Lang::tr{'red'} IP</option> - <optgroup label='$Lang::tr{'network'}'> <optgroup label='$Lang::tr{'network'}'> <option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option> END diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi index b277339..69656d0 100644 --- a/html/cgi-bin/outgoinggrp.cgi +++ b/html/cgi-bin/outgoinggrp.cgi @@ -199,7 +199,7 @@ print <<END </tr> <tr> <td align='left' colspan='3'> - <textarea name="ipgroupcontent" cols="20" rows="5" Wrap="off">192.168.1.0/14\n192.168.0.1\n192.168.0.2\n</textarea> + <textarea name="ipgroupcontent" cols="20" rows="5" Wrap="off">192.168.1.0/24\n192.168.3.0/255.255.255.0\n192.168.0.1\n192.168.0.2\n</textarea> </td> </tr> </table> diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0addee7..feef190 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -15,7 +15,7 @@ 'ConnSched change profile title' => 'Change to profile:', 'ConnSched days' => 'Days:', 'ConnSched down' => 'Down', -'Set time on boot' => 'Fixé l'heure en botte', +'Set time on boot' => 'Fixe l heure en botte', 'ConnSched ipsecstart' => 'IPSec (re)start', 'ConnSched ipsecstop' => 'IPSec stop', 'ConnSched reconnect' => 'Reconnect', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b15f209f2c10203c1891d3e9c577efb7eb71149d
by git＠ipfire.org 20 Apr '10

20 Apr '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 071df633cd1fb02057ea8ab6c27c609d5f993401
by git＠ipfire.org 19 Apr '10

19 Apr '10

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 071df633cd1fb02057ea8ab6c27c609d5f993401 (commit) via 449434145e45a0e0e5be0f35a428f047c72d9c9f (commit) via 5ad70e0974708c40992c199d758c7321d57a3e50 (commit) from e5877194d4b8c44c01f045bef5e1599e376a8e90 (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 071df633cd1fb02057ea8ab6c27c609d5f993401 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 19 16:09:37 2010 +0200 Update kvm-kmod (2.6.33). commit 449434145e45a0e0e5be0f35a428f047c72d9c9f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 19 16:09:13 2010 +0200 Update core38 filelist. commit 5ad70e0974708c40992c199d758c7321d57a3e50 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 19 16:08:35 2010 +0200 Rootfile update: configroot. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 1 + config/rootfiles/common/uClibc | 11 +++++++++++ config/rootfiles/core/38/filelists/files | 5 ++++- doc/packages-list.txt | 5 ++--- lfs/kvm-kmod | 4 ++-- 5 files changed, 20 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 38b8dff..a960e83 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -97,6 +97,7 @@ var/ipfire/outgoing #var/ipfire/outgoing/bin/outgoingfw.pl var/ipfire/outgoing/defaultservices #var/ipfire/outgoing/groups +#var/ipfire/outgoing/groups/ipgroups #var/ipfire/outgoing/ipgroups #var/ipfire/outgoing/p2protocols #var/ipfire/outgoing/rules diff --git a/config/rootfiles/common/uClibc b/config/rootfiles/common/uClibc index cdce6ae..009775a 100644 --- a/config/rootfiles/common/uClibc +++ b/config/rootfiles/common/uClibc @@ -57,6 +57,10 @@ #opt/i586-uClibc/include/asm/irq.h #opt/i586-uClibc/include/asm/kdebug.h #opt/i586-uClibc/include/asm/kprobes.h +#opt/i586-uClibc/include/asm/kvm.h +#opt/i586-uClibc/include/asm/kvm_emulate.h +#opt/i586-uClibc/include/asm/kvm_host.h +#opt/i586-uClibc/include/asm/kvm_para.h #opt/i586-uClibc/include/asm/ldt.h #opt/i586-uClibc/include/asm/linkage.h #opt/i586-uClibc/include/asm/mach-bigsmp @@ -170,6 +174,7 @@ #opt/i586-uClibc/include/asm/srat.h #opt/i586-uClibc/include/asm/stat.h #opt/i586-uClibc/include/asm/suspend.h +#opt/i586-uClibc/include/asm/svm.h #opt/i586-uClibc/include/asm/system.h #opt/i586-uClibc/include/asm/termbits.h #opt/i586-uClibc/include/asm/termios.h @@ -183,7 +188,9 @@ #opt/i586-uClibc/include/asm/user.h #opt/i586-uClibc/include/asm/vga.h #opt/i586-uClibc/include/asm/vic.h +#opt/i586-uClibc/include/asm/virtext.h #opt/i586-uClibc/include/asm/vm86.h +#opt/i586-uClibc/include/asm/vmx.h #opt/i586-uClibc/include/asm/voyager.h #opt/i586-uClibc/include/assert.h #opt/i586-uClibc/include/atomic.h @@ -594,6 +601,10 @@ #opt/i586-uClibc/include/linux/kmalloc_sizes.h #opt/i586-uClibc/include/linux/kmod.h #opt/i586-uClibc/include/linux/kprobes.h +#opt/i586-uClibc/include/linux/kvm.h +#opt/i586-uClibc/include/linux/kvm_host.h +#opt/i586-uClibc/include/linux/kvm_para.h +#opt/i586-uClibc/include/linux/kvm_types.h #opt/i586-uClibc/include/linux/lapb.h #opt/i586-uClibc/include/linux/lcd.h #opt/i586-uClibc/include/linux/libata.h diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index a830c95..97e2776 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -1,6 +1,8 @@ etc/system-release var/ipfire/backup/bin/backup.pl var/ipfire/header.pl +var/ipfire/menu.d/50-firewall.menu +var/ipfire/outgoing/bin/outgoingfw.pl etc/modprobe.d/cfg80211 var/ipfire/qos/bin/makeqosscripts.pl srv/web/ipfire/cgi-bin/connections.cgi @@ -14,8 +16,9 @@ var/ipfire/langs/en.pl var/ipfire/langs/fr.pl etc/rc.d/init.d/firewall etc/rc.d/init.d/ipsec +etc/rc.d/init.d/ntp +etc/rc.d/init.d/modules usr/local/bin/ipsecctrl usr/local/bin/syslogdctrl usr/local/bin/wirelessctrl opt/pakfire/lib/functions.sh - diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 3716f08..ea1498d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -160,8 +160,7 @@ * kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire * kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire-xen * kudzu-1.2.64 -* kvm-kmod-2.6.32.9-kmod-2.6.32.11-ipfire -* kvm-kmod-2.6.32.9.tar.bz2 +* kvm-kmod-2.6.33-kmod-2.6.32.11-ipfire * l7-protocols-2009-05-10 * lame-3.97 * lcd4linux-0.10.1-RC2 @@ -247,7 +246,7 @@ * noip_updater_v1.6 * ntfs-3g-2009.4.4 * ntp-4.2.4p7 -* nut-2.4.1 +* nut-2.4.3 * ocaml-3.09.2 * oinkmaster-2.0 * open-vm-tools-2009.05.22-167859 diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod index b4bb50f..2b0e24e 100644 --- a/lfs/kvm-kmod +++ b/lfs/kvm-kmod @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.32.9 +VER = 2.6.33 THISAPP = kvm-kmod-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a66a126a138c1b5a16e00b1da042050c +$(DL_FILE)_MD5 = 814ab17655bc0db909246677d3d68f81 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. e5877194d4b8c44c01f045bef5e1599e376a8e90
by git＠ipfire.org 19 Apr '10

19 Apr '10

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 e5877194d4b8c44c01f045bef5e1599e376a8e90 (commit) from 3f424d55eef2d683e16fdfee612993f5c41550ab (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 e5877194d4b8c44c01f045bef5e1599e376a8e90 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 19 16:03:26 2010 +0200 Rootfile update: nut. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/nut | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut index c4ebe19..f7d3d2b 100644 --- a/config/rootfiles/packages/nut +++ b/config/rootfiles/packages/nut @@ -1,6 +1,3 @@ -var/ipfire/backup/addons/includes/nut -var/state/ups -etc/rc.d/init.d/nut #etc/nut etc/nut/nut.conf.sample etc/nut/ups.conf.sample @@ -15,18 +12,22 @@ usr/bin/bcmxcp_usb usr/bin/belkin usr/bin/belkinunv usr/bin/bestfcom +usr/bin/bestfortress usr/bin/bestuferrups usr/bin/bestups usr/bin/blazer_ser usr/bin/blazer_usb -usr/bin/cyberpower +usr/bin/clone +usr/bin/clone-outlet usr/bin/dummy-ups usr/bin/etapro usr/bin/everups usr/bin/gamatronic usr/bin/genericups usr/bin/isbmex +usr/bin/ivtscd usr/bin/liebert +usr/bin/liebertgxt2 usr/bin/masterguard usr/bin/megatec usr/bin/megatec_usb @@ -68,6 +69,7 @@ usr/sbin/upsmon usr/sbin/upssched usr/share/cmdvartab usr/share/driver.list +#usr/share/man/man5/nut.conf.5 #usr/share/man/man5/ups.conf.5 #usr/share/man/man5/upsd.conf.5 #usr/share/man/man5/upsd.users.5 @@ -79,17 +81,20 @@ usr/share/driver.list #usr/share/man/man8/belkin.8 #usr/share/man/man8/belkinunv.8 #usr/share/man/man8/bestfcom.8 +#usr/share/man/man8/bestfortress.8 #usr/share/man/man8/bestuferrups.8 #usr/share/man/man8/bestups.8 #usr/share/man/man8/blazer.8 -#usr/share/man/man8/cyberpower.8 +#usr/share/man/man8/clone.8 #usr/share/man/man8/dummy-ups.8 #usr/share/man/man8/etapro.8 #usr/share/man/man8/everups.8 #usr/share/man/man8/gamatronic.8 #usr/share/man/man8/genericups.8 #usr/share/man/man8/isbmex.8 +#usr/share/man/man8/ivtscd.8 #usr/share/man/man8/liebert.8 +#usr/share/man/man8/liebertgxt2.8 #usr/share/man/man8/masterguard.8 #usr/share/man/man8/megatec.8 #usr/share/man/man8/megatec_usb.8 @@ -121,3 +126,6 @@ usr/share/driver.list #usr/share/man/man8/upssched.8 #usr/share/man/man8/usbhid-ups.8 #usr/share/man/man8/victronups.8 +var/ipfire/backup/addons/includes/nut +var/state/ups +etc/rc.d/init.d/nut hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3f424d55eef2d683e16fdfee612993f5c41550ab
by git＠ipfire.org 19 Apr '10

19 Apr '10

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 3f424d55eef2d683e16fdfee612993f5c41550ab (commit) via 9eacf9c8562eb0565febab4d979378189ac2a406 (commit) from 7c9de2bed226adf24f6a8313b5cca08e76186d77 (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 3f424d55eef2d683e16fdfee612993f5c41550ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 19 14:12:42 2010 +0200 Rootfile update: linux, linux-xen. commit 9eacf9c8562eb0565febab4d979378189ac2a406 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 19 14:09:19 2010 +0200 Fix kernel xen config. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire-xen | 5 +++-- config/rootfiles/common/linux | 1 + config/rootfiles/packages/linux-xen | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 036bfc6..d527117 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.10 -# Tue Mar 30 18:36:37 2010 +# Linux kernel version: 2.6.32.11 +# Mon Apr 19 11:38:34 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3119,6 +3119,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # # iptables trigger is under Netfilter config (LED target) # +CONFIG_LEDS_TRIGGER_NETDEV=m # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux index 5175f05..ffbe094 100644 --- a/config/rootfiles/common/linux +++ b/config/rootfiles/common/linux @@ -632,6 +632,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-backlight.ko #lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-default-on.ko #lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-heartbeat.ko +#lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-netdev.ko #lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-timer.ko #lib/modules/KVER-ipfire/kernel/drivers/lguest #lib/modules/KVER-ipfire/kernel/drivers/lguest/lg.ko diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen index 3e1f01a..9b8a7ad 100644 --- a/config/rootfiles/packages/linux-xen +++ b/config/rootfiles/packages/linux-xen @@ -581,6 +581,7 @@ lib/modules/KVER-ipfire-xen #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-backlight.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-default-on.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-heartbeat.ko +#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-netdev.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-timer.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/md #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-crypt.ko hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2010