[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. 45b6ea63afc826ee0500f54f66beeb10
From: git () ipfire ! org (Michael Tremer)
Date: 2015-08-12 13:05:08
Message-ID: 20150812130509.6469C2238E () 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 45b6ea63afc826ee0500f54f66beeb102c8445e0 (commit)
via 7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1 (commit)
from 9b1643fc3fd64a6ea0d5d02f20ceaa48b8fc8e41 (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 45b6ea63afc826ee0500f54f66beeb102c8445e0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Aug 12 14:01:55 2015 +0100
openssh: Update to 7.0p1
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Aug 12 13:59:00 2015 +0100
Start Core Update 94
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{93 => 94}/exclude | 0
config/rootfiles/{oldcore/88 => core/94}/filelists/files | 1 +
.../rootfiles/{oldcore/92 => core/94}/filelists/openssh | 0
config/rootfiles/core/{93 => 94}/meta | 0
config/rootfiles/core/{93 => 94}/update.sh | 16 ++++++++--------
config/rootfiles/oldcore/{92 => 93}/exclude | 0
config/rootfiles/{core => oldcore}/93/filelists/bind | 0
config/rootfiles/{core => oldcore}/93/filelists/daq | 0
config/rootfiles/{core => oldcore}/93/filelists/ddns | 0
config/rootfiles/{core => oldcore}/93/filelists/dnsmasq | 0
config/rootfiles/{core => oldcore}/93/filelists/files | 0
config/rootfiles/{core => oldcore}/93/filelists/libpcap | 0
config/rootfiles/{core => oldcore}/93/filelists/pcre | 0
config/rootfiles/{core => oldcore}/93/filelists/squid | 0
config/rootfiles/oldcore/{92 => 93}/meta | 0
config/rootfiles/{core => oldcore}/93/update.sh | 0
lfs/openssh | 5 +++--
make.sh | 2 +-
18 files changed, 13 insertions(+), 11 deletions(-)
rename config/rootfiles/core/{93 => 94}/exclude (100%)
copy config/rootfiles/{oldcore/88 => core/94}/filelists/files (63%)
copy config/rootfiles/{oldcore/92 => core/94}/filelists/openssh (100%)
rename config/rootfiles/core/{93 => 94}/meta (100%)
copy config/rootfiles/core/{93 => 94}/update.sh (90%)
copy config/rootfiles/oldcore/{92 => 93}/exclude (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/daq (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/ddns (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/dnsmasq (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/libpcap (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/pcre (100%)
rename config/rootfiles/{core => oldcore}/93/filelists/squid (100%)
copy config/rootfiles/oldcore/{92 => 93}/meta (100%)
rename config/rootfiles/{core => oldcore}/93/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/93/exclude b/config/rootfiles/core/93/exclude
deleted file mode 100644
index 18e9b4d..0000000
--- a/config/rootfiles/core/93/exclude
+++ /dev/null
@@ -1,20 +0,0 @@
-boot/config.txt
-etc/collectd.custom
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-etc/localtime
-etc/shadow
-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/ovpn
-var/log/cache
-var/state/dhcp/dhcpd.leases
-var/updatecache
diff --git a/config/rootfiles/core/93/filelists/bind \
b/config/rootfiles/core/93/filelists/bind deleted file mode 120000
index 48a0eba..0000000
--- a/config/rootfiles/core/93/filelists/bind
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/daq \
b/config/rootfiles/core/93/filelists/daq deleted file mode 120000
index d0e0956..0000000
--- a/config/rootfiles/core/93/filelists/daq
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/daq
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/ddns \
b/config/rootfiles/core/93/filelists/ddns deleted file mode 120000
index 7395164..0000000
--- a/config/rootfiles/core/93/filelists/ddns
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/dnsmasq \
b/config/rootfiles/core/93/filelists/dnsmasq deleted file mode 120000
index d469c74..0000000
--- a/config/rootfiles/core/93/filelists/dnsmasq
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/files \
b/config/rootfiles/core/93/filelists/files deleted file mode 100644
index bec26b8..0000000
--- a/config/rootfiles/core/93/filelists/files
+++ /dev/null
@@ -1,11 +0,0 @@
-etc/system-release
-etc/issue
-opt/pakfire/pakfire
-opt/pakfire/lib/functions.pl
-srv/web/ipfire/html/themes/darkdos/include/functions.pl
-srv/web/ipfire/html/themes/ipfire/include/css/style.css
-srv/web/ipfire/html/themes/ipfire/include/functions.pl
-srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl
-srv/web/ipfire/html/themes/maniac/include/functions.pl
-var/ipfire/backup/include
-var/ipfire/langs
diff --git a/config/rootfiles/core/93/filelists/libpcap \
b/config/rootfiles/core/93/filelists/libpcap deleted file mode 120000
index c7f9f52..0000000
--- a/config/rootfiles/core/93/filelists/libpcap
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libpcap
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/pcre \
b/config/rootfiles/core/93/filelists/pcre deleted file mode 120000
index b390d9a..0000000
--- a/config/rootfiles/core/93/filelists/pcre
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/squid \
b/config/rootfiles/core/93/filelists/squid deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/93/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/93/meta b/config/rootfiles/core/93/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/93/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/93/update.sh b/config/rootfiles/core/93/update.sh
deleted file mode 100644
index e4e88a3..0000000
--- a/config/rootfiles/core/93/update.sh
+++ /dev/null
@@ -1,63 +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) 2015 IPFire-Team <info@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=93
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-# Stop services
-/etc/init.d/squid stop
-
-# Extract files
-extract_files
-
-# Remove libevent2 addon meta and rootfile. libevent2 is now in core.
-rm -f /opt/pakfire/db/*/meta-libevent2
-rm -f /opt/pakfire/db/rootfiles/libevent2
-
-# Update Language cache
-/usr/local/bin/update-lang-cache
-
-# Start services
-/etc/init.d/squid start
-
-# 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 > /boot/grub/grub.cfg
-fi
-sync
-
-# Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/94/exclude b/config/rootfiles/core/94/exclude
new file mode 100644
index 0000000..18e9b4d
--- /dev/null
+++ b/config/rootfiles/core/94/exclude
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+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/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/94/filelists/files \
b/config/rootfiles/core/94/filelists/files new file mode 100644
index 0000000..168c7d1
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+var/ipfire/langs
diff --git a/config/rootfiles/core/94/filelists/openssh \
b/config/rootfiles/core/94/filelists/openssh new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/94/meta b/config/rootfiles/core/94/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/94/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
new file mode 100644
index 0000000..38ca331
--- /dev/null
+++ b/config/rootfiles/core/94/update.sh
@@ -0,0 +1,63 @@
+#!/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) 2015 IPFire-Team <info@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=94
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/sshd stop
+
+# Extract files
+extract_files
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Update SSH configuration
+sed -i /etc/ssh/sshd_config \
+ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/'
+
+# Start services
+/etc/init.d/sshd start
+
+# 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/93/exclude \
b/config/rootfiles/oldcore/93/exclude new file mode 100644
index 0000000..18e9b4d
--- /dev/null
+++ b/config/rootfiles/oldcore/93/exclude
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+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/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/93/filelists/bind \
b/config/rootfiles/oldcore/93/filelists/bind new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/filelists/daq \
b/config/rootfiles/oldcore/93/filelists/daq new file mode 120000
index 0000000..d0e0956
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/daq
@@ -0,0 +1 @@
+../../../common/daq
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/filelists/ddns \
b/config/rootfiles/oldcore/93/filelists/ddns new file mode 120000
index 0000000..7395164
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/filelists/dnsmasq \
b/config/rootfiles/oldcore/93/filelists/dnsmasq new file mode 120000
index 0000000..d469c74
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/dnsmasq
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/filelists/files \
b/config/rootfiles/oldcore/93/filelists/files new file mode 100644
index 0000000..bec26b8
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/files
@@ -0,0 +1,11 @@
+etc/system-release
+etc/issue
+opt/pakfire/pakfire
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/html/themes/darkdos/include/functions.pl
+srv/web/ipfire/html/themes/ipfire/include/css/style.css
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl
+srv/web/ipfire/html/themes/maniac/include/functions.pl
+var/ipfire/backup/include
+var/ipfire/langs
diff --git a/config/rootfiles/oldcore/93/filelists/libpcap \
b/config/rootfiles/oldcore/93/filelists/libpcap new file mode 120000
index 0000000..c7f9f52
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/libpcap
@@ -0,0 +1 @@
+../../../common/libpcap
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/filelists/pcre \
b/config/rootfiles/oldcore/93/filelists/pcre new file mode 120000
index 0000000..b390d9a
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/pcre
@@ -0,0 +1 @@
+../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/filelists/squid \
b/config/rootfiles/oldcore/93/filelists/squid new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/93/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/meta b/config/rootfiles/oldcore/93/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/93/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/93/update.sh \
b/config/rootfiles/oldcore/93/update.sh new file mode 100644
index 0000000..e4e88a3
--- /dev/null
+++ b/config/rootfiles/oldcore/93/update.sh
@@ -0,0 +1,63 @@
+#!/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) 2015 IPFire-Team <info@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=93
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/squid stop
+
+# Extract files
+extract_files
+
+# Remove libevent2 addon meta and rootfile. libevent2 is now in core.
+rm -f /opt/pakfire/db/*/meta-libevent2
+rm -f /opt/pakfire/db/rootfiles/libevent2
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/squid start
+
+# 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 > /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/lfs/openssh b/lfs/openssh
index 7e6e376..ef70f20 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
include Config
-VER = 6.8p1
+VER = 7.0p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 08f72de6751acfbd0892b5f003922701
+$(DL_FILE)_MD5 = 831883f251ac34f0ab9c812acc24ee69
install : $(TARGET)
@@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
-e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
-e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
+ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
/etc/ssh/sshd_config
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 4f6eedb..1925929 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="93" # Core Level (Filename)
+CORE="94" # Core Level (Filename)
PAKFIRE_CORE="93" # 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
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
http://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic