public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7d6609dc0196d9cc87b2013c0bee039574b0bea
@ 2012-09-21 12:55 git
  0 siblings, 0 replies; only message in thread
From: git @ 2012-09-21 12:55 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 7283 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, next has been updated
       via  c7d6609dc0196d9cc87b2013c0bee039574b0bea (commit)
      from  789e6f5c8ebf3eacebf40d56f0b972df851e9d40 (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 c7d6609dc0196d9cc87b2013c0bee039574b0bea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 21 14:55:36 2012 +0200

    Create core update 63.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/{60 => 63}/exclude           |    0
 .../{oldcore/51 => core/63}/filelists/dhcp         |    0
 .../{oldcore/58 => core/63}/filelists/files        |    4 +---
 .../rootfiles/core/{61 => 63}/filelists/fireinfo   |    0
 config/rootfiles/core/{60 => 63}/meta              |    0
 config/rootfiles/core/{62 => 63}/update.sh         |    3 +++
 make.sh                                            |    2 +-
 7 files changed, 5 insertions(+), 4 deletions(-)
 copy config/rootfiles/core/{60 => 63}/exclude (100%)
 copy config/rootfiles/{oldcore/51 => core/63}/filelists/dhcp (100%)
 copy config/rootfiles/{oldcore/58 => core/63}/filelists/files (62%)
 copy config/rootfiles/core/{61 => 63}/filelists/fireinfo (100%)
 copy config/rootfiles/core/{60 => 63}/meta (100%)
 copy config/rootfiles/core/{62 => 63}/update.sh (97%)

Difference in files:
diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/core/63/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/core/63/filelists/dhcp
new file mode 120000
index 0000000..32d8da4
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/dhcp
@@ -0,0 +1 @@
+../../../common/dhcp
\ No newline at end of file
diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/core/63/filelists/files
new file mode 100644
index 0000000..1455a87
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/network-vlans
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/core/63/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/core/63/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/63/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh
new file mode 100644
index 0000000..9b3fec5
--- /dev/null
+++ b/config/rootfiles/core/63/update.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=62
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Remove old symlink to DHCP server configuration file.
+rm -f /etc/dhcpd.conf
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+#	depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+#	depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/make.sh b/make.sh
index 576e997..773da66 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.11"							# Version number
-CORE="62"							# Core Level (Filename)
+CORE="63"							# Core Level (Filename)
 PAKFIRE_CORE="62"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-09-21 12:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-21 12:55 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7d6609dc0196d9cc87b2013c0bee039574b0bea git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox