From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 99597de716394f665fa745d4ef3784c5b495d02e
Date: Sun, 02 Jun 2019 22:57:07 +0100 [thread overview]
Message-ID: <20190602215707.92ADA84FDC8@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5234 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 99597de716394f665fa745d4ef3784c5b495d02e (commit)
via f748c79450589fc9046c3be832df1f91b2ac1d27 (commit)
via d2de0a00cefb9f4f84b7ad047fd2e3032b2954fb (commit)
via 7c1bbc9339e33d8b6c1fa7f5a53fd9bfe6c9045a (commit)
from 3608d485567284b52c17754c7f8809ee793db7cc (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 99597de716394f665fa745d4ef3784c5b495d02e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 2 22:52:57 2019 +0100
make.sh: Set default ccache size to 4G
Since we have now one cache for each architecture, we do not
need to make it too large.
The largest build (i586 because of the two kernels) uses around
2.5GB after one build. So 4G will give us some space.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f748c79450589fc9046c3be832df1f91b2ac1d27
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 2 22:49:42 2019 +0100
core133: Ship updated ovpnmain.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d2de0a00cefb9f4f84b7ad047fd2e3032b2954fb
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Sat Jun 1 08:46:14 2019 +0200
ovpnmain.cgi: Fixed line break for LZO option
It is better readable if everything is in one line.
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7c1bbc9339e33d8b6c1fa7f5a53fd9bfe6c9045a
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri May 31 21:54:45 2019 +0200
monit: Update to 5.25.3
For details see:
https://mmonit.com/monit/changes/
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/core/133/filelists/files | 1 +
html/cgi-bin/ovpnmain.cgi | 2 +-
lfs/monit | 8 ++++----
make.sh | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/133/filelists/files b/config/rootfiles/core/133/filelists/files
index de553e5b9..187b1de7f 100644
--- a/config/rootfiles/core/133/filelists/files
+++ b/config/rootfiles/core/133/filelists/files
@@ -1,4 +1,5 @@
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/vulnerabilities.cgi
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index c5eac26a9..439390228 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2736,7 +2736,7 @@ print <<END;
</tr>
<tr>
- <td width='20%'></td> <td width='15%'> </td><td width='20%'> </td><td width='20%'></td><td width='35%'></td>
+ <td width='20%'></td> <td width='15%'> </td><td width='35%'> </td><td width='20%'></td><td width='35%'></td>
</tr>
<tr>
diff --git a/lfs/monit b/lfs/monit
index 66c415f9f..9cdcd2f5f 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
# #
# 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 = 5.23.0
+VER = 5.25.3
THISAPP = monit-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = monit
-PAK_VER = 10
+PAK_VER = 11
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5fbaf7746a233f31ad0aed416ca1d0f9
+$(DL_FILE)_MD5 = 8d91f6e756cca42450ab0815b3086d5b
install : $(TARGET)
diff --git a/make.sh b/make.sh
index f2904df08..72a0b3037 100755
--- a/make.sh
+++ b/make.sh
@@ -903,7 +903,7 @@ update_contributors() {
}
# Default settings
-CCACHE_CACHE_SIZE="8G"
+CCACHE_CACHE_SIZE="4G"
ENABLE_RAMDISK="auto"
# Load configuration file
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-06-02 21:57 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=20190602215707.92ADA84FDC8@people01.i.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