Development September 2016

development@lists.ipfire.org

11 participants
97 discussions

[PATCH] intltool: Enable testsuite.
by Stefan Schantl 12 Jan '17

12 Jan '17

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- intltool/intltool.nm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/intltool/intltool.nm b/intltool/intltool.nm index 1f0311c..a217ea3 100644 --- a/intltool/intltool.nm +++ b/intltool/intltool.nm @@ -5,7 +5,7 @@ name = intltool version = 0.51.0 -release = 1 +release = 2 arch = noarch groups = Localization/Tools @@ -29,7 +29,18 @@ build end configure_options += \ - --mandir=/usr/share/man + --mandir=%{mandir} + + test + if ! make check; then + find . -type f -name 'test-suite.log' | while read trs; do + echo "BEGIN " ${trs}; cat ${trs} 1>&2; + done + + echo "Exiting abnormally due to make check failure above" 1>&2 + exit 1 + fi + end end packages -- 2.7.4

2 3

OpenVPN/IPsec - Sweet32: Birthday attacks
by ummeegge 12 Nov '16

12 Nov '16

Hi all, i wanted to report a cross-site scripting vulnerability problem for OpenVPN and possibly also IPSec via the "SWEET32: Birthday attacks on 64-bit block ciphers which concerns the DES cipher incl. the 3DES variants but also the Blowfish cipher. The only way to fix it which i have currently recognized is to use other ciphers then those and another way for a faster implementation for OpenVPN is to renegotiate new keys more often. An example can be to use '--reneg-bytes 64000' in the configuration. So my question is should we delete those ciphers from the OpenVPN/IPsec cipher lists and announce this problem to the community may via the Planet (have announced it already in the IPFire forum for OpenVPN) ? Some deeper insides causing this problem can be found in here: - https://sweet32.info/ - https://community.openvpn.net/openvpn/wiki/SWEET32 Greetings, Erik

4 13

[PATCH 1/2] ddns: Import patch for schokokeks.org support.
by Stefan Schantl 28 Oct '16

28 Oct '16

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ddns | 2 + .../ddns-0001-New-provider-Schokokeks.org.patch | 47 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 src/patches/ddns-0001-New-provider-Schokokeks.org.patch diff --git a/lfs/ddns b/lfs/ddns index 422f8e3..90c70c6 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -71,6 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-0001-New-provider-Schokokeks.org.patch + cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/src/patches/ddns-0001-New-provider-Schokokeks.org.patch b/src/patches/ddns-0001-New-provider-Schokokeks.org.patch new file mode 100644 index 0000000..be123a5 --- /dev/null +++ b/src/patches/ddns-0001-New-provider-Schokokeks.org.patch @@ -0,0 +1,47 @@ +From 521c9d90f4e879ef3d9e1590f29e27990011ae46 Mon Sep 17 00:00:00 2001 +From: Steffen Peters <sauron99(a)gmx.de> +Date: Mon, 4 Jul 2016 22:14:10 +0200 +Subject: [PATCH 185/185] New provider: Schokokeks.org + +Signed-off-by: Steffen Peters <sauron99(a)gmx.de> +Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> +--- + README | 1 + + src/ddns/providers.py | 12 ++++++++++++ + 2 files changed, 13 insertions(+) + +diff --git a/README b/README +index d8027a4..cedbf21 100644 +--- a/README ++++ b/README +@@ -75,6 +75,7 @@ SUPPORTED PROVIDERS: + opendns.com + ovh.com + regfish.com ++ schokokeks.org + selfhost.de + spdns.org + strato.com +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index 6b25cb6..c482dad 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -1687,3 +1687,15 @@ class DDNSProviderZZZZ(DDNSProvider): + + # If we got here, some other update error happened. + raise DDNSUpdateError ++ ++class DDNSProviderSchokokeksDNS(DDNSProtocolDynDNS2, DDNSProvider): ++ handle = "schokokeks.org" ++ name = "Schokokeks" ++ website = "http://www.schokokeks.org/" ++ protocols = ("ipv4",) ++ ++ # Information about the format of the request is to be found ++ # https://wiki.schokokeks.org/DynDNS ++ ++ url = "https://dyndns.schokokeks.org/nic/update?myip=<ipaddr>" ++ +-- +2.7.4 + -- 2.7.4

2 4

[PATCH 0/3] Update image libaries (libjpeg, libtiff, libpng)
by Marcel Lorenz 06 Oct '16

06 Oct '16

The next 3 patches update the image libaries to the last versions with many security fixes. They are necessary for apache 2.4.x update and other software (netpbm) Please merge this patches first. Marcel Lorenz (3): libjpeg: update to 1.4.2 libtiff: update to 4.0.6 libpng: update to 1.2.56 config/rootfiles/common/libjpeg | 19 +- config/rootfiles/common/libjpeg-compat | 33 ++++ config/rootfiles/common/libpng | 13 +- config/rootfiles/packages/libtiff | 310 ++++++++++++++++++--------------- lfs/libjpeg | 14 +- lfs/libjpeg-compat | 80 +++++++++ lfs/libpng | 11 +- lfs/libtiff | 13 +- make.sh | 1 + 9 files changed, 313 insertions(+), 181 deletions(-) create mode 100644 config/rootfiles/common/libjpeg-compat create mode 100644 lfs/libjpeg-compat -- 1.9.1

3 9

[PATCH] systemd: Update to 231.
by Stefan Schantl 04 Oct '16

04 Oct '16

This is an major update to the latest stable version of systemd. Enable testsuite during buildtime. Fixes #10962. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- .../patches/systemd-231-ipfire-disable-tests.patch | 58 ++++++++++++++++++++++ systemd/systemd.nm | 32 ++++++++++-- 2 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 systemd/patches/systemd-231-ipfire-disable-tests.patch diff --git a/systemd/patches/systemd-231-ipfire-disable-tests.patch b/systemd/patches/systemd-231-ipfire-disable-tests.patch new file mode 100644 index 0000000..cd4bbe9 --- /dev/null +++ b/systemd/patches/systemd-231-ipfire-disable-tests.patch @@ -0,0 +1,58 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2016-07-25 21:49:47.000000000 +0200 ++++ b/Makefile.am 2016-09-23 08:34:47.924257243 +0200 +@@ -1480,9 +1480,7 @@ + test-job-type \ + test-env-util \ + test-strbuf \ +- test-strv \ + test-path \ +- test-path-util \ + test-strxcpyx \ + test-siphash24 \ + test-unit-name \ +@@ -1541,7 +1539,6 @@ + test-capability \ + test-async \ + test-ratelimit \ +- test-condition \ + test-uid-range \ + test-locale-util \ + test-execute \ +@@ -3586,11 +3583,9 @@ + + tests += \ + test-dhcp-option \ +- test-dhcp-client \ + test-dhcp-server \ + test-ipv4ll \ + test-ndisc-rs \ +- test-dhcp6-client \ + test-lldp + + # ------------------------------------------------------------------------------ +@@ -4298,16 +4293,11 @@ + catalog-remove-hook + + tests += \ +- test-journal \ + test-journal-enum \ + test-journal-send \ + test-journal-syslog \ + test-journal-match \ +- test-journal-stream \ + test-journal-init \ +- test-journal-verify \ +- test-journal-interleaving \ +- test-journal-flush \ + test-mmap-cache \ + test-catalog \ + test-audit-type +@@ -6518,7 +6508,6 @@ + test-libudev-sym.c + + tests += \ +- test-libsystemd-sym \ + test-libudev-sym + + .PHONY: cppcheck diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 585916b..6d25ed2 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ############################################################################### name = systemd -version = 221 -release = 5 +version = 231 +release = 1 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -18,13 +18,20 @@ description SysV and LSB init scripts. end -source_dl = http://www.freedesktop.org/software/systemd/ -sources = %{thisapp}.tar.xz +source_dl = https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/ build unitdir = %{prefix}/lib/systemd/system requires + # Testsuite + /usr/bin/getfacl + /usr/bin/mount + /usr/bin/tree + /usr/bin/umount + + autoconf + automake attr-devel audit-devel cryptsetup-luks-devel >= 1.4.2 @@ -37,7 +44,7 @@ build gobject-introspection-devel >= 1.31 gperf hwdata - intltool + intltool >= 0.51.0 kmod-devel >= 15 libacl-devel libblkid-devel @@ -45,6 +52,7 @@ build libgcrypt-devel libmount-devel libselinux-devel + libtool libuuid-devel m4 pam-devel @@ -82,6 +90,20 @@ build prepare_cmds %{create_groups} + + ./autogen.sh + end + + test + # Create symlink so the testsuite will be able to find the shared lib. + ln -sv %{DIR_APP}/.libs/libsystemd-shared.so \ + %{libdir}/libsystemd-shared-%{version}.so + + # Create dummy machine-id file, which is required for some tests. + touch %{sysconfdir}/machine-id + + # Run the testsuite. + make check end install_cmds -- 2.7.4

2 2

[PATCH v2] grub: update 2.02~beta3
by Marcel Lorenz 30 Sep '16

30 Sep '16

This patch updates grub to 2.02~beta3 The 2.00 patches are removed. The CVE fix in included and the vga fallback patch was rejected from patch tool. Greetings, Marcel Lorenz

1 1

[PATCH v2] 7zip: update to 16.02
by Marcel Lorenz 30 Sep '16

30 Sep '16

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/packages/7zip | 213 +++++++++++++------------- lfs/7zip | 11 +- src/patches/p7zip/CVE-2016-2334.patch | 24 --- src/patches/p7zip/CVE-2016-2335.patch | 17 -- src/patches/p7zip_change_install_folder.patch | 10 ++ 5 files changed, 122 insertions(+), 153 deletions(-) delete mode 100644 src/patches/p7zip/CVE-2016-2334.patch delete mode 100644 src/patches/p7zip/CVE-2016-2335.patch create mode 100644 src/patches/p7zip_change_install_folder.patch diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index d3a5c38..d8f4630 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -1,106 +1,107 @@ -usr/local/bin/7z -usr/local/lib/p7zip -#usr/local/lib/p7zip/7z -#usr/local/lib/p7zip/7z.so -#usr/local/lib/p7zip/Codecs -usr/local/lib/p7zip/Codecs/Rar.so -#usr/local/man/man1/7z.1 -#usr/local/man/man1/7za.1 -#usr/local/man/man1/7zr.1 -#usr/local/share/doc/p7zip -#usr/local/share/doc/p7zip/ChangeLog -#usr/local/share/doc/p7zip/DOC -#usr/local/share/doc/p7zip/DOC/7zC.txt -#usr/local/share/doc/p7zip/DOC/7zFormat.txt -#usr/local/share/doc/p7zip/DOC/License.txt -#usr/local/share/doc/p7zip/DOC/MANUAL -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/index.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/list.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/rename.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/style.css -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/test.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/update.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/exit_codes.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/index.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/style.css -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bb.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bs.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/include.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/index.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/large_pages.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/list_tech.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/output_dir.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/overwrite.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/password.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/recurse.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sa.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scc.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sfx.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/shared.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sni.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sns.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/spf.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ssc.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdin.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stx.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/volume.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/working_dir.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/yes.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/syntax.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/about.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/benchmark.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/index.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/menu.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/options.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/index.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/style.css -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/style.css -#usr/local/share/doc/p7zip/DOC/MANUAL/general -#usr/local/share/doc/p7zip/DOC/MANUAL/general/7z.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/general/faq.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/general/formats.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/general/index.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/general/license.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/general/performance.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/general/style.css -#usr/local/share/doc/p7zip/DOC/MANUAL/general/thanks.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/start.htm -#usr/local/share/doc/p7zip/DOC/MANUAL/style.css -#usr/local/share/doc/p7zip/DOC/Methods.txt -#usr/local/share/doc/p7zip/DOC/copying.txt -#usr/local/share/doc/p7zip/DOC/lzma.txt -#usr/local/share/doc/p7zip/DOC/readme.txt -#usr/local/share/doc/p7zip/DOC/src-history.txt -#usr/local/share/doc/p7zip/DOC/unRarLicense.txt -#usr/local/share/doc/p7zip/README +usr/bin/7z +usr/lib/p7zip +#usr/lib/p7zip/7z +#usr/lib/p7zip/7z.so +#usr/lib/p7zip/Codecs +usr/lib/p7zip/Codecs/Rar.so +#usr/man/man1/7z.1 +#usr/man/man1/7za.1 +#usr/man/man1/7zr.1 +#usr/share/doc/p7zip +#usr/share/doc/p7zip/ChangeLog +#usr/share/doc/p7zip/DOC +#usr/share/doc/p7zip/DOC/7zC.txt +#usr/share/doc/p7zip/DOC/7zFormat.txt +#usr/share/doc/p7zip/DOC/License.txt +#usr/share/doc/p7zip/DOC/MANUAL +#usr/share/doc/p7zip/DOC/MANUAL/cmdline +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/index.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/list.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/rename.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/style.css +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/test.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/update.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/exit_codes.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/index.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/style.css +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bb.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bs.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/include.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/index.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/large_pages.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/list_tech.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/output_dir.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/overwrite.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/password.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/recurse.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sa.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scc.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sfx.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/shared.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sni.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sns.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/spf.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ssc.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdin.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stx.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/volume.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/working_dir.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/yes.htm +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/syntax.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm +#usr/share/doc/p7zip/DOC/MANUAL/fm/about.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/benchmark.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/index.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/menu.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/options.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/index.htm +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/style.css +#usr/share/doc/p7zip/DOC/MANUAL/fm/style.css +#usr/share/doc/p7zip/DOC/MANUAL/general +#usr/share/doc/p7zip/DOC/MANUAL/general/7z.htm +#usr/share/doc/p7zip/DOC/MANUAL/general/faq.htm +#usr/share/doc/p7zip/DOC/MANUAL/general/formats.htm +#usr/share/doc/p7zip/DOC/MANUAL/general/index.htm +#usr/share/doc/p7zip/DOC/MANUAL/general/license.htm +#usr/share/doc/p7zip/DOC/MANUAL/general/performance.htm +#usr/share/doc/p7zip/DOC/MANUAL/general/style.css +#usr/share/doc/p7zip/DOC/MANUAL/general/thanks.htm +#usr/share/doc/p7zip/DOC/MANUAL/start.htm +#usr/share/doc/p7zip/DOC/MANUAL/style.css +#usr/share/doc/p7zip/DOC/Methods.txt +#usr/share/doc/p7zip/DOC/copying.txt +#usr/share/doc/p7zip/DOC/lzma.txt +#usr/share/doc/p7zip/DOC/readme.txt +#usr/share/doc/p7zip/DOC/src-history.txt +#usr/share/doc/p7zip/DOC/unRarLicense.txt +#usr/share/doc/p7zip/README + diff --git a/lfs/7zip b/lfs/7zip index 847f89f..fbf63b3 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 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 = 15.14.1 +VER = 16.02 THISAPP = p7zip_$(VER) DL_FILE = $(THISAPP)_src_all.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 6 +PAK_VER = 7 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 92cca093312b5a71a7be7dc7d1d32509 +$(DL_FILE)_MD5 = a0128d661cfe7cc8c121e73519c54fbf install : $(TARGET) @@ -77,8 +77,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) patch -Np1 < $(DIR_SRC)/src/patches/p7zip/CVE-2016-2334.patch - cd $(DIR_APP) patch -Np1 < $(DIR_SRC)/src/patches/p7zip/CVE-2016-2335.patch + cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip_change_install_folder.patch cd $(DIR_APP) && make 7z $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/p7zip/CVE-2016-2334.patch b/src/patches/p7zip/CVE-2016-2334.patch deleted file mode 100644 index 1eb5163..0000000 --- a/src/patches/p7zip/CVE-2016-2334.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp -=================================================================== ---- p7zip_15.14.1.orig/CPP/7zip/Archive/HfsHandler.cpp -+++ p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp -@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo - item.GroupID = Get32(r + 0x24); - item.AdminFlags = r[0x28]; - item.OwnerFlags = r[0x29]; -+ */ - item.FileMode = Get16(r + 0x2A); -+ /* - item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount - item.FileType = Get32(r + 0x30); - item.FileCreator = Get32(r + 0x34); -@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile( - - UInt32 size = GetUi32(tableBuf + i * 8 + 4); - -+ if (size > buf.Size() || size > kCompressionBlockSize + 1) -+ return S_FALSE; -+ - RINOK(ReadStream_FALSE(inStream, buf, size)); - - if ((buf[0] & 0xF) == 0xF) diff --git a/src/patches/p7zip/CVE-2016-2335.patch b/src/patches/p7zip/CVE-2016-2335.patch deleted file mode 100644 index a00d6a3..0000000 --- a/src/patches/p7zip/CVE-2016-2335.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp -=================================================================== ---- p7zip_15.14.1.orig/CPP/7zip/Archive/Udf/UdfIn.cpp -+++ p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp -@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol - return S_FALSE; - CFile &file = Files.Back(); - const CLogVol &vol = LogVols[volIndex]; -- CPartition &partition = Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex]; -+ unsigned partitionRef = lad.Location.PartitionRef; -+ -+ if (partitionRef >= vol.PartitionMaps.Size()) -+ return S_FALSE; -+ CPartition &partition = Partitions[vol.PartitionMaps[partitionRef].PartitionIndex]; - - UInt32 key = lad.Location.Pos; - UInt32 value; diff --git a/src/patches/p7zip_change_install_folder.patch b/src/patches/p7zip_change_install_folder.patch new file mode 100644 index 0000000..4a83343 --- /dev/null +++ b/src/patches/p7zip_change_install_folder.patch @@ -0,0 +1,10 @@ +--- p7zip_15.14.1/makefile.common ++++ p7zip_15.14.1/makefile.common +@@ -1,6 +1,6 @@ + MKDIR = mkdir -p + +-DEST_HOME=/usr/local ++DEST_HOME=/usr + DEST_BIN=$(DEST_HOME)/bin + DEST_SHARE=$(DEST_HOME)/lib/p7zip + DEST_SHARE_DOC=$(DEST_HOME)/share/doc/p7zip -- 2.9.3

1 0

[PATCH] perl-Net-SSLeay: Update to 1.78.
by Stefan Schantl 30 Sep '16

30 Sep '16

This is an update to the latest stable version. Add dependencies information to cover perl ABI version and missing perl dependencies. Fixes #11175. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Tested-by: Alexander Marx <alexander.marx(a)ipfire.org> --- perl-Net-SSLeay/perl-Net-SSLeay.nm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/perl-Net-SSLeay/perl-Net-SSLeay.nm b/perl-Net-SSLeay/perl-Net-SSLeay.nm index 5a6e166..8485c2d 100644 --- a/perl-Net-SSLeay/perl-Net-SSLeay.nm +++ b/perl-Net-SSLeay/perl-Net-SSLeay.nm @@ -4,7 +4,7 @@ ############################################################################### name = perl-Net-SSLeay -version = 1.69 +version = 1.78 release = 1 thisapp = Net-SSLeay-%{version} @@ -40,6 +40,12 @@ end packages package %{name} + requires + perl(:MODULE_COMPAT_%{perl_version}) + perl(MIME::Base64) + perl(XSLoader) + end + end package %{name}-debuginfo template DEBUGINFO -- 2.5.5

1 1

[PATCH] guardian 2.0: suggested cosmetic changes
by Matthias Fischer 30 Sep '16

30 Sep '16

I did the following: - Rearranged the fields on 'guardian.cgi' a bit - in a (hopefully) logical manner, so that they don't need so much room. - Added some translation-strings and explanations to (revised) 'guardian.cgi'. - Added missing language string(s), deleted obsolete. - Deleted all guardian entries from standard language files in '/var/ipfire/langs'-directory. - Added (upgraded) addon-specific language files to '/var/ipfire/addon-lang'-directory. I hope, I didn't forget something... Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/guardian/guardian.de.pl | 45 ++++++++++++++++++++++++ config/guardian/guardian.en.pl | 45 ++++++++++++++++++++++++ config/guardian/guardian.es.pl | 23 ++++++++++++ config/guardian/guardian.fr.pl | 23 ++++++++++++ config/guardian/guardian.it.pl | 24 +++++++++++++ config/guardian/guardian.nl.pl | 23 ++++++++++++ config/guardian/guardian.pl.pl | 23 ++++++++++++ config/guardian/guardian.ru.pl | 24 +++++++++++++ config/guardian/guardian.tr.pl | 24 +++++++++++++ html/cgi-bin/guardian.cgi | 80 +++++++++++++++++++++++------------------- langs/de/cgi-bin/de.pl | 24 ------------- langs/en/cgi-bin/en.pl | 26 -------------- langs/es/cgi-bin/es.pl | 6 ---- langs/fr/cgi-bin/fr.pl | 6 ---- langs/it/cgi-bin/it.pl | 7 ---- langs/nl/cgi-bin/nl.pl | 6 ---- langs/pl/cgi-bin/pl.pl | 6 ---- langs/ru/cgi-bin/ru.pl | 6 ---- langs/tr/cgi-bin/tr.pl | 6 ---- lfs/guardian | 9 +++-- 20 files changed, 304 insertions(+), 132 deletions(-) create mode 100644 config/guardian/guardian.de.pl create mode 100644 config/guardian/guardian.en.pl create mode 100644 config/guardian/guardian.es.pl create mode 100644 config/guardian/guardian.fr.pl create mode 100644 config/guardian/guardian.it.pl create mode 100644 config/guardian/guardian.nl.pl create mode 100644 config/guardian/guardian.pl.pl create mode 100644 config/guardian/guardian.ru.pl create mode 100644 config/guardian/guardian.tr.pl diff --git a/config/guardian/guardian.de.pl b/config/guardian/guardian.de.pl new file mode 100644 index 0000000..344d045 --- /dev/null +++ b/config/guardian/guardian.de.pl @@ -0,0 +1,45 @@ +%tr = ( +%tr, + +'guardian' => 'Guardian', +'guardian block a host' => 'Host blocken', +'guardian block httpd brute-force' => 'httpd-Brute-Force-Erkennung', +'guardian block owncloud brute-force' => 'Owncloud-Brute-Force-Erkennung', +'guardian block ssh brute-force' => 'SSH-Brute-Force-Erkennung', +'guardian blockcount' => 'Trefferschwelle (Snort)', +'guardian blocked hosts' => 'Aktuell geblockte Hosts', +'guardian blocking of this address is not allowed' => 'Diese Addresse darf nicht geblockt werden.', +'guardian blocktime' => 'Blockzeit (Sekunden)', +'guardian common settings' => 'Allgemeine Einstellungen', +'guardian configuration' => 'Guardian-Konfiguration', +'guardian daemon' => 'Daemon', +'guardian empty input' => 'Fehlende Angabe: Bitte geben Sie einen gültigen Host oder ein gültiges Netzwerk an.', +'guardian enabled' => 'Guardian aktivieren', +'guardian firewallaction' => 'Firewall-Aktion', +'guardian ignored hosts' => 'Ignorierte Hosts', +'guardian invalid address or subnet' => 'Ungültige Host-Addresse oder Netzwerk.', +'guardian invalid blockcount' => 'Ungültige Anzahl: Bitte verwenden Sie eine natürliche Zahl größer als Null.', +'guardian invalid blocktime' => 'Ungültige Blockzeit: Bitte verwenden Sie eine natürliche Zahl größer als Null.', +'guardian invalid logfile' => 'Der angegebene Pfad zum "Ignore file" ist ungültig.', +'guardian logfacility' => 'Logziel', +'guardian logfile' => 'Logdatei', +'guardian loglevel' => 'Loglevel', +'guardian loglevel_off' => 'Aus', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'Datei', +'guardian logtarget_console' => 'Konsole', +'guardian no entries' => 'Keine Einträge vorhanden.', +'guardian not running no hosts can be blocked' => 'Guardian läuft nicht. Es werden keine Hosts geblockt.', +'guardian priolevel_high' => '1 - Hoch', +'guardian priolevel_medium' => '2 - Mittel', +'guardian priolevel_low' => '3 - Niedrig', +'guardian priolevel_very_low' => '4 - Sehr niedrig', +'guardian priority level' => 'Prioritätslevel (Snort)', +'guardian service' => 'Guardian-Dienst', +'guardian watch snort alertfile' => 'Snort-Alarme auswerten', + +); + +#EOF diff --git a/config/guardian/guardian.en.pl b/config/guardian/guardian.en.pl new file mode 100644 index 0000000..f6be865 --- /dev/null +++ b/config/guardian/guardian.en.pl @@ -0,0 +1,45 @@ +%tr = ( +%tr, + +'guardian' => 'Guardian', +'guardian block a host' => 'Block host', +'guardian block httpd brute-force' => 'httpd Brute Force Detection', +'guardian block owncloud brute-force' => 'Owncloud Brute Force detection', +'guardian block ssh brute-force' => 'SSH Brute Force Detection', +'guardian blockcount' => 'Strike Threshold (Snort)', +'guardian blocked hosts' => 'Currently blocked hosts', +'guardian blocking of this address is not allowed' => 'Blocking of the given address is not allowed.', +'guardian blocktime' => 'Block Time (seconds)', +'guardian common settings' => 'Common Settings', +'guardian configuration' => 'Guardian Configuration', +'guardian daemon' => 'Daemon', +'guardian empty input' => 'Empty input: Please enter a valid host address or subnet.', +'guardian enabled' => 'Enable Guardian', +'guardian firewallaction' => 'Firewall Action', +'guardian ignored hosts' => 'Ignored Hosts', +'guardian invalid address or subnet' => 'Invalid host address or subnet.', +'guardian invalid blockcount' => 'Invalid BlockCount: Please provide a natural number higher than zero.', +'guardian invalid blocktime' => 'Invalid BlockTime: Please provide a natural number higher than zero.', +'guardian invalid logfile' => 'The provided path for the logfile is not valid.', +'guardian logfacility' => 'Log Facility', +'guardian logfile' => 'Log File', +'guardian loglevel' => 'Log Level', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian no entries' => 'No entries at the moment.', +'guardian not running no hosts can be blocked' => 'Guardian is not running. No hosts will be blocked.', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian priority level' => 'Priority Level (Snort)', +'guardian service' => 'Guardian Service', +'guardian watch snort alertfile' => 'Monitor Snort Alert File', + +); + +#EOF diff --git a/config/guardian/guardian.es.pl b/config/guardian/guardian.es.pl new file mode 100644 index 0000000..89ffb52 --- /dev/null +++ b/config/guardian/guardian.es.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Archivo de alerta', +'guardian configuration' => 'Configuración de Guardian', +'guardian ignorefile' => 'Archivo Ignorefile', +'guardian interface' => 'Interfaz', +'guardian logfile' => 'Archivo de registro', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Límite de tiempo', + +); + +#EOF diff --git a/config/guardian/guardian.fr.pl b/config/guardian/guardian.fr.pl new file mode 100644 index 0000000..82e5736 --- /dev/null +++ b/config/guardian/guardian.fr.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Fichier d\'alerte', +'guardian configuration' => 'Configuration du gardien', +'guardian ignorefile' => 'Fichier d\'ignorés', +'guardian interface' => 'Interface', +'guardian logfile' => 'Fichier log', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Délai maximum', + +); + +#EOF diff --git a/config/guardian/guardian.it.pl b/config/guardian/guardian.it.pl new file mode 100644 index 0000000..9b89a52 --- /dev/null +++ b/config/guardian/guardian.it.pl @@ -0,0 +1,24 @@ +%tr = ( +%tr, + +'guaranteed bandwith' => 'Guaranteed bandwith', +'guardian alertfile' => 'Alertfile', +'guardian configuration' => 'Guardian Configuration', +'guardian ignorefile' => 'Ignorefile', +'guardian interface' => 'Interface', +'guardian logfile' => 'Logfile', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Timelimit', + +); + +#EOF diff --git a/config/guardian/guardian.nl.pl b/config/guardian/guardian.nl.pl new file mode 100644 index 0000000..d71a91f --- /dev/null +++ b/config/guardian/guardian.nl.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Meldingenbestand', +'guardian configuration' => 'Guardian configuratie', +'guardian ignorefile' => 'Negeerbestand', +'guardian interface' => 'Interface', +'guardian logfile' => 'Logbestand', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Tijdlimiet', + +); + +#EOF diff --git a/config/guardian/guardian.pl.pl b/config/guardian/guardian.pl.pl new file mode 100644 index 0000000..18cb396 --- /dev/null +++ b/config/guardian/guardian.pl.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Plik alertów', +'guardian configuration' => 'Konfiguracja Guardian\'a', +'guardian ignorefile' => 'Plik ignorowanych', +'guardian interface' => 'Interfejs', +'guardian logfile' => 'Plik Log', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Ograniczenie czasowe', + +); + +#EOF diff --git a/config/guardian/guardian.ru.pl b/config/guardian/guardian.ru.pl new file mode 100644 index 0000000..34b8928 --- /dev/null +++ b/config/guardian/guardian.ru.pl @@ -0,0 +1,24 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Alertfile', +'guardian configuration' => 'Настройки защиты', +'guardian ignorefile' => 'Ignorefile', +'guardian interface' => 'Интерфейс', +'guardian logfile' => 'Logfile', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Ограничение времени', + +); + +#EOF + diff --git a/config/guardian/guardian.tr.pl b/config/guardian/guardian.tr.pl new file mode 100644 index 0000000..701dc15 --- /dev/null +++ b/config/guardian/guardian.tr.pl @@ -0,0 +1,24 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Uyarı dosyası', +'guardian configuration' => 'Koruyucu Yapılandırması', +'guardian ignorefile' => 'Yoksayılan dosya', +'guardian interface' => 'Ara birim', +'guardian logfile' => 'Günlük dosyası', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Zaman sınırlaması', + +); + +#EOF + diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi index 9d044fe..963a564 100644 --- a/html/cgi-bin/guardian.cgi +++ b/html/cgi-bin/guardian.cgi @@ -534,33 +534,39 @@ END <tr> <td colspan='2' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'guardian common settings'}</b></td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian enabled'}:</td> + <td width='25%' class='base'>$Lang::tr{'guardian enabled'}:</td> <td><input type='checkbox' name='GUARDIAN_ENABLED' $checked{'GUARDIAN_ENABLED'}{'on'} /></td> </tr> + <tr> <td colspan='2'><br></td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian watch snort alertfile'}</td> + <td width='25%' class='base'>$Lang::tr{'guardian watch snort alertfile'}</td> <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_SNORT' value='on' $checked{'GUARDIAN_MONITOR_SNORT'}{'on'} /> / <input type='radio' name='GUARDIAN_MONITOR_SNORT' value='off' $checked{'GUARDIAN_MONITOR_SNORT'}{'off'} /> off</td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian block ssh brute-force'}</td> + <td width='25%' class='base'>$Lang::tr{'guardian block ssh brute-force'}</td> <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_SSH' value='on' $checked{'GUARDIAN_MONITOR_SSH'}{'on'} /> / <input type='radio' name='GUARDIAN_MONITOR_SSH' value='off' $checked{'GUARDIAN_MONITOR_SSH'}{'off'} /> off</td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian block httpd brute-force'}</td> + <td width='25%' class='base'>$Lang::tr{'guardian block httpd brute-force'}</td> <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='on' $checked{'GUARDIAN_MONITOR_HTTPD'}{'on'} /> / <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='off' $checked{'GUARDIAN_MONITOR_HTTPD'}{'off'} /> off</td> </tr> END + # Display owncloud checkbox when the addon is installed. if ( -e "$owncloud_meta" ) { print"<tr>\n"; - print"<td width='20%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n"; + print"<td width='25%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n"; print"<td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='on' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'on'} /> /\n"; print"<input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='off' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'off'} /> off</td>\n"; print"</tr>\n"; @@ -569,62 +575,64 @@ END <tr> <td colspan='2'><br></td> </tr> + <tr> <td align='left' width='20%'>$Lang::tr{'guardian logfacility'}:</td> - <td><select id='GUARDIAN_LOG_FACILITY' name='GUARDIAN_LOG_FACILITY'> - <option id='logfacility_syslog' value='syslog' $selected{'GUARDIAN_LOG_FACILITY'}{'syslog'}>syslog</option> - <option id='logfacility_file' value='file' $selected{'GUARDIAN_LOG_FACILITY'}{'file'}>file</option> - <option id='logfacility_console' value='console' $selected{'GUARDIAN_LOG_FACILITY'}{'console'}>console</option> + <td width='25%'><select id='GUARDIAN_LOG_FACILITY' name='GUARDIAN_LOG_FACILITY'> + <option id='logfacility_syslog' value='syslog' $selected{'GUARDIAN_LOG_FACILITY'}{'syslog'}>$Lang::tr{'guardian logtarget_syslog'}</option> + <option id='logfacility_file' value='file' $selected{'GUARDIAN_LOG_FACILITY'}{'file'}>$Lang::tr{'guardian logtarget_file'}</option> + <option id='logfacility_console' value='console' $selected{'GUARDIAN_LOG_FACILITY'}{'console'}>$Lang::tr{'guardian logtarget_console'}</option> + </select></td> + + <td align='left' width='20%'>$Lang::tr{'guardian loglevel'}:</td> + <td width='25%'><select id='GUARDIAN_LOGLEVEL' name='GUARDIAN_LOGLEVEL'> + <option id='loglevel_off' value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>$Lang::tr{'guardian loglevel_off'}</option> + <option id='loglevel_info' value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>$Lang::tr{'guardian loglevel_info'}</option> + <option id='loglevel_debug' value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>$Lang::tr{'guardian loglevel_debug'}</option> </select></td> </tr> - <tr> + + <tr class="GUARDIAN_LOGFILE"> <td colspan='2'><br></td> </tr> - <tr> - <td align='left' width='20%'>$Lang::tr{'guardian loglevel'}:</td> - <td><select id='GUARDIAN_LOGLEVEL' name='GUARDIAN_LOGLEVEL'> - <option id='loglevel_off' value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>off</option> - <option id='loglevel_info' value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>info</option> - <option id='loglevel_debug' value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>debug</option> - </select></td> + + <tr class="GUARDIAN_LOGFILE"> + <td width='25%' class='base'>$Lang::tr{'guardian logfile'}:</td> + <td><input type='text' name='GUARDIAN_LOGFILE' value='$settings{'GUARDIAN_LOGFILE'}' size='30' /></td> </tr> + <tr class="GUARDIAN_SNORT_PRIORITY_LEVEL"> <td colspan='2'><br></td> </tr> + <tr class="GUARDIAN_SNORT_PRIORITY_LEVEL"> <td align='left' width='20%'>$Lang::tr{'guardian priority level'}:</td> <td><select name='GUARDIAN_SNORT_PRIORITY_LEVEL'> - <option value='1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>1</option> - <option value='2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>2</option> - <option value='3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>3</option> - <option value='4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>4</option> + <option value='1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>$Lang::tr{'guardian priolevel_high'}</option> + <option value='2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>$Lang::tr{'guardian priolevel_medium'}</option> + <option value='3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>$Lang::tr{'guardian priolevel_low'}</option> + <option value='4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>$Lang::tr{'guardian priolevel_very_low'}</option> </select></td> + + <td width='25%' class='base'>$Lang::tr{'guardian blockcount'}:</td> + <td><input type='text' name='GUARDIAN_BLOCKCOUNT' value='$settings{'GUARDIAN_BLOCKCOUNT'}' size='5' /></td> </tr> + <tr> <td colspan='2'><br></td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian firewallaction'}:</td> + <td width='25%' class='base'>$Lang::tr{'guardian firewallaction'}:</td> <td><select name='GUARDIAN_FIREWALL_ACTION'> <option value='DROP' $selected{'GUARDIAN_FIREWALL_ACTION'}{'DROP'}>Drop</option> <option value='REJECT' $selected{'GUARDIAN_FIREWALL_ACTION'}{'REJECT'}>Reject</option> </select></td> - </tr> - <tr> - <td colspan='2'><br></td> - </tr> - <tr> - <td width='20%' class='base'>$Lang::tr{'guardian blockcount'}:</td> - <td><input type='text' name='GUARDIAN_BLOCKCOUNT' value='$settings{'GUARDIAN_BLOCKCOUNT'}' size='5' /></td> - </tr> - <tr> - <td width='20%' class='base'>$Lang::tr{'guardian blocktime'}:</td> + + <td width='25%' class='base'>$Lang::tr{'guardian blocktime'}:</td> <td><input type='text' name='GUARDIAN_BLOCKTIME' value='$settings{'GUARDIAN_BLOCKTIME'}' size='10' /></td> </tr> - <tr class="GUARDIAN_LOGFILE"> - <td width='20%' class='base'>$Lang::tr{'guardian logfile'}:</td> - <td><input type='text' name='GUARDIAN_LOGFILE' value='$settings{'GUARDIAN_LOGFILE'}' size='30' /></td> - </tr> + </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 400c2fe..261b92f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1217,30 +1217,6 @@ 'green interface' => 'Grünes Interface', 'grouptype' => 'Gruppentyp:', 'guaranteed bandwith' => 'Garantierte Bandbreite', -'guardian' => 'Guardian', -'guardian block a host' => 'Host blocken', -'guardian block httpd brute-force' => 'httpd-Brute-Force-Erkennung', -'guardian block owncloud brute-force' => 'Owncloud-Brute-Force-Erkennung', -'guardian block ssh brute-force' => 'SSH-Brute-Force-Erkennung', -'guardian blockcount' => 'Trefferschwelle', -'guardian blocked hosts' => 'Aktuell geblockte Hosts', -'guardian blocking of this address is not allowed' => 'Diese Addresse darf nicht gelockt werden.', -'guardian blocktime' => 'Blockzeit', -'guardian common settings' => 'Allgemeine Einstellungen', -'guardian configuration' => 'Guardian-Konfiguration', -'guardian daemon' => 'Daemon', -'guardian empty input' => 'Fehlende Angabe: Bitte eine gültige IP-Addresse oder Netzwerk angeben.', -'guardian enabled' => 'Guardian aktivieren', -'guardian firewallaction' => 'Firewall-Aktion', -'guardian ignored hosts' => 'Ignorierte Hosts', -'guardian invalid address or subnet' => 'Ungültige Host-Addresse oder Netzwerk.', -'guardian logfacility' => 'Logziel', -'guardian logfile' => 'Logdatei', -'guardian loglevel' => 'Loglevel', -'guardian no entries' => 'Keine Einträge vorhanden.', -'guardian priority level' => 'Prioritätslevel', -'guardian service' => 'Guardian-Dienst', -'guardian watch snort alertfile' => 'Snort-Alarme auswerten', 'guest ok' => 'Gastzugang gewähren', 'gui settings' => 'Benutzeroberfläche', 'gz with key' => 'Nur ein verschlüsseltes Archiv kann auf dieser Maschine wiederhergestellt werden.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7a7c104..0e5b46d 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1246,32 +1246,6 @@ 'green interface' => 'Green Interface', 'grouptype' => 'Grouptype:', 'guaranteed bandwith' => 'Guaranteed bandwith', -'guardian' => 'Guardian', -'guardian block a host' => 'Block host', -'guardian block httpd brute-force' => 'httpd Brute Force Detection', -'guardian block owncloud brute-force' => 'Owncloud Brute Force detection', -'guardian block ssh brute-force' => 'SSH Brute Force Detection', -'guardian blockcount' => 'Strike Threshold', -'guardian blocked hosts' => 'Currently blocked hosts', -'guardian blocking of this address is not allowed' => 'Blocking of the given address is not allowed.', -'guardian blocktime' => 'Block Time', -'guardian common settings' => 'Common Settings', -'guardian configuration' => 'Guardian Configuration', -'guardian daemon' => 'Daemon', -'guardian empty input' => 'Empty input: Please perform a valid host address or subnet.', -'guardian enabled' => 'Enable Guardian', -'guardian firewallaction' => 'Firewall Action', -'guardian ignored hosts' => 'Ignored Hosts', -'guardian invalid address or subnet' => 'Invalid host address or subnet.', -'guardian logfacility' => 'Log Facility', -'guardian logfile' => 'Log File', -'guardian loglevel' => 'Log Level', -'guardian no entries' => 'No entries at the moment.', -'guardian not running no hosts can be blocked' => 'Guardian is not running. No hosts will be blocked.', -'guardian priority level' => 'Priority Level', -'guardian service' => 'Guardian Service', -'guardian snort alertfile' => 'Snort Alert File', -'guardian watch snort alertfile' => 'Monitor Snort Alert File', 'guest ok' => 'allow guests to access', 'gui settings' => 'GUI Settings', 'gz with key' => 'Only an encrypted archive can be restored on this machine.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 7ac5d11..ede7b66 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -886,12 +886,6 @@ 'green' => 'Green', 'green interface' => 'Interfaz Green', 'guaranteed bandwith' => 'Ancho de banda garantizado', -'guardian alertfile' => 'Archivo de alerta', -'guardian configuration' => 'Configuración de Guardian', -'guardian ignorefile' => 'Archivo Ignorefile', -'guardian interface' => 'Interfaz', -'guardian logfile' => 'Archivo de registro', -'guardian timelimit' => 'Límite de tiempo', 'guest ok' => 'permitir acceso de invitado', 'gui settings' => 'Configuraciones de GUI', 'gz with key' => 'Esta máquina sólo se puede restaurar desde archivos encriptados', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 61c514d..e896c9b 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -877,12 +877,6 @@ 'green' => 'VERT', 'green interface' => 'Interface VERTE', 'guaranteed bandwith' => 'Bande passante garantie', -'guardian alertfile' => 'Fichier d\'alerte', -'guardian configuration' => 'Configuration du gardien', -'guardian ignorefile' => 'Fichier d\'ignorés', -'guardian interface' => 'Interface', -'guardian logfile' => 'Fichier log', -'guardian timelimit' => 'Délai maximum', 'guest ok' => 'autoriser l\'accès aux invités', 'gui settings' => 'Réglage GUI', 'gz with key' => 'Seulement les archives chiffrées peuvent être restaurées sur cette machine.', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 2ed22f2..b039cdb 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1187,13 +1187,6 @@ 'green' => 'Verde', 'green interface' => 'Interface Verde', 'grouptype' => 'Grouptype:', -'guaranteed bandwith' => 'Guaranteed bandwith', -'guardian alertfile' => 'Alertfile', -'guardian configuration' => 'Guardian Configuration', -'guardian ignorefile' => 'Ignorefile', -'guardian interface' => 'Interface', -'guardian logfile' => 'Logfile', -'guardian timelimit' => 'Timelimit', 'guest ok' => 'allow guests to access', 'gui settings' => 'Settaggio GUI', 'gz with key' => 'Only an encrypted archive can be restored on this machine.', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 2469ff2..49c0cce 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1168,12 +1168,6 @@ 'green interface' => 'Groene Interface', 'grouptype' => 'Groeptype:', 'guaranteed bandwith' => 'Gegarandeerde bandbreedte', -'guardian alertfile' => 'Meldingenbestand', -'guardian configuration' => 'Guardian configuratie', -'guardian ignorefile' => 'Negeerbestand', -'guardian interface' => 'Interface', -'guardian logfile' => 'Logbestand', -'guardian timelimit' => 'Tijdlimiet', 'guest ok' => 'verleen gasten toegang', 'gui settings' => 'Gebruikersinterface', 'gz with key' => 'Alleen gecodeerde archieven kunnen worden teruggezet op deze machine.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 9214205..e2f9da5 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -885,12 +885,6 @@ 'green' => 'Green', 'green interface' => 'Interfejs Green', 'guaranteed bandwith' => 'Gwarantowane pasmo', -'guardian alertfile' => 'Plik alertów', -'guardian configuration' => 'Konfiguracja Guardian\'a', -'guardian ignorefile' => 'Plik ignorowanych', -'guardian interface' => 'Interfejs', -'guardian logfile' => 'Plik Log', -'guardian timelimit' => 'Ograniczenie czasowe', 'guest ok' => 'zezwól na dostęp dla gości', 'gui settings' => 'Ustawienia GUI', 'gz with key' => 'Tylko zaszyfrowane archiwum może być odtworzone na tej maszynie.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 6a45f7f..4b0edb5 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -880,12 +880,6 @@ 'green' => 'Green', 'green interface' => 'Green Интерфейс', 'guaranteed bandwith' => 'Гарантированная пропускная способность', -'guardian alertfile' => 'Alertfile', -'guardian configuration' => 'Настройки защиты', -'guardian ignorefile' => 'Ignorefile', -'guardian interface' => 'Интерфейс', -'guardian logfile' => 'Logfile', -'guardian timelimit' => 'Ограничение времени', 'guest ok' => 'Разрешить гостевой доступ', 'gui settings' => 'Внешний вид', 'gz with key' => 'Только зашифрованный архив может быть восстановлен на этой машине.', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 3af2339..9eb3000 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1245,12 +1245,6 @@ 'green interface' => 'Yeşil Arabirim', 'grouptype' => 'Grup türü:', 'guaranteed bandwith' => 'Garantili bant genişliği', -'guardian alertfile' => 'Uyarı dosyası', -'guardian configuration' => 'Koruyucu Yapılandırması', -'guardian ignorefile' => 'Yoksayılan dosya', -'guardian interface' => 'Ara birim', -'guardian logfile' => 'Günlük dosyası', -'guardian timelimit' => 'Zaman sınırlaması', 'guest ok' => 'istemcilere erişim izni', 'gui settings' => 'GUI Ayarları', 'gz with key' => 'Sadece şifreli bir arşiv bu makinede geri yüklenebilir.', diff --git a/lfs/guardian b/lfs/guardian index b02ec54..c016f04 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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 # @@ -33,11 +33,10 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 10 +PAK_VER = 11 DEPS = "perl-inotify2 perl-Net-IP" - ############################################################################### # Top-level Rules ############################################################################### @@ -108,5 +107,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/guardian/guardian.logrotate \ /etc/logrotate.d/guardian + # Install addon-specific language-files. + install -v -m 004 $(DIR_SRC)/config/guardian/guardian.*.pl \ + /var/ipfire/addon-lang/ + @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.9.3

3 2

[PATCH] grub: update 2.02~beta3 v2
by Marcel Lorenz 26 Sep '16

26 Sep '16

The IPfire's screen resulution is changed from 640x480 to 1280x800 with fallback to 1024x786. Better for restore IPFire with network problems The lfs/flash-images is updated to fix build fail The "disable VGA fallback" patch is not more needed and removed The Unifont is updated to 9.0.02 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/grub2/default | 1 + config/rootfiles/common/i586/grub | 125 +++++++++++++++++++++- config/rootfiles/common/x86_64/grub | 127 ++++++++++++++++++++++- lfs/flash-images | 2 +- lfs/grub | 20 ++-- src/patches/grub-2.00_disable_vga_fallback.patch | 15 --- 6 files changed, 256 insertions(+), 34 deletions(-) delete mode 100644 src/patches/grub-2.00_disable_vga_fallback.patch diff --git a/config/grub2/default b/config/grub2/default index 39eed0f..4139e9c 100644 --- a/config/grub2/default +++ b/config/grub2/default @@ -5,3 +5,4 @@ GRUB_CMDLINE_LINUX="panic=10" GRUB_DISABLE_RECOVERY="true" GRUB_BACKGROUND="/boot/grub/splash.png" GRUB_FONT="/boot/grub/unifont.pf2" +GRUB_GFXMODE=1280x800,1024x768 diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub index 9d71942..010b52c 100644 --- a/config/rootfiles/common/i586/grub +++ b/config/rootfiles/common/i586/grub @@ -15,19 +15,24 @@ etc/grub.d/41_custom etc/grub.d/README etc/grub2.cfg usr/bin/grub-editenv +usr/bin/grub-file usr/bin/grub-fstest +usr/bin/grub-glue-efi usr/bin/grub-kbdcomp usr/bin/grub-menulst2cfg usr/bin/grub-mkfont usr/bin/grub-mkimage usr/bin/grub-mklayout +usr/bin/grub-mknetdir usr/bin/grub-mkpasswd-pbkdf2 usr/bin/grub-mkrelpath usr/bin/grub-mkrescue usr/bin/grub-mkstandalone +usr/bin/grub-render-label usr/bin/grub-script-check -usr/lib/grub -usr/lib/grub/i386-pc +usr/bin/grub-syslinux2cfg +#usr/lib/grub +#usr/lib/grub/i386-pc usr/lib/grub/i386-pc/acpi.mod usr/lib/grub/i386-pc/acpi.module usr/lib/grub/i386-pc/adler32.mod @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod usr/lib/grub/i386-pc/all_video.module usr/lib/grub/i386-pc/aout.mod usr/lib/grub/i386-pc/aout.module +usr/lib/grub/i386-pc/archelp.mod +usr/lib/grub/i386-pc/archelp.module usr/lib/grub/i386-pc/at_keyboard.mod usr/lib/grub/i386-pc/at_keyboard.module usr/lib/grub/i386-pc/ata.mod @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image usr/lib/grub/i386-pc/boot.img usr/lib/grub/i386-pc/boot.mod usr/lib/grub/i386-pc/boot.module +usr/lib/grub/i386-pc/boot_hybrid.image +usr/lib/grub/i386-pc/boot_hybrid.img usr/lib/grub/i386-pc/bsd.mod usr/lib/grub/i386-pc/bsd.module +usr/lib/grub/i386-pc/bswap_test.mod +usr/lib/grub/i386-pc/bswap_test.module usr/lib/grub/i386-pc/btrfs.mod usr/lib/grub/i386-pc/btrfs.module usr/lib/grub/i386-pc/bufio.mod usr/lib/grub/i386-pc/bufio.module usr/lib/grub/i386-pc/cat.mod usr/lib/grub/i386-pc/cat.module +usr/lib/grub/i386-pc/cbfs.mod +usr/lib/grub/i386-pc/cbfs.module +usr/lib/grub/i386-pc/cbls.mod +usr/lib/grub/i386-pc/cbls.module +usr/lib/grub/i386-pc/cbmemc.mod +usr/lib/grub/i386-pc/cbmemc.module +usr/lib/grub/i386-pc/cbtable.mod +usr/lib/grub/i386-pc/cbtable.module +usr/lib/grub/i386-pc/cbtime.mod +usr/lib/grub/i386-pc/cbtime.module usr/lib/grub/i386-pc/cdboot.image usr/lib/grub/i386-pc/cdboot.img usr/lib/grub/i386-pc/chain.mod usr/lib/grub/i386-pc/chain.module +usr/lib/grub/i386-pc/cmdline_cat_test.mod +usr/lib/grub/i386-pc/cmdline_cat_test.module +usr/lib/grub/i386-pc/cmosdump.mod +usr/lib/grub/i386-pc/cmosdump.module usr/lib/grub/i386-pc/cmostest.mod usr/lib/grub/i386-pc/cmostest.module usr/lib/grub/i386-pc/cmp.mod usr/lib/grub/i386-pc/cmp.module +usr/lib/grub/i386-pc/cmp_test.mod +usr/lib/grub/i386-pc/cmp_test.module usr/lib/grub/i386-pc/command.lst usr/lib/grub/i386-pc/config.h usr/lib/grub/i386-pc/configfile.mod @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod usr/lib/grub/i386-pc/cryptodisk.module usr/lib/grub/i386-pc/cs5536.mod usr/lib/grub/i386-pc/cs5536.module +usr/lib/grub/i386-pc/ctz_test.mod +usr/lib/grub/i386-pc/ctz_test.module usr/lib/grub/i386-pc/date.mod usr/lib/grub/i386-pc/date.module usr/lib/grub/i386-pc/datehook.mod usr/lib/grub/i386-pc/datehook.module usr/lib/grub/i386-pc/datetime.mod usr/lib/grub/i386-pc/datetime.module +usr/lib/grub/i386-pc/disk.mod +usr/lib/grub/i386-pc/disk.module usr/lib/grub/i386-pc/diskboot.image usr/lib/grub/i386-pc/diskboot.img usr/lib/grub/i386-pc/diskfilter.mod usr/lib/grub/i386-pc/diskfilter.module +usr/lib/grub/i386-pc/div.mod +usr/lib/grub/i386-pc/div.module +usr/lib/grub/i386-pc/div_test.mod +usr/lib/grub/i386-pc/div_test.module usr/lib/grub/i386-pc/dm_nv.mod usr/lib/grub/i386-pc/dm_nv.module usr/lib/grub/i386-pc/drivemap.mod @@ -119,6 +154,8 @@ usr/lib/grub/i386-pc/ehci.mod usr/lib/grub/i386-pc/ehci.module usr/lib/grub/i386-pc/elf.mod usr/lib/grub/i386-pc/elf.module +usr/lib/grub/i386-pc/eval.mod +usr/lib/grub/i386-pc/eval.module usr/lib/grub/i386-pc/exfat.mod usr/lib/grub/i386-pc/exfat.module usr/lib/grub/i386-pc/exfctest.mod @@ -129,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod usr/lib/grub/i386-pc/extcmd.module usr/lib/grub/i386-pc/fat.mod usr/lib/grub/i386-pc/fat.module +usr/lib/grub/i386-pc/file.mod +usr/lib/grub/i386-pc/file.module usr/lib/grub/i386-pc/font.mod usr/lib/grub/i386-pc/font.module usr/lib/grub/i386-pc/freedos.mod @@ -150,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod usr/lib/grub/i386-pc/gcry_crc.module usr/lib/grub/i386-pc/gcry_des.mod usr/lib/grub/i386-pc/gcry_des.module +usr/lib/grub/i386-pc/gcry_dsa.mod +usr/lib/grub/i386-pc/gcry_dsa.module +usr/lib/grub/i386-pc/gcry_idea.mod +usr/lib/grub/i386-pc/gcry_idea.module usr/lib/grub/i386-pc/gcry_md4.mod usr/lib/grub/i386-pc/gcry_md4.module usr/lib/grub/i386-pc/gcry_md5.mod @@ -160,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod usr/lib/grub/i386-pc/gcry_rijndael.module usr/lib/grub/i386-pc/gcry_rmd160.mod usr/lib/grub/i386-pc/gcry_rmd160.module +usr/lib/grub/i386-pc/gcry_rsa.mod +usr/lib/grub/i386-pc/gcry_rsa.module usr/lib/grub/i386-pc/gcry_seed.mod usr/lib/grub/i386-pc/gcry_seed.module usr/lib/grub/i386-pc/gcry_serpent.mod @@ -187,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod usr/lib/grub/i386-pc/gfxmenu.module usr/lib/grub/i386-pc/gfxterm.mod usr/lib/grub/i386-pc/gfxterm.module +usr/lib/grub/i386-pc/gfxterm_background.mod +usr/lib/grub/i386-pc/gfxterm_background.module +usr/lib/grub/i386-pc/gfxterm_menu.mod +usr/lib/grub/i386-pc/gfxterm_menu.module usr/lib/grub/i386-pc/gmodule.pl usr/lib/grub/i386-pc/gptsync.mod usr/lib/grub/i386-pc/gptsync.module @@ -208,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod usr/lib/grub/i386-pc/hfs.module usr/lib/grub/i386-pc/hfsplus.mod usr/lib/grub/i386-pc/hfsplus.module +usr/lib/grub/i386-pc/hfspluscomp.mod +usr/lib/grub/i386-pc/hfspluscomp.module usr/lib/grub/i386-pc/http.mod usr/lib/grub/i386-pc/http.module usr/lib/grub/i386-pc/iorw.mod @@ -226,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod usr/lib/grub/i386-pc/keystatus.module usr/lib/grub/i386-pc/ldm.mod usr/lib/grub/i386-pc/ldm.module +usr/lib/grub/i386-pc/legacy_password_test.mod +usr/lib/grub/i386-pc/legacy_password_test.module usr/lib/grub/i386-pc/legacycfg.mod usr/lib/grub/i386-pc/legacycfg.module usr/lib/grub/i386-pc/linux.mod @@ -256,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image usr/lib/grub/i386-pc/lzma_decompress.img usr/lib/grub/i386-pc/lzopio.mod usr/lib/grub/i386-pc/lzopio.module +usr/lib/grub/i386-pc/macbless.mod +usr/lib/grub/i386-pc/macbless.module +usr/lib/grub/i386-pc/macho.mod +usr/lib/grub/i386-pc/macho.module +usr/lib/grub/i386-pc/mda_text.mod +usr/lib/grub/i386-pc/mda_text.module usr/lib/grub/i386-pc/mdraid09.mod usr/lib/grub/i386-pc/mdraid09.module usr/lib/grub/i386-pc/mdraid09_be.mod @@ -284,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod usr/lib/grub/i386-pc/mmap.module usr/lib/grub/i386-pc/moddep.lst usr/lib/grub/i386-pc/modinfo.sh +usr/lib/grub/i386-pc/morse.mod +usr/lib/grub/i386-pc/morse.module +usr/lib/grub/i386-pc/mpi.mod +usr/lib/grub/i386-pc/mpi.module usr/lib/grub/i386-pc/msdospart.mod usr/lib/grub/i386-pc/msdospart.module +usr/lib/grub/i386-pc/mul_test.mod +usr/lib/grub/i386-pc/mul_test.module usr/lib/grub/i386-pc/multiboot.mod usr/lib/grub/i386-pc/multiboot.module usr/lib/grub/i386-pc/multiboot2.mod usr/lib/grub/i386-pc/multiboot2.module +usr/lib/grub/i386-pc/nativedisk.mod +usr/lib/grub/i386-pc/nativedisk.module usr/lib/grub/i386-pc/net.mod usr/lib/grub/i386-pc/net.module usr/lib/grub/i386-pc/newc.mod @@ -306,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod usr/lib/grub/i386-pc/ntldr.module usr/lib/grub/i386-pc/odc.mod usr/lib/grub/i386-pc/odc.module +usr/lib/grub/i386-pc/offsetio.mod +usr/lib/grub/i386-pc/offsetio.module usr/lib/grub/i386-pc/ohci.mod usr/lib/grub/i386-pc/ohci.module usr/lib/grub/i386-pc/part_acorn.mod @@ -316,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod usr/lib/grub/i386-pc/part_apple.module usr/lib/grub/i386-pc/part_bsd.mod usr/lib/grub/i386-pc/part_bsd.module +usr/lib/grub/i386-pc/part_dfly.mod +usr/lib/grub/i386-pc/part_dfly.module usr/lib/grub/i386-pc/part_dvh.mod usr/lib/grub/i386-pc/part_dvh.module usr/lib/grub/i386-pc/part_gpt.mod @@ -340,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod usr/lib/grub/i386-pc/pata.module usr/lib/grub/i386-pc/pbkdf2.mod usr/lib/grub/i386-pc/pbkdf2.module +usr/lib/grub/i386-pc/pbkdf2_test.mod +usr/lib/grub/i386-pc/pbkdf2_test.module usr/lib/grub/i386-pc/pci.mod usr/lib/grub/i386-pc/pci.module +usr/lib/grub/i386-pc/pcidump.mod +usr/lib/grub/i386-pc/pcidump.module usr/lib/grub/i386-pc/plan9.mod usr/lib/grub/i386-pc/plan9.module usr/lib/grub/i386-pc/play.mod @@ -352,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod usr/lib/grub/i386-pc/priority_queue.module usr/lib/grub/i386-pc/probe.mod usr/lib/grub/i386-pc/probe.module +usr/lib/grub/i386-pc/procfs.mod +usr/lib/grub/i386-pc/procfs.module +usr/lib/grub/i386-pc/progress.mod +usr/lib/grub/i386-pc/progress.module usr/lib/grub/i386-pc/pxe.mod usr/lib/grub/i386-pc/pxe.module usr/lib/grub/i386-pc/pxeboot.image @@ -362,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod usr/lib/grub/i386-pc/raid5rec.module usr/lib/grub/i386-pc/raid6rec.mod usr/lib/grub/i386-pc/raid6rec.module +usr/lib/grub/i386-pc/random.mod +usr/lib/grub/i386-pc/random.module usr/lib/grub/i386-pc/read.mod usr/lib/grub/i386-pc/read.module usr/lib/grub/i386-pc/reboot.mod @@ -390,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod usr/lib/grub/i386-pc/serial.module usr/lib/grub/i386-pc/setjmp.mod usr/lib/grub/i386-pc/setjmp.module +usr/lib/grub/i386-pc/setjmp_test.mod +usr/lib/grub/i386-pc/setjmp_test.module usr/lib/grub/i386-pc/setpci.mod usr/lib/grub/i386-pc/setpci.module usr/lib/grub/i386-pc/sfs.mod usr/lib/grub/i386-pc/sfs.module +usr/lib/grub/i386-pc/shift_test.mod +usr/lib/grub/i386-pc/shift_test.module +usr/lib/grub/i386-pc/signature_test.mod +usr/lib/grub/i386-pc/signature_test.module usr/lib/grub/i386-pc/sleep.mod usr/lib/grub/i386-pc/sleep.module +usr/lib/grub/i386-pc/sleep_test.mod +usr/lib/grub/i386-pc/sleep_test.module +usr/lib/grub/i386-pc/spkmodem.mod +usr/lib/grub/i386-pc/spkmodem.module usr/lib/grub/i386-pc/squash4.mod usr/lib/grub/i386-pc/squash4.module +usr/lib/grub/i386-pc/syslinuxcfg.mod +usr/lib/grub/i386-pc/syslinuxcfg.module usr/lib/grub/i386-pc/tar.mod usr/lib/grub/i386-pc/tar.module usr/lib/grub/i386-pc/terminal.lst @@ -411,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod usr/lib/grub/i386-pc/test_blockarg.module usr/lib/grub/i386-pc/testload.mod usr/lib/grub/i386-pc/testload.module +usr/lib/grub/i386-pc/testspeed.mod +usr/lib/grub/i386-pc/testspeed.module usr/lib/grub/i386-pc/tftp.mod usr/lib/grub/i386-pc/tftp.module usr/lib/grub/i386-pc/tga.mod usr/lib/grub/i386-pc/tga.module usr/lib/grub/i386-pc/time.mod usr/lib/grub/i386-pc/time.module +usr/lib/grub/i386-pc/tr.mod +usr/lib/grub/i386-pc/tr.module usr/lib/grub/i386-pc/trig.mod usr/lib/grub/i386-pc/trig.module usr/lib/grub/i386-pc/true.mod usr/lib/grub/i386-pc/true.module +usr/lib/grub/i386-pc/truecrypt.mod +usr/lib/grub/i386-pc/truecrypt.module usr/lib/grub/i386-pc/udf.mod usr/lib/grub/i386-pc/udf.module usr/lib/grub/i386-pc/ufs1.mod usr/lib/grub/i386-pc/ufs1.module +usr/lib/grub/i386-pc/ufs1_be.mod +usr/lib/grub/i386-pc/ufs1_be.module usr/lib/grub/i386-pc/ufs2.mod usr/lib/grub/i386-pc/ufs2.module usr/lib/grub/i386-pc/uhci.mod @@ -441,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod usr/lib/grub/i386-pc/usbserial_ftdi.module usr/lib/grub/i386-pc/usbserial_pl2303.mod usr/lib/grub/i386-pc/usbserial_pl2303.module +usr/lib/grub/i386-pc/usbserial_usbdebug.mod +usr/lib/grub/i386-pc/usbserial_usbdebug.module usr/lib/grub/i386-pc/usbtest.mod usr/lib/grub/i386-pc/usbtest.module usr/lib/grub/i386-pc/vbe.mod usr/lib/grub/i386-pc/vbe.module +usr/lib/grub/i386-pc/verify.mod +usr/lib/grub/i386-pc/verify.module usr/lib/grub/i386-pc/vga.mod usr/lib/grub/i386-pc/vga.module usr/lib/grub/i386-pc/vga_text.mod @@ -456,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod usr/lib/grub/i386-pc/video_bochs.module usr/lib/grub/i386-pc/video_cirrus.mod usr/lib/grub/i386-pc/video_cirrus.module +usr/lib/grub/i386-pc/video_colors.mod +usr/lib/grub/i386-pc/video_colors.module usr/lib/grub/i386-pc/video_fb.mod usr/lib/grub/i386-pc/video_fb.module usr/lib/grub/i386-pc/videoinfo.mod usr/lib/grub/i386-pc/videoinfo.module usr/lib/grub/i386-pc/videotest.mod usr/lib/grub/i386-pc/videotest.module +usr/lib/grub/i386-pc/videotest_checksum.mod +usr/lib/grub/i386-pc/videotest_checksum.module usr/lib/grub/i386-pc/xfs.mod usr/lib/grub/i386-pc/xfs.module usr/lib/grub/i386-pc/xnu.mod usr/lib/grub/i386-pc/xnu.module usr/lib/grub/i386-pc/xnu_uuid.mod usr/lib/grub/i386-pc/xnu_uuid.module +usr/lib/grub/i386-pc/xnu_uuid_test.mod +usr/lib/grub/i386-pc/xnu_uuid_test.module usr/lib/grub/i386-pc/xzio.mod usr/lib/grub/i386-pc/xzio.module usr/lib/grub/i386-pc/zfs.mod @@ -478,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod usr/lib/grub/i386-pc/zfsinfo.module usr/sbin/grub-bios-setup usr/sbin/grub-install +usr/sbin/grub-macbless usr/sbin/grub-mkconfig -usr/sbin/grub-mknetdir usr/sbin/grub-ofpathname usr/sbin/grub-probe usr/sbin/grub-reboot @@ -518,19 +629,27 @@ usr/share/grub/grub-mkconfig_lib #usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo #usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo #usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo #usr/share/locale/fi/LC_MESSAGES/grub.mo #usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo #usr/share/locale/hu/LC_MESSAGES/grub.mo #usr/share/locale/id/LC_MESSAGES/grub.mo #usr/share/locale/it/LC_MESSAGES/grub.mo #usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo #usr/share/locale/nl/LC_MESSAGES/grub.mo #usr/share/locale/pa #usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/grub.mo #usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo #usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo #usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo #usr/share/locale/uk/LC_MESSAGES/grub.mo #usr/share/locale/vi/LC_MESSAGES/grub.mo #usr/share/locale/zh_CN/LC_MESSAGES/grub.mo diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub index 19aef9b..010b52c 100644 --- a/config/rootfiles/common/x86_64/grub +++ b/config/rootfiles/common/x86_64/grub @@ -15,19 +15,24 @@ etc/grub.d/41_custom etc/grub.d/README etc/grub2.cfg usr/bin/grub-editenv +usr/bin/grub-file usr/bin/grub-fstest +usr/bin/grub-glue-efi usr/bin/grub-kbdcomp usr/bin/grub-menulst2cfg usr/bin/grub-mkfont usr/bin/grub-mkimage usr/bin/grub-mklayout +usr/bin/grub-mknetdir usr/bin/grub-mkpasswd-pbkdf2 usr/bin/grub-mkrelpath usr/bin/grub-mkrescue usr/bin/grub-mkstandalone +usr/bin/grub-render-label usr/bin/grub-script-check -usr/lib/grub -usr/lib/grub/i386-pc +usr/bin/grub-syslinux2cfg +#usr/lib/grub +#usr/lib/grub/i386-pc usr/lib/grub/i386-pc/acpi.mod usr/lib/grub/i386-pc/acpi.module usr/lib/grub/i386-pc/adler32.mod @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod usr/lib/grub/i386-pc/all_video.module usr/lib/grub/i386-pc/aout.mod usr/lib/grub/i386-pc/aout.module +usr/lib/grub/i386-pc/archelp.mod +usr/lib/grub/i386-pc/archelp.module usr/lib/grub/i386-pc/at_keyboard.mod usr/lib/grub/i386-pc/at_keyboard.module usr/lib/grub/i386-pc/ata.mod @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image usr/lib/grub/i386-pc/boot.img usr/lib/grub/i386-pc/boot.mod usr/lib/grub/i386-pc/boot.module +usr/lib/grub/i386-pc/boot_hybrid.image +usr/lib/grub/i386-pc/boot_hybrid.img usr/lib/grub/i386-pc/bsd.mod usr/lib/grub/i386-pc/bsd.module +usr/lib/grub/i386-pc/bswap_test.mod +usr/lib/grub/i386-pc/bswap_test.module usr/lib/grub/i386-pc/btrfs.mod usr/lib/grub/i386-pc/btrfs.module usr/lib/grub/i386-pc/bufio.mod usr/lib/grub/i386-pc/bufio.module usr/lib/grub/i386-pc/cat.mod usr/lib/grub/i386-pc/cat.module +usr/lib/grub/i386-pc/cbfs.mod +usr/lib/grub/i386-pc/cbfs.module +usr/lib/grub/i386-pc/cbls.mod +usr/lib/grub/i386-pc/cbls.module +usr/lib/grub/i386-pc/cbmemc.mod +usr/lib/grub/i386-pc/cbmemc.module +usr/lib/grub/i386-pc/cbtable.mod +usr/lib/grub/i386-pc/cbtable.module +usr/lib/grub/i386-pc/cbtime.mod +usr/lib/grub/i386-pc/cbtime.module usr/lib/grub/i386-pc/cdboot.image usr/lib/grub/i386-pc/cdboot.img usr/lib/grub/i386-pc/chain.mod usr/lib/grub/i386-pc/chain.module +usr/lib/grub/i386-pc/cmdline_cat_test.mod +usr/lib/grub/i386-pc/cmdline_cat_test.module +usr/lib/grub/i386-pc/cmosdump.mod +usr/lib/grub/i386-pc/cmosdump.module usr/lib/grub/i386-pc/cmostest.mod usr/lib/grub/i386-pc/cmostest.module usr/lib/grub/i386-pc/cmp.mod usr/lib/grub/i386-pc/cmp.module +usr/lib/grub/i386-pc/cmp_test.mod +usr/lib/grub/i386-pc/cmp_test.module usr/lib/grub/i386-pc/command.lst usr/lib/grub/i386-pc/config.h usr/lib/grub/i386-pc/configfile.mod @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod usr/lib/grub/i386-pc/cryptodisk.module usr/lib/grub/i386-pc/cs5536.mod usr/lib/grub/i386-pc/cs5536.module +usr/lib/grub/i386-pc/ctz_test.mod +usr/lib/grub/i386-pc/ctz_test.module usr/lib/grub/i386-pc/date.mod usr/lib/grub/i386-pc/date.module usr/lib/grub/i386-pc/datehook.mod usr/lib/grub/i386-pc/datehook.module usr/lib/grub/i386-pc/datetime.mod usr/lib/grub/i386-pc/datetime.module +usr/lib/grub/i386-pc/disk.mod +usr/lib/grub/i386-pc/disk.module usr/lib/grub/i386-pc/diskboot.image usr/lib/grub/i386-pc/diskboot.img usr/lib/grub/i386-pc/diskfilter.mod usr/lib/grub/i386-pc/diskfilter.module +usr/lib/grub/i386-pc/div.mod +usr/lib/grub/i386-pc/div.module +usr/lib/grub/i386-pc/div_test.mod +usr/lib/grub/i386-pc/div_test.module usr/lib/grub/i386-pc/dm_nv.mod usr/lib/grub/i386-pc/dm_nv.module usr/lib/grub/i386-pc/drivemap.mod @@ -115,12 +150,12 @@ usr/lib/grub/i386-pc/echo.mod usr/lib/grub/i386-pc/echo.module usr/lib/grub/i386-pc/efiemu.mod usr/lib/grub/i386-pc/efiemu.module -usr/lib/grub/i386-pc/efiemu32.o -usr/lib/grub/i386-pc/efiemu64.o usr/lib/grub/i386-pc/ehci.mod usr/lib/grub/i386-pc/ehci.module usr/lib/grub/i386-pc/elf.mod usr/lib/grub/i386-pc/elf.module +usr/lib/grub/i386-pc/eval.mod +usr/lib/grub/i386-pc/eval.module usr/lib/grub/i386-pc/exfat.mod usr/lib/grub/i386-pc/exfat.module usr/lib/grub/i386-pc/exfctest.mod @@ -131,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod usr/lib/grub/i386-pc/extcmd.module usr/lib/grub/i386-pc/fat.mod usr/lib/grub/i386-pc/fat.module +usr/lib/grub/i386-pc/file.mod +usr/lib/grub/i386-pc/file.module usr/lib/grub/i386-pc/font.mod usr/lib/grub/i386-pc/font.module usr/lib/grub/i386-pc/freedos.mod @@ -152,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod usr/lib/grub/i386-pc/gcry_crc.module usr/lib/grub/i386-pc/gcry_des.mod usr/lib/grub/i386-pc/gcry_des.module +usr/lib/grub/i386-pc/gcry_dsa.mod +usr/lib/grub/i386-pc/gcry_dsa.module +usr/lib/grub/i386-pc/gcry_idea.mod +usr/lib/grub/i386-pc/gcry_idea.module usr/lib/grub/i386-pc/gcry_md4.mod usr/lib/grub/i386-pc/gcry_md4.module usr/lib/grub/i386-pc/gcry_md5.mod @@ -162,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod usr/lib/grub/i386-pc/gcry_rijndael.module usr/lib/grub/i386-pc/gcry_rmd160.mod usr/lib/grub/i386-pc/gcry_rmd160.module +usr/lib/grub/i386-pc/gcry_rsa.mod +usr/lib/grub/i386-pc/gcry_rsa.module usr/lib/grub/i386-pc/gcry_seed.mod usr/lib/grub/i386-pc/gcry_seed.module usr/lib/grub/i386-pc/gcry_serpent.mod @@ -189,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod usr/lib/grub/i386-pc/gfxmenu.module usr/lib/grub/i386-pc/gfxterm.mod usr/lib/grub/i386-pc/gfxterm.module +usr/lib/grub/i386-pc/gfxterm_background.mod +usr/lib/grub/i386-pc/gfxterm_background.module +usr/lib/grub/i386-pc/gfxterm_menu.mod +usr/lib/grub/i386-pc/gfxterm_menu.module usr/lib/grub/i386-pc/gmodule.pl usr/lib/grub/i386-pc/gptsync.mod usr/lib/grub/i386-pc/gptsync.module @@ -210,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod usr/lib/grub/i386-pc/hfs.module usr/lib/grub/i386-pc/hfsplus.mod usr/lib/grub/i386-pc/hfsplus.module +usr/lib/grub/i386-pc/hfspluscomp.mod +usr/lib/grub/i386-pc/hfspluscomp.module usr/lib/grub/i386-pc/http.mod usr/lib/grub/i386-pc/http.module usr/lib/grub/i386-pc/iorw.mod @@ -228,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod usr/lib/grub/i386-pc/keystatus.module usr/lib/grub/i386-pc/ldm.mod usr/lib/grub/i386-pc/ldm.module +usr/lib/grub/i386-pc/legacy_password_test.mod +usr/lib/grub/i386-pc/legacy_password_test.module usr/lib/grub/i386-pc/legacycfg.mod usr/lib/grub/i386-pc/legacycfg.module usr/lib/grub/i386-pc/linux.mod @@ -258,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image usr/lib/grub/i386-pc/lzma_decompress.img usr/lib/grub/i386-pc/lzopio.mod usr/lib/grub/i386-pc/lzopio.module +usr/lib/grub/i386-pc/macbless.mod +usr/lib/grub/i386-pc/macbless.module +usr/lib/grub/i386-pc/macho.mod +usr/lib/grub/i386-pc/macho.module +usr/lib/grub/i386-pc/mda_text.mod +usr/lib/grub/i386-pc/mda_text.module usr/lib/grub/i386-pc/mdraid09.mod usr/lib/grub/i386-pc/mdraid09.module usr/lib/grub/i386-pc/mdraid09_be.mod @@ -286,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod usr/lib/grub/i386-pc/mmap.module usr/lib/grub/i386-pc/moddep.lst usr/lib/grub/i386-pc/modinfo.sh +usr/lib/grub/i386-pc/morse.mod +usr/lib/grub/i386-pc/morse.module +usr/lib/grub/i386-pc/mpi.mod +usr/lib/grub/i386-pc/mpi.module usr/lib/grub/i386-pc/msdospart.mod usr/lib/grub/i386-pc/msdospart.module +usr/lib/grub/i386-pc/mul_test.mod +usr/lib/grub/i386-pc/mul_test.module usr/lib/grub/i386-pc/multiboot.mod usr/lib/grub/i386-pc/multiboot.module usr/lib/grub/i386-pc/multiboot2.mod usr/lib/grub/i386-pc/multiboot2.module +usr/lib/grub/i386-pc/nativedisk.mod +usr/lib/grub/i386-pc/nativedisk.module usr/lib/grub/i386-pc/net.mod usr/lib/grub/i386-pc/net.module usr/lib/grub/i386-pc/newc.mod @@ -308,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod usr/lib/grub/i386-pc/ntldr.module usr/lib/grub/i386-pc/odc.mod usr/lib/grub/i386-pc/odc.module +usr/lib/grub/i386-pc/offsetio.mod +usr/lib/grub/i386-pc/offsetio.module usr/lib/grub/i386-pc/ohci.mod usr/lib/grub/i386-pc/ohci.module usr/lib/grub/i386-pc/part_acorn.mod @@ -318,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod usr/lib/grub/i386-pc/part_apple.module usr/lib/grub/i386-pc/part_bsd.mod usr/lib/grub/i386-pc/part_bsd.module +usr/lib/grub/i386-pc/part_dfly.mod +usr/lib/grub/i386-pc/part_dfly.module usr/lib/grub/i386-pc/part_dvh.mod usr/lib/grub/i386-pc/part_dvh.module usr/lib/grub/i386-pc/part_gpt.mod @@ -342,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod usr/lib/grub/i386-pc/pata.module usr/lib/grub/i386-pc/pbkdf2.mod usr/lib/grub/i386-pc/pbkdf2.module +usr/lib/grub/i386-pc/pbkdf2_test.mod +usr/lib/grub/i386-pc/pbkdf2_test.module usr/lib/grub/i386-pc/pci.mod usr/lib/grub/i386-pc/pci.module +usr/lib/grub/i386-pc/pcidump.mod +usr/lib/grub/i386-pc/pcidump.module usr/lib/grub/i386-pc/plan9.mod usr/lib/grub/i386-pc/plan9.module usr/lib/grub/i386-pc/play.mod @@ -354,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod usr/lib/grub/i386-pc/priority_queue.module usr/lib/grub/i386-pc/probe.mod usr/lib/grub/i386-pc/probe.module +usr/lib/grub/i386-pc/procfs.mod +usr/lib/grub/i386-pc/procfs.module +usr/lib/grub/i386-pc/progress.mod +usr/lib/grub/i386-pc/progress.module usr/lib/grub/i386-pc/pxe.mod usr/lib/grub/i386-pc/pxe.module usr/lib/grub/i386-pc/pxeboot.image @@ -364,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod usr/lib/grub/i386-pc/raid5rec.module usr/lib/grub/i386-pc/raid6rec.mod usr/lib/grub/i386-pc/raid6rec.module +usr/lib/grub/i386-pc/random.mod +usr/lib/grub/i386-pc/random.module usr/lib/grub/i386-pc/read.mod usr/lib/grub/i386-pc/read.module usr/lib/grub/i386-pc/reboot.mod @@ -392,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod usr/lib/grub/i386-pc/serial.module usr/lib/grub/i386-pc/setjmp.mod usr/lib/grub/i386-pc/setjmp.module +usr/lib/grub/i386-pc/setjmp_test.mod +usr/lib/grub/i386-pc/setjmp_test.module usr/lib/grub/i386-pc/setpci.mod usr/lib/grub/i386-pc/setpci.module usr/lib/grub/i386-pc/sfs.mod usr/lib/grub/i386-pc/sfs.module +usr/lib/grub/i386-pc/shift_test.mod +usr/lib/grub/i386-pc/shift_test.module +usr/lib/grub/i386-pc/signature_test.mod +usr/lib/grub/i386-pc/signature_test.module usr/lib/grub/i386-pc/sleep.mod usr/lib/grub/i386-pc/sleep.module +usr/lib/grub/i386-pc/sleep_test.mod +usr/lib/grub/i386-pc/sleep_test.module +usr/lib/grub/i386-pc/spkmodem.mod +usr/lib/grub/i386-pc/spkmodem.module usr/lib/grub/i386-pc/squash4.mod usr/lib/grub/i386-pc/squash4.module +usr/lib/grub/i386-pc/syslinuxcfg.mod +usr/lib/grub/i386-pc/syslinuxcfg.module usr/lib/grub/i386-pc/tar.mod usr/lib/grub/i386-pc/tar.module usr/lib/grub/i386-pc/terminal.lst @@ -413,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod usr/lib/grub/i386-pc/test_blockarg.module usr/lib/grub/i386-pc/testload.mod usr/lib/grub/i386-pc/testload.module +usr/lib/grub/i386-pc/testspeed.mod +usr/lib/grub/i386-pc/testspeed.module usr/lib/grub/i386-pc/tftp.mod usr/lib/grub/i386-pc/tftp.module usr/lib/grub/i386-pc/tga.mod usr/lib/grub/i386-pc/tga.module usr/lib/grub/i386-pc/time.mod usr/lib/grub/i386-pc/time.module +usr/lib/grub/i386-pc/tr.mod +usr/lib/grub/i386-pc/tr.module usr/lib/grub/i386-pc/trig.mod usr/lib/grub/i386-pc/trig.module usr/lib/grub/i386-pc/true.mod usr/lib/grub/i386-pc/true.module +usr/lib/grub/i386-pc/truecrypt.mod +usr/lib/grub/i386-pc/truecrypt.module usr/lib/grub/i386-pc/udf.mod usr/lib/grub/i386-pc/udf.module usr/lib/grub/i386-pc/ufs1.mod usr/lib/grub/i386-pc/ufs1.module +usr/lib/grub/i386-pc/ufs1_be.mod +usr/lib/grub/i386-pc/ufs1_be.module usr/lib/grub/i386-pc/ufs2.mod usr/lib/grub/i386-pc/ufs2.module usr/lib/grub/i386-pc/uhci.mod @@ -443,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod usr/lib/grub/i386-pc/usbserial_ftdi.module usr/lib/grub/i386-pc/usbserial_pl2303.mod usr/lib/grub/i386-pc/usbserial_pl2303.module +usr/lib/grub/i386-pc/usbserial_usbdebug.mod +usr/lib/grub/i386-pc/usbserial_usbdebug.module usr/lib/grub/i386-pc/usbtest.mod usr/lib/grub/i386-pc/usbtest.module usr/lib/grub/i386-pc/vbe.mod usr/lib/grub/i386-pc/vbe.module +usr/lib/grub/i386-pc/verify.mod +usr/lib/grub/i386-pc/verify.module usr/lib/grub/i386-pc/vga.mod usr/lib/grub/i386-pc/vga.module usr/lib/grub/i386-pc/vga_text.mod @@ -458,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod usr/lib/grub/i386-pc/video_bochs.module usr/lib/grub/i386-pc/video_cirrus.mod usr/lib/grub/i386-pc/video_cirrus.module +usr/lib/grub/i386-pc/video_colors.mod +usr/lib/grub/i386-pc/video_colors.module usr/lib/grub/i386-pc/video_fb.mod usr/lib/grub/i386-pc/video_fb.module usr/lib/grub/i386-pc/videoinfo.mod usr/lib/grub/i386-pc/videoinfo.module usr/lib/grub/i386-pc/videotest.mod usr/lib/grub/i386-pc/videotest.module +usr/lib/grub/i386-pc/videotest_checksum.mod +usr/lib/grub/i386-pc/videotest_checksum.module usr/lib/grub/i386-pc/xfs.mod usr/lib/grub/i386-pc/xfs.module usr/lib/grub/i386-pc/xnu.mod usr/lib/grub/i386-pc/xnu.module usr/lib/grub/i386-pc/xnu_uuid.mod usr/lib/grub/i386-pc/xnu_uuid.module +usr/lib/grub/i386-pc/xnu_uuid_test.mod +usr/lib/grub/i386-pc/xnu_uuid_test.module usr/lib/grub/i386-pc/xzio.mod usr/lib/grub/i386-pc/xzio.module usr/lib/grub/i386-pc/zfs.mod @@ -480,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod usr/lib/grub/i386-pc/zfsinfo.module usr/sbin/grub-bios-setup usr/sbin/grub-install +usr/sbin/grub-macbless usr/sbin/grub-mkconfig -usr/sbin/grub-mknetdir usr/sbin/grub-ofpathname usr/sbin/grub-probe usr/sbin/grub-reboot @@ -520,19 +629,27 @@ usr/share/grub/grub-mkconfig_lib #usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo #usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo #usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo #usr/share/locale/fi/LC_MESSAGES/grub.mo #usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo #usr/share/locale/hu/LC_MESSAGES/grub.mo #usr/share/locale/id/LC_MESSAGES/grub.mo #usr/share/locale/it/LC_MESSAGES/grub.mo #usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo #usr/share/locale/nl/LC_MESSAGES/grub.mo #usr/share/locale/pa #usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/grub.mo #usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo #usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo #usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo #usr/share/locale/uk/LC_MESSAGES/grub.mo #usr/share/locale/vi/LC_MESSAGES/grub.mo #usr/share/locale/zh_CN/LC_MESSAGES/grub.mo diff --git a/lfs/flash-images b/lfs/flash-images index d10fc9b..c95dbd9 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -193,7 +193,7 @@ endif -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g" # Install GRUB - grub-install --force --recheck --no-floppy \ + grub-install --force --recheck --no-floppy --directory /usr/lib/grub/i386-pc \ --root-directory=$(MNThdd) $(DEVICE) endif diff --git a/lfs/grub b/lfs/grub index ba74408..e4359b7 100644 --- a/lfs/grub +++ b/lfs/grub @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 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 = 2.00 +VER = 2.02~beta3 THISAPP = grub-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -41,13 +41,13 @@ CXXFLAGS = ############################################################################### objects = $(DL_FILE) \ - unifont-7.0.03.pcf.gz + unifont-9.0.02.pcf.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz +unifont-9.0.02.pcf.gz = $(DL_FROM)/unifont-9.0.02.pcf.gz -$(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91 -unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401 +$(DL_FILE)_MD5 = ab399fc6f74a97d66ff77f04b743149c +unifont-9.0.02.pcf.gz_MD5 = 8819d828361a6b70dcac793c1ec235bb install : $(TARGET) @@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch cd $(DIR_APP) && \ ./configure \ @@ -85,6 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/etc \ --with-platform=pc \ --with-grubdir=grub \ + --disable-efiemu \ + --disable-grub-emu-usb \ --program-transform-name=s,grub,grub, \ --disable-grub-mount \ --disable-werror @@ -100,15 +101,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub # Disable hardening. - paxctl -mpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe - paxctl -mpexs /usr/bin/grub-script-check + paxctl -mpesc /usr/sbin/grub-bios-setup /usr/sbin/grub-probe # We don't need to install unifont just to generate a grub2 compatible # font archive for the graphical boot menu. The following command only # converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters. /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \ --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \ - $(DIR_DL)/unifont-7.0.03.pcf.gz + $(DIR_DL)/unifont-9.0.02.pcf.gz @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/grub-2.00_disable_vga_fallback.patch b/src/patches/grub-2.00_disable_vga_fallback.patch deleted file mode 100644 index 0d1dec9..0000000 --- a/src/patches/grub-2.00_disable_vga_fallback.patch +++ /dev/null @@ -1,15 +0,0 @@ -We have to remove the vga fallback because this not work on bay-trail and other -new intel onboard graphics. - -diff -Naur grub-2.00.org/grub-core/video/i386/pc/vga.c grub-2.00/grub-core/video/i386/pc/vga.c ---- grub-2.00.org/grub-core/video/i386/pc/vga.c 2012-06-06 23:21:02.000000000 +0200 -+++ grub-2.00/grub-core/video/i386/pc/vga.c 2014-09-05 21:41:04.790870375 +0200 -@@ -122,7 +122,7 @@ - { - grub_err_t err; - -- if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT)) -+// if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT)) - return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found"); - - framebuffer.temporary_buffer = grub_malloc (VGA_HEIGHT * VGA_WIDTH); -- 2.9.3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development September 2016