[prev in list] [next in list] [prev in thread] [next in thread]
List: ipfire-scm
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f2aca6d2b1bd49b1fc090af657726f2
From: git () ipfire ! org (Michael Tremer)
Date: 2013-12-29 19:44:21
Message-ID: 20131229194421.881B420B0F () argus ! ipfire ! org
[Download RAW message or body]
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 4f2aca6d2b1bd49b1fc090af657726f2ce011086 (commit)
via d58c41f1ef6aa5bc0178f4351ddc110dc6159b2d (commit)
via aa29e9e46c30e8af9984dec30dc5e821af8f0168 (commit)
from 5cd3a05bf0653726834489c87b80064584e6073b (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 4f2aca6d2b1bd49b1fc090af657726f2ce011086
Author: Michael Tremer <michael.tremer at ipfire.org>
Date: Sun Dec 29 20:41:25 2013 +0100
Create core update 75.
commit d58c41f1ef6aa5bc0178f4351ddc110dc6159b2d
Author: Michael Tremer <michael.tremer at ipfire.org>
Date: Sat Dec 28 17:06:38 2013 +0100
pakfire: Prevent an infinite loop with empty server list.
commit aa29e9e46c30e8af9984dec30dc5e821af8f0168
Author: Michael Tremer <michael.tremer at ipfire.org>
Date: Wed Dec 25 15:12:34 2013 +0100
openvpn: Fix verify script.
Former versions of openvpn called the script where the arguments
in the certificate's common name where separated by /.
Now, those are separated by ", " (comma, space).
-----------------------------------------------------------------------
Summary of changes:
config/ovpn/verify | 4 ++--
config/rootfiles/core/{70 => 75}/exclude | 0
config/rootfiles/core/75/filelists/files | 6 ++++++
config/rootfiles/core/{70 => 75}/meta | 0
config/rootfiles/core/{72 => 75}/update.sh | 31 ++++++++----------------------
make.sh | 2 +-
src/pakfire/lib/functions.pl | 7 ++++++-
7 files changed, 23 insertions(+), 27 deletions(-)
copy config/rootfiles/core/{70 => 75}/exclude (100%)
create mode 100644 config/rootfiles/core/75/filelists/files
copy config/rootfiles/core/{70 => 75}/meta (100%)
copy config/rootfiles/core/{72 => 75}/update.sh (85%)
Difference in files:
diff --git a/config/ovpn/verify b/config/ovpn/verify
index 44ed110..1a1fcb5 100644
--- a/config/ovpn/verify
+++ b/config/ovpn/verify
@@ -30,8 +30,8 @@ my $CN = $ARGV[1];
exit 0 unless ($DEPTH eq "0");
# Strip the CN from the X509 identifier.
-$CN =~ /\/CN=(.*)$/i;
-$CN = $1;
+$CN =~ /(\/|,\ )CN=(.*)$/i;
+$CN = $2;
my %confighash = ();
if (-f "${General::swroot}/ovpn/ovpnconfig"){
diff --git a/config/rootfiles/core/75/exclude b/config/rootfiles/core/75/exclude
new file mode 100644
index 0000000..321a931
--- /dev/null
+++ b/config/rootfiles/core/75/exclude
@@ -0,0 +1,17 @@
+srv/web/ipfire/html/proxy.pac
+boot/config.txt
+etc/udev/rules.d/30-persistent-network.rules
+etc/collectd.custom
+etc/shadow
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/log/cache
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files
new file mode 100644
index 0000000..46af054
--- /dev/null
+++ b/config/rootfiles/core/75/filelists/files
@@ -0,0 +1,6 @@
+etc/system-release
+etc/issue
+opt/pakfire/lib/functions.pl
+var/ipfire/header.pl
+var/ipfire/langs
+var/ipfire/ovpn/verify
diff --git a/config/rootfiles/core/75/meta b/config/rootfiles/core/75/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/75/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/75/update.sh b/config/rootfiles/core/75/update.sh
new file mode 100644
index 0000000..05e2de3
--- /dev/null
+++ b/config/rootfiles/core/75/update.sh
@@ -0,0 +1,54 @@
+#!/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) 2013 IPFire-Team <info at 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=75
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Start services
+
+# Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+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 37fa1c8..6cebdd1 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
-CORE="74" # Core Level (Filename)
+CORE="75" # Core Level (Filename)
PAKFIRE_CORE="74" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 133b495..d14e031 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -305,7 +305,12 @@ sub selectmirror {
}
}
logger("MIRROR INFO: $scount servers found in list");
-
+
+ if ($scount eq 0) {
+ logger("MIRROR INFO: Could not find any servers. Falling back to main server $Conf::mainserver");
+ return ("HTTP", $Conf::mainserver, "/$Conf::version");
+ }
+
### Choose a random server and test if it is online
# If the check fails try a new server.
# This will never give up.
hooks/post-receive
--
IPFire 2.x development tree
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic