From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bc91a66281193d7fca60858e5efed5ec73ad9fe0
Date: Tue, 19 Jun 2018 11:41:59 +0100 [thread overview]
Message-ID: <20180619104200.33F631081BCF@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 16596 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 bc91a66281193d7fca60858e5efed5ec73ad9fe0 (commit)
via 319aedce97f16d62e8ceba24f8595f84f5bbab57 (commit)
via 823c6d270af23019d00ded527120d5391a6ea810 (commit)
via e3dda65eba58c6d168fcb1c98573a08d8c79703a (commit)
via 1feef6be7c3e62be8489be3ee265217bb12c58f8 (commit)
via 291bfda71eb40a20dd4db77bacef84717ad69e82 (commit)
via b1f4acaddec5da3db7317b236fb759f95ff3ebe8 (commit)
via e4529a9bc0db6882c102047dad9455c07ff74b20 (commit)
from beac479f2d1f4ad3e758df2346b6d5f0334458ea (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 bc91a66281193d7fca60858e5efed5ec73ad9fe0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jun 19 11:34:38 2018 +0100
core123: Ship updated iana-etc
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 319aedce97f16d62e8ceba24f8595f84f5bbab57
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon Jun 18 20:15:14 2018 +0200
iana-etc: update to 2.30
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 823c6d270af23019d00ded527120d5391a6ea810
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Mon Jun 18 19:57:56 2018 +0200
libstatgrab: Update tp 0.91
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e3dda65eba58c6d168fcb1c98573a08d8c79703a
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Mon Jun 18 19:16:36 2018 +0200
OpenVPN: Delete 1024 bit DH-parameter from menu
Since OpenVPN-2.4.x do not accepts 1024 bit DH-parameter for security concerns anymore,
it has been removed from the menu.
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1feef6be7c3e62be8489be3ee265217bb12c58f8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jun 19 11:31:01 2018 +0100
core123: Ship /var/ipfire/backup/exclude
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 291bfda71eb40a20dd4db77bacef84717ad69e82
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Mon Jun 18 19:05:56 2018 +0200
backup: Exclude OpenVPNs ovpn.cnf from backup
This fixes also bug #11773
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b1f4acaddec5da3db7317b236fb759f95ff3ebe8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jun 19 11:30:26 2018 +0100
core123: Ship updated gnupg
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e4529a9bc0db6882c102047dad9455c07ff74b20
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon Jun 18 18:46:54 2018 +0200
gnupg: update to 1.4.23
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/exclude | 1 +
config/rootfiles/core/123/filelists/files | 1 +
.../{oldcore/106 => core/123}/filelists/gnupg | 0
config/rootfiles/core/123/filelists/iana-etc | 1 +
config/rootfiles/packages/libstatgrab | 96 +++++++++++++++++++++-
html/cgi-bin/ovpnmain.cgi | 2 -
lfs/gnupg | 4 +-
lfs/iana-etc | 4 +-
lfs/libstatgrab | 28 +++++--
9 files changed, 122 insertions(+), 15 deletions(-)
copy config/rootfiles/{oldcore/106 => core/123}/filelists/gnupg (100%)
create mode 120000 config/rootfiles/core/123/filelists/iana-etc
Difference in files:
diff --git a/config/backup/exclude b/config/backup/exclude
index 6f09a1f9c..7ca9d10b2 100644
--- a/config/backup/exclude
+++ b/config/backup/exclude
@@ -2,6 +2,7 @@
/etc/sysconfig/lm_sensors
/var/ipfire/ethernet/settings
/var/ipfire/firewall/bin/*
+/var/ipfire/ovpn/openssl/*
/var/ipfire/proxy/calamaris/bin/*
/var/ipfire/qos/bin/qos.pl
/var/ipfire/urlfilter/blacklists/*/*.db
diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files
index 2e8d7961f..718af9eda 100644
--- a/config/rootfiles/core/123/filelists/files
+++ b/config/rootfiles/core/123/filelists/files
@@ -3,4 +3,5 @@ etc/issue
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/backup/exclude
var/ipfire/langs
diff --git a/config/rootfiles/core/123/filelists/gnupg b/config/rootfiles/core/123/filelists/gnupg
new file mode 120000
index 000000000..a1a156447
--- /dev/null
+++ b/config/rootfiles/core/123/filelists/gnupg
@@ -0,0 +1 @@
+../../../common/gnupg
\ No newline at end of file
diff --git a/config/rootfiles/core/123/filelists/iana-etc b/config/rootfiles/core/123/filelists/iana-etc
new file mode 120000
index 000000000..1f3d54dbd
--- /dev/null
+++ b/config/rootfiles/core/123/filelists/iana-etc
@@ -0,0 +1 @@
+../../../common/iana-etc
\ No newline at end of file
diff --git a/config/rootfiles/packages/libstatgrab b/config/rootfiles/packages/libstatgrab
index 2c6141163..cebfb4afe 100644
--- a/config/rootfiles/packages/libstatgrab
+++ b/config/rootfiles/packages/libstatgrab
@@ -3,33 +3,123 @@ usr/bin/statgrab
#usr/bin/statgrab-make-mrtg-config
#usr/bin/statgrab-make-mrtg-index
#usr/include/statgrab.h
-#usr/include/statgrab_deprecated.h
#usr/lib/libstatgrab.a
#usr/lib/libstatgrab.la
#usr/lib/libstatgrab.so
-usr/lib/libstatgrab.so.6
-usr/lib/libstatgrab.so.6.2.3
+usr/lib/libstatgrab.so.10
+usr/lib/libstatgrab.so.10.0.0
#usr/lib/pkgconfig/libstatgrab.pc
+#usr/share/doc/libstatgrab
+#usr/share/doc/libstatgrab/AUTHORS
+#usr/share/doc/libstatgrab/COPYING
+#usr/share/doc/libstatgrab/COPYING.LGPL
+#usr/share/doc/libstatgrab/NEWS
+#usr/share/doc/libstatgrab/PLATFORMS
+#usr/share/doc/libstatgrab/README
#usr/share/man/man1/saidar.1
#usr/share/man/man1/statgrab-make-mrtg-config.1
#usr/share/man/man1/statgrab-make-mrtg-index.1
#usr/share/man/man1/statgrab.1
+#usr/share/man/man3/libstatgrab.3
+#usr/share/man/man3/sg_clear_error.3
+#usr/share/man/man3/sg_comp_destroy.3
+#usr/share/man/man3/sg_comp_get_tls.3
+#usr/share/man/man3/sg_comp_init.3
+#usr/share/man/man3/sg_disk_io_compare_name.3
+#usr/share/man/man3/sg_disk_io_compare_traffic.3
+#usr/share/man/man3/sg_drop_privileges.3
+#usr/share/man/man3/sg_free_cpu_stats.3
+#usr/share/man/man3/sg_free_disk_io_stats.3
+#usr/share/man/man3/sg_free_fs_stats.3
+#usr/share/man/man3/sg_free_host_info.3
+#usr/share/man/man3/sg_free_load_stats.3
+#usr/share/man/man3/sg_free_mem_stats.3
+#usr/share/man/man3/sg_free_network_iface_stats.3
+#usr/share/man/man3/sg_free_network_io_stats.3
+#usr/share/man/man3/sg_free_page_stats.3
+#usr/share/man/man3/sg_free_process_count.3
+#usr/share/man/man3/sg_free_stats_buf.3
+#usr/share/man/man3/sg_free_swap_stats.3
+#usr/share/man/man3/sg_free_user_stats.3
+#usr/share/man/man3/sg_fs_compare_device_name.3
+#usr/share/man/man3/sg_fs_compare_mnt_point.3
#usr/share/man/man3/sg_get_cpu_percents.3
+#usr/share/man/man3/sg_get_cpu_percents_of.3
+#usr/share/man/man3/sg_get_cpu_percents_r.3
#usr/share/man/man3/sg_get_cpu_stats.3
#usr/share/man/man3/sg_get_cpu_stats_diff.3
+#usr/share/man/man3/sg_get_cpu_stats_diff_between.3
+#usr/share/man/man3/sg_get_cpu_stats_r.3
#usr/share/man/man3/sg_get_disk_io_stats.3
#usr/share/man/man3/sg_get_disk_io_stats_diff.3
+#usr/share/man/man3/sg_get_disk_io_stats_diff_between.3
+#usr/share/man/man3/sg_get_disk_io_stats_r.3
+#usr/share/man/man3/sg_get_error.3
+#usr/share/man/man3/sg_get_error_arg.3
+#usr/share/man/man3/sg_get_error_details.3
+#usr/share/man/man3/sg_get_error_errno.3
#usr/share/man/man3/sg_get_fs_stats.3
+#usr/share/man/man3/sg_get_fs_stats_diff.3
+#usr/share/man/man3/sg_get_fs_stats_diff_between.3
+#usr/share/man/man3/sg_get_fs_stats_r.3
#usr/share/man/man3/sg_get_host_info.3
+#usr/share/man/man3/sg_get_host_info_r.3
#usr/share/man/man3/sg_get_load_stats.3
+#usr/share/man/man3/sg_get_load_stats_r.3
#usr/share/man/man3/sg_get_mem_stats.3
+#usr/share/man/man3/sg_get_mem_stats_r.3
+#usr/share/man/man3/sg_get_nelements.3
#usr/share/man/man3/sg_get_network_iface_stats.3
+#usr/share/man/man3/sg_get_network_iface_stats_r.3
#usr/share/man/man3/sg_get_network_io_stats.3
#usr/share/man/man3/sg_get_network_io_stats_diff.3
+#usr/share/man/man3/sg_get_network_io_stats_diff_between.3
+#usr/share/man/man3/sg_get_network_io_stats_r.3
#usr/share/man/man3/sg_get_page_stats.3
#usr/share/man/man3/sg_get_page_stats_diff.3
+#usr/share/man/man3/sg_get_page_stats_diff_between.3
+#usr/share/man/man3/sg_get_page_stats_r.3
#usr/share/man/man3/sg_get_process_count.3
+#usr/share/man/man3/sg_get_process_count_of.3
+#usr/share/man/man3/sg_get_process_count_r.3
#usr/share/man/man3/sg_get_process_stats.3
+#usr/share/man/man3/sg_get_process_stats_r.3
#usr/share/man/man3/sg_get_swap_stats.3
+#usr/share/man/man3/sg_get_swap_stats_r.3
#usr/share/man/man3/sg_get_user_stats.3
+#usr/share/man/man3/sg_get_user_stats_r.3
+#usr/share/man/man3/sg_get_valid_filesystems.3
+#usr/share/man/man3/sg_global_lock.3
+#usr/share/man/man3/sg_global_unlock.3
+#usr/share/man/man3/sg_init.3
+#usr/share/man/man3/sg_internal-intro.3
+#usr/share/man/man3/sg_intro.3
+#usr/share/man/man3/sg_lock_mutex.3
+#usr/share/man/man3/sg_network_iface_compare_name.3
+#usr/share/man/man3/sg_network_io_compare_name.3
+#usr/share/man/man3/sg_process_compare_cpu.3
+#usr/share/man/man3/sg_process_compare_gid.3
+#usr/share/man/man3/sg_process_compare_name.3
+#usr/share/man/man3/sg_process_compare_pid.3
+#usr/share/man/man3/sg_process_compare_res.3
+#usr/share/man/man3/sg_process_compare_size.3
+#usr/share/man/man3/sg_process_compare_time.3
+#usr/share/man/man3/sg_process_compare_uid.3
+#usr/share/man/man3/sg_prove_vector.3
+#usr/share/man/man3/sg_set_error.3
+#usr/share/man/man3/sg_set_error_with_errno.3
+#usr/share/man/man3/sg_set_error_with_errno_code.3
+#usr/share/man/man3/sg_set_valid_filesystems.3
+#usr/share/man/man3/sg_shutdown.3
+#usr/share/man/man3/sg_snapshot.3
+#usr/share/man/man3/sg_str_error.3
+#usr/share/man/man3/sg_strperror.3
+#usr/share/man/man3/sg_unlock_mutex.3
+#usr/share/man/man3/sg_vector_clear.3
+#usr/share/man/man3/sg_vector_clone.3
+#usr/share/man/man3/sg_vector_clone_into.3
+#usr/share/man/man3/sg_vector_compute_diff.3
+#usr/share/man/man3/sg_vector_create.3
+#usr/share/man/man3/sg_vector_free.3
+#usr/share/man/man3/sg_vector_resize.3
#usr/share/man/man3/statgrab.3
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 0bc28cefe..4bc3473ab 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1291,7 +1291,6 @@ END
<form method='post'><input type='hidden' name='AREUSURE' value='yes' />
<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
<select name='DHLENGHT'>
- <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'} ($Lang::tr{'vpn weak'})</option>
<option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option>
<option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option>
<option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option>
@@ -1973,7 +1972,6 @@ END
</select></td>
<tr><td class='base'>$Lang::tr{'ovpn dh'}:</td>
<td class='base'><select name='DHLENGHT'>
- <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'} ($Lang::tr{'vpn weak'})</option>
<option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option>
<option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option>
<option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option>
diff --git a/lfs/gnupg b/lfs/gnupg
index f131d2b08..fc6583110 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -24,7 +24,7 @@
include Config
-VER = 1.4.22
+VER = 1.4.23
THISAPP = gnupg-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 082bda3951a94743e76b83fcf3627547
+$(DL_FILE)_MD5 = b1df02c73572f27bc859ac05ff2259ab
install : $(TARGET)
diff --git a/lfs/iana-etc b/lfs/iana-etc
index 6bcbf3438..2708b1b0d 100644
--- a/lfs/iana-etc
+++ b/lfs/iana-etc
@@ -24,7 +24,7 @@
include Config
-VER = 2.10
+VER = 2.30
THISAPP = iana-etc-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 53dea53262b281322143c744ca60ffbb
+$(DL_FILE)_MD5 = 3ba3afb1d1b261383d247f46cb135ee8
install : $(TARGET)
diff --git a/lfs/libstatgrab b/lfs/libstatgrab
index 2e673eeb1..8e62b4149 100644
--- a/lfs/libstatgrab
+++ b/lfs/libstatgrab
@@ -1,6 +1,21 @@
###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2018 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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
###############################################################################
###############################################################################
@@ -9,7 +24,7 @@
include Config
-VER = 0.17
+VER = 0.91
THISAPP = libstatgrab-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -17,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libstatgrab
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -29,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 58385c9392898be3b09ffc5e3ebe8717
+$(DL_FILE)_MD5 = b906d312076ca9be3d5188edfe07f496
install : $(TARGET)
@@ -62,9 +77,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure --prefix=/usr
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-06-19 10:41 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=20180619104200.33F631081BCF@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