From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 35b24ff8a933e2ab8614c4f9b7c27c25c6f95473
Date: Thu, 28 Jan 2016 22:10:59 +0100 [thread overview]
Message-ID: <20160128211059.8492021442@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 14258 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 35b24ff8a933e2ab8614c4f9b7c27c25c6f95473 (commit)
from 78574c184666087272235ceeafceaf585cff96ba (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 35b24ff8a933e2ab8614c4f9b7c27c25c6f95473
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jan 28 22:08:08 2016 +0100
set core to 98 and move 97 to oldcore
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{core => oldcore}/97/exclude | 0
config/rootfiles/{core => oldcore}/97/filelists/files | 0
config/rootfiles/{core => oldcore}/97/filelists/hwdata | 0
config/rootfiles/{core => oldcore}/97/filelists/i586/openssl-sse2 | 0
config/rootfiles/{core => oldcore}/97/filelists/openssh | 0
config/rootfiles/{core => oldcore}/97/filelists/openssl | 0
config/rootfiles/{core => oldcore}/97/meta | 0
config/rootfiles/{core => oldcore}/97/update.sh | 0
make.sh | 2 +-
9 files changed, 1 insertion(+), 1 deletion(-)
rename config/rootfiles/{core => oldcore}/97/exclude (100%)
rename config/rootfiles/{core => oldcore}/97/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/97/filelists/hwdata (100%)
rename config/rootfiles/{core => oldcore}/97/filelists/i586/openssl-sse2 (100%)
rename config/rootfiles/{core => oldcore}/97/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/97/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/97/meta (100%)
rename config/rootfiles/{core => oldcore}/97/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/97/exclude b/config/rootfiles/core/97/exclude
deleted file mode 100644
index d87f175..0000000
--- a/config/rootfiles/core/97/exclude
+++ /dev/null
@@ -1,25 +0,0 @@
-boot/config.txt
-etc/alternatives
-etc/collectd.custom
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-etc/localtime
-etc/shadow
-etc/snort/snort.conf
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
-etc/sudoers
-etc/sysconfig/firewall.local
-etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
-srv/web/ipfire/html/proxy.pac
-var/ipfire/dma
-var/ipfire/time
-var/ipfire/ovpn
-var/lib/alternatives
-var/log/cache
-var/state/dhcp/dhcpd.leases
-var/updatecache
diff --git a/config/rootfiles/core/97/filelists/files b/config/rootfiles/core/97/filelists/files
deleted file mode 100644
index 8586e6a..0000000
--- a/config/rootfiles/core/97/filelists/files
+++ /dev/null
@@ -1,18 +0,0 @@
-etc/system-release
-etc/issue
-etc/rc.d/init.d/firewall
-etc/modprobe.d/nf_conntrack.conf
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/webaccess.cgi
-usr/bin/pgrep
-usr/local/bin/qosctrl
-usr/local/bin/timectrl
diff --git a/config/rootfiles/core/97/filelists/hwdata b/config/rootfiles/core/97/filelists/hwdata
deleted file mode 100644
index 5a9672f..0000000
--- a/config/rootfiles/core/97/filelists/hwdata
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/hwdata/pci.ids
-usr/share/hwdata/usb.ids
diff --git a/config/rootfiles/core/97/filelists/i586/openssl-sse2 b/config/rootfiles/core/97/filelists/i586/openssl-sse2
deleted file mode 120000
index f424713..0000000
--- a/config/rootfiles/core/97/filelists/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/openssh b/config/rootfiles/core/97/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/97/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/openssl b/config/rootfiles/core/97/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/97/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/97/meta b/config/rootfiles/core/97/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/97/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/97/update.sh b/config/rootfiles/core/97/update.sh
deleted file mode 100644
index be240fa..0000000
--- a/config/rootfiles/core/97/update.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/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) 2016 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=97
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-# Stop services
-
-# Extract files
-extract_files
-
-# Update Language cache
-# /usr/local/bin/update-lang-cache
-
-# Start services
-/etc/init.d/sshd restart
-/etc/init.d/apace restart
-
-# This update need a reboot...
-touch /var/run/need_reboot
-
-# Finish
-/etc/init.d/fireinfo start
-sendprofile
-# Update grub config to display new core version
-if [ -e /boot/grub/grub.cfg ]; then
- grub-mkconfig -o /boot/grub/grub.cfg
-fi
-sync
-
-# Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/oldcore/97/exclude b/config/rootfiles/oldcore/97/exclude
new file mode 100644
index 0000000..d87f175
--- /dev/null
+++ b/config/rootfiles/oldcore/97/exclude
@@ -0,0 +1,25 @@
+boot/config.txt
+etc/alternatives
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/97/filelists/files b/config/rootfiles/oldcore/97/filelists/files
new file mode 100644
index 0000000..8586e6a
--- /dev/null
+++ b/config/rootfiles/oldcore/97/filelists/files
@@ -0,0 +1,18 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/firewall
+etc/modprobe.d/nf_conntrack.conf
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
+srv/web/ipfire/cgi-bin/optionsfw.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/webaccess.cgi
+usr/bin/pgrep
+usr/local/bin/qosctrl
+usr/local/bin/timectrl
diff --git a/config/rootfiles/oldcore/97/filelists/hwdata b/config/rootfiles/oldcore/97/filelists/hwdata
new file mode 100644
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/oldcore/97/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
diff --git a/config/rootfiles/oldcore/97/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/97/filelists/i586/openssl-sse2
new file mode 120000
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/oldcore/97/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/97/filelists/openssh b/config/rootfiles/oldcore/97/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/97/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/97/filelists/openssl b/config/rootfiles/oldcore/97/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/97/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/97/meta b/config/rootfiles/oldcore/97/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/97/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/97/update.sh b/config/rootfiles/oldcore/97/update.sh
new file mode 100644
index 0000000..be240fa
--- /dev/null
+++ b/config/rootfiles/oldcore/97/update.sh
@@ -0,0 +1,59 @@
+#!/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) 2016 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=97
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Update Language cache
+# /usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/sshd restart
+/etc/init.d/apace restart
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/make.sh b/make.sh
index f6486b9..0effba5 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.17" # Version number
-CORE="97" # Core Level (Filename)
+CORE="98" # Core Level (Filename)
PAKFIRE_CORE="97" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2016-01-28 21:10 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=20160128211059.8492021442@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