From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core124, updated. 161a5b834a7bdc134996c0d24a642242f42fcc2c
Date: Wed, 26 Sep 2018 13:10:52 +0100 [thread overview]
Message-ID: <20180926121053.1377A1081BD3@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2185 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, core124 has been updated
via 161a5b834a7bdc134996c0d24a642242f42fcc2c (commit)
via 0a5823db023c32135b1cd3fc9c8a426cd1d70b31 (commit)
via 5bf8ff9fcc48008f2d8f4023d07bcb3f158c88ae (commit)
from 46b307324263bdf2e874701c3c5c7afc673f0eb1 (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 161a5b834a7bdc134996c0d24a642242f42fcc2c
Merge: 46b307324 0a5823db0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Sep 26 14:09:57 2018 +0200
Merge remote-tracking branch 'origin/master' into core124
-----------------------------------------------------------------------
Summary of changes:
config/ssh/sshd_config | 2 +-
lfs/nano | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config
index 4a25e8383..60bb0a9e6 100644
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -12,7 +12,7 @@ ListenAddress 0.0.0.0
# limit authentication thresholds
LoginGraceTime 30s
-MaxAuthTries 3
+MaxAuthTries 6
# limit maximum instanctes to prevent DoS
MaxStartups 5
diff --git a/lfs/nano b/lfs/nano
index 9783c2917..671cf6731 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER = 2.9.8
+VER = 3.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 = 23
+PAK_VER = 24
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fd58e87c20abbf029e5c4b153c89232a
+$(DL_FILE)_MD5 = 2fb85e86c5b14ac9e9465d3ba7506364
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-09-26 12: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=20180926121053.1377A1081BD3@git01.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