From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <20180619104200.33F631081BCF@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7234920004774619578==" List-Id: --===============7234920004774619578== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Tue Jun 19 11:34:38 2018 +0100 core123: Ship updated iana-etc =20 Signed-off-by: Michael Tremer commit 319aedce97f16d62e8ceba24f8595f84f5bbab57 Author: Peter M=C3=BCller Date: Mon Jun 18 20:15:14 2018 +0200 iana-etc: update to 2.30 =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit 823c6d270af23019d00ded527120d5391a6ea810 Author: Erik Kapfer Date: Mon Jun 18 19:57:56 2018 +0200 libstatgrab: Update tp 0.91 =20 Signed-off-by: Erik Kapfer Signed-off-by: Michael Tremer commit e3dda65eba58c6d168fcb1c98573a08d8c79703a Author: Erik Kapfer Date: Mon Jun 18 19:16:36 2018 +0200 OpenVPN: Delete 1024 bit DH-parameter from menu =20 Since OpenVPN-2.4.x do not accepts 1024 bit DH-parameter for security con= cerns anymore, it has been removed from the menu. =20 Signed-off-by: Erik Kapfer Signed-off-by: Michael Tremer commit 1feef6be7c3e62be8489be3ee265217bb12c58f8 Author: Michael Tremer Date: Tue Jun 19 11:31:01 2018 +0100 core123: Ship /var/ipfire/backup/exclude =20 Signed-off-by: Michael Tremer commit 291bfda71eb40a20dd4db77bacef84717ad69e82 Author: Erik Kapfer Date: Mon Jun 18 19:05:56 2018 +0200 backup: Exclude OpenVPNs ovpn.cnf from backup =20 This fixes also bug #11773 =20 Signed-off-by: Erik Kapfer Signed-off-by: Michael Tremer commit b1f4acaddec5da3db7317b236fb759f95ff3ebe8 Author: Michael Tremer Date: Tue Jun 19 11:30:26 2018 +0100 core123: Ship updated gnupg =20 Signed-off-by: Michael Tremer commit e4529a9bc0db6882c102047dad9455c07ff74b20 Author: Peter M=C3=BCller Date: Mon Jun 18 18:46:54 2018 +0200 gnupg: update to 1.4.23 =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/backup/exclude | 1 + config/rootfiles/core/123/filelists/files | 1 + .../{oldcore/106 =3D> 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 =3D> 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/cor= e/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/cor= e/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/package= s/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
$Lang::tr{'ovpn dh'}: