* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc9f461f74525fa3f7300a86676634780c884a21
@ 2016-01-17 18:59 git
0 siblings, 0 replies; only message in thread
From: git @ 2016-01-17 18:59 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 11172 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 cc9f461f74525fa3f7300a86676634780c884a21 (commit)
via 037cf8d20dd5d754c89c8d267d9fd6384061d170 (commit)
via 43e5fe9ded9899276a338476ba8a2974055ca222 (commit)
via 64285d23eb9003efd7a2273d61814d4cd144431d (commit)
via cfdeb28050cac9c87d7be896378f2f53d722ff7d (commit)
via db017b4b6ef9ccf32f7e9a2c22f58c3f339e98ad (commit)
via c1de76704acbb06bffbb4e6b15f66892db93c525 (commit)
from 9b4f0e639705d87708b67038e11fc4f10cbe81e5 (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 cc9f461f74525fa3f7300a86676634780c884a21
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Jan 12 18:46:52 2016 +0100
nano: Update to 2.5.1
Excerpt form 'NEWS':
"It includes fixes for a syntax-highlighting bug and a positionlog bug,
it disables a time-eating multiline regex in the C syntax,
and it adds an escape hatch to the WriteOut menu when
--tempfile is used: the discardbuffer command, ^Q. It
also has translation updates for fifteen languages, and
a small fix in the softwrap code."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 037cf8d20dd5d754c89c8d267d9fd6384061d170
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 17 18:51:47 2016 +0000
core97: Ship updated openssh
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 43e5fe9ded9899276a338476ba8a2974055ca222
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Jan 15 17:43:50 2016 +0100
openssh: Update to 7.1p2
Fixes CVE-2016-0777
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 64285d23eb9003efd7a2273d61814d4cd144431d
Merge: cfdeb28 9b4f0e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 17 18:49:03 2016 +0000
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit cfdeb28050cac9c87d7be896378f2f53d722ff7d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 10 21:20:49 2016 +0000
core97: Ship updated ntp
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit db017b4b6ef9ccf32f7e9a2c22f58c3f339e98ad
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Jan 9 20:39:45 2016 +0100
ntp 4.2.8p5: removed obsolete patch file
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c1de76704acbb06bffbb4e6b15f66892db93c525
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Jan 9 20:29:41 2016 +0100
ntp: Update to 4.2.8p5
"...addresses 1 medium-severity security issue, 14 bugfixes,
and contains other improvements over 4.2.8p4."
For a complete list, see:
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/ntp | 2 ++
.../{oldcore/96 => core/97}/filelists/ntp | 0
.../{oldcore/94 => core/97}/filelists/openssh | 0
config/rootfiles/core/97/update.sh | 1 +
config/rootfiles/packages/nano | 2 ++
lfs/nano | 8 ++++----
lfs/ntp | 7 +++----
lfs/openssh | 4 ++--
src/patches/ntp-fix-sycing-with-local-clock.patch | 23 ----------------------
9 files changed, 14 insertions(+), 33 deletions(-)
copy config/rootfiles/{oldcore/96 => core/97}/filelists/ntp (100%)
copy config/rootfiles/{oldcore/94 => core/97}/filelists/openssh (100%)
delete mode 100644 src/patches/ntp-fix-sycing-with-local-clock.patch
Difference in files:
diff --git a/config/rootfiles/common/ntp b/config/rootfiles/common/ntp
index c6b95a5..fd1262e 100644
--- a/config/rootfiles/common/ntp
+++ b/config/rootfiles/common/ntp
@@ -10,6 +10,7 @@ usr/bin/ntpd
usr/bin/ntpdate
usr/bin/ntpdc
usr/bin/ntpq
+#usr/bin/ntpsnmpd
usr/bin/ntptime
usr/bin/ntptrace
usr/bin/sntp
@@ -276,6 +277,7 @@ usr/bin/update-leap
#usr/share/man/man1/ntpdc.1
#usr/share/man/man1/ntpq.1
#usr/share/man/man1/ntptrace.1
+#usr/share/man/man1/ntpsnmpd.1
#usr/share/man/man1/sntp.1
#usr/share/man/man1/update-leap.1
#usr/share/man/man5/ntp.conf.5
diff --git a/config/rootfiles/core/97/filelists/ntp b/config/rootfiles/core/97/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/core/97/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/openssh b/config/rootfiles/core/97/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/97/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/97/update.sh b/config/rootfiles/core/97/update.sh
index a9ee78e..4cd6abe 100644
--- a/config/rootfiles/core/97/update.sh
+++ b/config/rootfiles/core/97/update.sh
@@ -45,6 +45,7 @@ paxctl -mpexs /usr/bin/grub-script-check
# Start services
/etc/init.d/dnsmasq start
+/etc/init.d/sshd restart
# Delete old QoS enabled indicator
rm -f /var/ipfire/qos/enable
diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano
index d31753c..3582f36 100644
--- a/config/rootfiles/packages/nano
+++ b/config/rootfiles/packages/nano
@@ -14,6 +14,7 @@ usr/bin/rnano
#usr/share/man/man5/nanorc.5
#usr/share/nano
usr/share/nano/asm.nanorc
+usr/share/nano/autoconf.nanorc
usr/share/nano/awk.nanorc
usr/share/nano/c.nanorc
#usr/share/nano/changelog.nanorc
@@ -37,6 +38,7 @@ usr/share/nano/man.nanorc
usr/share/nano/mgp.nanorc
usr/share/nano/mutt.nanorc
usr/share/nano/nanorc.nanorc
+usr/share/nano/nftables.nanorc
usr/share/nano/objc.nanorc
usr/share/nano/ocaml.nanorc
usr/share/nano/patch.nanorc
diff --git a/lfs/nano b/lfs/nano
index c08ec88..0d92c6b 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 2.5.0
+VER = 2.5.1
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
-PAK_VER = 7
+PAK_VER = 8
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 751ed96457017572bab15be18cb873ba
+$(DL_FILE)_MD5 = f25c7da9813ae5f1df7e5dd1072de4ce
install : $(TARGET)
diff --git a/lfs/ntp b/lfs/ntp
index 2d04b17..3393f90 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 4.2.8p4
+VER = 4.2.8p5
THISAPP = ntp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6af96862b09324a8ef965ca76b759c8b
+$(DL_FILE)_MD5 = 9f02b2a0acc1617ce2716d529a58d2d8
install : $(TARGET)
@@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ntp-fix-sycing-with-local-clock.patch
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
diff --git a/lfs/openssh b/lfs/openssh
index 0bba1ec..546bc7e 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
include Config
-VER = 7.1p1
+VER = 7.1p2
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8709736bc8a8c253bc4eeb4829888ca5
+$(DL_FILE)_MD5 = 4d8547670e2a220d5ef805ad9e47acf2
install : $(TARGET)
diff --git a/src/patches/ntp-fix-sycing-with-local-clock.patch b/src/patches/ntp-fix-sycing-with-local-clock.patch
deleted file mode 100644
index bdca2e7..0000000
--- a/src/patches/ntp-fix-sycing-with-local-clock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# http://bugs.ntp.org/show_bug.cgi?id=2965
-
-From 6f68f1f0fd764f0006506e3957a5b8116726d443 Mon Sep 17 00:00:00 2001
-From: <burnicki/martin(a)pc-martin4.>
-Date: Mon, 16 Nov 2015 11:59:55 +0100
-Subject: [PATCH] [Bug 2965] Local clock didn't work since 4.2.8p4
-
----
- ntpd/refclock_local.c | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/ntpd/refclock_local.c b/ntpd/refclock_local.c
-index d816c55..8c0f74f 100644
---- a/ntpd/refclock_local.c
-+++ b/ntpd/refclock_local.c
-@@ -205,6 +205,7 @@ local_poll(
- pp->disp = 0;
- pp->jitter = 0;
- #else /* KERNEL_PLL LOCKCLOCK */
-+ pp->leap = LEAP_NOWARNING;
- pp->disp = DISPERSION;
- pp->jitter = 0;
- #endif /* KERNEL_PLL LOCKCLOCK */
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-01-17 18:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-17 18:59 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc9f461f74525fa3f7300a86676634780c884a21 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox