From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 141c7c95753e00366d0e993d879db1cdc5dc870d
Date: Mon, 16 Jul 2012 21:48:15 +0200 [thread overview]
Message-ID: <20120716194815.C28AE200B0@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 8284 bytes --]
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, kernel-update has been updated
via 141c7c95753e00366d0e993d879db1cdc5dc870d (commit)
via c78993cdde0391d1336797dd4368b41794a40487 (commit)
via ace40c90eceaf77ed20ba39a45a2f883aaafa3fe (commit)
via b81b96d215d289c2956552eeb4f6ed6440d59b9e (commit)
from 986a6b7c491a5f4a299f3f2f5f4511e33409f379 (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 141c7c95753e00366d0e993d879db1cdc5dc870d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Jul 16 21:13:28 2012 +0200
kernel3: update to 3.2.23.
also update rpi patches and firmware (14.7.2012).
commit c78993cdde0391d1336797dd4368b41794a40487
Merge: 986a6b7 ace40c9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jul 7 19:40:10 2012 +0200
Merge remote-tracking branch 'origin/next' into kernel-update
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/armv5tel/linux-omap | 6 +++---
config/rootfiles/common/armv5tel/linux-rpi | 6 +++---
config/rootfiles/core/61/filelists/files | 1 +
html/cgi-bin/index.cgi | 10 +++++++++-
langs/de/cgi-bin/de.pl | 1 +
langs/en/cgi-bin/en.pl | 1 +
lfs/linux3 | 8 ++++----
lfs/rpi-firmware | 4 ++--
src/pakfire/lib/functions.sh | 9 ++++++++-
9 files changed, 32 insertions(+), 14 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/armv5tel/linux-omap b/config/rootfiles/common/armv5tel/linux-omap
index dc3d399..2e85bef 100644
--- a/config/rootfiles/common/armv5tel/linux-omap
+++ b/config/rootfiles/common/armv5tel/linux-omap
@@ -1,5 +1,5 @@
boot/uInit-ipfire-omap
boot/uImage-ipfire-omap
-boot/System.map-3.2.22-ipfire-omap
-boot/config-3.2.22-ipfire-omap
-lib/modules/3.2.22-ipfire-omap
+boot/System.map-3.2.23-ipfire-omap
+boot/config-3.2.23-ipfire-omap
+lib/modules/3.2.23-ipfire-omap
diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/common/armv5tel/linux-rpi
index 1125fcb..fdc050f 100644
--- a/config/rootfiles/common/armv5tel/linux-rpi
+++ b/config/rootfiles/common/armv5tel/linux-rpi
@@ -1,4 +1,4 @@
boot/kernel.img
-boot/System.map-3.2.22-ipfire-rpi
-boot/config-3.2.22-ipfire-rpi
-lib/modules/3.2.22-ipfire-rpi
+boot/System.map-3.2.23-ipfire-rpi
+boot/config-3.2.23-ipfire-rpi
+lib/modules/3.2.23-ipfire-rpi
diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files
index 11316eb..56981ed 100644
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@ -1,6 +1,7 @@
etc/system-release
etc/issue
etc/rc.d/init.d/collectd
+opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 9f55927..01bb3d6 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2012 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 #
@@ -489,6 +489,14 @@ foreach my $file (@files) {
}
}
+# Reiser4 warning
+my @files = `mount | grep " reiser4 (" 2>/dev/null`;
+foreach my $disk (@files) {
+ chomp ($disk);
+ $warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
+}
+
+
if ($warnmessage) {
print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 9bd2c72..c7f254a 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -581,6 +581,7 @@
'delete share' => 'Freigabe löschen',
'delete user' => 'Benutzer löschen',
'demon login script' => 'Demon-Anmeldeskript',
+'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
'description' => 'Beschreibung',
'dest ip and port' => 'Ziel-IP:Port',
'destination' => 'Ziel',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index d1c3b6b..52872f4 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -602,6 +602,7 @@
'delete share' => 'Delete share',
'delete user' => 'Delete user',
'demon login script' => 'Demon login script',
+'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
'description' => 'Description',
'dest ip and port' => 'Dest. IP: Port',
'destination' => 'Destination',
diff --git a/lfs/linux3 b/lfs/linux3
index 081a139..e84fd7a 100644
--- a/lfs/linux3
+++ b/lfs/linux3
@@ -24,9 +24,9 @@
include Config
-VER = 3.2.22
+VER = 3.2.23
-RPI_PATCHES = linux-3.2-bootc-a1f8d7a
+RPI_PATCHES = linux-3.2-bootc-f23da7f
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.bz2
@@ -75,8 +75,8 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-$(DL_FILE)_MD5 = c1d28d8e27e1011687c52db17617cb8e
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = c3891a7f38609783358e765d784e5e6e
+$(DL_FILE)_MD5 = 1fc88918d247293d236d5dc169bf0b30
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 5651c6411bb1cbdbfe4b2908c117aaf3
install : $(TARGET)
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index 5ca7e16..4daec2f 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -24,7 +24,7 @@
include Config
-VER = 234c19d
+VER = 1309b3d
THISAPP = rpi-firmware-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 46d92089ff8d4da355954f7c2296e311
+$(DL_FILE)_MD5 = 90978c567f9bcd2aad2c1c138acb3518
install : $(TARGET)
diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 2f6491f..bc05bd0 100644
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2012 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 #
@@ -28,6 +28,13 @@ extract_files() {
echo "...Finished."
}
+extract_backup_includes() {
+ echo "Extracting backup includes..."
+ tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
+ var/ipfire/backup/addons/includes
+ echo "...Finished."
+}
+
remove_files() {
echo "Removing files..."
for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-07-16 19:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120716194815.C28AE200B0@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox