IPFire-SCM June 2019

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5194fdec46da8b264d9e8b68cdab7ce4c131c956
by Michael Tremer 24 Jun '19

24 Jun '19

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 3.x development tree". The branch, master has been updated via 5194fdec46da8b264d9e8b68cdab7ce4c131c956 (commit) via 10c7dfd8b18a9bcd883d4c6574f22bdc892d9236 (commit) via e30ce079e1971ea1c323d2c9a799bee06b1ed48f (commit) via 9e6dd6dc6b32bd7325fefae39a8f08ef37d42e42 (commit) via e54bb56dc6fe5bea4d991ef934e725de80aa09f9 (commit) via fb27129df3533154c749487d1d180f4460e686bb (commit) via d58493c8cb02e88ace4bc62f7ecaddc792df1a65 (commit) via 3647687dcd76bd594c5852d4cd277d81c0b7a777 (commit) via 6a8e687e51afcdb21faad6b6f870f546114e4ff6 (commit) via 1a1f3921bb12587637adf3dd66f6eb3dcc9ad12c (commit) via 530cba5e04576de7f97df0df0948d23dffbc4ea9 (commit) via 3c91321ff78247cca618ebd294e4dca624127140 (commit) via 48052e14340122aefc1235cb2ffb876bd4e187ad (commit) from aa7960eb1359f442ea41cf0d001550476db81c04 (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 5194fdec46da8b264d9e8b68cdab7ce4c131c956 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 24 14:03:24 2019 +0100 boost: Update to 1.70.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 10c7dfd8b18a9bcd883d4c6574f22bdc892d9236 Merge: 48052e143 e30ce079e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 24 13:30:24 2019 +0100 Merge remote-tracking branch 'stevee/master' commit e30ce079e1971ea1c323d2c9a799bee06b1ed48f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 17:21:57 2019 +0200 libyaml: Update to 0.2.2 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 9e6dd6dc6b32bd7325fefae39a8f08ef37d42e42 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 17:18:11 2019 +0200 python-yaml: New package Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit e54bb56dc6fe5bea4d991ef934e725de80aa09f9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 12:57:50 2019 +0200 less: Update to 551 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit fb27129df3533154c749487d1d180f4460e686bb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 11:15:22 2019 +0200 suricata-update: New package Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit d58493c8cb02e88ace4bc62f7ecaddc792df1a65 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 11:13:03 2019 +0200 ncurses: Update to 6.1 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 3647687dcd76bd594c5852d4cd277d81c0b7a777 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 11:10:25 2019 +0200 compat-ncurses: New package This package is used to keep compatibility for binaries which are linked to the series 5 of ncurses. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 6a8e687e51afcdb21faad6b6f870f546114e4ff6 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 22 15:32:19 2019 +0200 nftables: Update to latest snaphot (20190622). Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 1a1f3921bb12587637adf3dd66f6eb3dcc9ad12c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 22 15:30:49 2019 +0200 gawk: Update to 5.0.1 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 530cba5e04576de7f97df0df0948d23dffbc4ea9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 22 12:18:07 2019 +0200 dhcp: Update to 4.4.1 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 3c91321ff78247cca618ebd294e4dca624127140 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jun 20 23:44:24 2019 +0200 xfsprogs: Update to 5.0.0 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 48052e14340122aefc1235cb2ffb876bd4e187ad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 21 15:24:00 2019 +0100 strongswan: Update to 5.8.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: boost/boost.nm | 28 +- boost/patches/boost-1.48.0-add-bjam-man-page.patch | 150 ------- .../patches/boost-1.50.0-fix-non-utf8-files.patch | 22 -- ...1.55.0-python-test-PyImport_AppendInittab.patch | 98 ----- boost/patches/boost-1.57.0-build-optflags.patch | 48 --- boost/patches/boost-1.57.0-mpl-print.patch | 31 -- .../patches/boost-1.57.0-python-abi_letters.patch | 62 --- .../boost-1.57.0-python-libpython_dep.patch | 13 - .../boost-1.57.0-spirit-unused_typedef.patch | 19 - boost/patches/boost-1.58.0-pool-test_linking.patch | 31 -- boost/patches/boost-1.58.0-pool.patch0 | 120 ------ boost/patches/boost-1.59-test-fenv.patch2 | 32 -- boost/patches/boost-1.60.0-no-rpath.patch0 | 21 - .../ncurses.nm => compat-ncurses/compat-ncurses.nm | 96 +---- dhcp/dhcp.nm | 9 +- ...arn-message.patch => 0001-change-bug-url.patch} | 33 +- dhcp/patches/0001-dhcp-remove-bind.patch | 261 ------------- ...atch => 0002-additional-dhclient-options.patch} | 342 +++++++--------- dhcp/patches/0002-dhcp-sharedlib.patch | 140 ------- ...easing-interfaces-requested-by-sbin-ifup.patch} | 39 +- ...cast-BOOTP-for-IBM-pSeries-systems-and-ma.patch | 117 ++++++ ...=> 0005-Change-default-requested-options.patch} | 39 +- ...atch => 0006-Various-man-page-only-fixes.patch} | 119 +++--- .../0006-dhcp-dhclient-decline-backoff.patch | 63 --- ...-Change-paths-to-conform-to-our-standards.patch | 53 +++ dhcp/patches/0007-dhcp-unicast-bootp.patch | 101 ----- ...ll-open-file-descriptors-are-closed-on-ex.patch | 366 ++++++++++++++++++ .../0009-Fix-garbage-in-format-string-error.patch | 26 ++ dhcp/patches/0010-Handle-null-timeout.patch | 31 ++ dhcp/patches/0010-dhcp-paths.patch | 38 -- ...ch => 0011-Drop-unnecessary-capabilities.patch} | 255 ++++++------ dhcp/patches/0011-dhcp-CLOEXEC.patch | 336 ---------------- ...ssless-Static-Route-Option-for-DHCPv4-51.patch} | 319 ++++++++------- dhcp/patches/0012-dhcp-garbage-chars.patch | 12 - .../0013-DHCPv6-over-PPP-support-626514.patch | 175 +++++++++ dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch | 14 - ...pf-ib.patch => 0014-IPoIB-support-660681.patch} | 428 ++++++++++---------- dhcp/patches/0014-dhcp-64_bit_lease_parse.patch | 75 ---- .../0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch | 331 ++++++++++++++++ .../0016-Turn-on-creating-sending-of-DUID.patch | 125 ++++++ dhcp/patches/0016-dhcp-sendDecline.patch | 231 ----------- ...ast-request-release-via-correct-interface.patch | 76 ++++ ...eclaration-for-iface-should-be-info-not-e.patch | 62 +++ dhcp/patches/0018-dhcp-honor-expired.patch | 49 --- ...ite-DUID_LLT-even-in-stateless-mode-11563.patch | 28 ++ dhcp/patches/0019-dhcp-PPP.patch | 150 ------- ...Discover-all-hwaddress-for-xid-uniqueness.patch | 100 +++++ ...21-Load-leases-DB-in-non-replay-mode-only.patch | 50 +++ dhcp/patches/0021-dhcp-IPoIB-log-id.patch | 165 -------- ...notify-patch-for-systemd-support-1687040.patch} | 77 ++-- dhcp/patches/0022-dhcp-improved-xid.patch | 138 ------- dhcp/patches/0023-dhcp-duidv4.patch | 34 -- dhcp/patches/0024-dhcp-duid_uuid.patch | 111 ------ dhcp/patches/0025-dhcp-getifaddrs.patch | 429 --------------------- ...26-dhcp-client-request-release-bind-iface.patch | 61 --- dhcp/patches/0027-dhcp-interval.patch | 25 -- dhcp/patches/0028-dhcp-no-subnet-error2info.patch | 48 --- .../patches/0030-dhcp-option97-pxe-client-id.patch | 217 ----------- dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch | 13 - dhcp/patches/0032-dhcp-dhclient-preinit6s.patch | 64 --- gawk/gawk.nm | 6 +- less/less.nm | 12 +- libyaml/libyaml.nm | 11 +- ncurses/ncurses.nm | 10 +- nftables/nftables.nm | 13 +- pyxattr/pyxattr.nm => python-yaml/python-yaml.nm | 21 +- strongswan/strongswan.nm | 4 +- .../suricata-update.nm | 28 +- xfsprogs/xfsprogs.nm | 2 +- 69 files changed, 2484 insertions(+), 4369 deletions(-) delete mode 100644 boost/patches/boost-1.48.0-add-bjam-man-page.patch delete mode 100644 boost/patches/boost-1.50.0-fix-non-utf8-files.patch delete mode 100644 boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch delete mode 100644 boost/patches/boost-1.57.0-build-optflags.patch delete mode 100644 boost/patches/boost-1.57.0-mpl-print.patch delete mode 100644 boost/patches/boost-1.57.0-python-abi_letters.patch delete mode 100644 boost/patches/boost-1.57.0-python-libpython_dep.patch delete mode 100644 boost/patches/boost-1.57.0-spirit-unused_typedef.patch delete mode 100644 boost/patches/boost-1.58.0-pool-test_linking.patch delete mode 100644 boost/patches/boost-1.58.0-pool.patch0 delete mode 100644 boost/patches/boost-1.59-test-fenv.patch2 delete mode 100644 boost/patches/boost-1.60.0-no-rpath.patch0 copy ncurses/ncurses.nm => compat-ncurses/compat-ncurses.nm (50%) rename dhcp/patches/{0003-dhcp-errwarn-message.patch => 0001-change-bug-url.patch} (76%) delete mode 100644 dhcp/patches/0001-dhcp-remove-bind.patch rename dhcp/patches/{0004-dhcp-dhclient-options.patch => 0002-additional-dhclient-options.patch} (59%) delete mode 100644 dhcp/patches/0002-dhcp-sharedlib.patch rename dhcp/patches/{0005-dhcp-release-by-ifup.patch => 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch} (75%) create mode 100644 dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch rename dhcp/patches/{0008-dhcp-default-requested-options.patch => 0005-Change-default-requested-options.patch} (55%) rename dhcp/patches/{0009-dhcp-manpages.patch => 0006-Various-man-page-only-fixes.patch} (73%) delete mode 100644 dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch create mode 100644 dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch delete mode 100644 dhcp/patches/0007-dhcp-unicast-bootp.patch create mode 100644 dhcp/patches/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch create mode 100644 dhcp/patches/0009-Fix-garbage-in-format-string-error.patch create mode 100644 dhcp/patches/0010-Handle-null-timeout.patch delete mode 100644 dhcp/patches/0010-dhcp-paths.patch rename dhcp/patches/{0015-dhcp-capability.patch => 0011-Drop-unnecessary-capabilities.patch} (52%) delete mode 100644 dhcp/patches/0011-dhcp-CLOEXEC.patch rename dhcp/patches/{0017-dhcp-rfc3442-classless-static-routes.patch => 0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch} (61%) delete mode 100644 dhcp/patches/0012-dhcp-garbage-chars.patch create mode 100644 dhcp/patches/0013-DHCPv6-over-PPP-support-626514.patch delete mode 100644 dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch rename dhcp/patches/{0020-dhcp-lpf-ib.patch => 0014-IPoIB-support-660681.patch} (60%) delete mode 100644 dhcp/patches/0014-dhcp-64_bit_lease_parse.patch create mode 100644 dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch create mode 100644 dhcp/patches/0016-Turn-on-creating-sending-of-DUID.patch delete mode 100644 dhcp/patches/0016-dhcp-sendDecline.patch create mode 100644 dhcp/patches/0017-Send-unicast-request-release-via-correct-interface.patch create mode 100644 dhcp/patches/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch delete mode 100644 dhcp/patches/0018-dhcp-honor-expired.patch create mode 100644 dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch delete mode 100644 dhcp/patches/0019-dhcp-PPP.patch create mode 100644 dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch create mode 100644 dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch delete mode 100644 dhcp/patches/0021-dhcp-IPoIB-log-id.patch rename dhcp/patches/{0029-dhcp-sd_notify.patch => 0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch} (55%) delete mode 100644 dhcp/patches/0022-dhcp-improved-xid.patch delete mode 100644 dhcp/patches/0023-dhcp-duidv4.patch delete mode 100644 dhcp/patches/0024-dhcp-duid_uuid.patch delete mode 100644 dhcp/patches/0025-dhcp-getifaddrs.patch delete mode 100644 dhcp/patches/0026-dhcp-client-request-release-bind-iface.patch delete mode 100644 dhcp/patches/0027-dhcp-interval.patch delete mode 100644 dhcp/patches/0028-dhcp-no-subnet-error2info.patch delete mode 100644 dhcp/patches/0030-dhcp-option97-pxe-client-id.patch delete mode 100644 dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch delete mode 100644 dhcp/patches/0032-dhcp-dhclient-preinit6s.patch copy pyxattr/pyxattr.nm => python-yaml/python-yaml.nm (61%) copy pyxattr/pyxattr.nm => suricata-update/suricata-update.nm (51%) Difference in files: diff --git a/boost/boost.nm b/boost/boost.nm index 1e6038c80..0ce308976 100644 --- a/boost/boost.nm +++ b/boost/boost.nm @@ -5,10 +5,10 @@ name = boost ver_major = 1 -ver_minor = 60 +ver_minor = 70 ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel} -release = 2 +release = 1 groups = System/Libraries url = http://www.boost.org/ @@ -43,23 +43,27 @@ build # Obtain python3 abiflags. python3_abiflags = %(python3-config --abiflags) + CFLAGS += -I/usr/include/python%{python3_version}%{python3_abiflags} + CXXFLAGS += -I/usr/include/python%{python3_version}%{python3_abiflags} + # Don't build in parallel on any architecture. # The C++ compiles consumes too much memory, so # we cannot run multiple instances at once. PARALLELISMFLAGS = -j2 configure_options = \ - --layout=tagged \ - --without-mpi \ - --without-graph_parallel \ + --layout=system \ --build-dir=serial \ \ cflags="%{CFLAGS}" \ cxxflags="%{CXXFLAGS}" \ + linkflags="%{LDFLAGS}" \ variant=release \ - threading=single,multi \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ debug-symbols=on \ - python=%{python_version} \ + python=%{python3_version} \ pch=off # Get python3 abi flags. @@ -70,13 +74,11 @@ build mkdir -pv %{DIR_APP}/serial # Bootstrap build environment. - ./bootstrap.sh --with-toolset=gcc --with-icu + ./bootstrap.sh --with-toolset=gcc --with-icu \ + --with-python=%{python3} - # Enable boost lib for python3. - cat >> ./tools/build/src/user-config.jam << EOF - using python : %{python_version} : %{python2} : %{includedir}/python%{python_version} : : : : ; - using python : %{python3_version} : %{python3} : %{includedir}/python%{python3_version}%{python3_abiflags} : : : : %{python3_abiflags} ; - EOF + # Support for OpenMPI + echo "using mpi ;" >> project-config.jam end build diff --git a/boost/patches/boost-1.48.0-add-bjam-man-page.patch b/boost/patches/boost-1.48.0-add-bjam-man-page.patch deleted file mode 100644 index ea3f19fb6..000000000 --- a/boost/patches/boost-1.48.0-add-bjam-man-page.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/tools/build/v2/doc/bjam.1 b/tools/build/v2/doc/bjam.1 -new file mode 100644 -index 0000000..8a44af6 ---- /dev/null -+++ b/tools/build/v2/doc/bjam.1 -@@ -0,0 +1,144 @@ -+.TH "bjam" 1 "Sat Nov 19 2011" "Doxygen" \" -*- nroff -*- -+.ad l -+.nh -+.SH NAME -+bjam \- Command-line utility to build Boost-related C++ projects with Boost\&.Build -+.SH "SYNOPSIS" -+.PP -+\fBbjam\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP -+.PP -+\fIbjam\fP accepts the following options: -+.PP -+\fB-a\fP -+.br -+ Build all targets, even if they are current -+.PP -+\fB-dx\fP -+.br -+ Set the debug level to x (0-9) -+.PP -+\fB-fx\fP -+.br -+ Read x instead of Jambase -+.PP -+\fB-jx\fP -+.br -+ Run up to x shell commands concurrently -+.PP -+\fB-lx\fP -+.br -+ Limit actions to x number of seconds after which they are stopped -+.PP -+\fB-n\fP -+.br -+ Don't actually execute the updating actions -+.PP -+\fB-ox\fP -+.br -+ Write the updating actions to file x -+.PP -+\fB-px\fP -+.br -+ x=0, pipes action stdout and stderr merged into action output -+.PP -+\fB-q\fP -+.br -+ Quit quickly as soon as a target fails -+.PP -+\fB-sx=y\fP -+.br -+ Set variable x=y, overriding environment -+.PP -+\fB-tx\fP -+.br -+ Rebuild x, even if it is up-to-date -+.PP -+\fB-v\fP -+.br -+ Print the version of jam and exit -+.PP -+\fB--x\fP -+.br -+ Option is ignored -+.SH "DESCRIPTION" -+.PP -+This section provides the information necessary to create your own projects using \fIBoost\&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help) -+.PP -+\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a build engine with its own interpreted language, and \fIBoost\&.Build\fP itself, implemented in \fIBoost\&.Jam's\fP language\&. The chain of events when you type bjam on the command line is as follows: -+.IP "\(bu" 2 -+\fIBoost\&.Jam\fP tries to find \fIBoost\&.Build\fP and loads the top-level module\&. The exact process is described in the section called âInitializationâ -+.PP -+.PP -+.IP "\(bu" 2 -+The top-level module loads user-defined configuration files, \fIuser-config\&.jam\fP and \fIsite-config\&.jam\fP, which define available toolsets -+.PP -+.PP -+.IP "\(bu" 2 -+The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles\&. As a result, a tree of projects is created, with targets inside projects -+.PP -+.PP -+.IP "\(bu" 2 -+Finally, using the build request specified on the command line, \fIBoost\&.Build\fP decides which targets should be built and how\&. That information is passed back to \fIBoost\&.Jam\fP, which takes care of actually running the scheduled build action commands -+.PP -+.PP -+So, to be able to successfully use \fIBoost\&.Build\fP, you need to know only four things: -+.IP "\(bu" 2 -+How to configure \fIBoost\&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html) -+.IP "\(bu" 2 -+How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html) -+.IP "\(bu" 2 -+How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html) -+.PP -+.PP -+Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called âBoost\&.Jam Languageâ (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html) -+.SH "CONCEPTS" -+.PP -+\fIBoost\&.Build\fP has a few unique concepts that are introduced in this section\&. The best way to explain the concepts is by comparison with more classical build tools -+.PP -+When using any flavour of make, you directly specify targets and commands that are used to create them from other target\&. The below example creates a\&.o from a\&.c using a hardcoded compiler invocation command -+.PP -+a\&.o: a\&.c -+.br -+ g++ -o a\&.o -g a\&.c -+.PP -+This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system\&. -+.PP -+To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files\&. Consider this example: -+.PP -+add_program ('a', 'a\&.c') -+.br -+.PP -+This is a function call that creates targets necessary to create executable file from source file a\&.c\&. Depending on configured properties, different commands line may be used\&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds\&. Often, change in any build property requires complete reconfiguration of the build tree -+.PP -+In order to support true multivariant builds, Boost\&.Build introduces the concept of metatargetâobject that is created when build description is parsed and can be later called with specific build properties to generate actual targets -+.PP -+Consider an example: -+.PP -+exe a : a\&.cpp ; -+.br -+.PP -+When this declaration is parsed, \fIBoost\&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used\&. After all build files are parsed, Boost\&.Build considers properties requested on the command line\&. Supposed you have invoked \fIBoost\&.Build\fP with: -+.PP -+\fIbjam\fP toolset=gcc toolset=msvc -+.br -+.PP -+In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc\&. Both invocations will produce concrete targets, that will have different extensions and use different command lines\&. Another key concept is build property\&. Build property is a variable that affects the build process\&. It can be specified on the command line, and is passed when calling a metatarget -+.PP -+While all build tools have a similar mechanism, \fIBoost\&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics -+.PP -+The final concept is property propagation\&. Boost\&.Build does not require that every metatarget is called with the same properties\&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called âRequirementsâ: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.…) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own\&. -+.PP -+For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost\&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)\&. -+.SH "SEE ALSO" -+.PP -+\fBboost-libraries\fP(3) -+.SH "SUPPORT" -+.PP -+Please report any bugs to https://svn.boost.org/trac/boost/ -+.SH "COPYRIGHT" -+.PP -+Boost Software License - Version 1\&.0 - August 17th, 2003 -+.PP -+See the LICENSE_1_0\&.txt file for more information on that license, or directly on Internet: -+.br -+ http://www.boost.org/LICENSE_1_0.txt diff --git a/boost/patches/boost-1.50.0-fix-non-utf8-files.patch b/boost/patches/boost-1.50.0-fix-non-utf8-files.patch deleted file mode 100644 index b60a3ac49..000000000 --- a/boost/patches/boost-1.50.0-fix-non-utf8-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp -index 8b2bc43..d04f2fe 100644 ---- a/libs/units/example/autoprefixes.cpp -+++ b/libs/units/example/autoprefixes.cpp -@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units:: - struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5> - { - static const char* name() { return("EUR"); } -- static const char* symbol() { return(""); } -+ static const char* symbol() { return("â¬"); } - }; - - int main() -@@ -140,7 +140,7 @@ int main() - - quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type(); - cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR -- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k -+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 kâ¬ - - - return 0; diff --git a/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch b/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch deleted file mode 100644 index 1d2ee5c38..000000000 --- a/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -up boost_1_55_0/libs/python/test/exec.cpp\~ boost_1_55_0/libs/python/test/exec.cpp ---- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0200 -+++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +0100 -@@ -56,6 +56,20 @@ void eval_test() - BOOST_TEST(value == "ABCDEFG"); - } - -+struct PyCtx -+{ -+ PyCtx() { -+ Py_Initialize(); -+ } -+ -+ ~PyCtx() { -+ // N.B. certain problems may arise when Py_Finalize is called when -+ // using Boost.Python. However in this test suite it all seems to -+ // work fine. -+ Py_Finalize(); -+ } -+}; -+ - void exec_test() - { - // Register the module with the interpreter -@@ -68,6 +82,8 @@ void exec_test() - ) == -1) - throw std::runtime_error("Failed to add embedded_hello to the interpreter's " - "builtin modules"); -+ -+ PyCtx ctx; - // Retrieve the main module - python::object main = python::import("__main__"); - -@@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=fal - } - } - -+template <class Cb> -+bool -+run_and_handle_exception(Cb cb, bool pyerr_expected = false) -+{ -+ PyCtx ctx; -+ if (python::handle_exception(cb)) { -+ check_pyerr(pyerr_expected); -+ return true; -+ } else { -+ return false; -+ } -+} -+ - int main(int argc, char **argv) - { - BOOST_TEST(argc == 2 || argc == 3); - std::string script = argv[1]; -- // Initialize the interpreter -- Py_Initialize(); - -- if (python::handle_exception(eval_test)) { -- check_pyerr(); -- } -- else if(python::handle_exception(exec_test)) { -- check_pyerr(); -- } -- else if (python::handle_exception(boost::bind(exec_file_test, script))) { -+ // N.B. exec_test mustn't be called through run_and_handle_exception -+ // as it needs to handles the python context by itself. -+ if (run_and_handle_exception(eval_test) -+ || python::handle_exception(exec_test)) - check_pyerr(); -- } -- -- if (python::handle_exception(exec_test_error)) -- { -- check_pyerr(/*pyerr_expected*/ true); -- } - else -- { -+ run_and_handle_exception(boost::bind(exec_file_test, script)); -+ -+ if (!run_and_handle_exception(exec_test_error, true)) - BOOST_ERROR("Python exception expected, but not seen."); -- } - - if (argc > 2) { -+ PyCtx ctx; - // The main purpose is to test compilation. Since this test generates - // a file and I (rwgk) am uncertain about the side-effects, run it only - // if explicitly requested. - exercise_embedding_html(); - } - -- // Boost.Python doesn't support Py_Finalize yet. -- // Py_Finalize(); - return boost::report_errors(); - } - - -Diff finished. Fri Jan 9 21:31:13 2015 diff --git a/boost/patches/boost-1.57.0-build-optflags.patch b/boost/patches/boost-1.57.0-build-optflags.patch deleted file mode 100644 index d0b925fbb..000000000 --- a/boost/patches/boost-1.57.0-build-optflags.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam ---- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100 -+++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100 -@@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch - toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ; - - # Declare flags and action for compilation. --toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ; --toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ; --toolset.flags gcc.compile OPTIONS <optimization>space : -Os ; -+toolset.flags gcc.compile OPTIONS <optimization>off : ; -+toolset.flags gcc.compile OPTIONS <optimization>speed : ; -+toolset.flags gcc.compile OPTIONS <optimization>space : ; - --toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ; --toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ; --toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ; -+toolset.flags gcc.compile OPTIONS <inlining>off : ; -+toolset.flags gcc.compile OPTIONS <inlining>on : ; -+toolset.flags gcc.compile OPTIONS <inlining>full : ; - --toolset.flags gcc.compile OPTIONS <warnings>off : -w ; --toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ; --toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ; -+toolset.flags gcc.compile OPTIONS <warnings>off : ; -+toolset.flags gcc.compile OPTIONS <warnings>on : ; -+toolset.flags gcc.compile OPTIONS <warnings>all : ; - toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ; - - toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ; -@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc - - actions compile.c++ bind PCH_FILE - { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" -+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" - } - - actions compile.c bind PCH_FILE -@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE - - actions compile.c++.preprocess bind PCH_FILE - { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" -+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" - } - - actions compile.c.preprocess bind PCH_FILE diff --git a/boost/patches/boost-1.57.0-mpl-print.patch b/boost/patches/boost-1.57.0-mpl-print.patch deleted file mode 100644 index 561cef19e..000000000 --- a/boost/patches/boost-1.57.0-mpl-print.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp ---- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 -+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 -@@ -52,16 +52,15 @@ struct print - enum { n = sizeof(T) + -1 }; - #elif defined(__MWERKS__) - void f(int); --#else -- enum { -- n = --# if defined(__EDG_VERSION__) -- aux::dependent_unsigned<T>::value > -1 --# else -- sizeof(T) > -1 --# endif -- }; --#endif -+#elif defined(__EDG_VERSION__) -+ enum { n = aux::dependent_unsigned<T>::value > -1 }; -+#elif defined(BOOST_GCC) -+ enum { n1 }; -+ enum { n2 }; -+ enum { n = n1 != n2 }; -+#else -+ enum { n = sizeof(T) > -1 }; -+#endif - }; - - #if defined(BOOST_MSVC) - -Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/boost/patches/boost-1.57.0-python-abi_letters.patch b/boost/patches/boost-1.57.0-python-abi_letters.patch deleted file mode 100644 index 7df3ee704..000000000 --- a/boost/patches/boost-1.57.0-python-abi_letters.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 -+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 -@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti - # using python : 2.3 : /usr/local/bin/python ; - # - rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? -- : condition * : extension-suffix ? ) -+ : condition * : extension-suffix ? : abi-letters ? ) - { - project.push-current $(.project) ; - -@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ? - } - } - -- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; -+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ; - - project.pop-current ; - } -@@ -653,7 +653,7 @@ local rule system-library-dependencies ( - - # Declare a target to represent Python's library. - # --local rule declare-libpython-target ( version ? : requirements * ) -+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? ) - { - # Compute the representation of Python version in the name of Python's - # library file. -@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve - } - - # Declare it. -- lib python.lib : : <name>python$(lib-version) $(requirements) ; -+ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ; - } - - - # Implementation of init. - local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : -- condition * : extension-suffix ? ) -+ condition * : extension-suffix ? : abi-letters ? ) - { - local prefix ; - local exec-prefix ; -@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o - extension-suffix ?= _d ; - } - extension-suffix ?= "" ; -+ abi-letters ?= "" ; - - # Normalize and dissect any version number. - local major-minor ; -@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o - } - else - { -- declare-libpython-target $(version) : $(target-requirements) ; -+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ; - - # This is an evil hack. On, Windows, when Python is embedded, nothing - # seems to set up sys.path to include Python's standard library diff --git a/boost/patches/boost-1.57.0-python-libpython_dep.patch b/boost/patches/boost-1.57.0-python-libpython_dep.patch deleted file mode 100644 index 57bfc2677..000000000 --- a/boost/patches/boost-1.57.0-python-libpython_dep.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: boost_1_57_0/tools/build/src/tools/python.jam -=================================================================== ---- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) -+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) -@@ -994,7 +994,7 @@ - else - { - alias python_for_extensions -- : -+ : python - : $(target-requirements) - : - : $(usage-requirements) diff --git a/boost/patches/boost-1.57.0-spirit-unused_typedef.patch b/boost/patches/boost-1.57.0-spirit-unused_typedef.patch deleted file mode 100644 index 282962987..000000000 --- a/boost/patches/boost-1.57.0-spirit-unused_typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ---- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 -+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 -@@ -282,12 +282,12 @@ struct grammar_definition - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base<GrammarT> helper_base_t; - typedef grammar_helper_list<GrammarT> helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - - helper_list_t& helpers = - grammartract_helper_list::do_(self); - - # if defined(BOOST_INTEL_CXX_VERSION) -+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) - (*i)->undefine(self); - # else - -Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/boost/patches/boost-1.58.0-pool-test_linking.patch b/boost/patches/boost-1.58.0-pool-test_linking.patch deleted file mode 100644 index a3813707c..000000000 --- a/boost/patches/boost-1.58.0-pool-test_linking.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2 ---- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100 -+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100 -@@ -28,17 +28,17 @@ - local Werr = <toolset>gcc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on ; - - test-suite pool : -- [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 ] -- [ run test_pool_alloc.cpp : : : $(Werr) ] -- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 ] -- [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) ] -- [ run test_bug_3349.cpp : : : $(Werr) ] -- [ run test_bug_4960.cpp : : : $(Werr) ] -- [ run test_bug_1252.cpp : : : $(Werr) ] -- [ run test_bug_2696.cpp : : : $(Werr) ] -- [ run test_bug_5526.cpp : : : $(Werr) ] -+ [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ] -+ [ run test_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ] -+ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ] -+ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) <library>/boost/system//boost_system ] -+ [ run test_bug_3349.cpp : : : $(Werr) <library>/boost/system//boost_system ] -+ [ run test_bug_4960.cpp : : : $(Werr) <library>/boost/system//boost_system ] -+ [ run test_bug_1252.cpp : : : $(Werr) <library>/boost/system//boost_system ] -+ [ run test_bug_2696.cpp : : : $(Werr) <library>/boost/system//boost_system ] -+ [ run test_bug_5526.cpp : : : $(Werr) <library>/boost/system//boost_system ] - [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ] -- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ] -+ [ run ../example/time_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ] - [ compile test_poisoned_macros.cpp : $(Werr) ] - - # diff --git a/boost/patches/boost-1.58.0-pool.patch0 b/boost/patches/boost-1.58.0-pool.patch0 deleted file mode 100644 index ed8449ef0..000000000 --- a/boost/patches/boost-1.58.0-pool.patch0 +++ /dev/null @@ -1,120 +0,0 @@ -Index: boost/pool/pool.hpp -=================================================================== ---- boost/pool/pool.hpp (revision 78317) -+++ boost/pool/pool.hpp (revision 78326) -@@ -27,4 +27,6 @@ - #include <boost/pool/poolfwd.hpp> - -+// std::numeric_limits -+#include <boost/limits.hpp> - // boost::integer::static_lcm - #include <boost/integer/common_factor_ct.hpp> -@@ -358,4 +360,11 @@ - } - -+ size_type max_chunks() const -+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. -+ size_type partition_size = alloc_size(); -+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); -+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); -+ } -+ - static void * & nextof(void * const ptr) - { //! \returns Pointer dereferenced. -@@ -377,5 +388,7 @@ - //! the first time that object needs to allocate system memory. - //! The default is 32. This parameter may not be 0. -- //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } - -@@ -400,7 +413,7 @@ - } - void set_next_size(const size_type nnext_size) -- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -- //! \returns nnext_size. -- next_size = start_size = nnext_size; -+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -+ BOOST_USING_STD_MIN(); -+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); - } - size_type get_max_size() const -@@ -410,5 +423,6 @@ - void set_max_size(const size_type nmax_size) - { //! Set max_size. -- max_size = nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); - } - size_type get_requested_size() const -@@ -713,7 +727,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -753,7 +767,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -797,4 +811,6 @@ - //! \returns Address of chunk n if allocated ok. - //! \returns 0 if not enough memory for n chunks. -+ if (n > max_chunks()) -+ return 0; - - const size_type partition_size = alloc_size(); -@@ -845,7 +861,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=================================================================== ---- libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ libs/pool/test/test_bug_6701.cpp (revision 78326) -@@ -0,0 +1,27 @@ -+/* Copyright (C) 2012 Ãtienne Dupuis -+* -+* Use, modification and distribution is subject to the -+* Boost Software License, Version 1.0. (See accompanying -+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) -+ -+#include <boost/pool/object_pool.hpp> -+#include <boost/limits.hpp> -+ -+int main() -+{ -+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768); -+ -+ void *x = p.malloc(); -+ BOOST_ASSERT(!x); -+ -+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size()); -+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size()); -+ -+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768); -+ BOOST_ASSERT(!y); -+ -+ return 0; -+} diff --git a/boost/patches/boost-1.59-test-fenv.patch2 b/boost/patches/boost-1.59-test-fenv.patch2 deleted file mode 100644 index df87f56e5..000000000 --- a/boost/patches/boost-1.59-test-fenv.patch2 +++ /dev/null @@ -1,32 +0,0 @@ -commit 2f3b98e640c25fe45ae691a5aa950745380b983e -Author: Jonathan Wakely <jwakely(a)redhat.com> -Date: Mon Sep 14 15:05:24 2015 +0100 - - Do not qualify <fenv.h> names that might be macros. - -diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp -index 3a9e779..8b319df 100644 ---- a/include/boost/test/impl/execution_monitor.ipp -+++ b/include/boost/test/impl/execution_monitor.ipp -@@ -1380,8 +1380,8 @@ enable( unsigned mask ) - - return ~old_cw & BOOST_FPE_ALL; - #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) -- ::feclearexcept(BOOST_FPE_ALL); -- int res = ::feenableexcept( mask ); -+ feclearexcept(BOOST_FPE_ALL); -+ int res = feenableexcept( mask ); - return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; - #else - /* Not Implemented */ -@@ -1417,8 +1417,8 @@ disable( unsigned mask ) - - return ~old_cw & BOOST_FPE_ALL; - #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) -- ::feclearexcept(BOOST_FPE_ALL); -- int res = ::fedisableexcept( mask ); -+ feclearexcept(BOOST_FPE_ALL); -+ int res = fedisableexcept( mask ); - return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; - #else - /* Not Implemented */ diff --git a/boost/patches/boost-1.60.0-no-rpath.patch0 b/boost/patches/boost-1.60.0-no-rpath.patch0 deleted file mode 100644 index eed65c252..000000000 --- a/boost/patches/boost-1.60.0-no-rpath.patch0 +++ /dev/null @@ -1,21 +0,0 @@ -diff -up tools/build/src/tools/gcc.jam.rpath tools/build/src/tools/gcc.jam ---- tools/build/src/tools/gcc.jam.rpath 2016-05-27 13:30:01.092192721 -0500 -+++ tools/build/src/tools/gcc.jam 2016-05-27 13:30:46.686987585 -0500 -@@ -952,7 +952,7 @@ rule link ( targets * : sources * : prop - - actions link bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - -@@ -1018,7 +1018,7 @@ rule link.dll ( targets * : sources * : - # Differs from 'link' above only by -shared. - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - rule setup-threading ( targets * : sources * : properties * ) diff --git a/compat-ncurses/compat-ncurses.nm b/compat-ncurses/compat-ncurses.nm new file mode 100644 index 000000000..677060fdf --- /dev/null +++ b/compat-ncurses/compat-ncurses.nm @@ -0,0 +1,106 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = compat-ncurses +version = 5.9 +revision = 20150117 +release = 12.%{revision} +thisapp = ncurses-%{version}-%{revision} + +groups = System/Base +url = http://invisible-island.net/ncurses/ncurses.html +license = MIT +summary = Ncurses support utilities. + +description + The curses library routines are a terminal-independent method of + updating character screens with reasonable optimization. The ncurses + (new curses) library is a freely distributable replacement for the + discontinued 4.4 BSD classic curses library. +end + +source_dl = ftp://invisible-island.net/ncurses/current/ +sources = %{thisapp}.tgz + +build + requires + gcc-c++ + end + + configure_options += \ + --with-shared \ + --without-debug \ + --without-ada \ + --with-ospeed=unsigned \ + --with-chtype=long \ + --enable-hard-tabs \ + --enable-xmc-glitch \ + --enable-colorfgbg \ + --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \ + --enable-overwrite \ + --enable-pc-files \ + --with-termlib=tinfo + + export PKG_CONFIG_LIBDIR=%{libdir}/pkgconfig + + build + mkdir -pv narrowc widec + + # Build narrowc version. + cd narrowc + ln -svf ../configure . + ./configure %{configure_options} --with-ticlib + make %{PARALLELISMFLAGS} libs + make %{PARALLELISMFLAGS} -C progs + + # Build widec version. + cd ../widec + ln -svf ../configure . + ./configure %{configure_options} --enable-widec --without-progs + make %{PARALLELISMFLAGS} libs + cd .. + end + + install + make -C narrowc DESTDIR=%{BUILDROOT} install.libs + rm -rvf %{BUILDROOT}%{libdir}/libtinfo.* + make -C widec DESTDIR=%{BUILDROOT} install.libs + + chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.* + + # don't require -ltinfo when linking with --no-add-needed + for l in %{BUILDROOT}%{libdir}/libncurses{,w}.so; do + soname=$(basename $(readlink $l)) + rm -f $l + echo "INPUT($soname -ltinfo)" > $l + done + + rm -f %{BUILDROOT}%{libdir}/libcurses{,w}.so + echo "INPUT(-lncurses)" > %{BUILDROOT}%{libdir}/libcurses.so + echo "INPUT(-lncursesw)" > %{BUILDROOT}%{libdir}/libcursesw.so + echo "INPUT(-ltinfo)" > %{BUILDROOT}%{libdir}/libtermcap.so + + rm -vf %{BUILDROOT}%{libdir}/terminfo + rm -vf %{BUILDROOT}%{libdir}/pkgconfig/{*_g,ncurses++*}.pc + end +end + +packages + package %{name} + template LIBS + + provides + ncurses-libs = %{thisver} + end + + obsoletes + ncurses-libs <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm index eafb0b0fc..421c6ca4f 100644 --- a/dhcp/dhcp.nm +++ b/dhcp/dhcp.nm @@ -4,7 +4,7 @@ ############################################################################### name = dhcp -version = 4.3.5b1 +version = 4.4.1 release = 1 groups = Networking/Daemons @@ -37,6 +37,8 @@ build CFLAGS += -fno-strict-aliasing + PARALLELISMFLAGS = # No parallel build. + configure_options += \ --sysconfdir=%{sysconfdir}/dhcp \ --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \ @@ -50,8 +52,6 @@ build --with-relay-pid-file=/run/dhcrelay.pid \ --with-ldap \ --with-ldapcrypto \ - --with-libbind=/usr/include/ \ - --with-libbind-libs=/usr/lib/ \ --disable-static \ --enable-paranoia \ --enable-early-chroot \ @@ -59,9 +59,6 @@ build --with-systemd prepare_cmds - # Remove bundled BIND source - rm -rvf %{DIR_APP}/bind/bind.tar.gz - # Regenerate build environment autoreconf --verbose --force --install diff --git a/dhcp/patches/0003-dhcp-errwarn-message.patch b/dhcp/patches/0001-change-bug-url.patch similarity index 76% rename from dhcp/patches/0003-dhcp-errwarn-message.patch rename to dhcp/patches/0001-change-bug-url.patch index f42d1e980..e0fbba92f 100644 --- a/dhcp/patches/0003-dhcp-errwarn-message.patch +++ b/dhcp/patches/0001-change-bug-url.patch @@ -1,10 +1,21 @@ -diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c ---- dhcp-4.3.5/omapip/errwarn.c.errwarn 2016-09-27 21:16:50.000000000 +0200 -+++ dhcp-4.3.5/omapip/errwarn.c 2016-11-29 19:44:03.515031147 +0100 -@@ -49,6 +49,41 @@ void (*log_cleanup) (void); +From 31ef6eadb15c3773b81256a8617eccc7657fd2fd Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:09:57 +0100 +Subject: [PATCH 01/21] change bug url +Cc: pzhukov(a)redhat.com + +--- + omapip/errwarn.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 42 insertions(+), 5 deletions(-) + +diff --git a/omapip/errwarn.c b/omapip/errwarn.c +index e30f8a0..09a3004 100644 +--- a/omapip/errwarn.c ++++ b/omapip/errwarn.c +@@ -48,6 +48,41 @@ void (*log_cleanup) (void); static char mbuf [CVT_BUF_MAX + 1]; static char fbuf [CVT_BUF_MAX + 1]; - + +// get BUG_REPORT_URL from /etc/os-release +char * bug_report_url(void) { + FILE * file = fopen("/etc/os-release", "r"); @@ -41,17 +52,17 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c + + /* Log an error message, then exit... */ - + void log_fatal (const char * fmt, ... ) -@@ -75,11 +110,13 @@ void log_fatal (const char * fmt, ... ) +@@ -74,11 +109,13 @@ void log_fatal (const char * fmt, ... ) } - + log_error ("%s", ""); - log_error ("If you think you have received this message due to a bug rather"); - log_error ("than a configuration issue please read the section on submitting"); - log_error ("bugs on either our web page at www.isc.org or in the README file"); - log_error ("before submitting a bug. These pages explain the proper"); -- log_error ("process and the information we find helpful for debugging.."); +- log_error ("process and the information we find helpful for debugging."); + log_error ("This version of ISC DHCP is based on the release available"); + log_error ("on ftp.isc.org. Features have been added and other changes"); + log_error ("have been made to the base software release in order to make"); @@ -61,4 +72,6 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c + log_error ("%s", bug_report_url()); log_error ("%s", ""); log_error ("exiting."); - + +-- +2.14.5 diff --git a/dhcp/patches/0001-dhcp-remove-bind.patch b/dhcp/patches/0001-dhcp-remove-bind.patch deleted file mode 100644 index 46bd323d6..000000000 --- a/dhcp/patches/0001-dhcp-remove-bind.patch +++ /dev/null @@ -1,261 +0,0 @@ -diff -up dhcp-4.3.5b1/client/Makefile.am.remove-bind dhcp-4.3.5b1/client/Makefile.am ---- dhcp-4.3.5b1/client/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/Makefile.am 2016-09-12 17:00:22.797902248 +0200 -@@ -4,8 +4,6 @@ - # production code. Sadly, we are not there yet. - SUBDIRS = . tests - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' - -@@ -15,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c - scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt --dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind dhcp-4.3.5b1/common/tests/Makefile.am ---- dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/common/tests/Makefile.am 2016-09-12 17:07:42.168232452 +0200 -@@ -1,7 +1,5 @@ - SUBDIRS = . - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes - - EXTRA_DIST = Atffile -@@ -15,26 +13,26 @@ ATF_TESTS += alloc_unittest dns_unittest - alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c - alloc_unittest_LDADD = $(ATF_LDFLAGS) - alloc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - dns_unittest_LDADD = $(ATF_LDFLAGS) - dns_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - misc_unittest_LDADD = $(ATF_LDFLAGS) - misc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c - ns_name_unittest_LDADD = $(ATF_LDFLAGS) - ns_name_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - check: $(ATF_TESTS) - @if test $(top_srcdir) != ${top_builddir}; then \ -diff -up dhcp-4.3.5b1/configure.ac.remove-bind dhcp-4.3.5b1/configure.ac ---- dhcp-4.3.5b1/configure.ac.remove-bind 2016-08-26 20:24:41.000000000 +0200 -+++ dhcp-4.3.5b1/configure.ac 2016-09-12 17:00:22.798902249 +0200 -@@ -682,20 +682,33 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t - BINDDIR= - BINDSRCDIR= - AC_ARG_WITH(libbind, -- AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH -- (default is ./bind)]), -+ AS_HELP_STRING([--with-libbind=PATH],[bind includes are in PATH -+ (default is ./bind/includes)]), - use_libbind="$withval", use_libbind="no") - case "$use_libbind" in -+yes|no) -+ libbind="\${top_srcdir}/bind/include" -+ ;; -+*) -+ libbind="$use_libbind" -+ ;; -+esac -+ -+BIND9_LIBDIR='-L$(top_builddir)/bind/lib' -+AC_ARG_WITH(libbind-libs, -+ AC_HELP_STRING([--with-libbind-libs=PATH], -+ [bind9 export libraries are in PATH]), -+ [libbind_libs="$withval"], [libbind_libs='no']) -+case "$libbind_libs" in - yes) -- BINDDIR="\${top_srcdir}/bind" -- BINDSRCDIR="\${top_srcdir}/bind" -+ AC_MSG_ERROR([Specify path to bind9 libraries]) - ;; - no) -- BINDDIR="\${top_srcdir}/bind" -- BINDSRCDIR="\${top_srcdir}/bind" -+ BUNDLED_BIND=yes - ;; - *) -- BINDDIR="$use_libbind" -+ BIND9_LIBDIR="-L$libbind_libs" -+ BUNDLED_BIND=no - if test ! -d "$srcdir/bind"; then - # no bind directory, create it with a fake Makefile.in - # (AC_CONFIG_FILES and top Makefile refer to it so -@@ -709,8 +722,8 @@ EOF - fi - ;; - esac --AC_SUBST(BINDDIR) --AC_SUBST(BINDSRCDIR) -+AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes]) -+AC_SUBST([BIND9_LIBDIR]) - - # OpenLDAP support. - AC_ARG_WITH(ldap, -@@ -788,7 +801,7 @@ fi - CFLAGS="$CFLAGS $STD_CWARNINGS" - - # Try to add the bind and dhcp include directories --CFLAGS="$CFLAGS -I\$(top_srcdir)/includes -I$BINDDIR/include" -+CFLAGS="$CFLAGS -I$libbind" - - case "$host" in - *-darwin*) -diff -up dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.3.5b1/dhcpctl/Makefile.am ---- dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/dhcpctl/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,5 +1,3 @@ --BINDLIBDIR = @BINDDIR@/lib -- - bin_PROGRAMS = omshell - lib_LIBRARIES = libdhcpctl.a - noinst_PROGRAMS = cltest -@@ -8,12 +6,10 @@ EXTRA_DIST = $(man_MANS) - - omshell_SOURCES = omshell.c - omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c - - cltest_SOURCES = cltest.c - cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export -diff -up dhcp-4.3.5b1/Makefile.am.remove-bind dhcp-4.3.5b1/Makefile.am ---- dhcp-4.3.5b1/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -26,7 +26,13 @@ EXTRA_DIST = RELNOTES LICENSE \ - bind/Makefile.in bind/bind.tar.gz bind/version.tmp \ - common/tests/Atffile server/tests/Atffile - --SUBDIRS = @BINDSRCDIR@ includes tests common omapip client dhcpctl relay server -+if BUNDLED_BIND -+SUBDIRS = bind -+else -+SUBDIRS = -+endif -+ -+SUBDIRS += includes tests common omapip client dhcpctl relay server - - nobase_include_HEADERS = dhcpctl/dhcpctl.h - -diff -up dhcp-4.3.5b1/omapip/Makefile.am.remove-bind dhcp-4.3.5b1/omapip/Makefile.am ---- dhcp-4.3.5b1/omapip/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/omapip/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,5 +1,3 @@ --BINDLIBDIR = @BINDDIR@/lib -- - lib_LIBRARIES = libomapi.a - noinst_PROGRAMS = svtest - -@@ -12,6 +10,6 @@ man_MANS = omapi.3 - EXTRA_DIST = $(man_MANS) - - svtest_SOURCES = test.c --svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+svtest_LDADD = libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - -diff -up dhcp-4.3.5b1/relay/Makefile.am.remove-bind dhcp-4.3.5b1/relay/Makefile.am ---- dhcp-4.3.5b1/relay/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/relay/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,12 +1,9 @@ --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' - - sbin_PROGRAMS = dhcrelay - dhcrelay_SOURCES = dhcrelay.c - dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhcrelay.8 - EXTRA_DIST = $(man_MANS) - -diff -up dhcp-4.3.5b1/server/Makefile.am.remove-bind dhcp-4.3.5b1/server/Makefile.am ---- dhcp-4.3.5b1/server/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -4,8 +4,6 @@ - # production code. Sadly, we are not there yet. - SUBDIRS = . tests - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' - - dist_sysconf_DATA = dhcpd.conf.example -@@ -15,10 +13,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c - dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c - - dhcpd_CFLAGS = $(LDAP_CFLAGS) --dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -- ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ -- $(BINDLIBDIR)/libisc.a $(LDAP_LIBS) -+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \ -+ $(LDAP_LIBS) - - man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind dhcp-4.3.5b1/server/tests/Makefile.am ---- dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/tests/Makefile.am 2016-09-12 17:00:22.799902249 +0200 -@@ -1,9 +1,7 @@ - SUBDIRS = . - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes --AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) -+AM_CPPFLAGS += -I$(top_srcdir) - AM_CPPFLAGS += -DLOCALSTATEDIR='"."' - - EXTRA_DIST = Atffile -@@ -20,9 +18,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa - ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c - - DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ -- $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ -- $(BINDLIBDIR)/libisc.a -+ $(top_builddir)/dhcpctl/libdhcpctl.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ATF_TESTS = - if HAVE_ATF diff --git a/dhcp/patches/0004-dhcp-dhclient-options.patch b/dhcp/patches/0002-additional-dhclient-options.patch similarity index 59% rename from dhcp/patches/0004-dhcp-dhclient-options.patch rename to dhcp/patches/0002-additional-dhclient-options.patch index 8f0dfe98b..8f83f8659 100644 --- a/dhcp/patches/0004-dhcp-dhclient-options.patch +++ b/dhcp/patches/0002-additional-dhclient-options.patch @@ -1,41 +1,58 @@ -diff -up dhcp-4.3.4/client/clparse.c.options dhcp-4.3.4/client/clparse.c ---- dhcp-4.3.4/client/clparse.c.options 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/clparse.c 2016-04-29 12:06:13.485470579 +0200 +From 3a86bcb58a7c081df22b6f55e973d5e3c99065d8 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:19:47 +0100 +Subject: [PATCH 02/21] additional dhclient options +Cc: pzhukov(a)redhat.com + +--- + client/clparse.c | 10 +- + client/dhclient.8 | 27 ++++++ + client/dhclient.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++- + common/conflex.c | 2 + + includes/dhcpd.h | 3 + + includes/dhctoken.h | 1 + + 6 files changed, 308 insertions(+), 6 deletions(-) + +diff --git a/client/clparse.c b/client/clparse.c +index eaf48a8..7212e3a 100644 +--- a/client/clparse.c ++++ b/client/clparse.c @@ -189,6 +189,7 @@ isc_result_t read_client_conf () - /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache) - */ - top_level_config.requested_lease = 7200; + /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache) + */ + top_level_config.requested_lease = 7200; + top_level_config.bootp_broadcast_always = 0; - - group_allocate (&top_level_config.on_receipt, MDL); - if (!top_level_config.on_receipt) + + group_allocate (&top_level_config.on_receipt, MDL); + if (!top_level_config.on_receipt) @@ -394,7 +395,8 @@ void read_client_leases () - interface-declaration | - LEASE client-lease-statement | - ALIAS client-lease-statement | + interface-declaration | + LEASE client-lease-statement | + ALIAS client-lease-statement | - KEY key-definition */ + KEY key-definition | + BOOTP_BROADCAST_ALWAYS */ - + void parse_client_statement (cfile, ip, config) - struct parse *cfile; -@@ -817,6 +819,12 @@ void parse_client_statement (cfile, ip, - parse_lease_id_format(cfile); - break; - + struct parse *cfile; +@@ -817,6 +819,12 @@ void parse_client_statement (cfile, ip, config) + parse_lease_id_format(cfile); + break; + + case BOOTP_BROADCAST_ALWAYS: + token = next_token(&val, (unsigned*)0, cfile); + config -> bootp_broadcast_always = 1; + parse_semi (cfile); + return; + - - default: - lose = 0; -diff -up dhcp-4.3.4/client/dhclient.8.options dhcp-4.3.4/client/dhclient.8 ---- dhcp-4.3.4/client/dhclient.8.options 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/dhclient.8 2016-04-29 11:59:50.446590077 +0200 -@@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Pr + + default: + lose = 0; +diff --git a/client/dhclient.8 b/client/dhclient.8 +index ebc750f..6d7fbdb 100644 +--- a/client/dhclient.8 ++++ b/client/dhclient.8 +@@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Protocol Client .B -w ] [ @@ -66,86 +83,17 @@ diff -up dhcp-4.3.4/client/dhclient.8.options dhcp-4.3.4/client/dhclient.8 +.I timeout +] +[ - .B -v + .B --dad-wait-time + .I seconds ] - [ -@@ -289,6 +316,69 @@ not to exit when it doesn't find any suc - program can then be used to notify the client when a network interface - has been added or removed, so that the client can attempt to configure an IP - address on that interface. -+ -+.TP -+.BI \-B -+Set the BOOTP broadcast flag in request packets so servers will always -+broadcast replies. -+ -+.TP -+.BI \-C\ <dhcp-client-identifier> -+Specify the dhcp-client-identifier option to send to the DHCP server. -+ -+.TP -+.BI \-H\ <host-name> -+Specify the host-name option to send to the DHCP server. The host-name -+string only contains the client's hostname prefix, to which the server will -+append the ddns-domainname or domain-name options, if any, to derive the -+fully qualified domain name of the client. The -+.B -H -+option cannot be used with the -+.B -F -+option. -+ -+.TP -+.BI \-F\ <fqdn.fqdn> -+Specify the fqdn.fqdn option to send to the DHCP server. This option cannot -+be used with the -+.B -H -+option. The fqdn.fqdn option must specify the complete domain name of the -+client host, which the server may use for dynamic DNS updates. -+ -+.TP -+.BI \-V\ <vendor-class-identifier> -+Specify the vendor-class-identifier option to send to the DHCP server. -+ -+.TP -+.BI \--request-options\ <option>[,<option>...] -+Specify the list of options the client is to request from the server. The -+option list must be a single string consisting of option names separated -+by at least one command and optional space characters. The default option -+list is: -+ -+.BR -+ subnet-mask, broadcast-address, time-offset, routers, -+.BR -+ domain-search, domain-name, domain-name-servers, host-name, -+.BR -+ nis-domain, nis-servers, ntp-servers, interface-mtu -+ -+.TP -+.B --request-options -+option does not append options to the default request, it overrides the -+default request list. Keep this in mind if you want to request an -+additional option besides the default request list. You will have to -+specify all option names for the -+.B --request-options -+parameter. -+ -+.TP -+.BI \--timeout\ <timeout> -+Specify the time after which -+.B dhclient -+will decide that no DHCP servers can be contacted when no responses have been -+received. -+ - .TP - .BI \-n - Do not configure any interfaces. This is most likely to be useful in -diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.options 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:12:14.182364093 +0200 -@@ -40,6 +40,12 @@ - #include <isc/file.h> - #include <dns/result.h> - +diff --git a/client/dhclient.c b/client/dhclient.c +index 825ab00..26a333c 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -41,6 +41,12 @@ + #include <sys/wait.h> + #include <limits.h> + +/* + * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define + * that when building ISC code. @@ -154,37 +102,39 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c + TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ - -@@ -100,6 +106,10 @@ char *mockup_relay = NULL; - + +@@ -110,6 +116,10 @@ char *mockup_relay = NULL; + char *progname = NULL; - + +int bootp_broadcast_always = 0; + +extern struct option *default_requested_options[]; + void run_stateless(int exit_mode, u_int16_t port); - + static isc_result_t write_duid(struct data_string *duid); -@@ -177,7 +187,11 @@ usage(const char *sfmt, const char *sarg - " [-s server-addr] [-cf config-file]\n" - " [-df duid-file] [-lf lease-file]\n" - " [-pf pid-file] [--no-pid] [-e VAR=val]\n" -- " [-sf script-file] [interface]*", -+ " [-sf script-file] [interface]*\n" -+ " [-C <dhcp-client-identifier>] [-B]\n" -+ " [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n" -+ " [-V <vendor-class-identifier>]\n" -+ " [--request-options <request option list>]", - isc_file_basename(progname)); - } - -@@ -214,6 +228,16 @@ main(int argc, char **argv) { - progname = argv[0]; +@@ -183,8 +193,12 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; + " [-s server-addr] [-cf config-file]\n" \ + " [-df duid-file] [-lf lease-file]\n" \ + " [-pf pid-file] [--no-pid] [-e VAR=val]\n" \ +-" [-sf script-file] [interface]*" +- ++" [-sf script-file] [interface]*\n" \ ++" [-C <dhcp-client-identifier>] [-B]\n" \ ++" [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n" \ ++" [-V <vendor-class-identifier>]\n" \ ++" [--request-options <request option list>]" ++ + #define DHCLIENT_USAGEH "{--version|--help|-h}" + + static void +@@ -243,6 +257,16 @@ main(int argc, char **argv) { + #else + progname = argv[0]; #endif - -+ char *dhcp_client_identifier_arg = NULL; -+ char *dhcp_host_name_arg = NULL; ++ char *dhcp_client_identifier_arg = NULL; ++ char *dhcp_host_name_arg = NULL; + char *dhcp_fqdn_arg = NULL; + char *dhcp_vendor_class_identifier_arg = NULL; + char *dhclient_request_options = NULL; @@ -193,13 +143,13 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c + char *arg_conf = NULL; + int arg_conf_len = 0; + - /* Initialize client globals. */ - memset(&default_duid, 0, sizeof(default_duid)); - -@@ -431,6 +455,88 @@ main(int argc, char **argv) { - strlen(PACKAGE_VERSION))); - IGNORE_RET(write(STDERR_FILENO, "\n", 1)); - exit(0); + /* Initialize client globals. */ + memset(&default_duid, 0, sizeof(default_duid)); + +@@ -558,6 +582,89 @@ main(int argc, char **argv) { + std_dhcid = 1; + } else if (!strcmp(argv[i], "-v")) { + quiet = 0; + } else if (!strcmp(argv[i], "-C")) { + if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) { + usage(use_noarg, argv[i-1]); @@ -282,13 +232,14 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c + } + + dhclient_request_options = argv[i]; - } else if (argv[i][0] == '-') { - usage("Unknown command: %s", argv[i]); - } else if (interfaces_requested < 0) { -@@ -630,6 +736,156 @@ main(int argc, char **argv) { - /* Parse the dhclient.conf file. */ - read_client_conf(); - ++ + } else if (argv[i][0] == '-') { + usage("Unknown command: %s", argv[i]); + } else if (interfaces_requested < 0) { +@@ -754,6 +861,156 @@ main(int argc, char **argv) { + /* Parse the dhclient.conf file. */ + read_client_conf(); + + /* Parse any extra command line configuration arguments: */ + if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) { + arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg); @@ -439,75 +390,78 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c + arg_conf_len = 0; + } + - /* Parse the lease database. */ - read_client_leases(); - -@@ -3067,7 +3323,8 @@ void make_discover (client, lease) - client -> packet.xid = random (); - client -> packet.secs = 0; /* filled in by send_discover. */ - + /* Parse the lease database. */ + read_client_leases(); + +@@ -3226,7 +3483,8 @@ void make_discover (client, lease) + client -> packet.xid = random (); + client -> packet.secs = 0; /* filled in by send_discover. */ + - if (can_receive_unicast_unconfigured (client -> interface)) + if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always)) + && can_receive_unicast_unconfigured(client->interface)) - client -> packet.flags = 0; - else - client -> packet.flags = htons (BOOTP_BROADCAST); -@@ -3152,7 +3409,9 @@ void make_request (client, lease) - } else { - memset (&client -> packet.ciaddr, 0, - sizeof client -> packet.ciaddr); + client -> packet.flags = 0; + else + client -> packet.flags = htons (BOOTP_BROADCAST); +@@ -3311,7 +3569,9 @@ void make_request (client, lease) + } else { + memset (&client -> packet.ciaddr, 0, + sizeof client -> packet.ciaddr); - if (can_receive_unicast_unconfigured (client -> interface)) + if ((!(bootp_broadcast_always || + client ->config->bootp_broadcast_always)) && + can_receive_unicast_unconfigured (client -> interface)) - client -> packet.flags = 0; - else - client -> packet.flags = htons (BOOTP_BROADCAST); -@@ -3215,7 +3474,8 @@ void make_decline (client, lease) - client -> packet.hops = 0; - client -> packet.xid = client -> xid; - client -> packet.secs = 0; /* Filled in by send_request. */ + client -> packet.flags = 0; + else + client -> packet.flags = htons (BOOTP_BROADCAST); +@@ -3374,7 +3634,8 @@ void make_decline (client, lease) + client -> packet.hops = 0; + client -> packet.xid = client -> xid; + client -> packet.secs = 0; /* Filled in by send_request. */ - if (can_receive_unicast_unconfigured (client -> interface)) + if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always)) + && can_receive_unicast_unconfigured (client->interface)) - client -> packet.flags = 0; - else - client -> packet.flags = htons (BOOTP_BROADCAST); -diff -up dhcp-4.3.4/common/conflex.c.options dhcp-4.3.4/common/conflex.c ---- dhcp-4.3.4/common/conflex.c.options 2016-04-29 11:59:50.448590077 +0200 -+++ dhcp-4.3.4/common/conflex.c 2016-04-29 12:13:23.637342420 +0200 -@@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) - if (!strcasecmp(atom+1, "ig-endian")) { - return TOKEN_BIG_ENDIAN; - } + client -> packet.flags = 0; + else + client -> packet.flags = htons (BOOTP_BROADCAST); +diff --git a/common/conflex.c b/common/conflex.c +index 045b655..71c0bf5 100644 +--- a/common/conflex.c ++++ b/common/conflex.c +@@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) { + if (!strcasecmp(atom+1, "ig-endian")) { + return TOKEN_BIG_ENDIAN; + } + if (!strcasecmp (atom + 1, "ootp-broadcast-always")) + return BOOTP_BROADCAST_ALWAYS; - break; - case 'c': - if (!strcasecmp(atom + 1, "ase")) -diff -up dhcp-4.3.4/includes/dhcpd.h.options dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.options 2016-04-29 11:59:50.448590077 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:14:05.361329401 +0200 -@@ -1246,6 +1246,9 @@ struct client_config { - - int lease_id_format; /* format for IDs in lease file, - TOKEN_OCTAL or TOKEN_HEX */ + break; + case 'c': + if (!strcasecmp(atom + 1, "ase")) +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 5930e6a..018fa34 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -1269,6 +1269,9 @@ struct client_config { + + int lease_id_format; /* format for IDs in lease file, + TOKEN_OCTAL or TOKEN_HEX */ + + int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST + flag in requests */ }; - + /* Per-interface state used in the dhcp client... */ -diff -up dhcp-4.3.4/includes/dhctoken.h.options dhcp-4.3.4/includes/dhctoken.h ---- dhcp-4.3.4/includes/dhctoken.h.options 2016-04-29 11:59:50.449590076 +0200 -+++ dhcp-4.3.4/includes/dhctoken.h 2016-04-29 12:15:03.073300846 +0200 -@@ -373,7 +373,8 @@ enum dhcp_token { - TOKEN_BIG_ENDIAN = 675, - LEASE_ID_FORMAT = 676, - TOKEN_HEX = 677, -- TOKEN_OCTAL = 678 -+ TOKEN_OCTAL = 678, -+ BOOTP_BROADCAST_ALWAYS = 679 +diff --git a/includes/dhctoken.h b/includes/dhctoken.h +index 5920f4f..7e7215a 100644 +--- a/includes/dhctoken.h ++++ b/includes/dhctoken.h +@@ -377,6 +377,7 @@ enum dhcp_token { + TOKEN_HEX = 677, + TOKEN_OCTAL = 678, + KEY_ALGORITHM = 679 ++ BOOTP_BROADCAST_ALWAYS = 680 }; - + #define is_identifier(x) ((x) >= FIRST_TOKEN && \ +-- +2.14.5 diff --git a/dhcp/patches/0002-dhcp-sharedlib.patch b/dhcp/patches/0002-dhcp-sharedlib.patch deleted file mode 100644 index 3427f78f7..000000000 --- a/dhcp/patches/0002-dhcp-sharedlib.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -up dhcp-4.3.4/client/Makefile.am.sharedlib dhcp-4.3.4/client/Makefile.am ---- dhcp-4.3.4/client/Makefile.am.sharedlib 2016-04-29 11:48:30.389923087 +0200 -+++ dhcp-4.3.4/client/Makefile.am 2016-04-29 11:48:30.393923084 +0200 -@@ -13,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c - scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt --dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.4/common/tests/Makefile.am.sharedlib dhcp-4.3.4/common/tests/Makefile.am ---- dhcp-4.3.4/common/tests/Makefile.am.sharedlib 2016-04-29 11:48:30.394923084 +0200 -+++ dhcp-4.3.4/common/tests/Makefile.am 2016-04-29 11:54:16.890716651 +0200 -@@ -13,25 +13,25 @@ ATF_TESTS += alloc_unittest dns_unittest - alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c - alloc_unittest_LDADD = $(ATF_LDFLAGS) - alloc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - dns_unittest_LDADD = $(ATF_LDFLAGS) - dns_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - misc_unittest_LDADD = $(ATF_LDFLAGS) - misc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c - ns_name_unittest_LDADD = $(ATF_LDFLAGS) - ns_name_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - check: $(ATF_TESTS) -diff -up dhcp-4.3.4/configure.ac.sharedlib dhcp-4.3.4/configure.ac ---- dhcp-4.3.4/configure.ac.sharedlib 2016-04-29 11:48:30.394923084 +0200 -+++ dhcp-4.3.4/configure.ac 2016-04-29 11:55:22.729691668 +0200 -@@ -47,7 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$c - # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. - AC_USE_SYSTEM_EXTENSIONS - --AC_PROG_RANLIB -+# Use libtool to simplify building of shared libraries -+AC_PROG_LIBTOOL - - AC_PATH_PROG(AR, ar) - AC_SUBST(AR) -diff -up dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib dhcp-4.3.4/dhcpctl/Makefile.am ---- dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib 2016-04-29 11:48:30.394923084 +0200 -+++ dhcp-4.3.4/dhcpctl/Makefile.am 2016-04-29 11:56:18.390670546 +0200 -@@ -1,15 +1,15 @@ - bin_PROGRAMS = omshell --lib_LIBRARIES = libdhcpctl.a -+lib_LTLIBRARIES = libdhcpctl.la - noinst_PROGRAMS = cltest - man_MANS = omshell.1 dhcpctl.3 - EXTRA_DIST = $(man_MANS) - - omshell_SOURCES = omshell.c --omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - --libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c -+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c - - cltest_SOURCES = cltest.c --cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export -diff -up dhcp-4.3.4/omapip/Makefile.am.sharedlib dhcp-4.3.4/omapip/Makefile.am ---- dhcp-4.3.4/omapip/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200 -+++ dhcp-4.3.4/omapip/Makefile.am 2016-04-29 11:57:33.709641969 +0200 -@@ -1,7 +1,7 @@ --lib_LIBRARIES = libomapi.a -+lib_LTLIBRARIES = libomapi.la - noinst_PROGRAMS = svtest - --libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ -+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ - errwarn.c listener.c dispatch.c generic.c support.c \ - handle.c message.c convert.c hash.c auth.c inet_addr.c \ - array.c trace.c toisc.c iscprint.c isclib.c -@@ -10,6 +10,6 @@ man_MANS = omapi.3 - EXTRA_DIST = $(man_MANS) - - svtest_SOURCES = test.c --svtest_LDADD = libomapi.a \ -+svtest_LDADD = libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - -diff -up dhcp-4.3.4/relay/Makefile.am.sharedlib dhcp-4.3.4/relay/Makefile.am ---- dhcp-4.3.4/relay/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200 -+++ dhcp-4.3.4/relay/Makefile.am 2016-04-29 11:48:30.395923083 +0200 -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst - - sbin_PROGRAMS = dhcrelay - dhcrelay_SOURCES = dhcrelay.c --dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhcrelay.8 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.4/server/Makefile.am.sharedlib dhcp-4.3.4/server/Makefile.am ---- dhcp-4.3.4/server/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200 -+++ dhcp-4.3.4/server/Makefile.am 2016-04-29 11:48:30.395923083 +0200 -@@ -13,7 +13,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c - dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c - - dhcpd_CFLAGS = $(LDAP_CFLAGS) --dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \ -+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \ - $(LDAP_LIBS) - -diff -up dhcp-4.3.4/server/tests/Makefile.am.sharedlib dhcp-4.3.4/server/tests/Makefile.am ---- dhcp-4.3.4/server/tests/Makefile.am.sharedlib 2016-04-29 11:48:30.395923083 +0200 -+++ dhcp-4.3.4/server/tests/Makefile.am 2016-04-29 11:59:13.414604130 +0200 -@@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa - ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ - ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c - --DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ -- $(top_builddir)/dhcpctl/libdhcpctl.a \ -+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \ -+ $(top_builddir)/dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ATF_TESTS = diff --git a/dhcp/patches/0005-dhcp-release-by-ifup.patch b/dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch similarity index 75% rename from dhcp/patches/0005-dhcp-release-by-ifup.patch rename to dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch index 677eb5c75..34301d936 100644 --- a/dhcp/patches/0005-dhcp-release-by-ifup.patch +++ b/dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch @@ -1,10 +1,21 @@ -diff -up dhcp-4.3.0a1/client/dhclient.c.ifup dhcp-4.3.0a1/client/dhclient.c ---- dhcp-4.3.0a1/client/dhclient.c.ifup 2013-12-19 14:53:08.817760677 +0100 -+++ dhcp-4.3.0a1/client/dhclient.c 2013-12-19 15:05:16.290518574 +0100 -@@ -521,9 +521,81 @@ main(int argc, char **argv) { - } - } - fclose(pidfd); +From 692fd8b16ef6f12a57596351e930c65c68597bac Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:21:14 +0100 +Subject: [PATCH 03/21] Handle releasing interfaces requested by /sbin/ifup +Cc: pzhukov(a)redhat.com + +--- + client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 72 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 26a333c..2a2e9e6 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -787,9 +787,81 @@ main(int argc, char **argv) { + } + } + fclose(pidfd); + } else { + /* handle release for interfaces requested with Red Hat + * /sbin/ifup - pidfile will be /var/run/dhclient-$interface.pid @@ -75,11 +86,13 @@ diff -up dhcp-4.3.0a1/client/dhclient.c.ifup dhcp-4.3.0a1/client/dhclient.c + if (dhc_running) { + log_fatal("dhclient(%u) is already running - exiting. ", dhcpid); + return(1); - } - } - + } + } + + write_client_pid_file(); + - if (!quiet) { - log_info("%s %s", message, PACKAGE_VERSION); - log_info(copyright); + if (!quiet) { + log_info("%s %s", message, PACKAGE_VERSION); + log_info(copyright); +-- +2.14.5 diff --git a/dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch b/dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch new file mode 100644 index 000000000..5b0e10933 --- /dev/null +++ b/dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch @@ -0,0 +1,117 @@ +From 9dc17d6086bf140efda84ce434664b60ce2191a1 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:22:41 +0100 +Subject: [PATCH 04/21] Support unicast BOOTP for IBM pSeries systems (and + maybe others) +Cc: pzhukov(a)redhat.com + +--- + server/bootp.c | 12 +++++++++++- + server/dhcp.c | 33 ++++++++++++++++++++++++++------- + 2 files changed, 37 insertions(+), 8 deletions(-) + +diff --git a/server/bootp.c b/server/bootp.c +index 26a7607..2212f31 100644 +--- a/server/bootp.c ++++ b/server/bootp.c +@@ -52,6 +52,7 @@ void bootp (packet) + char msgbuf [1024]; + int ignorep; + int peer_has_leases = 0; ++ int norelay = 0; + + if (packet -> raw -> op != BOOTREQUEST) + return; +@@ -67,7 +68,7 @@ void bootp (packet) + ? inet_ntoa (packet -> raw -> giaddr) + : packet -> interface -> name); + +- if (!locate_network (packet)) { ++ if ((norelay = locate_network (packet)) == 0) { + log_info ("%s: network unknown", msgbuf); + return; + } +@@ -428,6 +429,15 @@ void bootp (packet) + + goto out; + } ++ } else if (norelay == 2) { ++ to.sin_addr = raw.ciaddr; ++ to.sin_port = remote_port; ++ if (fallback_interface) { ++ result = send_packet (fallback_interface, NULL, &raw, ++ outgoing.packet_length, from, ++ &to, &hto); ++ goto out; ++ } + + /* If it comes from a client that already knows its address + and is not requesting a broadcast response, and we can +diff --git a/server/dhcp.c b/server/dhcp.c +index 6f3a91f..20f2a62 100644 +--- a/server/dhcp.c ++++ b/server/dhcp.c +@@ -5224,6 +5224,7 @@ int locate_network (packet) + struct data_string data; + struct subnet *subnet = (struct subnet *)0; + struct option_cache *oc; ++ int norelay = 0; + + #if defined(DHCPv6) && defined(DHCP4o6) + if (dhcpv4_over_dhcpv6 && (packet->dhcp4o6_response != NULL)) { +@@ -5245,12 +5246,24 @@ int locate_network (packet) + from the interface, if there is one. If not, fail. */ + if (!oc && !packet -> raw -> giaddr.s_addr) { + if (packet -> interface -> shared_network) { +- shared_network_reference +- (&packet -> shared_network, +- packet -> interface -> shared_network, MDL); +- return 1; ++ struct in_addr any_addr; ++ any_addr.s_addr = INADDR_ANY; ++ ++ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) { ++ struct iaddr cip; ++ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4); ++ cip.len = 4; ++ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL)) ++ norelay = 2; ++ } ++ ++ if (!norelay) { ++ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL); ++ return 1; ++ } ++ } else { ++ return 0; + } +- return 0; + } + + /* If there's an option indicating link connection, and it's valid, +@@ -5277,7 +5290,10 @@ int locate_network (packet) + data_string_forget (&data, MDL); + } else { + ia.len = 4; +- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4); ++ if (norelay) ++ memcpy (ia.iabuf, &packet->raw->ciaddr, 4); ++ else ++ memcpy (ia.iabuf, &packet->raw->giaddr, 4); + } + + /* If we know the subnet on which the IP address lives, use it. */ +@@ -5285,7 +5301,10 @@ int locate_network (packet) + shared_network_reference (&packet -> shared_network, + subnet -> shared_network, MDL); + subnet_dereference (&subnet, MDL); +- return 1; ++ if (norelay) ++ return norelay; ++ else ++ return 1; + } + + /* Otherwise, fail. */ +-- +2.14.5 diff --git a/dhcp/patches/0008-dhcp-default-requested-options.patch b/dhcp/patches/0005-Change-default-requested-options.patch similarity index 55% rename from dhcp/patches/0008-dhcp-default-requested-options.patch rename to dhcp/patches/0005-Change-default-requested-options.patch index f57fa1fbd..ec5384edd 100644 --- a/dhcp/patches/0008-dhcp-default-requested-options.patch +++ b/dhcp/patches/0005-Change-default-requested-options.patch @@ -1,19 +1,32 @@ -diff -up dhcp-4.3.4/client/clparse.c.requested dhcp-4.3.4/client/clparse.c ---- dhcp-4.3.4/client/clparse.c.requested 2016-04-29 12:18:50.157151352 +0200 -+++ dhcp-4.3.4/client/clparse.c 2016-04-29 12:19:22.235137243 +0200 +From ac21c8b966620cbe79be3508c024ae30f93d6266 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:24:24 +0100 +Subject: [PATCH 05/21] Change default requested options +Cc: pzhukov(a)redhat.com + +Add NIS domain, NIS servers, NTP servers, interface-mtu and domain-search +to the list of default requested DHCP options +--- + client/clparse.c | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/client/clparse.c b/client/clparse.c +index 7212e3a..39b95a0 100644 +--- a/client/clparse.c ++++ b/client/clparse.c @@ -31,7 +31,7 @@ - + struct client_config top_level_config; - + -#define NUM_DEFAULT_REQUESTED_OPTS 9 +#define NUM_DEFAULT_REQUESTED_OPTS 14 /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1]; - + @@ -116,6 +116,31 @@ isc_result_t read_client_conf () - option_code_hash_lookup(&default_requested_options[8], - dhcpv6_universe.code_hash, &code, 0, MDL); - + option_code_hash_lookup(&default_requested_options[8], + dhcpv6_universe.code_hash, &code, 0, MDL); + + /* 10 */ + code = DHO_NIS_DOMAIN; + option_code_hash_lookup(&default_requested_options[9], @@ -39,6 +52,8 @@ diff -up dhcp-4.3.4/client/clparse.c.requested dhcp-4.3.4/client/clparse.c + option_code_hash_lookup(&default_requested_options[13], + dhcp_universe.code_hash, &code, 0, MDL); + - for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { - if (default_requested_options[code] == NULL) - log_fatal("Unable to find option definition for " + for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { + if (default_requested_options[code] == NULL) + log_fatal("Unable to find option definition for " +-- +2.14.5 diff --git a/dhcp/patches/0009-dhcp-manpages.patch b/dhcp/patches/0006-Various-man-page-only-fixes.patch similarity index 73% rename from dhcp/patches/0009-dhcp-manpages.patch rename to dhcp/patches/0006-Various-man-page-only-fixes.patch index 24d6972af..63c6b5cba 100644 --- a/dhcp/patches/0009-dhcp-manpages.patch +++ b/dhcp/patches/0006-Various-man-page-only-fixes.patch @@ -1,38 +1,21 @@ -diff -up dhcp-4.3.5b1/client/dhclient.conf.5.man dhcp-4.3.5b1/client/dhclient.conf.5 ---- dhcp-4.3.5b1/client/dhclient.conf.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/dhclient.conf.5 2016-09-12 17:09:23.243313514 +0200 -@@ -228,7 +228,8 @@ responding to the client send the client - options. Only the option names should be specified in the request - statement - not option parameters. By default, the DHCPv4 client - requests the subnet-mask, broadcast-address, time-offset, routers, --domain-name, domain-name-servers and host-name options while the DHCPv6 -+domain-search, domain-name, domain-name-servers, host-name, nis-domain, -+nis-servers, ntp-servers and interface-mtu options while the DHCPv6 - client requests the dhcp6 name-servers and domain-search options. Note - that if you enter a \'request\' statement, you over-ride these defaults - and these options will not be requested. -@@ -736,6 +737,17 @@ know the DHCP service(s) anycast MAC add - client. The \fIlink-type\fR and \fImac-address\fR parameters are configured - in a similar manner to the \fBhardware\fR statement. - .PP -+ \fBbootp-broadcast-always;\fR -+.PP -+The -+.B bootp-broadcast-always -+statement instructs dhclient to always set the bootp broadcast flag in -+request packets, so that servers will always broadcast replies. -+This is equivalent to supplying the dhclient -B argument, and has -+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. -+This option is provided as an extension to enable dhclient to work -+on IBM s390 Linux guests. -+.PP - .SH SAMPLE - The following configuration file was used on a laptop running NetBSD - 1.3, though the domains have been modified. -diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient-script.8 ---- dhcp-4.3.5b1/client/dhclient-script.8.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/dhclient-script.8 2016-09-12 17:08:09.516254385 +0200 -@@ -45,7 +45,7 @@ customizations are needed, they should b +From dd3053e6f45ac1f149869b7ded3f539d6c046114 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:25:53 +0100 +Subject: [PATCH 06/21] Various man-page-only fixes +Cc: pzhukov(a)redhat.com + +--- + client/dhclient-script.8 | 22 +++++++++++++++++++++- + client/dhclient.conf.5 | 14 +++++++++++++- + common/dhcp-options.5 | 15 +++++++++++++++ + server/dhcpd.conf.5 | 14 +++++++++----- + 4 files changed, 58 insertions(+), 7 deletions(-) + +diff --git a/client/dhclient-script.8 b/client/dhclient-script.8 +index 3553afd..0db5516 100644 +--- a/client/dhclient-script.8 ++++ b/client/dhclient-script.8 +@@ -43,7 +43,7 @@ customizations are needed, they should be possible using the enter and exit hooks provided (see HOOKS for details). These hooks will allow the user to override the default behaviour of the client in creating a .B /etc/resolv.conf @@ -41,7 +24,7 @@ diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient- .PP No standard client script exists for some operating systems, even though the actual client may work, so a pioneering user may well need to create -@@ -89,6 +89,26 @@ present. The +@@ -87,6 +87,26 @@ present. The .B ETCDIR/dhclient-exit-hooks script can modify the valid of exit_status to change the exit status of dhclient-script. @@ -68,10 +51,43 @@ diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient- .SH OPERATION When dhclient needs to invoke the client configuration script, it defines a set of variables in the environment, and then invokes -diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options.5 ---- dhcp-4.3.5b1/common/dhcp-options.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/common/dhcp-options.5 2016-09-12 17:08:09.517254386 +0200 -@@ -1013,6 +1013,21 @@ classless IP routing - it does not inclu +diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5 +index fa3b908..566a881 100644 +--- a/client/dhclient.conf.5 ++++ b/client/dhclient.conf.5 +@@ -228,7 +228,8 @@ responding to the client send the client its values for the specified + options. Only the option names should be specified in the request + statement - not option parameters. By default, the DHCPv4 client + requests the subnet-mask, broadcast-address, time-offset, routers, +-domain-name, domain-name-servers and host-name options while the DHCPv6 ++domain-search, domain-name, domain-name-servers, host-name, nis-domain, ++nis-servers, ntp-servers and interface-mtu options while the DHCPv6 + client requests the dhcp6 name-servers and domain-search options. Note + that if you enter a \'request\' statement, you over-ride these defaults + and these options will not be requested. +@@ -735,6 +736,17 @@ broadcast packets transmitted by DHCP clients, but is only useful if you + know the DHCP service(s) anycast MAC address prior to configuring your + client. The \fIlink-type\fR and \fImac-address\fR parameters are configured + in a similar manner to the \fBhardware\fR statement. ++.PP ++ \fBbootp-broadcast-always;\fR ++.PP ++The ++.B bootp-broadcast-always ++statement instructs dhclient to always set the bootp broadcast flag in ++request packets, so that servers will always broadcast replies. ++This is equivalent to supplying the dhclient -B argument, and has ++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. ++This option is provided as an extension to enable dhclient to work ++on IBM s390 Linux guests. + .PP + .SH SAMPLE + The following configuration file was used on a laptop running NetBSD +diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 +index 33d4804..d9e1197 100644 +--- a/common/dhcp-options.5 ++++ b/common/dhcp-options.5 +@@ -1068,6 +1068,21 @@ classless IP routing - it does not include a subnet mask. Since classless IP routing is now the most widely deployed routing standard, this option is virtually useless, and is not implemented by any of the popular DHCP clients, for example the Microsoft DHCP client. @@ -93,10 +109,11 @@ diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options .RE .PP .nf -diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 ---- dhcp-4.3.5b1/server/dhcpd.conf.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/dhcpd.conf.5 2016-09-12 17:10:11.205351980 +0200 -@@ -528,6 +528,9 @@ pool { +diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 +index 17330d4..89b5540 100644 +--- a/server/dhcpd.conf.5 ++++ b/server/dhcpd.conf.5 +@@ -527,6 +527,9 @@ pool { }; .fi .PP @@ -106,7 +123,7 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 The server currently does very little sanity checking, so if you configure it wrong, it will just fail in odd ways. I would recommend therefore that you either do failover or don't do failover, but don't -@@ -542,9 +545,9 @@ primary server might look like this: +@@ -541,9 +544,9 @@ primary server might look like this: failover peer "foo" { primary; address anthrax.rc.example.com; @@ -118,7 +135,7 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 max-response-delay 60; max-unacked-updates 10; mclt 3600; -@@ -1246,7 +1249,7 @@ the zone containing PTR records - for IS +@@ -1323,7 +1326,7 @@ the zone containing PTR records - for ISC BIND, something like this: .PP .nf key DHCP_UPDATER { @@ -126,8 +143,8 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 + algorithm hmac-md5; secret pRP5FapFoJ95JEL06sv4PQ==; }; - -@@ -1269,7 +1272,7 @@ dhcpd.conf file: + +@@ -1346,7 +1349,7 @@ dhcpd.conf file: .PP .nf key DHCP_UPDATER { @@ -135,8 +152,8 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 + algorithm hmac-md5; secret pRP5FapFoJ95JEL06sv4PQ==; }; - -@@ -2742,7 +2745,8 @@ statement + +@@ -2912,7 +2915,8 @@ statement The \fInext-server\fR statement is used to specify the host address of the server from which the initial boot file (specified in the \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should @@ -146,3 +163,5 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 .RE .PP The +-- +2.14.5 diff --git a/dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch b/dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch deleted file mode 100644 index 645f9314b..000000000 --- a/dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.backoff dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.backoff 2016-04-29 12:16:26.976245611 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:16:26.979245609 +0200 -@@ -1423,6 +1423,8 @@ void state_init (cpp) - void *cpp; - { - struct client_state *client = cpp; -+ enum dhcp_state init_state = client->state; -+ struct timeval tv; - - ASSERT_STATE(state, S_INIT); - -@@ -1435,9 +1437,18 @@ void state_init (cpp) - client -> first_sending = cur_time; - client -> interval = client -> config -> initial_interval; - -- /* Add an immediate timeout to cause the first DHCPDISCOVER packet -- to go out. */ -- send_discover (client); -+ if (init_state != S_DECLINED) { -+ /* Add an immediate timeout to cause the first DHCPDISCOVER packet -+ to go out. */ -+ send_discover(client); -+ } else { -+ /* We've received an OFFER and it has been DECLINEd by dhclient-script. -+ * wait for a random time between 1 and backoff_cutoff seconds before -+ * trying again. */ -+ tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff); -+ tv . tv_usec = 0; -+ add_timeout(&tv, send_discover, client, 0, 0); -+ } - } - - /* -@@ -1734,6 +1745,7 @@ void bind_lease (client) - "try (declined). Exiting."); - exit(2); - } else { -+ client -> state = S_DECLINED; - state_init(client); - return; - } -@@ -4626,6 +4638,7 @@ void client_location_changed () - case S_INIT: - case S_REBINDING: - case S_STOPPED: -+ case S_DECLINED: - break; - } - client -> state = S_INIT; -diff -up dhcp-4.3.4/includes/dhcpd.h.backoff dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.backoff 2016-04-29 12:16:26.980245609 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:17:30.893203533 +0200 -@@ -1171,7 +1171,8 @@ enum dhcp_state { - S_BOUND = 5, - S_RENEWING = 6, - S_REBINDING = 7, -- S_STOPPED = 8 -+ S_STOPPED = 8, -+ S_DECLINED = 9 - }; - - /* Possible pending client operations. */ diff --git a/dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch b/dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch new file mode 100644 index 000000000..1ca9c16cb --- /dev/null +++ b/dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch @@ -0,0 +1,53 @@ +From bf4e3f1d181b5b4e6225fe5726c02420157433cc Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:26:34 +0100 +Subject: [PATCH 07/21] Change paths to conform to our standards +Cc: pzhukov(a)redhat.com + +--- + doc/examples/dhcpd-dhcpv6.conf | 2 +- + includes/dhcpd.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/examples/dhcpd-dhcpv6.conf b/doc/examples/dhcpd-dhcpv6.conf +index 448a6a6..2357824 100644 +--- a/doc/examples/dhcpd-dhcpv6.conf ++++ b/doc/examples/dhcpd-dhcpv6.conf +@@ -43,7 +43,7 @@ option dhcp6.domain-search "test.example.com","example.com"; + option dhcp6.info-refresh-time 21600; + + # The path of the lease file +-dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases"; ++dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases"; + + # Static definition (must be global) + host myclient { +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 018fa34..3632a6b 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -1545,7 +1545,7 @@ typedef unsigned char option_mask [16]; + #else /* !DEBUG */ + + #ifndef _PATH_DHCPD_CONF +-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" ++#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" + #endif /* DEBUG */ + + #ifndef _PATH_DHCPD_DB +@@ -1567,11 +1567,11 @@ typedef unsigned char option_mask [16]; + #endif /* DEBUG */ + + #ifndef _PATH_DHCLIENT_CONF +-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" ++#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" + #endif + + #ifndef _PATH_DHCLIENT_SCRIPT +-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" ++#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script" + #endif + + #ifndef _PATH_DHCLIENT_PID +-- +2.14.5 diff --git a/dhcp/patches/0007-dhcp-unicast-bootp.patch b/dhcp/patches/0007-dhcp-unicast-bootp.patch deleted file mode 100644 index abf89f237..000000000 --- a/dhcp/patches/0007-dhcp-unicast-bootp.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -up dhcp-4.3.4/server/bootp.c.unicast dhcp-4.3.4/server/bootp.c ---- dhcp-4.3.4/server/bootp.c.unicast 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/server/bootp.c 2016-05-02 15:09:40.023243008 +0200 -@@ -52,6 +52,7 @@ void bootp (packet) - char msgbuf [1024]; - int ignorep; - int peer_has_leases = 0; -+ int norelay = 0; - - if (packet -> raw -> op != BOOTREQUEST) - return; -@@ -67,7 +68,7 @@ void bootp (packet) - ? inet_ntoa (packet -> raw -> giaddr) - : packet -> interface -> name); - -- if (!locate_network (packet)) { -+ if ((norelay = locate_network (packet)) == 0) { - log_info ("%s: network unknown", msgbuf); - return; - } -@@ -428,6 +429,15 @@ void bootp (packet) - - goto out; - } -+ } else if (norelay == 2) { -+ to.sin_addr = raw.ciaddr; -+ to.sin_port = remote_port; -+ if (fallback_interface) { -+ result = send_packet (fallback_interface, NULL, &raw, -+ outgoing.packet_length, from, -+ &to, &hto); -+ goto out; -+ } - - /* If it comes from a client that already knows its address - and is not requesting a broadcast response, and we can -diff -up dhcp-4.3.4/server/dhcp.c.unicast dhcp-4.3.4/server/dhcp.c ---- dhcp-4.3.4/server/dhcp.c.unicast 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/server/dhcp.c 2016-05-02 15:10:13.255267511 +0200 -@@ -5132,6 +5132,7 @@ int locate_network (packet) - struct data_string data; - struct subnet *subnet = (struct subnet *)0; - struct option_cache *oc; -+ int norelay = 0; - - #if defined(DHCPv6) && defined(DHCP4o6) - if (dhcpv4_over_dhcpv6 && (packet->dhcp4o6_response != NULL)) { -@@ -5153,12 +5154,24 @@ int locate_network (packet) - from the interface, if there is one. If not, fail. */ - if (!oc && !packet -> raw -> giaddr.s_addr) { - if (packet -> interface -> shared_network) { -- shared_network_reference -- (&packet -> shared_network, -- packet -> interface -> shared_network, MDL); -- return 1; -+ struct in_addr any_addr; -+ any_addr.s_addr = INADDR_ANY; -+ -+ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) { -+ struct iaddr cip; -+ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4); -+ cip.len = 4; -+ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL)) -+ norelay = 2; -+ } -+ -+ if (!norelay) { -+ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL); -+ return 1; -+ } -+ } else { -+ return 0; - } -- return 0; - } - - /* If there's an option indicating link connection, and it's valid, -@@ -5185,7 +5198,10 @@ int locate_network (packet) - data_string_forget (&data, MDL); - } else { - ia.len = 4; -- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4); -+ if (norelay) -+ memcpy (ia.iabuf, &packet->raw->ciaddr, 4); -+ else -+ memcpy (ia.iabuf, &packet->raw->giaddr, 4); - } - - /* If we know the subnet on which the IP address lives, use it. */ -@@ -5193,7 +5209,10 @@ int locate_network (packet) - shared_network_reference (&packet -> shared_network, - subnet -> shared_network, MDL); - subnet_dereference (&subnet, MDL); -- return 1; -+ if (norelay) -+ return norelay; -+ else -+ return 1; - } - - /* Otherwise, fail. */ diff --git a/dhcp/patches/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch b/dhcp/patches/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch new file mode 100644 index 000000000..58d3696a3 --- /dev/null +++ b/dhcp/patches/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch @@ -0,0 +1,366 @@ +From 26d34bc8e55c39ef84d580b6453c65b5cbeab8ff Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:27:18 +0100 +Subject: [PATCH 08/21] Make sure all open file descriptors are closed-on-exec + for SELinux +Cc: pzhukov(a)redhat.com + +ISC-bug: #19148 +--- + client/clparse.c | 4 ++-- + client/dhclient.c | 28 ++++++++++++++-------------- + common/bpf.c | 2 +- + common/dlpi.c | 2 +- + common/nit.c | 2 +- + common/resolv.c | 2 +- + common/upf.c | 2 +- + omapip/trace.c | 6 +++--- + relay/dhcrelay.c | 10 +++++----- + server/confpars.c | 2 +- + server/db.c | 4 ++-- + server/dhcpd.c | 14 +++++++------- + server/ldap.c | 2 +- + 13 files changed, 40 insertions(+), 40 deletions(-) + +diff --git a/client/clparse.c b/client/clparse.c +index 39b95a0..44387ed 100644 +--- a/client/clparse.c ++++ b/client/clparse.c +@@ -288,7 +288,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip, + int token; + isc_result_t status; + +- if ((file = open (name, O_RDONLY)) < 0) ++ if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0) + return uerr2isc (errno); + + cfile = NULL; +@@ -364,7 +364,7 @@ void read_client_leases () + + /* Open the lease file. If we can't open it, just return - + we can safely trust the server to remember our state. */ +- if ((file = open (path_dhclient_db, O_RDONLY)) < 0) ++ if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0) + return; + + cfile = NULL; +diff --git a/client/dhclient.c b/client/dhclient.c +index 2a2e9e6..a86ab9e 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -273,11 +273,11 @@ main(int argc, char **argv) { + /* Make sure that file descriptors 0 (stdin), 1, (stdout), and + 2 (stderr) are open. To do this, we assume that when we + open a file the lowest available file descriptor is used. */ +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 0) +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 1) +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 2) + log_perror = 0; /* No sense logging to /dev/null. */ + else if (fd != -1) +@@ -765,7 +765,7 @@ main(int argc, char **argv) { + long temp; + int e; + +- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) { ++ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) { + e = fscanf(pidfd, "%ld\n", &temp); + oldpid = (pid_t)temp; + +@@ -820,7 +820,7 @@ main(int argc, char **argv) { + strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx); + sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name); + +- if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) { ++ if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) { + e = fscanf(pidfd, "%ld\n", &temp); + oldpid = (pid_t)temp; + +@@ -845,7 +845,7 @@ main(int argc, char **argv) { + int dhc_running = 0; + char procfn[256] = ""; + +- if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) { ++ if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) { + if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) { + snprintf(procfn,256,"/proc/%u",dhcpid); + dhc_running = (access(procfn, F_OK) == 0); +@@ -3808,7 +3808,7 @@ void rewrite_client_leases () + + if (leaseFile != NULL) + fclose (leaseFile); +- leaseFile = fopen (path_dhclient_db, "w"); ++ leaseFile = fopen (path_dhclient_db, "we"); + if (leaseFile == NULL) { + log_error ("can't create %s: %m", path_dhclient_db); + return; +@@ -4003,7 +4003,7 @@ write_duid(struct data_string *duid) + return DHCP_R_INVALIDARG; + + if (leaseFile == NULL) { /* XXX? */ +- leaseFile = fopen(path_dhclient_db, "w"); ++ leaseFile = fopen(path_dhclient_db, "we"); + if (leaseFile == NULL) { + log_error("can't create %s: %m", path_dhclient_db); + return ISC_R_IOERROR; +@@ -4207,7 +4207,7 @@ int write_client_lease (client, lease, rewrite, makesure) + return 1; + + if (leaseFile == NULL) { /* XXX */ +- leaseFile = fopen (path_dhclient_db, "w"); ++ leaseFile = fopen (path_dhclient_db, "we"); + if (leaseFile == NULL) { + log_error ("can't create %s: %m", path_dhclient_db); + return 0; +@@ -4786,9 +4786,9 @@ void detach () + (void) close(2); + + /* Reopen them on /dev/null. */ +- (void) open("/dev/null", O_RDWR); +- (void) open("/dev/null", O_RDWR); +- (void) open("/dev/null", O_RDWR); ++ (void) open("/dev/null", O_RDWR | O_CLOEXEC); ++ (void) open("/dev/null", O_RDWR | O_CLOEXEC); ++ (void) open("/dev/null", O_RDWR | O_CLOEXEC); + + write_client_pid_file (); + +@@ -4806,14 +4806,14 @@ void write_client_pid_file () + return; + } + +- pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644); ++ pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644); + + if (pfdesc < 0) { + log_error ("Can't create %s: %m", path_dhclient_pid); + return; + } + +- pf = fdopen (pfdesc, "w"); ++ pf = fdopen (pfdesc, "we"); + if (!pf) { + close(pfdesc); + log_error ("Can't fdopen %s: %m", path_dhclient_pid); +diff --git a/common/bpf.c b/common/bpf.c +index 16076fe..67b6d64 100644 +--- a/common/bpf.c ++++ b/common/bpf.c +@@ -94,7 +94,7 @@ int if_register_bpf (info) + for (b = 0; 1; b++) { + /* %Audit% 31 bytes max. %2004.06.17,Safe% */ + sprintf(filename, BPF_FORMAT, b); +- sock = open (filename, O_RDWR, 0); ++ sock = open (filename, O_RDWR | O_CLOEXEC, 0); + if (sock < 0) { + if (errno == EBUSY) { + continue; +diff --git a/common/dlpi.c b/common/dlpi.c +index 3990bf1..a941258 100644 +--- a/common/dlpi.c ++++ b/common/dlpi.c +@@ -817,7 +817,7 @@ dlpiopen(const char *ifname) { + } + *dp = '\0'; + +- return open (devname, O_RDWR, 0); ++ return open (devname, O_RDWR | O_CLOEXEC, 0); + } + + /* +diff --git a/common/nit.c b/common/nit.c +index d822c15..a9132bc 100644 +--- a/common/nit.c ++++ b/common/nit.c +@@ -75,7 +75,7 @@ int if_register_nit (info) + struct strioctl sio; + + /* Open a NIT device */ +- sock = open ("/dev/nit", O_RDWR); ++ sock = open ("/dev/nit", O_RDWR | O_CLOEXEC); + if (sock < 0) + log_fatal ("Can't open NIT device for %s: %m", info -> name); + +diff --git a/common/resolv.c b/common/resolv.c +index a01f520..b209e3f 100644 +--- a/common/resolv.c ++++ b/common/resolv.c +@@ -43,7 +43,7 @@ void read_resolv_conf (parse_time) + struct domain_search_list *dp, *dl, *nd; + isc_result_t status; + +- if ((file = open (path_resolv_conf, O_RDONLY)) < 0) { ++ if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) { + log_error ("Can't open %s: %m", path_resolv_conf); + return; + } +diff --git a/common/upf.c b/common/upf.c +index 9785879..e0a524f 100644 +--- a/common/upf.c ++++ b/common/upf.c +@@ -71,7 +71,7 @@ int if_register_upf (info) + /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */ + sprintf(filename, "/dev/pf/pfilt%d", b); + +- sock = open (filename, O_RDWR, 0); ++ sock = open (filename, O_RDWR | O_CLOEXEC, 0); + if (sock < 0) { + if (errno == EBUSY) { + continue; +diff --git a/omapip/trace.c b/omapip/trace.c +index 45bd508..5ea7486 100644 +--- a/omapip/trace.c ++++ b/omapip/trace.c +@@ -136,10 +136,10 @@ isc_result_t trace_begin (const char *filename, + return DHCP_R_INVALIDARG; + } + +- traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600); ++ traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600); + if (traceoutfile < 0 && errno == EEXIST) { + log_error ("WARNING: Overwriting trace file \"%s\"", filename); +- traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC, ++ traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC | O_CLOEXEC, + 0600); + } + +@@ -427,7 +427,7 @@ void trace_file_replay (const char *filename) + isc_result_t result; + int len; + +- traceinfile = fopen (filename, "r"); ++ traceinfile = fopen (filename, "re"); + if (!traceinfile) { + log_error("Can't open tracefile %s: %m", filename); + return; +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index d8caaaf..ea1be18 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c +@@ -296,11 +296,11 @@ main(int argc, char **argv) { + /* Make sure that file descriptors 0(stdin), 1,(stdout), and + 2(stderr) are open. To do this, we assume that when we + open a file the lowest available file descriptor is used. */ +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 0) +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 1) +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 2) + log_perror = 0; /* No sense logging to /dev/null. */ + else if (fd != -1) +@@ -776,13 +776,13 @@ main(int argc, char **argv) { + /* Create the pid file. */ + if (no_pid_file == ISC_FALSE) { + pfdesc = open(path_dhcrelay_pid, +- O_CREAT | O_TRUNC | O_WRONLY, 0644); ++ O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644); + + if (pfdesc < 0) { + log_error("Can't create %s: %m", + path_dhcrelay_pid); + } else { +- pf = fdopen(pfdesc, "w"); ++ pf = fdopen(pfdesc, "we"); + if (!pf) + log_error("Can't fdopen %s: %m", + path_dhcrelay_pid); +diff --git a/server/confpars.c b/server/confpars.c +index d2cedfe..2743979 100644 +--- a/server/confpars.c ++++ b/server/confpars.c +@@ -118,7 +118,7 @@ isc_result_t read_conf_file (const char *filename, struct group *group, + } + #endif + +- if ((file = open (filename, O_RDONLY)) < 0) { ++ if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) { + if (leasep) { + log_error ("Can't open lease database %s: %m --", + path_dhcpd_db); +diff --git a/server/db.c b/server/db.c +index 67e6cc1..6181528 100644 +--- a/server/db.c ++++ b/server/db.c +@@ -1154,7 +1154,7 @@ int new_lease_file (int test_mode) + path_dhcpd_db, (int)t) >= sizeof newfname) + log_fatal("new_lease_file: lease file path too long"); + +- db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664); ++ db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664); + if (db_fd < 0) { + log_error ("Can't create new lease file: %m"); + return 0; +@@ -1175,7 +1175,7 @@ int new_lease_file (int test_mode) + } + #endif /* PARANOIA */ + +- if ((new_db_file = fdopen(db_fd, "w")) == NULL) { ++ if ((new_db_file = fdopen(db_fd, "we")) == NULL) { + log_error("Can't fdopen new lease file: %m"); + close(db_fd); + goto fdfail; +diff --git a/server/dhcpd.c b/server/dhcpd.c +index 55ffae7..530a923 100644 +--- a/server/dhcpd.c ++++ b/server/dhcpd.c +@@ -300,11 +300,11 @@ main(int argc, char **argv) { + /* Make sure that file descriptors 0 (stdin), 1, (stdout), and + 2 (stderr) are open. To do this, we assume that when we + open a file the lowest available file descriptor is used. */ +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 0) +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 1) +- fd = open("/dev/null", O_RDWR); ++ fd = open("/dev/null", O_RDWR | O_CLOEXEC); + if (fd == 2) + log_perror = 0; /* No sense logging to /dev/null. */ + else if (fd != -1) +@@ -975,7 +975,7 @@ main(int argc, char **argv) { + * appropriate. + */ + if (no_pid_file == ISC_FALSE) { +- i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644); ++ i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644); + if (i >= 0) { + sprintf(pbuf, "%d\n", (int) getpid()); + IGNORE_RET(write(i, pbuf, strlen(pbuf))); +@@ -1028,9 +1028,9 @@ main(int argc, char **argv) { + (void) close(2); + + /* Reopen them on /dev/null. */ +- (void) open("/dev/null", O_RDWR); +- (void) open("/dev/null", O_RDWR); +- (void) open("/dev/null", O_RDWR); ++ (void) open("/dev/null", O_RDWR | O_CLOEXEC); ++ (void) open("/dev/null", O_RDWR | O_CLOEXEC); ++ (void) open("/dev/null", O_RDWR | O_CLOEXEC); + log_perror = 0; /* No sense logging to /dev/null. */ + + IGNORE_RET (chdir("/")); +diff --git a/server/ldap.c b/server/ldap.c +index 5126d24..555545c 100644 +--- a/server/ldap.c ++++ b/server/ldap.c +@@ -1446,7 +1446,7 @@ ldap_start (void) + + if (ldap_debug_file != NULL && ldap_debug_fd == -1) + { +- if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY, ++ if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, + S_IRUSR | S_IWUSR)) < 0) + log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file, + strerror (errno)); +-- +2.14.5 diff --git a/dhcp/patches/0009-Fix-garbage-in-format-string-error.patch b/dhcp/patches/0009-Fix-garbage-in-format-string-error.patch new file mode 100644 index 000000000..eca1db76c --- /dev/null +++ b/dhcp/patches/0009-Fix-garbage-in-format-string-error.patch @@ -0,0 +1,26 @@ +From 9ffd73d22b1337aeedef751afd03822cc0a15014 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:28:13 +0100 +Subject: [PATCH 09/21] Fix 'garbage in format string' error +Cc: pzhukov(a)redhat.com + +RHBZ: 450042 +--- + common/tables.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/tables.c b/common/tables.c +index c1aa214..d2294c0 100644 +--- a/common/tables.c ++++ b/common/tables.c +@@ -215,7 +215,7 @@ static struct option dhcp_options[] = { + { "name-service-search", "Sa", &dhcp_universe, 117, 1 }, + #endif + { "subnet-selection", "I", &dhcp_universe, 118, 1 }, +- { "domain-search", "Dc", &dhcp_universe, 119, 1 }, ++ { "domain-search", "D", &dhcp_universe, 119, 1 }, + { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, + { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, + #if 0 +-- +2.14.5 diff --git a/dhcp/patches/0010-Handle-null-timeout.patch b/dhcp/patches/0010-Handle-null-timeout.patch new file mode 100644 index 000000000..5b5e2cf23 --- /dev/null +++ b/dhcp/patches/0010-Handle-null-timeout.patch @@ -0,0 +1,31 @@ +From e269e137c3b7d25a2d089be508e6769731618d54 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:29:08 +0100 +Subject: [PATCH 10/21] Handle null timeout +Cc: pzhukov(a)redhat.com + +Handle cases in add_timeout() where the function is called with a NULL +value for the 'when' parameter + +ISC-Bugs: #19867 (rejected) +--- + common/dispatch.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/common/dispatch.c b/common/dispatch.c +index 0207ad3..d7fe200 100644 +--- a/common/dispatch.c ++++ b/common/dispatch.c +@@ -209,6 +209,10 @@ void add_timeout (when, where, what, ref, unref) + isc_interval_t interval; + isc_time_t expires; + ++ if (when == NULL) { ++ return; ++ } ++ + /* See if this timeout supersedes an existing timeout. */ + t = (struct timeout *)0; + for (q = timeouts; q; q = q->next) { +-- +2.14.5 diff --git a/dhcp/patches/0010-dhcp-paths.patch b/dhcp/patches/0010-dhcp-paths.patch deleted file mode 100644 index 59a711dad..000000000 --- a/dhcp/patches/0010-dhcp-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf ---- dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths 2013-11-07 20:15:08.000000000 +0100 -+++ dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf 2013-12-19 15:34:16.262247711 +0100 -@@ -42,7 +42,7 @@ option dhcp6.domain-search "test.example - option dhcp6.info-refresh-time 21600; - - # The path of the lease file --dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases"; -+dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases"; - - # Static definition (must be global) - host myclient { -diff -up dhcp-4.3.0a1/includes/dhcpd.h.paths dhcp-4.3.0a1/includes/dhcpd.h ---- dhcp-4.3.0a1/includes/dhcpd.h.paths 2013-12-19 15:34:16.253247840 +0100 -+++ dhcp-4.3.0a1/includes/dhcpd.h 2013-12-19 15:34:16.263247697 +0100 -@@ -1429,7 +1429,7 @@ typedef unsigned char option_mask [16]; - #else /* !DEBUG */ - - #ifndef _PATH_DHCPD_CONF --#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" -+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" - #endif /* DEBUG */ - - #ifndef _PATH_DHCPD_DB -@@ -1451,11 +1451,11 @@ typedef unsigned char option_mask [16]; - #endif /* DEBUG */ - - #ifndef _PATH_DHCLIENT_CONF --#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" -+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" - #endif - - #ifndef _PATH_DHCLIENT_SCRIPT --#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" -+#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script" - #endif - - #ifndef _PATH_DHCLIENT_PID diff --git a/dhcp/patches/0015-dhcp-capability.patch b/dhcp/patches/0011-Drop-unnecessary-capabilities.patch similarity index 52% rename from dhcp/patches/0015-dhcp-capability.patch rename to dhcp/patches/0011-Drop-unnecessary-capabilities.patch index 4572c348c..a36c068b6 100644 --- a/dhcp/patches/0015-dhcp-capability.patch +++ b/dhcp/patches/0011-Drop-unnecessary-capabilities.patch @@ -1,7 +1,59 @@ -diff -up dhcp-4.3.4/client/dhclient.8.capability dhcp-4.3.4/client/dhclient.8 ---- dhcp-4.3.4/client/dhclient.8.capability 2016-04-29 12:19:40.657129322 +0200 -+++ dhcp-4.3.4/client/dhclient.8 2016-04-29 12:19:40.715129297 +0200 -@@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Pr +From 291f738f341a78f8c7974a7603d1a2eaa01ebacc Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:30:28 +0100 +Subject: [PATCH 11/21] Drop unnecessary capabilities +Cc: pzhukov(a)redhat.com + +dhclient (#517649, #546765), dhcpd/dhcrelay (#699713) +--- + client/Makefile.am | 3 ++- + client/dhclient-script.8 | 10 ++++++++++ + client/dhclient.8 | 29 +++++++++++++++++++++++++++++ + client/dhclient.c | 24 ++++++++++++++++++++++++ + configure.ac | 35 +++++++++++++++++++++++++++++++++++ + relay/Makefile.am | 3 ++- + relay/dhcrelay.c | 29 +++++++++++++++++++++++++++++ + 7 files changed, 131 insertions(+), 2 deletions(-) + +diff --git a/client/Makefile.am b/client/Makefile.am +index d177159..0689185 100644 +--- a/client/Makefile.am ++++ b/client/Makefile.am +@@ -17,6 +17,7 @@ dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ + @BINDLIBIRSDIR@/libirs.@A@ \ + @BINDLIBDNSDIR@/libdns.@A@ \ + @BINDLIBISCCFGDIR@/libisccfg.@A@ \ +- @BINDLIBISCDIR@/libisc.@A@ ++ @BINDLIBISCDIR@/libisc.@A@ \ ++ $(CAPNG_LDADD) + man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 + EXTRA_DIST = $(man_MANS) +diff --git a/client/dhclient-script.8 b/client/dhclient-script.8 +index 0db5516..2eddb8f 100644 +--- a/client/dhclient-script.8 ++++ b/client/dhclient-script.8 +@@ -243,6 +243,16 @@ repeatedly initialized to the values provided by one server, and then + the other. Assuming the information provided by both servers is + valid, this shouldn't cause any real problems, but it could be + confusing. ++.PP ++Normally, if dhclient was compiled with libcap-ng support, ++dhclient drops most capabilities immediately upon startup. ++While more secure, this greatly restricts the additional actions that ++hooks in dhclient-script can take. For example, any daemons that ++dhclient-script starts or restarts will inherit the restricted ++capabilities as well, which may interfere with their correct operation. ++Thus, the ++.BI \-nc ++option can be used to prevent dhclient from dropping capabilities. + .SH SEE ALSO + dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and + dhclient.leases(5). +diff --git a/client/dhclient.8 b/client/dhclient.8 +index 6d7fbdb..0145b9f 100644 +--- a/client/dhclient.8 ++++ b/client/dhclient.8 +@@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Protocol Client .B -w ] [ @@ -11,10 +63,11 @@ diff -up dhcp-4.3.4/client/dhclient.8.capability dhcp-4.3.4/client/dhclient.8 .B -B ] [ -@@ -318,6 +321,32 @@ has been added or removed, so that the c +@@ -328,6 +331,32 @@ not to exit when it doesn't find any such interfaces. The + program can then be used to notify the client when a network interface + has been added or removed, so that the client can attempt to configure an IP address on that interface. - - .TP ++.TP +.BI \-nc +Do not drop capabilities. + @@ -25,7 +78,7 @@ diff -up dhcp-4.3.4/client/dhclient.8.capability dhcp-4.3.4/client/dhclient.8 +drops most capabilities immediately upon startup. While more secure, +this greatly restricts the additional actions that hooks in +.B dhclient-script (8) -+can take. (For example, any daemons that ++can take. (For example, any daemons that +.B dhclient-script (8) +starts or restarts will inherit the restricted capabilities as well, +which may interfere with their correct operation.) Thus, the @@ -40,17 +93,17 @@ diff -up dhcp-4.3.4/client/dhclient.8.capability dhcp-4.3.4/client/dhclient.8 +.B dhclient +was not compiled with libcap-ng support. + -+.TP - .BI \-B - Set the BOOTP broadcast flag in request packets so servers will always - broadcast replies. -diff -up dhcp-4.3.4/client/dhclient.c.capability dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.capability 2016-04-29 12:19:40.691129307 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:21:07.620091930 +0200 -@@ -40,6 +40,10 @@ - #include <isc/file.h> - #include <dns/result.h> - + .TP + .BI \-n + Do not configure any interfaces. This is most likely to be useful in +diff --git a/client/dhclient.c b/client/dhclient.c +index a86ab9e..5d3f5bc 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -41,6 +41,10 @@ + #include <sys/wait.h> + #include <limits.h> + +#ifdef HAVE_LIBCAP_NG +#include <cap-ng.h> +#endif @@ -58,31 +111,31 @@ diff -up dhcp-4.3.4/client/dhclient.c.capability dhcp-4.3.4/client/dhclient.c /* * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define * that when building ISC code. -@@ -237,6 +241,9 @@ main(int argc, char **argv) { - int timeout_arg = 0; - char *arg_conf = NULL; - int arg_conf_len = 0; +@@ -266,6 +270,9 @@ main(int argc, char **argv) { + int timeout_arg = 0; + char *arg_conf = NULL; + int arg_conf_len = 0; +#ifdef HAVE_LIBCAP_NG + int keep_capabilities = 0; +#endif - - /* Initialize client globals. */ - memset(&default_duid, 0, sizeof(default_duid)); -@@ -537,6 +544,10 @@ main(int argc, char **argv) { - } - - dhclient_request_options = argv[i]; + + /* Initialize client globals. */ + memset(&default_duid, 0, sizeof(default_duid)); +@@ -665,6 +672,10 @@ main(int argc, char **argv) { + + dhclient_request_options = argv[i]; + + } else if (!strcmp(argv[i], "-nc")) { +#ifdef HAVE_LIBCAP_NG -+ keep_capabilities = 1; ++ keep_capabilities = 1; +#endif - } else if (argv[i][0] == '-') { - usage("Unknown command: %s", argv[i]); - } else if (interfaces_requested < 0) { -@@ -597,6 +608,19 @@ main(int argc, char **argv) { - path_dhclient_script = s; - } - + } else if (argv[i][0] == '-') { + usage("Unknown command: %s", argv[i]); + } else if (interfaces_requested < 0) { +@@ -725,6 +736,19 @@ main(int argc, char **argv) { + path_dhclient_script = s; + } + +#ifdef HAVE_LIBCAP_NG + /* Drop capabilities */ + if (!keep_capabilities) { @@ -96,48 +149,17 @@ diff -up dhcp-4.3.4/client/dhclient.c.capability dhcp-4.3.4/client/dhclient.c + } +#endif + - /* Set up the initial dhcp option universe. */ - initialize_common_option_spaces(); - -diff -up dhcp-4.3.4/client/dhclient-script.8.capability dhcp-4.3.4/client/dhclient-script.8 ---- dhcp-4.3.4/client/dhclient-script.8.capability 2016-04-29 12:19:40.668129317 +0200 -+++ dhcp-4.3.4/client/dhclient-script.8 2016-04-29 12:19:40.717129296 +0200 -@@ -243,6 +243,16 @@ repeatedly initialized to the values pro - the other. Assuming the information provided by both servers is - valid, this shouldn't cause any real problems, but it could be - confusing. -+.PP -+Normally, if dhclient was compiled with libcap-ng support, -+dhclient drops most capabilities immediately upon startup. -+While more secure, this greatly restricts the additional actions that -+hooks in dhclient-script can take. For example, any daemons that -+dhclient-script starts or restarts will inherit the restricted -+capabilities as well, which may interfere with their correct operation. -+Thus, the -+.BI \-nc -+option can be used to prevent dhclient from dropping capabilities. - .SH SEE ALSO - dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and - dhclient.leases(5). -diff -up dhcp-4.3.4/client/Makefile.am.capability dhcp-4.3.4/client/Makefile.am ---- dhcp-4.3.4/client/Makefile.am.capability 2016-04-29 12:19:40.652129324 +0200 -+++ dhcp-4.3.4/client/Makefile.am 2016-04-29 12:19:40.717129296 +0200 -@@ -13,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c - scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt --dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ -+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.4/configure.ac.capability dhcp-4.3.4/configure.ac ---- dhcp-4.3.4/configure.ac.capability 2016-04-29 12:19:40.652129324 +0200 -+++ dhcp-4.3.4/configure.ac 2016-04-29 12:19:40.717129296 +0200 -@@ -585,6 +585,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], + /* Set up the initial dhcp option universe. */ + initialize_common_option_spaces(); + +diff --git a/configure.ac b/configure.ac +index a797438..15fc0d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -612,6 +612,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn)); # Look for optional headers. AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) - + +# look for capabilities library +AC_ARG_WITH(libcap-ng, + [ --with-libcap-ng=[auto/yes/no] Add Libcap-ng support [default=auto]],, @@ -176,13 +198,28 @@ diff -up dhcp-4.3.4/configure.ac.capability dhcp-4.3.4/configure.ac # Solaris needs some libraries for functions AC_SEARCH_LIBS(socket, [socket]) AC_SEARCH_LIBS(inet_ntoa, [nsl]) -diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c ---- dhcp-4.3.4/relay/dhcrelay.c.capability 2016-04-29 12:19:40.694129306 +0200 -+++ dhcp-4.3.4/relay/dhcrelay.c 2016-04-29 12:22:30.278056386 +0200 +diff --git a/relay/Makefile.am b/relay/Makefile.am +index 2ba5979..8900e0b 100644 +--- a/relay/Makefile.am ++++ b/relay/Makefile.am +@@ -6,7 +6,8 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ + @BINDLIBIRSDIR@/libirs.@A@ \ + @BINDLIBDNSDIR@/libdns.@A@ \ + @BINDLIBISCCFGDIR@/libisccfg.@A@ \ +- @BINDLIBISCDIR@/libisc.@A@ ++ @BINDLIBISCDIR@/libisc.@A@ \ ++ $(CAPNG_LDADD) + man_MANS = dhcrelay.8 + EXTRA_DIST = $(man_MANS) + +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index ea1be18..7b4f4f1 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c @@ -32,6 +32,11 @@ #include <sys/time.h> #include <isc/file.h> - + +#ifdef HAVE_LIBCAP_NG +# include <cap-ng.h> + int keep_capabilities = 0; @@ -191,21 +228,21 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ struct tree_cache *global_options[256]; -@@ -454,6 +459,10 @@ main(int argc, char **argv) { - usage(use_noarg, argv[i-1]); - dhcrelay_sub_id = argv[i]; - #endif +@@ -590,6 +595,10 @@ main(int argc, char **argv) { + if (++i == argc) + usage(use_noarg, argv[i-1]); + dhcrelay_sub_id = argv[i]; ++#endif + } else if (!strcmp(argv[i], "-nc")) { +#ifdef HAVE_LIBCAP_NG + keep_capabilities = 1; -+#endif - } else if (!strcmp(argv[i], "-pf")) { - if (++i == argc) - usage(use_noarg, argv[i-1]); -@@ -528,6 +537,17 @@ main(int argc, char **argv) { #endif - } - + } else if (!strcmp(argv[i], "-pf")) { + if (++i == argc) +@@ -660,6 +669,17 @@ main(int argc, char **argv) { + #endif + } + +#ifdef HAVE_LIBCAP_NG + /* Drop capabilities */ + if (!keep_capabilities) { @@ -217,13 +254,13 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c + } +#endif + - if (!quiet) { - log_info("%s %s", message, PACKAGE_VERSION); - log_info(copyright); -@@ -680,6 +700,15 @@ main(int argc, char **argv) { - signal(SIGTERM, dhcp_signal_handler); /* kill */ + if (!quiet) { + log_info("%s %s", message, PACKAGE_VERSION); + log_info(copyright); +@@ -816,6 +836,15 @@ main(int argc, char **argv) { + signal(SIGTERM, dhcp_signal_handler); /* kill */ #endif - + +#ifdef HAVE_LIBCAP_NG + /* Drop all capabilities */ + if (!keep_capabilities) { @@ -233,18 +270,8 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c + } +#endif + - /* Start dispatching packets and timeouts... */ - dispatch(); - -diff -up dhcp-4.3.4/relay/Makefile.am.capability dhcp-4.3.4/relay/Makefile.am ---- dhcp-4.3.4/relay/Makefile.am.capability 2016-04-29 12:19:40.653129323 +0200 -+++ dhcp-4.3.4/relay/Makefile.am 2016-04-29 12:19:40.718129295 +0200 -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst - - sbin_PROGRAMS = dhcrelay - dhcrelay_SOURCES = dhcrelay.c --dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ -+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhcrelay.8 - EXTRA_DIST = $(man_MANS) + /* Start dispatching packets and timeouts... */ + dispatch(); + +-- +2.14.5 diff --git a/dhcp/patches/0011-dhcp-CLOEXEC.patch b/dhcp/patches/0011-dhcp-CLOEXEC.patch deleted file mode 100644 index 309a87c1e..000000000 --- a/dhcp/patches/0011-dhcp-CLOEXEC.patch +++ /dev/null @@ -1,336 +0,0 @@ -diff -up dhcp-4.3.3b1/client/clparse.c.cloexec dhcp-4.3.3b1/client/clparse.c ---- dhcp-4.3.3b1/client/clparse.c.cloexec 2015-08-10 10:46:20.264755543 +0200 -+++ dhcp-4.3.3b1/client/clparse.c 2015-08-10 10:46:20.274755510 +0200 -@@ -247,7 +247,7 @@ int read_client_conf_file (const char *n - int token; - isc_result_t status; - -- if ((file = open (name, O_RDONLY)) < 0) -+ if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0) - return uerr2isc (errno); - - cfile = NULL; -@@ -323,7 +323,7 @@ void read_client_leases () - - /* Open the lease file. If we can't open it, just return - - we can safely trust the server to remember our state. */ -- if ((file = open (path_dhclient_db, O_RDONLY)) < 0) -+ if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0) - return; - - cfile = NULL; -diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c ---- dhcp-4.3.3b1/client/dhclient.c.cloexec 2015-08-10 10:46:20.260755556 +0200 -+++ dhcp-4.3.3b1/client/dhclient.c 2015-08-10 10:46:20.275755506 +0200 -@@ -153,11 +153,11 @@ main(int argc, char **argv) { - /* Make sure that file descriptors 0 (stdin), 1, (stdout), and - 2 (stderr) are open. To do this, we assume that when we - open a file the lowest available file descriptor is used. */ -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 0) -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 1) -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 2) - log_perror = 0; /* No sense logging to /dev/null. */ - else if (fd != -1) -@@ -519,7 +519,7 @@ main(int argc, char **argv) { - long temp; - int e; - -- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) { -+ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) { - e = fscanf(pidfd, "%ld\n", &temp); - oldpid = (pid_t)temp; - -@@ -574,7 +574,7 @@ main(int argc, char **argv) { - strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx); - sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name); - -- if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) { -+ if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) { - e = fscanf(pidfd, "%ld\n", &temp); - oldpid = (pid_t)temp; - -@@ -599,7 +599,7 @@ main(int argc, char **argv) { - int dhc_running = 0; - char procfn[256] = ""; - -- if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) { -+ if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) { - if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) { - snprintf(procfn,256,"/proc/%u",dhcpid); - dhc_running = (access(procfn, F_OK) == 0); -@@ -3120,7 +3120,7 @@ void rewrite_client_leases () - - if (leaseFile != NULL) - fclose (leaseFile); -- leaseFile = fopen (path_dhclient_db, "w"); -+ leaseFile = fopen (path_dhclient_db, "we"); - if (leaseFile == NULL) { - log_error ("can't create %s: %m", path_dhclient_db); - return; -@@ -3313,7 +3313,7 @@ write_duid(struct data_string *duid) - return DHCP_R_INVALIDARG; - - if (leaseFile == NULL) { /* XXX? */ -- leaseFile = fopen(path_dhclient_db, "w"); -+ leaseFile = fopen(path_dhclient_db, "we"); - if (leaseFile == NULL) { - log_error("can't create %s: %m", path_dhclient_db); - return ISC_R_IOERROR; -@@ -3493,7 +3493,7 @@ int write_client_lease (client, lease, r - return 1; - - if (leaseFile == NULL) { /* XXX */ -- leaseFile = fopen (path_dhclient_db, "w"); -+ leaseFile = fopen (path_dhclient_db, "we"); - if (leaseFile == NULL) { - log_error ("can't create %s: %m", path_dhclient_db); - return 0; -@@ -4011,9 +4011,9 @@ void go_daemon () - (void) close(2); - - /* Reopen them on /dev/null. */ -- (void) open("/dev/null", O_RDWR); -- (void) open("/dev/null", O_RDWR); -- (void) open("/dev/null", O_RDWR); -+ (void) open("/dev/null", O_RDWR | O_CLOEXEC); -+ (void) open("/dev/null", O_RDWR | O_CLOEXEC); -+ (void) open("/dev/null", O_RDWR | O_CLOEXEC); - - write_client_pid_file (); - -@@ -4030,14 +4030,14 @@ void write_client_pid_file () - return; - } - -- pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644); -+ pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644); - - if (pfdesc < 0) { - log_error ("Can't create %s: %m", path_dhclient_pid); - return; - } - -- pf = fdopen (pfdesc, "w"); -+ pf = fdopen (pfdesc, "we"); - if (!pf) { - close(pfdesc); - log_error ("Can't fdopen %s: %m", path_dhclient_pid); -diff -up dhcp-4.3.3b1/common/bpf.c.cloexec dhcp-4.3.3b1/common/bpf.c ---- dhcp-4.3.3b1/common/bpf.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/bpf.c 2015-08-10 10:46:20.275755506 +0200 -@@ -95,7 +95,7 @@ int if_register_bpf (info) - for (b = 0; 1; b++) { - /* %Audit% 31 bytes max. %2004.06.17,Safe% */ - sprintf(filename, BPF_FORMAT, b); -- sock = open (filename, O_RDWR, 0); -+ sock = open (filename, O_RDWR | O_CLOEXEC, 0); - if (sock < 0) { - if (errno == EBUSY) { - continue; -diff -up dhcp-4.3.3b1/common/dlpi.c.cloexec dhcp-4.3.3b1/common/dlpi.c ---- dhcp-4.3.3b1/common/dlpi.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/dlpi.c 2015-08-10 10:46:20.275755506 +0200 -@@ -804,7 +804,7 @@ dlpiopen(const char *ifname) { - } - *dp = '\0'; - -- return open (devname, O_RDWR, 0); -+ return open (devname, O_RDWR | O_CLOEXEC, 0); - } - - /* -diff -up dhcp-4.3.3b1/common/nit.c.cloexec dhcp-4.3.3b1/common/nit.c ---- dhcp-4.3.3b1/common/nit.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/nit.c 2015-08-10 10:46:20.275755506 +0200 -@@ -75,7 +75,7 @@ int if_register_nit (info) - struct strioctl sio; - - /* Open a NIT device */ -- sock = open ("/dev/nit", O_RDWR); -+ sock = open ("/dev/nit", O_RDWR | O_CLOEXEC); - if (sock < 0) - log_fatal ("Can't open NIT device for %s: %m", info -> name); - -diff -up dhcp-4.3.3b1/common/resolv.c.cloexec dhcp-4.3.3b1/common/resolv.c ---- dhcp-4.3.3b1/common/resolv.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/resolv.c 2015-08-10 10:46:20.276755503 +0200 -@@ -44,7 +44,7 @@ void read_resolv_conf (parse_time) - struct domain_search_list *dp, *dl, *nd; - isc_result_t status; - -- if ((file = open (path_resolv_conf, O_RDONLY)) < 0) { -+ if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) { - log_error ("Can't open %s: %m", path_resolv_conf); - return; - } -diff -up dhcp-4.3.3b1/common/upf.c.cloexec dhcp-4.3.3b1/common/upf.c ---- dhcp-4.3.3b1/common/upf.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/upf.c 2015-08-10 10:46:20.276755503 +0200 -@@ -71,7 +71,7 @@ int if_register_upf (info) - /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */ - sprintf(filename, "/dev/pf/pfilt%d", b); - -- sock = open (filename, O_RDWR, 0); -+ sock = open (filename, O_RDWR | O_CLOEXEC, 0); - if (sock < 0) { - if (errno == EBUSY) { - continue; -diff -up dhcp-4.3.3b1/omapip/trace.c.cloexec dhcp-4.3.3b1/omapip/trace.c ---- dhcp-4.3.3b1/omapip/trace.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/omapip/trace.c 2015-08-10 10:46:20.276755503 +0200 -@@ -138,10 +138,10 @@ isc_result_t trace_begin (const char *fi - return DHCP_R_INVALIDARG; - } - -- traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600); -+ traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600); - if (traceoutfile < 0 && errno == EEXIST) { - log_error ("WARNING: Overwriting trace file \"%s\"", filename); -- traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC, -+ traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC | O_CLOEXEC, - 0600); - } - -@@ -429,7 +429,7 @@ void trace_file_replay (const char *file - isc_result_t result; - int len; - -- traceinfile = fopen (filename, "r"); -+ traceinfile = fopen (filename, "re"); - if (!traceinfile) { - log_error("Can't open tracefile %s: %m", filename); - return; -diff -up dhcp-4.3.3b1/relay/dhcrelay.c.cloexec dhcp-4.3.3b1/relay/dhcrelay.c ---- dhcp-4.3.3b1/relay/dhcrelay.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/relay/dhcrelay.c 2015-08-10 10:46:20.276755503 +0200 -@@ -187,11 +187,11 @@ main(int argc, char **argv) { - /* Make sure that file descriptors 0(stdin), 1,(stdout), and - 2(stderr) are open. To do this, we assume that when we - open a file the lowest available file descriptor is used. */ -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 0) -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 1) -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 2) - log_perror = 0; /* No sense logging to /dev/null. */ - else if (fd != -1) -@@ -558,13 +558,13 @@ main(int argc, char **argv) { - - if (no_pid_file == ISC_FALSE) { - pfdesc = open(path_dhcrelay_pid, -- O_CREAT | O_TRUNC | O_WRONLY, 0644); -+ O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644); - - if (pfdesc < 0) { - log_error("Can't create %s: %m", - path_dhcrelay_pid); - } else { -- pf = fdopen(pfdesc, "w"); -+ pf = fdopen(pfdesc, "we"); - if (!pf) - log_error("Can't fdopen %s: %m", - path_dhcrelay_pid); -diff -up dhcp-4.3.3b1/server/confpars.c.cloexec dhcp-4.3.3b1/server/confpars.c ---- dhcp-4.3.3b1/server/confpars.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/server/confpars.c 2015-08-10 10:46:20.277755500 +0200 -@@ -111,7 +111,7 @@ isc_result_t read_conf_file (const char - } - #endif - -- if ((file = open (filename, O_RDONLY)) < 0) { -+ if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) { - if (leasep) { - log_error ("Can't open lease database %s: %m --", - path_dhcpd_db); -diff -up dhcp-4.3.3b1/server/db.c.cloexec dhcp-4.3.3b1/server/db.c ---- dhcp-4.3.3b1/server/db.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/server/db.c 2015-08-10 10:47:32.644518358 +0200 -@@ -1072,7 +1072,7 @@ void db_startup (testp) - } - #endif - if (!testp) { -- db_file = fopen (path_dhcpd_db, "a"); -+ db_file = fopen (path_dhcpd_db, "ae"); - if (!db_file) - log_fatal ("Can't open %s for append.", path_dhcpd_db); - expire_all_pools (); -@@ -1120,7 +1120,7 @@ int new_lease_file () - path_dhcpd_db, (int)t) >= sizeof newfname) - log_fatal("new_lease_file: lease file path too long"); - -- db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664); -+ db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664); - if (db_fd < 0) { - log_error ("Can't create new lease file: %m"); - return 0; -@@ -1141,7 +1141,7 @@ int new_lease_file () - } - #endif /* PARANOIA */ - -- if ((new_db_file = fdopen(db_fd, "w")) == NULL) { -+ if ((new_db_file = fdopen(db_fd, "we")) == NULL) { - log_error("Can't fdopen new lease file: %m"); - close(db_fd); - goto fdfail; -diff -up dhcp-4.3.3b1/server/dhcpd.c.cloexec dhcp-4.3.3b1/server/dhcpd.c ---- dhcp-4.3.3b1/server/dhcpd.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/server/dhcpd.c 2015-08-10 10:46:20.278755497 +0200 -@@ -194,11 +194,11 @@ main(int argc, char **argv) { - /* Make sure that file descriptors 0 (stdin), 1, (stdout), and - 2 (stderr) are open. To do this, we assume that when we - open a file the lowest available file descriptor is used. */ -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 0) -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 1) -- fd = open("/dev/null", O_RDWR); -+ fd = open("/dev/null", O_RDWR | O_CLOEXEC); - if (fd == 2) - log_perror = 0; /* No sense logging to /dev/null. */ - else if (fd != -1) -@@ -743,7 +743,7 @@ main(int argc, char **argv) { - * appropriate. - */ - if (no_pid_file == ISC_FALSE) { -- i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644); -+ i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644); - if (i >= 0) { - sprintf(pbuf, "%d\n", (int) getpid()); - IGNORE_RET(write(i, pbuf, strlen(pbuf))); -@@ -787,9 +787,9 @@ main(int argc, char **argv) { - (void) close(2); - - /* Reopen them on /dev/null. */ -- (void) open("/dev/null", O_RDWR); -- (void) open("/dev/null", O_RDWR); -- (void) open("/dev/null", O_RDWR); -+ (void) open("/dev/null", O_RDWR | O_CLOEXEC); -+ (void) open("/dev/null", O_RDWR | O_CLOEXEC); -+ (void) open("/dev/null", O_RDWR | O_CLOEXEC); - log_perror = 0; /* No sense logging to /dev/null. */ - - IGNORE_RET (chdir("/")); -diff -up dhcp-4.3.3b1/server/ldap.c.cloexec dhcp-4.3.3b1/server/ldap.c ---- dhcp-4.3.3b1/server/ldap.c.cloexec 2015-07-30 21:03:40.000000000 +0200 -+++ dhcp-4.3.3b1/server/ldap.c 2015-08-10 10:46:20.279755493 +0200 -@@ -1442,7 +1442,7 @@ ldap_start (void) - - if (ldap_debug_file != NULL && ldap_debug_fd == -1) - { -- if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY, -+ if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, - S_IRUSR | S_IWUSR)) < 0) - log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file, - strerror (errno)); diff --git a/dhcp/patches/0017-dhcp-rfc3442-classless-static-routes.patch b/dhcp/patches/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch similarity index 61% rename from dhcp/patches/0017-dhcp-rfc3442-classless-static-routes.patch rename to dhcp/patches/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch index 6c3a2392b..6ab3c6b81 100644 --- a/dhcp/patches/0017-dhcp-rfc3442-classless-static-routes.patch +++ b/dhcp/patches/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch @@ -1,44 +1,66 @@ -diff -up dhcp-4.3.4/client/clparse.c.rfc3442 dhcp-4.3.4/client/clparse.c ---- dhcp-4.3.4/client/clparse.c.rfc3442 2016-04-29 12:23:34.192032714 +0200 -+++ dhcp-4.3.4/client/clparse.c 2016-04-29 12:24:37.531016317 +0200 +From 2756fcc3f88c27d0e12e72dbdd2906fbf45f2362 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:32:35 +0100 +Subject: [PATCH 12/21] RFC 3442 - Classless Static Route Option for DHCPv4 + (#516325) +Cc: pzhukov(a)redhat.com + +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #24572]) +--- + client/clparse.c | 13 ++++++++++-- + common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++++++++ + common/inet.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ + common/options.c | 49 +++++++++++++++++++++++++++++++++++++++++++- + common/parse.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++- + common/tables.c | 2 ++ + includes/dhcp.h | 1 + + includes/dhcpd.h | 2 ++ + includes/dhctoken.h | 5 +++-- + 9 files changed, 219 insertions(+), 6 deletions(-) + +diff --git a/client/clparse.c b/client/clparse.c +index 44387ed..862e4f9 100644 +--- a/client/clparse.c ++++ b/client/clparse.c @@ -31,7 +31,7 @@ - + struct client_config top_level_config; - + -#define NUM_DEFAULT_REQUESTED_OPTS 14 +#define NUM_DEFAULT_REQUESTED_OPTS 15 /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1]; - + @@ -87,7 +87,11 @@ isc_result_t read_client_conf () - dhcp_universe.code_hash, &code, 0, MDL); - - /* 4 */ + dhcp_universe.code_hash, &code, 0, MDL); + + /* 4 */ - code = DHO_ROUTERS; + /* The Classless Static Routes option code MUST appear in the parameter + * request list prior to both the Router option code and the Static + * Routes option code, if present. (RFC3442) + */ + code = DHO_CLASSLESS_STATIC_ROUTES; - option_code_hash_lookup(&default_requested_options[3], - dhcp_universe.code_hash, &code, 0, MDL); - + option_code_hash_lookup(&default_requested_options[3], + dhcp_universe.code_hash, &code, 0, MDL); + @@ -141,6 +145,11 @@ isc_result_t read_client_conf () - option_code_hash_lookup(&default_requested_options[13], - dhcp_universe.code_hash, &code, 0, MDL); - + option_code_hash_lookup(&default_requested_options[13], + dhcp_universe.code_hash, &code, 0, MDL); + + /* 15 */ + code = DHO_ROUTERS; + option_code_hash_lookup(&default_requested_options[14], + dhcp_universe.code_hash, &code, 0, MDL); + - for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { - if (default_requested_options[code] == NULL) - log_fatal("Unable to find option definition for " -diff -up dhcp-4.3.4/common/dhcp-options.5.rfc3442 dhcp-4.3.4/common/dhcp-options.5 ---- dhcp-4.3.4/common/dhcp-options.5.rfc3442 2016-04-29 12:23:34.183032716 +0200 -+++ dhcp-4.3.4/common/dhcp-options.5 2016-04-29 12:23:34.237032703 +0200 -@@ -111,6 +111,26 @@ hexadecimal, separated by colons. For e + for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { + if (default_requested_options[code] == NULL) + log_fatal("Unable to find option definition for " +diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 +index d9e1197..2343b19 100644 +--- a/common/dhcp-options.5 ++++ b/common/dhcp-options.5 +@@ -110,6 +110,26 @@ hexadecimal, separated by colons. For example: or option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f; .fi @@ -65,7 +87,7 @@ diff -up dhcp-4.3.4/common/dhcp-options.5.rfc3442 dhcp-4.3.4/common/dhcp-options .SH SETTING OPTION VALUES USING EXPRESSIONS Sometimes it's helpful to be able to set the value of a DHCP option based on some value that the client has sent. To do this, you can -@@ -1031,6 +1051,29 @@ dhclient-script will create routes: +@@ -1086,6 +1106,29 @@ dhclient-script will create routes: .RE .PP .nf @@ -95,13 +117,14 @@ diff -up dhcp-4.3.4/common/dhcp-options.5.rfc3442 dhcp-4.3.4/common/dhcp-options .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...]\fB;\fR .fi -diff -up dhcp-4.3.4/common/inet.c.rfc3442 dhcp-4.3.4/common/inet.c ---- dhcp-4.3.4/common/inet.c.rfc3442 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/inet.c 2016-04-29 12:23:34.237032703 +0200 -@@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne - return ISC_R_SUCCESS; +diff --git a/common/inet.c b/common/inet.c +index c4da73c..981fb92 100644 +--- a/common/inet.c ++++ b/common/inet.c +@@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrnetlist **result) { + return ISC_R_SUCCESS; } - + +static const char * +inet_ntopdd(const unsigned char *src, unsigned srclen, char *dst, size_t size) +{ @@ -159,42 +182,43 @@ diff -up dhcp-4.3.4/common/inet.c.rfc3442 dhcp-4.3.4/common/inet.c /* piaddr() turns an iaddr structure into a printable address. */ /* XXX: should use a const pointer rather than passing the structure */ const char * -diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c ---- dhcp-4.3.4/common/options.c.rfc3442 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/options.c 2016-04-29 12:23:34.237032703 +0200 -@@ -713,7 +713,11 @@ cons_options(struct packet *inpacket, st - * packet. - */ - priority_list[priority_len++] = DHO_SUBNET_MASK; +diff --git a/common/options.c b/common/options.c +index fc0e088..3034cf0 100644 +--- a/common/options.c ++++ b/common/options.c +@@ -729,7 +729,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket, + * packet. + */ + priority_list[priority_len++] = DHO_SUBNET_MASK; - priority_list[priority_len++] = DHO_ROUTERS; + if (lookup_option(&dhcp_universe, cfg_options, + DHO_CLASSLESS_STATIC_ROUTES)) + priority_list[priority_len++] = DHO_CLASSLESS_STATIC_ROUTES; + else + priority_list[priority_len++] = DHO_ROUTERS; - priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS; - priority_list[priority_len++] = DHO_HOST_NAME; - priority_list[priority_len++] = DHO_FQDN; -@@ -1694,6 +1698,7 @@ const char *pretty_print_option (option, - unsigned long tval; - isc_boolean_t a_array = ISC_FALSE; - int len_used; + priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS; + priority_list[priority_len++] = DHO_HOST_NAME; + priority_list[priority_len++] = DHO_FQDN; +@@ -1804,6 +1808,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) + unsigned long tval; + isc_boolean_t a_array = ISC_FALSE; + int len_used; + unsigned int octets = 0; - - if (emit_commas) - comma = ','; -@@ -1702,6 +1707,7 @@ const char *pretty_print_option (option, - - memset (enumbuf, 0, sizeof enumbuf); - + + if (emit_commas) + comma = ','; +@@ -1812,6 +1817,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) + + memset (enumbuf, 0, sizeof enumbuf); + + if (option->format[0] != 'R') { /* see explanation lower */ - /* Figure out the size of the data. */ - for (l = i = 0; option -> format [i]; i++, l++) { - if (l >= sizeof(fmtbuf) - 1) -@@ -1894,6 +1900,33 @@ const char *pretty_print_option (option, - if (numhunk < 0) - numhunk = 1; - + /* Figure out the size of the data. */ + for (l = i = 0; option -> format [i]; i++, l++) { + if (l >= sizeof(fmtbuf) - 1) +@@ -2004,6 +2010,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) + if (numhunk < 0) + numhunk = 1; + + } else { /* option->format[i] == 'R') */ + /* R (destination descriptor) has variable length. + * We can find it only in classless static route option, @@ -222,13 +246,13 @@ diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c + } + } + - /* Cycle through the array (or hunk) printing the data. */ - for (i = 0; i < numhunk; i++) { - if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) { -@@ -2049,6 +2082,20 @@ const char *pretty_print_option (option, - strcpy(op, piaddr(iaddr)); - dp += 4; - break; + /* Cycle through the array (or hunk) printing the data. */ + for (i = 0; i < numhunk; i++) { + if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) { +@@ -2159,6 +2192,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) + strcpy(op, piaddr(iaddr)); + dp += 4; + break; + + case 'R': + if (dp[0] <= 32) @@ -243,16 +267,18 @@ diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c + dp += iaddr.len; + break; + - case '6': - iaddr.len = 16; - memcpy(iaddr.iabuf, dp, 16); -diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c ---- dhcp-4.3.4/common/parse.c.rfc3442 2016-04-29 12:23:34.220032707 +0200 -+++ dhcp-4.3.4/common/parse.c 2016-04-29 12:23:34.238032702 +0200 -@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr) - } - - /* + case '6': + iaddr.len = 16; + memcpy(iaddr.iabuf, dp, 16); +diff --git a/common/parse.c b/common/parse.c +index 3ac4ebf..f17bc0b 100644 +--- a/common/parse.c ++++ b/common/parse.c +@@ -344,6 +344,39 @@ int parse_ip_addr (cfile, addr) + return 0; + } + ++/* + * destination-descriptor :== NUMBER DOT NUMBER | + * NUMBER DOT NUMBER DOT NUMBER | + * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER | @@ -285,36 +311,35 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c + return 0; +} + -+/* + /* * Return true if every character in the string is hexadecimal. */ - static int -@@ -720,8 +753,10 @@ unsigned char *parse_numeric_aggregate ( - if (count) { - token = peek_token (&val, (unsigned *)0, cfile); - if (token != separator) { +@@ -724,8 +757,10 @@ unsigned char *parse_numeric_aggregate (cfile, buf, + if (count) { + token = peek_token (&val, (unsigned *)0, cfile); + if (token != separator) { - if (!*max) + if (!*max) { + *max = count; - break; + break; + } - if (token != RBRACE && token != LBRACE) - token = next_token (&val, - (unsigned *)0, -@@ -1668,6 +1703,9 @@ int parse_option_code_definition (cfile, - case IP_ADDRESS: - type = 'I'; - break; + if (token != RBRACE && token != LBRACE) + token = next_token (&val, + (unsigned *)0, +@@ -1672,6 +1707,9 @@ int parse_option_code_definition (cfile, option) + case IP_ADDRESS: + type = 'I'; + break; + case DESTINATION_DESCRIPTOR: + type = 'R'; + break; - case IP6_ADDRESS: - type = '6'; - break; -@@ -5097,6 +5135,15 @@ int parse_option_token (rv, cfile, fmt, - } - break; - + case IP6_ADDRESS: + type = '6'; + break; +@@ -5101,6 +5139,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups) + } + break; + + case 'R': /* destination descriptor */ + if (!parse_destination_descriptor (cfile, &addr)) { + return 0; @@ -324,13 +349,13 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c + } + break; + - case '6': /* IPv6 address. */ - if (!parse_ip6_addr(cfile, &addr)) { - return 0; -@@ -5374,6 +5421,13 @@ int parse_option_decl (oc, cfile) - goto exit; - len = ip_addr.len; - dp = ip_addr.iabuf; + case '6': /* IPv6 address. */ + if (!parse_ip6_addr(cfile, &addr)) { + return 0; +@@ -5378,6 +5425,13 @@ int parse_option_decl (oc, cfile) + goto exit; + len = ip_addr.len; + dp = ip_addr.iabuf; + goto alloc; + + case 'R': /* destination descriptor */ @@ -338,15 +363,16 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c + goto exit; + len = ip_addr.len; + dp = ip_addr.iabuf; - - alloc: - if (hunkix + len > sizeof hunkbuf) { -diff -up dhcp-4.3.4/common/tables.c.rfc3442 dhcp-4.3.4/common/tables.c ---- dhcp-4.3.4/common/tables.c.rfc3442 2016-04-29 12:23:34.209032710 +0200 -+++ dhcp-4.3.4/common/tables.c 2016-04-29 12:23:34.238032702 +0200 -@@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsig + + alloc: + if (hunkix + len > sizeof hunkbuf) { +diff --git a/common/tables.c b/common/tables.c +index d2294c0..f1be07d 100644 +--- a/common/tables.c ++++ b/common/tables.c +@@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option, Format codes: - + I - IPv4 address + R - destination descriptor (RFC3442) 6 - IPv6 address @@ -354,52 +380,59 @@ diff -up dhcp-4.3.4/common/tables.c.rfc3442 dhcp-4.3.4/common/tables.c L - 32-bit unsigned integer @@ -216,6 +217,7 @@ static struct option dhcp_options[] = { #endif - { "subnet-selection", "I", &dhcp_universe, 118, 1 }, - { "domain-search", "D", &dhcp_universe, 119, 1 }, + { "subnet-selection", "I", &dhcp_universe, 118, 1 }, + { "domain-search", "D", &dhcp_universe, 119, 1 }, + { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 }, - { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, - { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, + { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, + { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, #if 0 -diff -up dhcp-4.3.4/includes/dhcpd.h.rfc3442 dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.rfc3442 2016-04-29 12:23:34.186032716 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:23:34.239032702 +0200 -@@ -2894,6 +2894,7 @@ isc_result_t range2cidr(struct iaddrcidr - const struct iaddr *lo, const struct iaddr *hi); +diff --git a/includes/dhcp.h b/includes/dhcp.h +index 0a74137..95bf539 100644 +--- a/includes/dhcp.h ++++ b/includes/dhcp.h +@@ -158,6 +158,7 @@ struct dhcp_packet { + #define DHO_ASSOCIATED_IP 92 + #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ + #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ ++#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ + #define DHO_VIVCO_SUBOPTIONS 124 + #define DHO_VIVSO_SUBOPTIONS 125 + +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 3632a6b..2ac39ae 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -2951,6 +2951,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result, + const struct iaddr *lo, const struct iaddr *hi); isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result); const char *piaddr (struct iaddr); +const char *pdestdesc (struct iaddr); char *piaddrmask(struct iaddr *, struct iaddr *); char *piaddrcidr(const struct iaddr *, unsigned int); u_int16_t validate_port(char *); -@@ -3108,6 +3109,7 @@ void parse_client_lease_declaration (str +@@ -3169,6 +3170,7 @@ void parse_client_lease_declaration (struct parse *, int parse_option_decl (struct option_cache **, struct parse *); void parse_string_list (struct parse *, struct string_list **, int); int parse_ip_addr (struct parse *, struct iaddr *); +int parse_destination_descriptor (struct parse *, struct iaddr *); int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *); void parse_reject_statement (struct parse *, struct client_config *); - -diff -up dhcp-4.3.4/includes/dhcp.h.rfc3442 dhcp-4.3.4/includes/dhcp.h ---- dhcp-4.3.4/includes/dhcp.h.rfc3442 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/includes/dhcp.h 2016-04-29 12:23:34.239032702 +0200 -@@ -159,6 +159,7 @@ struct dhcp_packet { - #define DHO_ASSOCIATED_IP 92 - #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ - #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ -+#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ - #define DHO_VIVCO_SUBOPTIONS 124 - #define DHO_VIVSO_SUBOPTIONS 125 - -diff -up dhcp-4.3.4/includes/dhctoken.h.rfc3442 dhcp-4.3.4/includes/dhctoken.h ---- dhcp-4.3.4/includes/dhctoken.h.rfc3442 2016-04-29 12:23:34.239032702 +0200 -+++ dhcp-4.3.4/includes/dhctoken.h 2016-04-29 12:25:07.236008628 +0200 -@@ -374,7 +374,8 @@ enum dhcp_token { - LEASE_ID_FORMAT = 676, - TOKEN_HEX = 677, - TOKEN_OCTAL = 678, -- BOOTP_BROADCAST_ALWAYS = 679 -+ BOOTP_BROADCAST_ALWAYS = 679, -+ DESTINATION_DESCRIPTOR = 680 + +diff --git a/includes/dhctoken.h b/includes/dhctoken.h +index 7e7215a..b4d93ba 100644 +--- a/includes/dhctoken.h ++++ b/includes/dhctoken.h +@@ -376,8 +376,9 @@ enum dhcp_token { + LEASE_ID_FORMAT = 676, + TOKEN_HEX = 677, + TOKEN_OCTAL = 678, +- KEY_ALGORITHM = 679 +- BOOTP_BROADCAST_ALWAYS = 680 ++ KEY_ALGORITHM = 679, ++ BOOTP_BROADCAST_ALWAYS = 680, ++ DESTINATION_DESCRIPTOR = 681 }; - + #define is_identifier(x) ((x) >= FIRST_TOKEN && \ +-- +2.14.5 diff --git a/dhcp/patches/0012-dhcp-garbage-chars.patch b/dhcp/patches/0012-dhcp-garbage-chars.patch deleted file mode 100644 index 131360be6..000000000 --- a/dhcp/patches/0012-dhcp-garbage-chars.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up dhcp-4.3.0rc1/common/tables.c.garbage dhcp-4.3.0rc1/common/tables.c ---- dhcp-4.3.0rc1/common/tables.c.garbage 2014-01-29 10:03:52.132624677 +0100 -+++ dhcp-4.3.0rc1/common/tables.c 2014-01-29 10:04:51.413875343 +0100 -@@ -213,7 +213,7 @@ static struct option dhcp_options[] = { - { "name-service-search", "Sa", &dhcp_universe, 117, 1 }, - #endif - { "subnet-selection", "I", &dhcp_universe, 118, 1 }, -- { "domain-search", "Dc", &dhcp_universe, 119, 1 }, -+ { "domain-search", "D", &dhcp_universe, 119, 1 }, - { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, - { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, - #if 0 diff --git a/dhcp/patches/0013-DHCPv6-over-PPP-support-626514.patch b/dhcp/patches/0013-DHCPv6-over-PPP-support-626514.patch new file mode 100644 index 000000000..a0d4bf3bd --- /dev/null +++ b/dhcp/patches/0013-DHCPv6-over-PPP-support-626514.patch @@ -0,0 +1,175 @@ +From 43332b29f0c8fef3ddd225e31f5f2b4ff8273b36 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:33:06 +0100 +Subject: [PATCH 13/21] DHCPv6 over PPP support (#626514) +Cc: pzhukov(a)redhat.com + +--- + client/dhc6.c | 3 ++- + client/dhclient.c | 17 ++++++++++++++--- + common/bpf.c | 16 ++++++++++++++++ + common/lpf.c | 16 ++++++++++++++++ + includes/dhcp.h | 2 ++ + includes/dhcpd.h | 2 +- + server/dhcpv6.c | 3 +++ + 7 files changed, 54 insertions(+), 5 deletions(-) + +diff --git a/client/dhc6.c b/client/dhc6.c +index 16a0838..3171828 100644 +--- a/client/dhc6.c ++++ b/client/dhc6.c +@@ -5744,7 +5744,8 @@ make_client6_options(struct client_state *client, struct option_state **op, + */ + if ((oc = lookup_option(&dhcpv6_universe, *op, + D6O_CLIENTID)) == NULL) { +- if (!option_cache(&oc, &default_duid, NULL, clientid_option, ++ if (default_duid.len == 0 || ++ !option_cache(&oc, &default_duid, NULL, clientid_option, + MDL)) + log_fatal("Failure assembling a DUID."); + +diff --git a/client/dhclient.c b/client/dhclient.c +index 5d3f5bc..301132c 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -1202,8 +1202,8 @@ main(int argc, char **argv) { + if (default_duid.buffer != NULL) + data_string_forget(&default_duid, MDL); + +- form_duid(&default_duid, MDL); +- write_duid(&default_duid); ++ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS) ++ write_duid(&default_duid); + } + } + +@@ -3956,7 +3956,7 @@ write_options(struct client_state *client, struct option_state *options, + * is not how it is intended. Upcoming rearchitecting the client should + * address this "one daemon model." + */ +-void ++isc_result_t + form_duid(struct data_string *duid, const char *file, int line) + { + struct interface_info *ip; +@@ -3969,6 +3969,15 @@ form_duid(struct data_string *duid, const char *file, int line) + if (ip == NULL) + log_fatal("Impossible condition at %s:%d.", MDL); + ++ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) { ++ /* Try the other interfaces */ ++ log_debug("Cannot form default DUID from interface %s.", ip->name); ++ ip = ip->next; ++ } ++ if (ip == NULL) { ++ return ISC_R_UNEXPECTED; ++ } ++ + if ((ip->hw_address.hlen == 0) || + (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) + log_fatal("Impossible hardware address length at %s:%d.", MDL); +@@ -4014,6 +4023,8 @@ form_duid(struct data_string *duid, const char *file, int line) + log_info("Created duid %s.", str); + dfree(str, MDL); + } ++ ++ return ISC_R_SUCCESS; + } + + /* Write the default DUID to the lease store. */ +diff --git a/common/bpf.c b/common/bpf.c +index 67b6d64..ffbd09a 100644 +--- a/common/bpf.c ++++ b/common/bpf.c +@@ -650,6 +650,22 @@ get_hw_addr(const char *name, struct hardware *hw) { + memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen); + break; + #endif /* IFT_FDDI */ ++#if defined(IFT_PPP) ++ case IFT_PPP: ++ if (local_family != AF_INET6) ++ log_fatal("Unsupported device type %d for \"%s\"", ++ sa->sdl_type, name); ++ hw->hlen = 0; ++ hw->hbuf[0] = HTYPE_RESERVED; ++ /* 0xdeadbeef should never occur on the wire, ++ * and is a signature that something went wrong. ++ */ ++ hw->hbuf[1] = 0xde; ++ hw->hbuf[2] = 0xad; ++ hw->hbuf[3] = 0xbe; ++ hw->hbuf[4] = 0xef; ++ break; ++#endif + default: + log_fatal("Unsupported device type %d for \"%s\"", + sa->sdl_type, name); +diff --git a/common/lpf.c b/common/lpf.c +index 82a279b..b0ed01c 100644 +--- a/common/lpf.c ++++ b/common/lpf.c +@@ -563,6 +563,22 @@ get_hw_addr(const char *name, struct hardware *hw) { + hw->hbuf[0] = HTYPE_FDDI; + memcpy(&hw->hbuf[1], sa->sa_data, 6); + break; ++#if defined(ARPHRD_PPP) ++ case ARPHRD_PPP: ++ if (local_family != AF_INET6) ++ log_fatal("Unsupported device type %d for \"%s\"", ++ sa->sa_family, name); ++ hw->hlen = 0; ++ hw->hbuf[0] = HTYPE_RESERVED; ++ /* 0xdeadbeef should never occur on the wire, ++ * and is a signature that something went wrong. ++ */ ++ hw->hbuf[1] = 0xde; ++ hw->hbuf[2] = 0xad; ++ hw->hbuf[3] = 0xbe; ++ hw->hbuf[4] = 0xef; ++ break; ++#endif + default: + log_fatal("Unsupported device type %ld for \"%s\"", + (long int)sa->sa_family, name); +diff --git a/includes/dhcp.h b/includes/dhcp.h +index 95bf539..4cc547a 100644 +--- a/includes/dhcp.h ++++ b/includes/dhcp.h +@@ -80,6 +80,8 @@ struct dhcp_packet { + * is no standard for this so we + * just steal a type */ + ++#define HTYPE_RESERVED 0 /* RFC 5494 */ ++ + /* Magic cookie validating dhcp options field (and bootp vendor + extensions field). */ + #define DHCP_OPTIONS_COOKIE "\143\202\123\143" +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 2ac39ae..faa9251 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -3051,7 +3051,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr); + + void dhcpv4_client_assignments(void); + void dhcpv6_client_assignments(void); +-void form_duid(struct data_string *duid, const char *file, int line); ++isc_result_t form_duid(struct data_string *duid, const char *file, int line); + + void dhcp4o6_start(void); + +diff --git a/server/dhcpv6.c b/server/dhcpv6.c +index a7110f9..c5ce7e8 100644 +--- a/server/dhcpv6.c ++++ b/server/dhcpv6.c +@@ -482,6 +482,9 @@ generate_new_server_duid(void) { + if (p->hw_address.hlen > 0) { + break; + } ++ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) { ++ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!"); ++ } + } + if (p == NULL) { + return ISC_R_UNEXPECTED; +-- +2.14.5 diff --git a/dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch b/dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch deleted file mode 100644 index 103824c38..000000000 --- a/dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up dhcp-4.3.0a1/common/dispatch.c.dracut dhcp-4.3.0a1/common/dispatch.c ---- dhcp-4.3.0a1/common/dispatch.c.dracut 2013-12-11 01:25:12.000000000 +0100 -+++ dhcp-4.3.0a1/common/dispatch.c 2013-12-19 15:39:50.350505860 +0100 -@@ -210,6 +210,10 @@ void add_timeout (when, where, what, ref - isc_interval_t interval; - isc_time_t expires; - -+ if (when == NULL) { -+ return; -+ } -+ - /* See if this timeout supersedes an existing timeout. */ - t = (struct timeout *)0; - for (q = timeouts; q; q = q->next) { diff --git a/dhcp/patches/0020-dhcp-lpf-ib.patch b/dhcp/patches/0014-IPoIB-support-660681.patch similarity index 60% rename from dhcp/patches/0020-dhcp-lpf-ib.patch rename to dhcp/patches/0014-IPoIB-support-660681.patch index 766d518ad..7e3a43a95 100644 --- a/dhcp/patches/0020-dhcp-lpf-ib.patch +++ b/dhcp/patches/0014-IPoIB-support-660681.patch @@ -1,19 +1,36 @@ -diff -up dhcp-4.3.4/client/dhclient.c.lpf-ib dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.lpf-ib 2016-05-02 14:37:36.945128001 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-05-02 14:37:36.952128005 +0200 -@@ -163,6 +163,8 @@ static const char use_noarg[] = "No argu - static const char use_v6command[] = "Command not used for DHCPv4: %s"; - #endif - +From de8468cf16c0fa9d01412446fcf1d44ccd0fd411 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:34:21 +0100 +Subject: [PATCH 14/21] IPoIB support (#660681) +Cc: pzhukov(a)redhat.com + +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #24249]) +--- + client/dhclient.c | 32 +++++++ + common/bpf.c | 32 +++++++ + common/discover.c | 4 +- + common/lpf.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++----- + common/socket.c | 8 +- + includes/dhcpd.h | 6 +- + 6 files changed, 315 insertions(+), 29 deletions(-) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 301132c..dc9080e 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -205,6 +205,8 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; + + #define DHCLIENT_USAGEH "{--version|--help|-h}" + +static void setup_ib_interface(struct interface_info *ip); + static void usage(const char *sfmt, const char *sarg) { -@@ -1066,6 +1068,13 @@ main(int argc, char **argv) { - } - srandom(seed + cur_time + (unsigned)getpid()); - +@@ -1191,6 +1193,13 @@ main(int argc, char **argv) { + } + srandom(seed + cur_time + (unsigned)getpid()); + + /* Setup specific Infiniband options */ + for (ip = interfaces; ip; ip = ip->next) { + if (ip->client && @@ -21,13 +38,13 @@ diff -up dhcp-4.3.4/client/dhclient.c.lpf-ib dhcp-4.3.4/client/dhclient.c + setup_ib_interface(ip); + } + } - - /* - * Establish a default DUID. We always do so for v6 and -@@ -1361,6 +1370,29 @@ int find_subnet (struct subnet **sp, - return 0; + + /* + * Establish a default DUID. We always do so for v6 and +@@ -1486,6 +1495,29 @@ int find_subnet (struct subnet **sp, + return 0; } - + +static void setup_ib_interface(struct interface_info *ip) +{ + struct group *g; @@ -54,13 +71,14 @@ diff -up dhcp-4.3.4/client/dhclient.c.lpf-ib dhcp-4.3.4/client/dhclient.c /* Individual States: * * Each routine is called from the dhclient_state_machine() in one of -diff -up dhcp-4.3.4/common/bpf.c.lpf-ib dhcp-4.3.4/common/bpf.c ---- dhcp-4.3.4/common/bpf.c.lpf-ib 2016-05-02 14:37:36.946128001 +0200 -+++ dhcp-4.3.4/common/bpf.c 2016-05-02 14:37:36.952128005 +0200 -@@ -198,11 +198,43 @@ struct bpf_insn dhcp_bpf_filter [] = { - BPF_STMT(BPF_RET+BPF_K, 0), - }; - +diff --git a/common/bpf.c b/common/bpf.c +index ffbd09a..568e3d9 100644 +--- a/common/bpf.c ++++ b/common/bpf.c +@@ -237,11 +237,43 @@ int dhcp_bpf_relay_filter_len = + sizeof dhcp_bpf_relay_filter / sizeof (struct bpf_insn); + #endif + +/* Packet filter program for DHCP over Infiniband. + * + * XXX @@ -95,37 +113,39 @@ diff -up dhcp-4.3.4/common/bpf.c.lpf-ib dhcp-4.3.4/common/bpf.c #if defined (DEC_FDDI) struct bpf_insn *bpf_fddi_filter = NULL; #endif - + int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn); +int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn); #if defined (HAVE_TR_SUPPORT) struct bpf_insn dhcp_bpf_tr_filter [] = { /* accept all token ring packets due to variable length header */ -diff -up dhcp-4.3.4/common/discover.c.lpf-ib dhcp-4.3.4/common/discover.c ---- dhcp-4.3.4/common/discover.c.lpf-ib 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/discover.c 2016-05-02 14:38:08.257147982 +0200 -@@ -1235,7 +1235,7 @@ discover_interfaces(int state) { - if_register_send(tmp); - } else { - /* get_hw_addr() was called by register. */ +diff --git a/common/discover.c b/common/discover.c +index 6ef8852..65881fc 100644 +--- a/common/discover.c ++++ b/common/discover.c +@@ -894,7 +894,7 @@ discover_interfaces(int state) { + if_register_send(tmp); + } else { + /* get_hw_addr() was called by register. */ - get_hw_addr(tmp->name, &tmp->hw_address); + get_hw_addr(tmp); - } - break; + } + break; #ifdef DHCPv6 -@@ -1248,7 +1248,7 @@ discover_interfaces(int state) { - so now we have to call it explicitly - to not leave the hardware address unknown - (some code expects it cannot be. */ +@@ -907,7 +907,7 @@ discover_interfaces(int state) { + so now we have to call it explicitly + to not leave the hardware address unknown + (some code expects it cannot be. */ - get_hw_addr(tmp->name, &tmp->hw_address); + get_hw_addr(tmp); - } else { - if_register_linklocal6(tmp); - } -diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c ---- dhcp-4.3.4/common/lpf.c.lpf-ib 2016-05-02 14:37:36.947128002 +0200 -+++ dhcp-4.3.4/common/lpf.c 2016-05-02 14:37:36.953128006 +0200 -@@ -47,6 +47,17 @@ + } else { + if_register_linklocal6(tmp); + } +diff --git a/common/lpf.c b/common/lpf.c +index b0ed01c..b732a86 100644 +--- a/common/lpf.c ++++ b/common/lpf.c +@@ -45,6 +45,17 @@ #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> @@ -141,12 +161,12 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c +}; + #endif - + #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE) -@@ -80,10 +91,20 @@ int if_register_lpf (info) - struct sockaddr common; - } sa; - struct ifreq ifr; +@@ -78,10 +89,20 @@ int if_register_lpf (info) + struct sockaddr common; + } sa; + struct ifreq ifr; + int type; + int protocol; + @@ -158,44 +178,44 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c + type = SOCK_RAW; + protocol = ETH_P_ALL; + } - - /* Make an LPF socket. */ + + /* Make an LPF socket. */ - if ((sock = socket(PF_PACKET, SOCK_RAW, - htons((short)ETH_P_ALL))) < 0) { + if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) { - if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || - errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || - errno == EAFNOSUPPORT || errno == EINVAL) { -@@ -106,6 +127,7 @@ int if_register_lpf (info) - /* Bind to the interface name */ - memset (&sa, 0, sizeof sa); - sa.ll.sll_family = AF_PACKET; + if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || + errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || + errno == EAFNOSUPPORT || errno == EINVAL) { +@@ -104,6 +125,7 @@ int if_register_lpf (info) + /* Bind to the interface name */ + memset (&sa, 0, sizeof sa); + sa.ll.sll_family = AF_PACKET; + sa.ll.sll_protocol = htons(protocol); - sa.ll.sll_ifindex = ifr.ifr_ifindex; - if (bind (sock, &sa.common, sizeof sa)) { - if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || -@@ -122,8 +144,6 @@ int if_register_lpf (info) - - } - + sa.ll.sll_ifindex = ifr.ifr_ifindex; + if (bind (sock, &sa.common, sizeof sa)) { + if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || +@@ -120,8 +142,6 @@ int if_register_lpf (info) + + } + - get_hw_addr(info->name, &info->hw_address); - - return sock; + return sock; } #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */ -@@ -178,6 +198,8 @@ void if_deregister_send (info) +@@ -176,6 +196,8 @@ void if_deregister_send (info) in bpf includes... */ extern struct sock_filter dhcp_bpf_filter []; extern int dhcp_bpf_filter_len; +extern struct sock_filter dhcp_ib_bpf_filter []; +extern int dhcp_ib_bpf_filter_len; - - #if defined (HAVE_TR_SUPPORT) - extern struct sock_filter dhcp_bpf_tr_filter []; -@@ -196,11 +218,12 @@ void if_register_receive (info) + + #if defined(RELAY_PORT) + extern struct sock_filter dhcp_bpf_relay_filter []; +@@ -199,11 +221,12 @@ void if_register_receive (info) #ifdef PACKET_AUXDATA - { - int val = 1; + { + int val = 1; - - if (setsockopt(info->rfdesc, SOL_PACKET, PACKET_AUXDATA, - &val, sizeof(val)) < 0) { @@ -207,50 +227,12 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c + if (errno != ENOPROTOOPT) { + log_fatal ("Failed to set auxiliary packet data: %m"); + } - } - } - } -@@ -250,15 +273,28 @@ static void lpf_gen_filter_setup (info) - - memset(&p, 0, sizeof(p)); - -- /* Set up the bpf filter program structure. This is defined in -- bpf.c */ -- p.len = dhcp_bpf_filter_len; -- p.filter = dhcp_bpf_filter; -- -- /* Patch the server port into the LPF program... -- XXX changes to filter program may require changes -- to the insn number(s) used below! XXX */ -- dhcp_bpf_filter [8].k = ntohs ((short)local_port); -+ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) { -+ /* Set up the bpf filter program structure. */ -+ p.len = dhcp_ib_bpf_filter_len; -+ p.filter = dhcp_ib_bpf_filter; -+ -+ /* Patch the server port into the LPF program... -+ XXX -+ changes to filter program may require changes -+ to the insn number(s) used below! -+ XXX */ -+ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port); -+ } else { -+ /* Set up the bpf filter program structure. -+ This is defined in bpf.c */ -+ p.len = dhcp_bpf_filter_len; -+ p.filter = dhcp_bpf_filter; -+ -+ /* Patch the server port into the LPF program... -+ XXX changes to filter program may require changes -+ to the insn number(s) used below! XXX */ -+ dhcp_bpf_filter [8].k = ntohs ((short)local_port); -+ } - - if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p, - sizeof p) < 0) { -@@ -315,6 +351,54 @@ static void lpf_tr_filter_setup (info) + } + } + } +@@ -330,6 +353,54 @@ static void lpf_tr_filter_setup (info) #endif /* USE_LPF_RECEIVE */ - + #ifdef USE_LPF_SEND +ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto) + struct interface_info *interface; @@ -301,23 +283,23 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c +} + ssize_t send_packet (interface, packet, raw, len, from, to, hto) - struct interface_info *interface; - struct packet *packet; -@@ -335,6 +419,11 @@ ssize_t send_packet (interface, packet, - return send_fallback (interface, packet, raw, - len, from, to, hto); - + struct interface_info *interface; + struct packet *packet; +@@ -350,6 +421,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) + return send_fallback (interface, packet, raw, + len, from, to, hto); + + if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) { + return send_packet_ib(interface, packet, raw, len, from, + to, hto); + } + - if (hto == NULL && interface->anycast_mac_addr.hlen) - hto = &interface->anycast_mac_addr; - -@@ -355,6 +444,42 @@ ssize_t send_packet (interface, packet, + if (hto == NULL && interface->anycast_mac_addr.hlen) + hto = &interface->anycast_mac_addr; + +@@ -370,6 +446,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) #endif /* USE_LPF_SEND */ - + #ifdef USE_LPF_RECEIVE +ssize_t receive_packet_ib (interface, buf, len, from, hfrom) + struct interface_info *interface; @@ -356,22 +338,22 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c +} + ssize_t receive_packet (interface, buf, len, from, hfrom) - struct interface_info *interface; - unsigned char *buf; -@@ -393,6 +518,10 @@ ssize_t receive_packet (interface, buf, - }; + struct interface_info *interface; + unsigned char *buf; +@@ -408,6 +520,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom) + }; #endif /* PACKET_AUXDATA */ - + + if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) { + return receive_packet_ib(interface, buf, len, from, hfrom); + } + - length = recvmsg (interface->rfdesc, &msg, 0); - if (length <= 0) - return length; -@@ -506,11 +635,33 @@ void maybe_setup_fallback () + length = recvmsg (interface->rfdesc, &msg, 0); + if (length <= 0) + return length; +@@ -521,11 +637,33 @@ void maybe_setup_fallback () #endif - + #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR) -void -get_hw_addr(const char *name, struct hardware *hw) { @@ -398,25 +380,25 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c +struct sockaddr_ll * +ioctl_get_ll(char *name) +{ - int sock; - struct ifreq tmp; + int sock; + struct ifreq tmp; - struct sockaddr *sa; + struct sockaddr *sa = NULL; + struct sockaddr_ll *sll = NULL; - - if (strlen(name) >= sizeof(tmp.ifr_name)) { - log_fatal("Device name too long: \"%s\"", name); -@@ -524,16 +675,61 @@ get_hw_addr(const char *name, struct har - memset(&tmp, 0, sizeof(tmp)); - strcpy(tmp.ifr_name, name); - if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) { -- log_fatal("Error getting hardware address for \"%s\": %m", + + if (strlen(name) >= sizeof(tmp.ifr_name)) { + log_fatal("Device name too long: \"%s\"", name); +@@ -539,16 +677,61 @@ get_hw_addr(const char *name, struct hardware *hw) { + memset(&tmp, 0, sizeof(tmp)); + strcpy(tmp.ifr_name, name); + if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) { +- log_fatal("Error getting hardware address for \"%s\": %m", + log_fatal("Error getting hardware address for \"%s\": %m", - name); - } + name); + } + close(sock); - - sa = &tmp.ifr_hwaddr; + + sa = &tmp.ifr_hwaddr; - switch (sa->sa_family) { + // needs to be freed outside this function + sll = dmalloc (sizeof (struct sockaddr_ll), MDL); @@ -463,24 +445,24 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c + } + + switch (sll->sll_hatype) { - case ARPHRD_ETHER: - hw->hlen = 7; - hw->hbuf[0] = HTYPE_ETHER; + case ARPHRD_ETHER: + hw->hlen = 7; + hw->hbuf[0] = HTYPE_ETHER; - memcpy(&hw->hbuf[1], sa->sa_data, 6); + memcpy(&hw->hbuf[1], sll->sll_addr, 6); - break; - case ARPHRD_IEEE802: + break; + case ARPHRD_IEEE802: #ifdef ARPHRD_IEEE802_TR -@@ -541,18 +737,50 @@ get_hw_addr(const char *name, struct har +@@ -556,18 +739,50 @@ get_hw_addr(const char *name, struct hardware *hw) { #endif /* ARPHRD_IEEE802_TR */ - hw->hlen = 7; - hw->hbuf[0] = HTYPE_IEEE802; + hw->hlen = 7; + hw->hbuf[0] = HTYPE_IEEE802; - memcpy(&hw->hbuf[1], sa->sa_data, 6); + memcpy(&hw->hbuf[1], sll->sll_addr, 6); - break; - case ARPHRD_FDDI: - hw->hlen = 7; - hw->hbuf[0] = HTYPE_FDDI; + break; + case ARPHRD_FDDI: + hw->hlen = 7; + hw->hbuf[0] = HTYPE_FDDI; - memcpy(&hw->hbuf[1], sa->sa_data, 6); + memcpy(&hw->hbuf[1], sll->sll_addr, 6); + break; @@ -515,100 +497,104 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c + memcpy(&hw->hbuf[1], + &sll->sll_addr[sll->sll_halen - HARDWARE_ADDR_LEN_IOCTL], + HARDWARE_ADDR_LEN_IOCTL); - break; + break; #if defined(ARPHRD_PPP) - case ARPHRD_PPP: - if (local_family != AF_INET6) + case ARPHRD_PPP: + if (local_family != AF_INET6) - log_fatal("Unsupported device type %d for \"%s\"", - sa->sa_family, name); + log_fatal("local_family != AF_INET6 for \"%s\"", + name); - hw->hlen = 0; - hw->hbuf[0] = HTYPE_RESERVED; - /* 0xdeadbeef should never occur on the wire, -@@ -565,10 +793,13 @@ get_hw_addr(const char *name, struct har - break; + hw->hlen = 0; + hw->hbuf[0] = HTYPE_RESERVED; + /* 0xdeadbeef should never occur on the wire, +@@ -580,10 +795,13 @@ get_hw_addr(const char *name, struct hardware *hw) { + break; #endif - default: + default: - log_fatal("Unsupported device type %ld for \"%s\"", - (long int)sa->sa_family, name); + freeifaddrs(ifaddrs); + log_fatal("Unsupported device type %hu for \"%s\"", + sll->sll_hatype, name); - } - + } + - close(sock); + if (sll_allocated) + dfree(sll, MDL); + freeifaddrs(ifaddrs); } #endif -diff -up dhcp-4.3.4/common/socket.c.lpf-ib dhcp-4.3.4/common/socket.c ---- dhcp-4.3.4/common/socket.c.lpf-ib 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/socket.c 2016-05-02 14:37:36.953128006 +0200 -@@ -328,7 +328,7 @@ void if_register_send (info) - info->wfdesc = if_register_socket(info, AF_INET, 0, NULL); - /* If this is a normal IPv4 address, get the hardware address. */ - if (strcmp(info->name, "fallback") != 0) +diff --git a/common/socket.c b/common/socket.c +index 483eb9c..6e1caac 100644 +--- a/common/socket.c ++++ b/common/socket.c +@@ -350,7 +350,7 @@ void if_register_send (info) + info->wfdesc = if_register_socket(info, AF_INET, 0, NULL); + /* If this is a normal IPv4 address, get the hardware address. */ + if (strcmp(info->name, "fallback") != 0) - get_hw_addr(info->name, &info->hw_address); + get_hw_addr(info); #if defined (USE_SOCKET_FALLBACK) - /* Fallback only registers for send, but may need to receive as - well. */ -@@ -391,7 +391,7 @@ void if_register_receive (info) + /* Fallback only registers for send, but may need to receive as + well. */ +@@ -413,7 +413,7 @@ void if_register_receive (info) #endif /* IP_PKTINFO... */ - /* If this is a normal IPv4 address, get the hardware address. */ - if (strcmp(info->name, "fallback") != 0) + /* If this is a normal IPv4 address, get the hardware address. */ + if (strcmp(info->name, "fallback") != 0) - get_hw_addr(info->name, &info->hw_address); + get_hw_addr(info); - - if (!quiet_interface_discovery) - log_info ("Listening on Socket/%s%s%s", -@@ -505,7 +505,7 @@ if_register6(struct interface_info *info - if (req_multi) - if_register_multicast(info); - + + if (!quiet_interface_discovery) + log_info ("Listening on Socket/%s%s%s", +@@ -567,7 +567,7 @@ if_register6(struct interface_info *info, int do_multicast) { + if (req_multi) + if_register_multicast(info); + - get_hw_addr(info->name, &info->hw_address); + get_hw_addr(info); - - if (!quiet_interface_discovery) { - if (info->shared_network != NULL) { -@@ -561,7 +561,7 @@ if_register_linklocal6(struct interface_ - info->rfdesc = sock; - info->wfdesc = sock; - + + if (!quiet_interface_discovery) { + if (info->shared_network != NULL) { +@@ -623,7 +623,7 @@ if_register_linklocal6(struct interface_info *info) { + info->rfdesc = sock; + info->wfdesc = sock; + - get_hw_addr(info->name, &info->hw_address); + get_hw_addr(info); - - if (!quiet_interface_discovery) { - if (info->shared_network != NULL) { -diff -up dhcp-4.3.4/includes/dhcpd.h.lpf-ib dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.lpf-ib 2016-05-02 14:37:36.948128002 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-05-02 14:37:36.954128006 +0200 -@@ -482,6 +482,9 @@ struct packet { - + + if (!quiet_interface_discovery) { + if (info->shared_network != NULL) { +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index faa9251..0c1a0aa 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -485,6 +485,9 @@ struct packet { + #define HARDWARE_ADDR_LEN 20 - + +/* ioctl limits hardware addresses to 8 bytes */ +#define HARDWARE_ADDR_LEN_IOCTL 8 + struct hardware { - u_int8_t hlen; - u_int8_t hbuf[HARDWARE_ADDR_LEN + 1]; -@@ -1343,6 +1346,7 @@ struct interface_info { - struct shared_network *shared_network; - /* Networks connected to this interface. */ - struct hardware hw_address; /* Its physical address. */ + u_int8_t hlen; + u_int8_t hbuf[HARDWARE_ADDR_LEN + 1]; +@@ -1365,6 +1368,7 @@ struct interface_info { + struct shared_network *shared_network; + /* Networks connected to this interface. */ + struct hardware hw_address; /* Its physical address. */ + u_int8_t bcast_addr[20]; /* Infiniband broadcast address */ - struct in_addr *addresses; /* Addresses associated with this - * interface. - */ -@@ -2580,7 +2584,7 @@ void print_dns_status (int, struct dhcp_ + struct in_addr *addresses; /* Addresses associated with this + * interface. + */ +@@ -2633,7 +2637,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); #endif const char *print_time(TIME); - + -void get_hw_addr(const char *name, struct hardware *hw); +void get_hw_addr(struct interface_info *info); char *buf_to_hex (const unsigned char *s, unsigned len, const char *file, int line); char *format_lease_id(const unsigned char *s, unsigned len, int format, +-- +2.14.5 diff --git a/dhcp/patches/0014-dhcp-64_bit_lease_parse.patch b/dhcp/patches/0014-dhcp-64_bit_lease_parse.patch deleted file mode 100644 index a07b5b032..000000000 --- a/dhcp/patches/0014-dhcp-64_bit_lease_parse.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse dhcp-4.3.0a1/common/parse.c ---- dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse 2013-12-11 01:25:12.000000000 +0100 -+++ dhcp-4.3.0a1/common/parse.c 2013-12-19 15:45:25.990771814 +0100 -@@ -938,8 +938,8 @@ TIME - parse_date_core(cfile) - struct parse *cfile; - { -- int guess; -- int tzoff, year, mon, mday, hour, min, sec; -+ TIME guess; -+ long int tzoff, year, mon, mday, hour, min, sec; - const char *val; - enum dhcp_token token; - static int months[11] = { 31, 59, 90, 120, 151, 181, -@@ -965,7 +965,7 @@ parse_date_core(cfile) - } - - skip_token(&val, NULL, cfile); /* consume number */ -- guess = atoi(val); -+ guess = atol(val); - - return((TIME)guess); - } -@@ -993,7 +993,7 @@ parse_date_core(cfile) - somebody invents a time machine, I think we can safely disregard - it. This actually works around a stupid Y2K bug that was present - in a very early beta release of dhcpd. */ -- year = atoi(val); -+ year = atol(val); - if (year > 1900) - year -= 1900; - -@@ -1039,7 +1039,7 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume day of month */ -- mday = atoi(val); -+ mday = atol(val); - - /* Hour... */ - token = peek_token(&val, NULL, cfile); -@@ -1050,7 +1050,7 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume hour */ -- hour = atoi(val); -+ hour = atol(val); - - /* Colon separating hour from minute... */ - token = peek_token(&val, NULL, cfile); -@@ -1072,7 +1072,7 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume minute */ -- min = atoi(val); -+ min = atol(val); - - /* Colon separating minute from second... */ - token = peek_token(&val, NULL, cfile); -@@ -1094,13 +1094,13 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume second */ -- sec = atoi(val); -+ sec = atol(val); - - tzoff = 0; - token = peek_token(&val, NULL, cfile); - if (token == NUMBER) { - skip_token(&val, NULL, cfile); /* consume tzoff */ -- tzoff = atoi(val); -+ tzoff = atol(val); - } else if (token != SEMI) { - skip_token(&val, NULL, cfile); - parse_warn(cfile, diff --git a/dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch b/dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch new file mode 100644 index 000000000..191a8cc39 --- /dev/null +++ b/dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch @@ -0,0 +1,331 @@ +From 7ac7d0b00874ee996c7ee75a595c029759368aad Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:35:47 +0100 +Subject: [PATCH 15/21] Add GUID/DUID to dhcpd logs (#1064416) +Cc: pzhukov(a)redhat.com + +--- + client/dhclient.c | 75 ++++++++++++++++++++++++++++++++++++++++++---------- + server/dhcp.c | 78 +++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 108 insertions(+), 45 deletions(-) + +diff --git a/client/dhclient.c b/client/dhclient.c +index dc9080e..8e57da9 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -1170,6 +1170,26 @@ main(int argc, char **argv) { + } + } + ++ /* We create a backup seed before rediscovering interfaces in order to ++ have a seed built using all of the available interfaces ++ It's interesting if required interfaces doesn't let us defined ++ a really unique seed due to a lack of valid HW addr later ++ (this is the case with DHCP over IB) ++ We only use the last device as using a sum could broke the ++ uniqueness of the seed among multiple nodes ++ */ ++ unsigned backup_seed = 0; ++ for (ip = interfaces; ip; ip = ip -> next) { ++ int junk; ++ if ( ip -> hw_address.hlen <= sizeof seed ) ++ continue; ++ memcpy (&junk, ++ &ip -> hw_address.hbuf [ip -> hw_address.hlen - ++ sizeof seed], sizeof seed); ++ backup_seed = junk; ++ } ++ ++ + /* At this point, all the interfaces that the script thinks + are relevant should be running, so now we once again call + discover_interfaces(), and this time ask it to actually set +@@ -1184,14 +1204,36 @@ main(int argc, char **argv) { + Not much entropy, but we're booting, so we're not likely to + find anything better. */ + seed = 0; ++ int seed_flag = 0; + for (ip = interfaces; ip; ip = ip->next) { + int junk; ++ if ( ip -> hw_address.hlen <= sizeof seed ) ++ continue; + memcpy(&junk, + &ip->hw_address.hbuf[ip->hw_address.hlen - + sizeof seed], sizeof seed); + seed += junk; ++ seed_flag = 1; + } +- srandom(seed + cur_time + (unsigned)getpid()); ++ if ( seed_flag == 0 ) { ++ if ( backup_seed != 0 ) { ++ seed = backup_seed; ++ log_info ("xid: rand init seed (0x%x) built using all" ++ " available interfaces",seed); ++ } ++ else { ++ seed = cur_time^((unsigned) gethostid()) ; ++ log_info ("xid: warning: no netdev with useable HWADDR found" ++ " for seed's uniqueness enforcement"); ++ log_info ("xid: rand init seed (0x%x) built using gethostid", ++ seed); ++ } ++ /* we only use seed and no current time as a broadcast reply */ ++ /* will certainly be used by the hwaddrless interface */ ++ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); ++ } ++ else ++ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); + + /* Setup specific Infiniband options */ + for (ip = interfaces; ip; ip = ip->next) { +@@ -1746,10 +1788,10 @@ void dhcpack (packet) + #endif + return; + } +- +- log_info ("DHCPACK of %s from %s", +- inet_ntoa(packet->raw->yiaddr), +- piaddr (packet->client_addr)); ++ log_info ("DHCPACK of %s from %s (xid=0x%x)", ++ inet_ntoa(packet->raw->yiaddr), ++ piaddr (packet -> client_addr), ++ ntohl(client -> xid)); + + lease = packet_to_lease (packet, client); + if (!lease) { +@@ -2669,7 +2711,7 @@ void dhcpnak (packet) + return; + } + +- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr)); ++ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid)); + + if (!client -> active) { + #if defined (DEBUG) +@@ -2802,10 +2844,10 @@ void send_discover (cpp) + (long)(client -> interval)); + } else + #endif +- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld", ++ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)", + client -> name ? client -> name : client -> interface -> name, + inet_ntoa (sockaddr_broadcast.sin_addr), +- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval)); ++ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), ntohl(client -> xid)); + + /* Send out a packet. */ + #if defined(DHCPv6) && defined(DHCP4o6) +@@ -3108,10 +3150,12 @@ void send_request (cpp) + } + + strncpy(rip_buf, rip_str, sizeof(rip_buf)-1); +- log_info ("DHCPREQUEST for %s on %s to %s port %d", rip_buf, ++ log_info ("DHCPREQUEST for %s on %s to %s port %d (xid=0x%x)", ++ rip_buf, + client->name ? client->name : client->interface->name, + inet_ntoa(destination.sin_addr), +- ntohs (destination.sin_port)); ++ ntohs (destination.sin_port), ++ ntohl(client -> xid)); + + #if defined(DHCPv6) && defined(DHCP4o6) + if (dhcpv4_over_dhcpv6) { +@@ -3168,11 +3212,13 @@ void send_decline (cpp) + log_info ("DHCPDECLINE"); + } else + #endif +- log_info ("DHCPDECLINE of %s on %s to %s port %d", ++ log_info ("DHCPDECLINE of %s on %s to %s port %d (xid=0x%x)", + piaddr(client->requested_address), + (client->name ? client->name : client->interface->name), + inet_ntoa(sockaddr_broadcast.sin_addr), +- ntohs(sockaddr_broadcast.sin_port)); ++ ntohs(sockaddr_broadcast.sin_port), ++ ntohl(client -> xid)); ++ + + /* Send out a packet. */ + #if defined(DHCPv6) && defined(DHCP4o6) +@@ -3231,11 +3277,12 @@ void send_release (cpp) + log_info ("DHCPRELEASE"); + } else + #endif +- log_info ("DHCPRELEASE of %s on %s to %s port %d", ++ log_info ("DHCPRELEASE of %s on %s to %s port %d (xid=0x%x)", + piaddr(client->active->address), + client->name ? client->name : client->interface->name, + inet_ntoa (destination.sin_addr), +- ntohs (destination.sin_port)); ++ ntohs (destination.sin_port), ++ ntohl(client -> xid)); + + #if defined(DHCPv6) && defined(DHCP4o6) + if (dhcpv4_over_dhcpv6) { +diff --git a/server/dhcp.c b/server/dhcp.c +index 20f2a62..0582c4c 100644 +--- a/server/dhcp.c ++++ b/server/dhcp.c +@@ -87,6 +87,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *)); + + static TIME leaseTimeCheck(TIME calculated, TIME alternate); + ++char *print_client_identifier_from_packet (packet) ++ struct packet *packet; ++{ ++ struct option_cache *oc; ++ struct data_string client_identifier; ++ char *ci; ++ ++ memset (&client_identifier, 0, sizeof client_identifier); ++ ++ oc = lookup_option (&dhcp_universe, packet -> options, ++ DHO_DHCP_CLIENT_IDENTIFIER); ++ if (oc && ++ evaluate_option_cache (&client_identifier, ++ packet, (struct lease *)0, ++ (struct client_state *)0, ++ packet -> options, ++ (struct option_state *)0, ++ &global_scope, oc, MDL)) { ++ ci = print_hw_addr (HTYPE_INFINIBAND, client_identifier.len, client_identifier.data); ++ data_string_forget (&client_identifier, MDL); ++ return ci; ++ } else ++ return "\"no client id\""; ++} ++ ++char *print_hw_addr_or_client_id (packet) ++ struct packet *packet; ++{ ++ if (packet -> raw -> htype == HTYPE_INFINIBAND) ++ return print_client_identifier_from_packet (packet); ++ else ++ return print_hw_addr (packet -> raw -> htype, ++ packet -> raw -> hlen, ++ packet -> raw -> chaddr); ++} ++ + void + dhcp (struct packet *packet) { + int ms_nulltp = 0; +@@ -129,9 +165,7 @@ dhcp (struct packet *packet) { + + log_info("%s from %s via %s: %s", s, + (packet->raw->htype +- ? print_hw_addr(packet->raw->htype, +- packet->raw->hlen, +- packet->raw->chaddr) ++ ? print_hw_addr_or_client_id(packet) + : "<no identifier>"), + packet->raw->giaddr.s_addr + ? inet_ntoa(packet->raw->giaddr) +@@ -328,9 +362,7 @@ void dhcpdiscover (packet, ms_nulltp) + #endif + snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s", + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id (packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -542,9 +574,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease) + "DHCPREQUEST for %s%s from %s %s%s%svia %s", + piaddr (cip), smbuf, + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id(packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -785,9 +815,7 @@ void dhcprelease (packet, ms_nulltp) + if ((oc = lookup_option (&dhcp_universe, packet -> options, + DHO_DHCP_REQUESTED_ADDRESS))) { + log_info ("DHCPRELEASE from %s specified requested-address.", +- print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr)); ++ print_hw_addr_or_client_id(packet)); + } + + oc = lookup_option (&dhcp_universe, packet -> options, +@@ -879,9 +907,7 @@ void dhcprelease (packet, ms_nulltp) + "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)", + cstr, + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id(packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -986,9 +1012,7 @@ void dhcpdecline (packet, ms_nulltp) + "DHCPDECLINE of %s from %s %s%s%svia %s", + piaddr (cip), + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id(packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -1732,8 +1756,7 @@ void dhcpinform (packet, ms_nulltp) + /* Report what we're sending. */ + snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip), + (packet->raw->htype && packet->raw->hlen) ? +- print_hw_addr(packet->raw->htype, packet->raw->hlen, +- packet->raw->chaddr) : ++ print_hw_addr_or_client_id(packet) : + "<no client hardware address>"); + log_info("%s %s", msgbuf, gip.len ? piaddr(gip) : + packet->interface->name); +@@ -1918,9 +1941,7 @@ void nak_lease (packet, cip, network_group) + #endif + log_info ("DHCPNAK on %s to %s via %s", + piaddr (*cip), +- print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr), ++ print_hw_addr_or_client_id(packet), + packet -> raw -> giaddr.s_addr + ? inet_ntoa (packet -> raw -> giaddr) + : packet -> interface -> name); +@@ -3936,7 +3957,7 @@ void dhcp_reply (lease) + ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER") + : "BOOTREPLY"), + piaddr (lease -> ip_addr), +- (lease -> hardware_addr.hlen ++ (lease -> hardware_addr.hlen > 1 + ? print_hw_addr (lease -> hardware_addr.hbuf [0], + lease -> hardware_addr.hlen - 1, + &lease -> hardware_addr.hbuf [1]) +@@ -4497,10 +4518,7 @@ int find_lease (struct lease **lp, + if (uid_lease) { + if (uid_lease->binding_state == FTS_ACTIVE) { + log_error ("client %s has duplicate%s on %s", +- (print_hw_addr +- (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr)), ++ (print_hw_addr_or_client_id(packet)), + " leases", + (ip_lease -> subnet -> + shared_network -> name)); +@@ -4667,9 +4685,7 @@ int find_lease (struct lease **lp, + log_error("uid lease %s for client %s is duplicate " + "on %s", + piaddr(uid_lease->ip_addr), +- print_hw_addr(packet->raw->htype, +- packet->raw->hlen, +- packet->raw->chaddr), ++ print_hw_addr_or_client_id(packet), + uid_lease->subnet->shared_network->name); + + if (!packet -> raw -> ciaddr.s_addr && +-- +2.14.5 diff --git a/dhcp/patches/0016-Turn-on-creating-sending-of-DUID.patch b/dhcp/patches/0016-Turn-on-creating-sending-of-DUID.patch new file mode 100644 index 000000000..535c67c47 --- /dev/null +++ b/dhcp/patches/0016-Turn-on-creating-sending-of-DUID.patch @@ -0,0 +1,125 @@ +From 1f0473939bcb17095bbef48cd9a81105a3de9846 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:36:30 +0100 +Subject: [PATCH 16/21] Turn on creating/sending of DUID +Cc: pzhukov(a)redhat.com + +as client identifier with DHCPv4 clients (#560361c#40, rfc4361) +--- + client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 70 insertions(+), 4 deletions(-) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 8e57da9..ccc98e4 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -4021,6 +4021,59 @@ write_options(struct client_state *client, struct option_state *options, + } + } + ++int unhexchar(char c) { ++ ++ if (c >= '0' && c <= '9') ++ return c - '0'; ++ ++ if (c >= 'a' && c <= 'f') ++ return c - 'a' + 10; ++ ++ if (c >= 'A' && c <= 'F') ++ return c - 'A' + 10; ++ ++ return -1; ++} ++ ++isc_result_t ++read_uuid(u_int8_t* uuid) { ++ const char *id_fname = "/etc/machine-id"; ++ char id[32]; ++ size_t nread; ++ FILE * file = fopen( id_fname , "r"); ++ if (!file) { ++ log_debug("Cannot open %s", id_fname); ++ return ISC_R_IOERROR; ++ } ++ nread = fread(id, 1, sizeof id, file); ++ fclose(file); ++ ++ if (nread < 32) { ++ log_debug("Not enough data in %s", id_fname); ++ return ISC_R_IOERROR; ++ } ++ int j; ++ for (j = 0; j < 16; j++) { ++ int a, b; ++ ++ a = unhexchar(id[j*2]); ++ b = unhexchar(id[j*2+1]); ++ ++ if (a < 0 || b < 0) { ++ log_debug("Wrong data in %s", id_fname); ++ return ISC_R_IOERROR; ++ } ++ uuid[j] = a << 4 | b; ++ } ++ ++ /* Set UUID version to 4 --- truly random generation */ ++ uuid[6] = (uuid[6] & 0x0F) | 0x40; ++ /* Set the UUID variant to DCE */ ++ uuid[8] = (uuid[8] & 0x3F) | 0x80; ++ ++ return ISC_R_SUCCESS; ++} ++ + /* + * The "best" default DUID, since we cannot predict any information + * about the system (such as whether or not the hardware addresses are +@@ -4041,6 +4094,7 @@ form_duid(struct data_string *duid, const char *file, int line) + struct interface_info *ip; + int len; + char *str; ++ u_int8_t uuid[16]; + + /* For now, just use the first interface on the list. */ + ip = interfaces; +@@ -4061,9 +4115,16 @@ form_duid(struct data_string *duid, const char *file, int line) + (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) + log_fatal("Impossible hardware address length at %s:%d.", MDL); + +- if (duid_type == 0) +- duid_type = stateless ? DUID_LL : DUID_LLT; +- ++ if (duid_type == 0) { ++ if (read_uuid(uuid) == ISC_R_SUCCESS) ++ duid_type = DUID_UUID; ++ else ++ duid_type = stateless ? DUID_LL : DUID_LLT; ++ } ++ ++ if (duid_type == DUID_UUID) ++ len = 2 + sizeof (uuid); ++ else { + /* + * 2 bytes for the 'duid type' field. + * 2 bytes for the 'htype' field. +@@ -4074,13 +4135,18 @@ form_duid(struct data_string *duid, const char *file, int line) + len = 4 + (ip->hw_address.hlen - 1); + if (duid_type == DUID_LLT) + len += 4; ++ } + if (!buffer_allocate(&duid->buffer, len, MDL)) + log_fatal("no memory for default DUID!"); + duid->data = duid->buffer->data; + duid->len = len; + ++ if (duid_type == DUID_UUID) { ++ putUShort(duid->buffer->data, DUID_UUID); ++ memcpy(duid->buffer->data + 2, uuid, sizeof(uuid)); ++ } + /* Basic Link Local Address type of DUID. */ +- if (duid_type == DUID_LLT) { ++ else if (duid_type == DUID_LLT) { + putUShort(duid->buffer->data, DUID_LLT); + putUShort(duid->buffer->data + 2, ip->hw_address.hbuf[0]); + putULong(duid->buffer->data + 4, cur_time - DUID_TIME_EPOCH); +-- +2.14.5 diff --git a/dhcp/patches/0016-dhcp-sendDecline.patch b/dhcp/patches/0016-dhcp-sendDecline.patch deleted file mode 100644 index ede929885..000000000 --- a/dhcp/patches/0016-dhcp-sendDecline.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff -up dhcp-4.3.4/client/dhc6.c.sendDecline dhcp-4.3.4/client/dhc6.c ---- dhcp-4.3.4/client/dhc6.c.sendDecline 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/dhc6.c 2016-05-02 14:51:57.916578401 +0200 -@@ -115,6 +115,8 @@ void do_select6(void *input); - void do_refresh6(void *input); - static void do_release6(void *input); - static void start_bound(struct client_state *client); -+static void start_decline6(struct client_state *client); -+static void do_decline6(void *input); - static void start_informed(struct client_state *client); - void informed_handler(struct packet *packet, struct client_state *client); - void bound_handler(struct packet *packet, struct client_state *client); -@@ -2314,6 +2316,7 @@ start_release6(struct client_state *clie - cancel_timeout(do_select6, client); - cancel_timeout(do_refresh6, client); - cancel_timeout(do_release6, client); -+ cancel_timeout(do_decline6, client); - client->state = S_STOPPED; - - /* -@@ -2968,6 +2971,7 @@ dhc6_check_reply(struct client_state *cl - break; - - case S_STOPPED: -+ case S_DECLINED: - action = dhc6_stop_action; - break; - -@@ -3084,6 +3088,7 @@ dhc6_check_reply(struct client_state *cl - break; - - case S_STOPPED: -+ case S_DECLINED: - /* Nothing critical to do at this stage. */ - break; - -@@ -4214,17 +4219,23 @@ reply_handler(struct packet *packet, str - cancel_timeout(do_select6, client); - cancel_timeout(do_refresh6, client); - cancel_timeout(do_release6, client); -+ cancel_timeout(do_decline6, client); - - /* If this is in response to a Release/Decline, clean up and return. */ -- if (client->state == S_STOPPED) { -- if (client->active_lease == NULL) -- return; -+ if ((client->state == S_STOPPED) || -+ (client->state == S_DECLINED)) { -+ -+ if (client->active_lease != NULL) { -+ dhc6_lease_destroy(&client->active_lease, MDL); -+ client->active_lease = NULL; -+ /* We should never wait for nothing!? */ -+ if (stopping_finished()) -+ exit(0); -+ } -+ -+ if (client->state == S_DECLINED) -+ start_init6(client); - -- dhc6_lease_destroy(&client->active_lease, MDL); -- client->active_lease = NULL; -- /* We should never wait for nothing!? */ -- if (stopping_finished()) -- exit(0); - return; - } - -@@ -4798,7 +4809,11 @@ start_bound(struct client_state *client) - dhc6_marshall_values("new_", client, lease, ia, addr); - script_write_requested6(client); - -- script_go(client); -+ // when script returns 3, DAD failed -+ if (script_go(client) == 3) { -+ start_decline6(client); -+ return; -+ } - } - - /* XXX: maybe we should loop on the old values instead? */ -@@ -4851,6 +4866,149 @@ start_bound(struct client_state *client) - dhc6_check_times(client); - } - -+/* -+ * Decline addresses. -+ */ -+void -+start_decline6(struct client_state *client) -+{ -+ /* Cancel any pending transmissions */ -+ cancel_timeout(do_confirm6, client); -+ cancel_timeout(do_select6, client); -+ cancel_timeout(do_refresh6, client); -+ cancel_timeout(do_release6, client); -+ cancel_timeout(do_decline6, client); -+ client->state = S_DECLINED; -+ -+ if (client->active_lease == NULL) -+ return; -+ -+ /* Set timers per RFC3315 section 18.1.7. */ -+ client->IRT = DEC_TIMEOUT * 100; -+ client->MRT = 0; -+ client->MRC = DEC_MAX_RC; -+ client->MRD = 0; -+ -+ dhc6_retrans_init(client); -+ client->v6_handler = reply_handler; -+ -+ client->refresh_type = DHCPV6_DECLINE; -+ do_decline6(client); -+} -+ -+/* -+ * do_decline6() creates a Decline packet and transmits it. -+ */ -+static void -+do_decline6(void *input) -+{ -+ struct client_state *client; -+ struct data_string ds; -+ struct timeval elapsed, tv; -+ int send_ret, added; -+ -+ client = input; -+ -+ if ((client->active_lease == NULL) || !active_prefix(client)) -+ return; -+ -+ if ((client->MRC != 0) && (client->txcount > client->MRC)) { -+ log_info("Max retransmission count exceeded."); -+ goto decline_done; -+ } -+ -+ /* -+ * Start_time starts at the first transmission. -+ */ -+ if (client->txcount == 0) { -+ client->start_time.tv_sec = cur_tv.tv_sec; -+ client->start_time.tv_usec = cur_tv.tv_usec; -+ } -+ -+ /* elapsed = cur - start */ -+ elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec; -+ elapsed.tv_usec = cur_tv.tv_usec - client->start_time.tv_usec; -+ if (elapsed.tv_usec < 0) { -+ elapsed.tv_sec -= 1; -+ elapsed.tv_usec += 1000000; -+ } -+ -+ memset(&ds, 0, sizeof(ds)); -+ if (!buffer_allocate(&ds.buffer, 4, MDL)) { -+ log_error("Unable to allocate memory for Decline."); -+ goto decline_done; -+ } -+ -+ ds.data = ds.buffer->data; -+ ds.len = 4; -+ ds.buffer->data[0] = DHCPV6_DECLINE; -+ memcpy(ds.buffer->data + 1, client->dhcpv6_transaction_id, 3); -+ -+ /* Form an elapsed option. */ -+ /* Maximum value is 65535 1/100s coded as 0xffff. */ -+ if ((elapsed.tv_sec < 0) || (elapsed.tv_sec > 655) || -+ ((elapsed.tv_sec == 655) && (elapsed.tv_usec > 350000))) { -+ client->elapsed = 0xffff; -+ } else { -+ client->elapsed = elapsed.tv_sec * 100; -+ client->elapsed += elapsed.tv_usec / 10000; -+ } -+ -+ client->elapsed = htons(client->elapsed); -+ -+ log_debug("XMT: Forming Decline."); -+ make_client6_options(client, &client->sent_options, -+ client->active_lease, DHCPV6_DECLINE); -+ dhcpv6_universe.encapsulate(&ds, NULL, NULL, client, NULL, -+ client->sent_options, &global_scope, -+ &dhcpv6_universe); -+ -+ /* Append IA's (but don't release temporary addresses). */ -+ if (wanted_ia_na && -+ dhc6_add_ia_na(client, &ds, client->active_lease, -+ DHCPV6_DECLINE, 0, &added) != ISC_R_SUCCESS) { -+ data_string_forget(&ds, MDL); -+ goto decline_done; -+ } -+ if (wanted_ia_pd && -+ dhc6_add_ia_pd(client, &ds, client->active_lease, -+ DHCPV6_DECLINE, 0, &added) != ISC_R_SUCCESS) { -+ data_string_forget(&ds, MDL); -+ goto decline_done; -+ } -+ -+ /* Transmit and wait. */ -+ log_info("XMT: Decline on %s, interval %ld0ms.", -+ client->name ? client->name : client->interface->name, -+ (long int)client->RT); -+ -+ send_ret = send_packet6(client->interface, ds.data, ds.len, -+ &DHCPv6DestAddr); -+ if (send_ret != ds.len) { -+ log_error("dhc6: sendpacket6() sent %d of %d bytes", -+ send_ret, ds.len); -+ } -+ -+ data_string_forget(&ds, MDL); -+ -+ /* Wait RT */ -+ tv.tv_sec = cur_tv.tv_sec + client->RT / 100; -+ tv.tv_usec = cur_tv.tv_usec + (client->RT % 100) * 10000; -+ if (tv.tv_usec >= 1000000) { -+ tv.tv_sec += 1; -+ tv.tv_usec -= 1000000; -+ } -+ add_timeout(&tv, do_decline6, client, NULL, NULL); -+ dhc6_retrans_advance(client); -+ return; -+ -+decline_done: -+ dhc6_lease_destroy(&client->active_lease, MDL); -+ client->active_lease = NULL; -+ start_init6(client); -+ return; -+} -+ - /* While bound, ignore packets. In the future we'll want to answer - * Reconfigure-Request messages and the like. - */ diff --git a/dhcp/patches/0017-Send-unicast-request-release-via-correct-interface.patch b/dhcp/patches/0017-Send-unicast-request-release-via-correct-interface.patch new file mode 100644 index 000000000..0f8703761 --- /dev/null +++ b/dhcp/patches/0017-Send-unicast-request-release-via-correct-interface.patch @@ -0,0 +1,76 @@ +From 8a2b491f79aab1f04feac89586dfab1e55b47adb Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:39:36 +0100 +Subject: [PATCH 17/21] Send unicast request/release via correct interface +Cc: pzhukov(a)redhat.com + +(#800561, #1177351) +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #30544]) +--- + client/dhclient.c | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index ccc98e4..27fde69 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -3171,6 +3171,14 @@ void send_request (cpp) + #endif + if (destination.sin_addr.s_addr != INADDR_BROADCAST && + fallback_interface) { ++#if defined(SO_BINDTODEVICE) ++ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, ++ SO_BINDTODEVICE, client->interface->name, ++ strlen(client->interface->name)) < 0) { ++ log_error("%s:%d: Failed to bind fallback interface" ++ " to %s: %m", MDL, client->interface->name); ++ } ++#endif + result = send_packet(fallback_interface, NULL, &client->packet, + client->packet_length, from, &destination, + NULL); +@@ -3180,6 +3188,13 @@ void send_request (cpp) + client->packet_length, + fallback_interface->name); + } ++#if defined(SO_BINDTODEVICE) ++ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, ++ SO_BINDTODEVICE, NULL, 0) < 0) { ++ log_fatal("%s:%d: Failed to unbind fallback interface:" ++ " %m", MDL); ++ } ++#endif + } + else { + /* Send out a packet. */ +@@ -3297,6 +3312,14 @@ void send_release (cpp) + } else + #endif + if (fallback_interface) { ++#if defined(SO_BINDTODEVICE) ++ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, ++ SO_BINDTODEVICE, client->interface->name, ++ strlen(client->interface->name)) < 0) { ++ log_error("%s:%d: Failed to bind fallback interface" ++ " to %s: %m", MDL, client->interface->name); ++ } ++#endif + result = send_packet(fallback_interface, NULL, &client->packet, + client->packet_length, from, &destination, + NULL); +@@ -3306,6 +3329,13 @@ void send_release (cpp) + client->packet_length, + fallback_interface->name); + } ++#if defined(SO_BINDTODEVICE) ++ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, ++ SO_BINDTODEVICE, NULL, 0) < 0) { ++ log_fatal("%s:%d: Failed to unbind fallback interface:" ++ " %m", MDL); ++ } ++#endif + } else { + /* Send out a packet. */ + result = send_packet(client->interface, NULL, &client->packet, +-- +2.14.5 diff --git a/dhcp/patches/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch b/dhcp/patches/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch new file mode 100644 index 000000000..be7e940ae --- /dev/null +++ b/dhcp/patches/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch @@ -0,0 +1,62 @@ +From 588ead2d9a9cfe70f14569a8e950c6c42f15c1e3 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:40:51 +0100 +Subject: [PATCH 18/21] No subnet declaration for <iface>' should be info, not + error. +Cc: pzhukov(a)redhat.com + +--- + common/discover.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/common/discover.c b/common/discover.c +index 65881fc..056342c 100644 +--- a/common/discover.c ++++ b/common/discover.c +@@ -801,9 +801,9 @@ discover_interfaces(int state) { + + /* We must have a subnet declaration for each interface. */ + if (!tmp->shared_network && (state == DISCOVER_SERVER)) { +- log_error("%s", ""); ++ log_info("%s", ""); + if (local_family == AF_INET) { +- log_error("No subnet declaration for %s (%s).", ++ log_info("No subnet declaration for %s (%s).", + tmp->name, + (tmp->addresses == NULL) ? + "no IPv4 addresses" : +@@ -818,26 +818,26 @@ discover_interfaces(int state) { + } else { + strcpy(abuf, "no IPv6 addresses"); + } +- log_error("No subnet6 declaration for %s (%s).", ++ log_info("No subnet6 declaration for %s (%s).", + tmp->name, + abuf); + #endif /* DHCPv6 */ + } + if (supports_multiple_interfaces(tmp)) { +- log_error ("** Ignoring requests on %s. %s", ++ log_info ("** Ignoring requests on %s. %s", + tmp -> name, "If this is not what"); +- log_error (" you want, please write %s", ++ log_info (" you want, please write %s", + #ifdef DHCPv6 + (local_family != AF_INET) ? + "a subnet6 declaration" : + #endif + "a subnet declaration"); +- log_error (" in your dhcpd.conf file %s", ++ log_info (" in your dhcpd.conf file %s", + "for the network segment"); +- log_error (" to %s %s %s", ++ log_info (" to %s %s %s", + "which interface", + tmp -> name, "is attached. **"); +- log_error ("%s", ""); ++ log_info ("%s", ""); + goto next; + } else { + log_error ("You must write a %s", +-- +2.14.5 diff --git a/dhcp/patches/0018-dhcp-honor-expired.patch b/dhcp/patches/0018-dhcp-honor-expired.patch deleted file mode 100644 index bd892975b..000000000 --- a/dhcp/patches/0018-dhcp-honor-expired.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up dhcp-4.3.0a1/client/dhc6.c.honor-expired dhcp-4.3.0a1/client/dhc6.c ---- dhcp-4.3.0a1/client/dhc6.c.honor-expired 2013-12-19 16:00:28.062183037 +0100 -+++ dhcp-4.3.0a1/client/dhc6.c 2013-12-19 16:00:28.076182842 +0100 -@@ -1351,6 +1351,32 @@ start_info_request6(struct client_state - go_daemon(); - } - -+/* Run through the addresses in lease and return true if there's any unexpired. -+ * Return false otherwise. -+ */ -+isc_boolean_t -+unexpired_address_in_lease(struct dhc6_lease *lease) -+{ -+ struct dhc6_ia *ia; -+ struct dhc6_addr *addr; -+ -+ for (ia = lease->bindings ; ia != NULL ; ia = ia->next) { -+ for (addr = ia->addrs ; addr != NULL ; addr = addr->next) { -+ if (addr->flags & DHC6_ADDR_EXPIRED) -+ continue; -+ -+ if (addr->starts + addr->max_life > cur_time) { -+ return ISC_TRUE; -+ } -+ } -+ } -+ -+ log_info("PRC: Previous lease is devoid of active addresses." -+ " Re-initializing."); -+ -+ return ISC_FALSE; -+} -+ - /* - * start_confirm6() kicks off an "init-reboot" version of the process, at - * startup to find out if old bindings are 'fair' and at runtime whenever -@@ -1363,8 +1389,10 @@ start_confirm6(struct client_state *clie - - /* If there is no active lease, there is nothing to check. */ - if ((client->active_lease == NULL) || -- !active_prefix(client) || -- client->active_lease->released) { -+ !active_prefix(client) || -+ client->active_lease->released || -+ !unexpired_address_in_lease(client->active_lease)) { -+ dhc6_lease_destroy(&client->active_lease, MDL); - start_init6(client); - return; - } diff --git a/dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch b/dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch new file mode 100644 index 000000000..f870fd752 --- /dev/null +++ b/dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch @@ -0,0 +1,28 @@ +From 07b333c48a2fc99d7d502a0c88907b38f61c6230 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:41:14 +0100 +Subject: [PATCH 19/21] dhclient: write DUID_LLT even in stateless mode + (#1156356) +Cc: pzhukov(a)redhat.com + +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #38144]) +--- + client/dhclient.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 27fde69..4e5546a 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -1442,6 +1442,9 @@ void run_stateless(int exit_mode, u_int16_t port) + data_string_forget(&default_duid, MDL); + + form_duid(&default_duid, MDL); ++ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS && ++ duid_type == DUID_LLT) ++ write_duid(&default_duid); + } + + #ifdef DHCP4o6 +-- +2.14.5 diff --git a/dhcp/patches/0019-dhcp-PPP.patch b/dhcp/patches/0019-dhcp-PPP.patch deleted file mode 100644 index b3d82ea4d..000000000 --- a/dhcp/patches/0019-dhcp-PPP.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -up dhcp-4.3.4/client/dhc6.c.PPP dhcp-4.3.4/client/dhc6.c ---- dhcp-4.3.4/client/dhc6.c.PPP 2016-04-29 12:46:29.824988665 +0200 -+++ dhcp-4.3.4/client/dhc6.c 2016-04-29 12:46:29.828988666 +0200 -@@ -5641,7 +5641,8 @@ make_client6_options(struct client_state - */ - if ((oc = lookup_option(&dhcpv6_universe, *op, - D6O_CLIENTID)) == NULL) { -- if (!option_cache(&oc, &default_duid, NULL, clientid_option, -+ if (default_duid.len == 0 || -+ !option_cache(&oc, &default_duid, NULL, clientid_option, - MDL)) - log_fatal("Failure assembling a DUID."); - -diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.PPP 2016-04-29 12:46:29.815988664 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:46:29.830988666 +0200 -@@ -1077,8 +1077,8 @@ main(int argc, char **argv) { - if (default_duid.buffer != NULL) - data_string_forget(&default_duid, MDL); - -- form_duid(&default_duid, MDL); -- write_duid(&default_duid); -+ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS) -+ write_duid(&default_duid); - } - } - -@@ -3808,7 +3808,7 @@ write_options(struct client_state *clien - * is not how it is intended. Upcoming rearchitecting the client should - * address this "one daemon model." - */ --void -+isc_result_t - form_duid(struct data_string *duid, const char *file, int line) - { - struct interface_info *ip; -@@ -3821,6 +3821,15 @@ form_duid(struct data_string *duid, cons - if (ip == NULL) - log_fatal("Impossible condition at %s:%d.", MDL); - -+ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) { -+ /* Try the other interfaces */ -+ log_debug("Cannot form default DUID from interface %s.", ip->name); -+ ip = ip->next; -+ } -+ if (ip == NULL) { -+ return ISC_R_UNEXPECTED; -+ } -+ - if ((ip->hw_address.hlen == 0) || - (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) - log_fatal("Impossible hardware address length at %s:%d.", MDL); -@@ -3866,6 +3875,8 @@ form_duid(struct data_string *duid, cons - log_info("Created duid %s.", str); - dfree(str, MDL); - } -+ -+ return ISC_R_SUCCESS; - } - - /* Write the default DUID to the lease store. */ -diff -up dhcp-4.3.4/common/bpf.c.PPP dhcp-4.3.4/common/bpf.c ---- dhcp-4.3.4/common/bpf.c.PPP 2016-04-29 12:46:29.794988660 +0200 -+++ dhcp-4.3.4/common/bpf.c 2016-04-29 12:46:29.830988666 +0200 -@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har - memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen); - break; - #endif /* IFT_FDDI */ -+#if defined(IFT_PPP) -+ case IFT_PPP: -+ if (local_family != AF_INET6) -+ log_fatal("Unsupported device type %d for \"%s\"", -+ sa->sdl_type, name); -+ hw->hlen = 0; -+ hw->hbuf[0] = HTYPE_RESERVED; -+ /* 0xdeadbeef should never occur on the wire, -+ * and is a signature that something went wrong. -+ */ -+ hw->hbuf[1] = 0xde; -+ hw->hbuf[2] = 0xad; -+ hw->hbuf[3] = 0xbe; -+ hw->hbuf[4] = 0xef; -+ break; -+#endif - default: - log_fatal("Unsupported device type %d for \"%s\"", - sa->sdl_type, name); -diff -up dhcp-4.3.4/common/lpf.c.PPP dhcp-4.3.4/common/lpf.c ---- dhcp-4.3.4/common/lpf.c.PPP 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/lpf.c 2016-04-29 12:46:29.830988666 +0200 -@@ -548,6 +548,22 @@ get_hw_addr(const char *name, struct har - hw->hbuf[0] = HTYPE_FDDI; - memcpy(&hw->hbuf[1], sa->sa_data, 6); - break; -+#if defined(ARPHRD_PPP) -+ case ARPHRD_PPP: -+ if (local_family != AF_INET6) -+ log_fatal("Unsupported device type %d for \"%s\"", -+ sa->sa_family, name); -+ hw->hlen = 0; -+ hw->hbuf[0] = HTYPE_RESERVED; -+ /* 0xdeadbeef should never occur on the wire, -+ * and is a signature that something went wrong. -+ */ -+ hw->hbuf[1] = 0xde; -+ hw->hbuf[2] = 0xad; -+ hw->hbuf[3] = 0xbe; -+ hw->hbuf[4] = 0xef; -+ break; -+#endif - default: - log_fatal("Unsupported device type %ld for \"%s\"", - (long int)sa->sa_family, name); -diff -up dhcp-4.3.4/includes/dhcpd.h.PPP dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.PPP 2016-04-29 12:46:29.831988667 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:47:13.167995959 +0200 -@@ -2990,7 +2990,7 @@ void client_dns_remove(struct client_sta - - void dhcpv4_client_assignments(void); - void dhcpv6_client_assignments(void); --void form_duid(struct data_string *duid, const char *file, int line); -+isc_result_t form_duid(struct data_string *duid, const char *file, int line); - - void dhcp4o6_start(void); - -diff -up dhcp-4.3.4/includes/dhcp.h.PPP dhcp-4.3.4/includes/dhcp.h ---- dhcp-4.3.4/includes/dhcp.h.PPP 2016-04-29 12:46:29.822988665 +0200 -+++ dhcp-4.3.4/includes/dhcp.h 2016-04-29 12:46:29.832988667 +0200 -@@ -81,6 +81,8 @@ struct dhcp_packet { - * is no standard for this so we - * just steal a type */ - -+#define HTYPE_RESERVED 0 /* RFC 5494 */ -+ - /* Magic cookie validating dhcp options field (and bootp vendor - extensions field). */ - #define DHCP_OPTIONS_COOKIE "\143\202\123\143" -diff -up dhcp-4.3.4/server/dhcpv6.c.PPP dhcp-4.3.4/server/dhcpv6.c ---- dhcp-4.3.4/server/dhcpv6.c.PPP 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/server/dhcpv6.c 2016-04-29 12:46:29.833988667 +0200 -@@ -454,6 +454,9 @@ generate_new_server_duid(void) { - if (p->hw_address.hlen > 0) { - break; - } -+ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) { -+ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!"); -+ } - } - if (p == NULL) { - return ISC_R_UNEXPECTED; diff --git a/dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch b/dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch new file mode 100644 index 000000000..31d9a2e50 --- /dev/null +++ b/dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch @@ -0,0 +1,100 @@ +From f1467835402eee90a350a952f1a411f37475a9df Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:42:50 +0100 +Subject: [PATCH 20/21] Discover all hwaddress for xid uniqueness +Cc: pzhukov(a)redhat.com + +--- + common/discover.c | 2 ++ + common/lpf.c | 27 ++++++++++++++++++++++----- + includes/dhcpd.h | 3 +++ + 3 files changed, 27 insertions(+), 5 deletions(-) + +diff --git a/common/discover.c b/common/discover.c +index 056342c..e66e1c5 100644 +--- a/common/discover.c ++++ b/common/discover.c +@@ -648,6 +648,8 @@ discover_interfaces(int state) { + interface_dereference(&tmp, MDL); + tmp = interfaces; /* XXX */ + } ++ if (tmp != NULL) ++ try_hw_addr(tmp); + + if (dhcp_interface_discovery_hook) { + (*dhcp_interface_discovery_hook)(tmp); +diff --git a/common/lpf.c b/common/lpf.c +index b732a86..a708a5d 100644 +--- a/common/lpf.c ++++ b/common/lpf.c +@@ -699,8 +699,22 @@ ioctl_get_ll(char *name) + return sll; + } + ++// define ? ++void try_hw_addr(struct interface_info *info){ ++ get_hw_addr2(info); ++}; ++ + void + get_hw_addr(struct interface_info *info) ++{ ++ if (get_hw_addr2(info) == ISC_R_NOTFOUND){ ++ log_fatal("Unsupported device type for \"%s\"", ++ info->name); ++ } ++} ++ ++isc_result_t ++get_hw_addr2(struct interface_info *info) + { + struct hardware *hw = &info->hw_address; + char *name = info->name; +@@ -710,7 +724,8 @@ get_hw_addr(struct interface_info *info) + int sll_allocated = 0; + char *dup = NULL; + char *colon = NULL; +- ++ isc_result_t result = ISC_R_SUCCESS; ++ + if (getifaddrs(&ifaddrs) == -1) + log_fatal("Failed to get interfaces"); + +@@ -794,14 +809,16 @@ get_hw_addr(struct interface_info *info) + hw->hbuf[4] = 0xef; + break; + #endif +- default: +- freeifaddrs(ifaddrs); +- log_fatal("Unsupported device type %hu for \"%s\"", +- sll->sll_hatype, name); ++ default: ++ log_error("Unsupported device type %hu for \"%s\"", ++ sll->sll_hatype, name); ++ result = ISC_R_NOTFOUND; ++ + } + + if (sll_allocated) + dfree(sll, MDL); + freeifaddrs(ifaddrs); ++ return result; + } + #endif +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 0c1a0aa..635c510 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -2637,7 +2637,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); + #endif + const char *print_time(TIME); + ++ + void get_hw_addr(struct interface_info *info); ++void try_hw_addr(struct interface_info *info); ++isc_result_t get_hw_addr2(struct interface_info *info); + char *buf_to_hex (const unsigned char *s, unsigned len, + const char *file, int line); + char *format_lease_id(const unsigned char *s, unsigned len, int format, +-- +2.14.5 diff --git a/dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch b/dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch new file mode 100644 index 000000000..7b6da2d01 --- /dev/null +++ b/dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch @@ -0,0 +1,50 @@ +From 1c7b876dc558774c40a2a28da53c19c65e123124 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:44:06 +0100 +Subject: [PATCH 21/21] Load leases DB in non-replay mode only +Cc: pzhukov(a)redhat.com + +--- + server/confpars.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/server/confpars.c b/server/confpars.c +index 2743979..db21a0b 100644 +--- a/server/confpars.c ++++ b/server/confpars.c +@@ -134,6 +134,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group, + + cfile = (struct parse *)0; + #if defined (TRACING) ++ // No need to dmalloc huge memory region if we're not going to re-play ++ if (!trace_playback()){ ++ status = new_parse(&cfile, file, NULL, 0, filename, 0); ++ goto noreplay; ++ }; + flen = lseek (file, (off_t)0, SEEK_END); + if (flen < 0) { + boom: +@@ -171,9 +176,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group, + if (trace_record ()) + trace_write_packet (ttype, ulen + tflen + 1, dbuf, MDL); + status = new_parse(&cfile, -1, fbuf, ulen, filename, 0); /* XXX */ ++ dfree(dbuf, MDL); + #else + status = new_parse(&cfile, file, NULL, 0, filename, 0); + #endif ++ noreplay: + if (status != ISC_R_SUCCESS || cfile == NULL) + return status; + +@@ -182,9 +189,6 @@ isc_result_t read_conf_file (const char *filename, struct group *group, + else + status = conf_file_subparse (cfile, group, group_type); + end_parse (&cfile); +-#if defined (TRACING) +- dfree (dbuf, MDL); +-#endif + return status; + } + +-- +2.14.5 diff --git a/dhcp/patches/0021-dhcp-IPoIB-log-id.patch b/dhcp/patches/0021-dhcp-IPoIB-log-id.patch deleted file mode 100644 index 97e9dd56c..000000000 --- a/dhcp/patches/0021-dhcp-IPoIB-log-id.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff -up dhcp-4.3.4/server/dhcp.c.IPoIB-log-id dhcp-4.3.4/server/dhcp.c ---- dhcp-4.3.4/server/dhcp.c.IPoIB-log-id 2016-04-29 12:52:14.285061620 +0200 -+++ dhcp-4.3.4/server/dhcp.c 2016-04-29 12:53:59.535088020 +0200 -@@ -85,6 +85,42 @@ const int dhcp_type_name_max = ((sizeof - # define send_packet trace_packet_send - #endif - -+char *print_client_identifier_from_packet (packet) -+ struct packet *packet; -+{ -+ struct option_cache *oc; -+ struct data_string client_identifier; -+ char *ci; -+ -+ memset (&client_identifier, 0, sizeof client_identifier); -+ -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_DHCP_CLIENT_IDENTIFIER); -+ if (oc && -+ evaluate_option_cache (&client_identifier, -+ packet, (struct lease *)0, -+ (struct client_state *)0, -+ packet -> options, -+ (struct option_state *)0, -+ &global_scope, oc, MDL)) { -+ ci = print_hw_addr (HTYPE_INFINIBAND, client_identifier.len, client_identifier.data); -+ data_string_forget (&client_identifier, MDL); -+ return ci; -+ } else -+ return "\"no client id\""; -+} -+ -+char *print_hw_addr_or_client_id (packet) -+ struct packet *packet; -+{ -+ if (packet -> raw -> htype == HTYPE_INFINIBAND) -+ return print_client_identifier_from_packet (packet); -+ else -+ return print_hw_addr (packet -> raw -> htype, -+ packet -> raw -> hlen, -+ packet -> raw -> chaddr); -+} -+ - void - dhcp (struct packet *packet) { - int ms_nulltp = 0; -@@ -127,9 +163,7 @@ dhcp (struct packet *packet) { - - log_info("%s from %s via %s: %s", s, - (packet->raw->htype -- ? print_hw_addr(packet->raw->htype, -- packet->raw->hlen, -- packet->raw->chaddr) -+ ? print_hw_addr_or_client_id(packet) - : "<no identifier>"), - packet->raw->giaddr.s_addr - ? inet_ntoa(packet->raw->giaddr) -@@ -326,9 +360,7 @@ void dhcpdiscover (packet, ms_nulltp) - #endif - snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s", - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id (packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -540,9 +572,7 @@ void dhcprequest (packet, ms_nulltp, ip_ - "DHCPREQUEST for %s%s from %s %s%s%svia %s", - piaddr (cip), smbuf, - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id(packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -783,9 +813,7 @@ void dhcprelease (packet, ms_nulltp) - if ((oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_REQUESTED_ADDRESS))) { - log_info ("DHCPRELEASE from %s specified requested-address.", -- print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr)); -+ print_hw_addr_or_client_id(packet)); - } - - oc = lookup_option (&dhcp_universe, packet -> options, -@@ -877,9 +905,7 @@ void dhcprelease (packet, ms_nulltp) - "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)", - cstr, - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id(packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -984,9 +1010,7 @@ void dhcpdecline (packet, ms_nulltp) - "DHCPDECLINE of %s from %s %s%s%svia %s", - piaddr (cip), - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id(packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -1683,8 +1707,7 @@ void dhcpinform (packet, ms_nulltp) - /* Report what we're sending. */ - snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip), - (packet->raw->htype && packet->raw->hlen) ? -- print_hw_addr(packet->raw->htype, packet->raw->hlen, -- packet->raw->chaddr) : -+ print_hw_addr_or_client_id(packet) : - "<no client hardware address>"); - log_info("%s %s", msgbuf, gip.len ? piaddr(gip) : - packet->interface->name); -@@ -1862,9 +1885,7 @@ void nak_lease (packet, cip, network_gro - #endif - log_info ("DHCPNAK on %s to %s via %s", - piaddr (*cip), -- print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr), -+ print_hw_addr_or_client_id(packet), - packet -> raw -> giaddr.s_addr - ? inet_ntoa (packet -> raw -> giaddr) - : packet -> interface -> name); -@@ -3859,7 +3880,7 @@ void dhcp_reply (lease) - ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER") - : "BOOTREPLY"), - piaddr (lease -> ip_addr), -- (lease -> hardware_addr.hlen -+ (lease -> hardware_addr.hlen > 1 - ? print_hw_addr (lease -> hardware_addr.hbuf [0], - lease -> hardware_addr.hlen - 1, - &lease -> hardware_addr.hbuf [1]) -@@ -4408,10 +4429,7 @@ int find_lease (struct lease **lp, - if (uid_lease) { - if (uid_lease->binding_state == FTS_ACTIVE) { - log_error ("client %s has duplicate%s on %s", -- (print_hw_addr -- (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr)), -+ (print_hw_addr_or_client_id(packet)), - " leases", - (ip_lease -> subnet -> - shared_network -> name)); -@@ -4578,9 +4596,7 @@ int find_lease (struct lease **lp, - log_error("uid lease %s for client %s is duplicate " - "on %s", - piaddr(uid_lease->ip_addr), -- print_hw_addr(packet->raw->htype, -- packet->raw->hlen, -- packet->raw->chaddr), -+ print_hw_addr_or_client_id(packet), - uid_lease->subnet->shared_network->name); - - if (!packet -> raw -> ciaddr.s_addr && diff --git a/dhcp/patches/0029-dhcp-sd_notify.patch b/dhcp/patches/0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch similarity index 55% rename from dhcp/patches/0029-dhcp-sd_notify.patch rename to dhcp/patches/0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch index a12392360..2d6bb743a 100644 --- a/dhcp/patches/0029-dhcp-sd_notify.patch +++ b/dhcp/patches/0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch @@ -1,10 +1,23 @@ -diff -up dhcp-4.3.4/configure.ac.sd_notify dhcp-4.3.4/configure.ac ---- dhcp-4.3.4/configure.ac.sd_notify 2016-04-29 13:08:52.813287060 +0200 -+++ dhcp-4.3.4/configure.ac 2016-04-29 13:08:52.872287075 +0200 -@@ -832,6 +832,17 @@ if test x$ldap = xyes || test x$ldapcryp +From 5c6204bab7279050b78b3d03d1211e9d13d3fd71 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Wed, 27 Mar 2019 09:59:20 +0100 +Subject: [PATCH] Backport sd-notify patch for systemd support (#1687040) +Cc: pzhukov(a)redhat.com + +--- + configure.ac | 11 +++++++++++ + relay/dhcrelay.c | 12 ++++++++++++ + server/dhcpd.c | 12 ++++++++++++ + 3 files changed, 35 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 15fc0d7..0c08000 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1014,6 +1014,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes; AC_SUBST(LDAP_CFLAGS, [$LDAP_CFLAGS]) fi - + +AC_ARG_WITH(systemd, + AC_HELP_STRING([--with-systemd], + [enable sending status notifications to systemd daemon (default is no)]), @@ -19,13 +32,14 @@ diff -up dhcp-4.3.4/configure.ac.sd_notify dhcp-4.3.4/configure.ac # Append selected warning levels to CFLAGS before substitution (but after # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc). CFLAGS="$CFLAGS $STD_CWARNINGS" -diff -up dhcp-4.3.4/relay/dhcrelay.c.sd_notify dhcp-4.3.4/relay/dhcrelay.c ---- dhcp-4.3.4/relay/dhcrelay.c.sd_notify 2016-04-29 13:08:52.814287061 +0200 -+++ dhcp-4.3.4/relay/dhcrelay.c 2016-04-29 13:08:52.872287075 +0200 +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index 7b4f4f1..9eb5bfd 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c @@ -37,6 +37,10 @@ int keep_capabilities = 0; #endif - + +#ifdef HAVE_LIBSYSTEMD +#include <systemd/sd-daemon.h> +#endif @@ -33,10 +47,10 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.sd_notify dhcp-4.3.4/relay/dhcrelay.c TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ struct tree_cache *global_options[256]; -@@ -709,6 +713,14 @@ main(int argc, char **argv) { - } +@@ -845,6 +849,14 @@ main(int argc, char **argv) { + } #endif - + +#ifdef HAVE_LIBSYSTEMD + /* We are ready to process incomming packets. Let's notify systemd */ + sd_notifyf(0, "READY=1\n" @@ -45,27 +59,28 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.sd_notify dhcp-4.3.4/relay/dhcrelay.c + (unsigned long) getpid()); +#endif + - /* Start dispatching packets and timeouts... */ - dispatch(); - -diff -up dhcp-4.3.4/server/dhcpd.c.sd_notify dhcp-4.3.4/server/dhcpd.c ---- dhcp-4.3.4/server/dhcpd.c.sd_notify 2016-04-29 13:08:52.873287075 +0200 -+++ dhcp-4.3.4/server/dhcpd.c 2016-04-29 13:12:00.655333096 +0200 -@@ -57,6 +57,10 @@ uid_t set_uid = 0; - gid_t set_gid = 0; - #endif /* PARANOIA */ - + /* Start dispatching packets and timeouts... */ + dispatch(); + +diff --git a/server/dhcpd.c b/server/dhcpd.c +index 530a923..e06f6b4 100644 +--- a/server/dhcpd.c ++++ b/server/dhcpd.c +@@ -60,6 +60,10 @@ gid_t set_gid = 0; + struct class unknown_class; + struct class known_class; + +#ifdef HAVE_LIBSYSTEMD +#include <systemd/sd-daemon.h> +#endif + struct iaddr server_identifier; int server_identifier_matched; - -@@ -931,6 +935,14 @@ main(int argc, char **argv) { - /* Log that we are about to start working */ - log_info("Server starting service."); - + +@@ -1057,6 +1061,14 @@ main(int argc, char **argv) { + /* Log that we are about to start working */ + log_info("Server starting service."); + +#ifdef HAVE_LIBSYSTEMD + /* We are ready to process incomming packets. Let's notify systemd */ + sd_notifyf(0, "READY=1\n" @@ -74,6 +89,8 @@ diff -up dhcp-4.3.4/server/dhcpd.c.sd_notify dhcp-4.3.4/server/dhcpd.c + (unsigned long) getpid()); +#endif + - /* - * Receive packets and dispatch them... - * dispatch() will never return. + /* + * Receive packets and dispatch them... + * dispatch() will never return. +-- +2.14.5 diff --git a/dhcp/patches/0022-dhcp-improved-xid.patch b/dhcp/patches/0022-dhcp-improved-xid.patch deleted file mode 100644 index 69a6975dd..000000000 --- a/dhcp/patches/0022-dhcp-improved-xid.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.improved-xid dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.improved-xid 2016-04-29 12:54:55.997102182 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:57:25.123139587 +0200 -@@ -1045,6 +1045,26 @@ main(int argc, char **argv) { - } - } - -+ /* We create a backup seed before rediscovering interfaces in order to -+ have a seed built using all of the available interfaces -+ It's interesting if required interfaces doesn't let us defined -+ a really unique seed due to a lack of valid HW addr later -+ (this is the case with DHCP over IB) -+ We only use the last device as using a sum could broke the -+ uniqueness of the seed among multiple nodes -+ */ -+ unsigned backup_seed = 0; -+ for (ip = interfaces; ip; ip = ip -> next) { -+ int junk; -+ if ( ip -> hw_address.hlen <= sizeof seed ) -+ continue; -+ memcpy (&junk, -+ &ip -> hw_address.hbuf [ip -> hw_address.hlen - -+ sizeof seed], sizeof seed); -+ backup_seed = junk; -+ } -+ -+ - /* At this point, all the interfaces that the script thinks - are relevant should be running, so now we once again call - discover_interfaces(), and this time ask it to actually set -@@ -1059,14 +1079,36 @@ main(int argc, char **argv) { - Not much entropy, but we're booting, so we're not likely to - find anything better. */ - seed = 0; -+ int seed_flag = 0; - for (ip = interfaces; ip; ip = ip->next) { - int junk; -+ if ( ip -> hw_address.hlen <= sizeof seed ) -+ continue; - memcpy(&junk, - &ip->hw_address.hbuf[ip->hw_address.hlen - - sizeof seed], sizeof seed); - seed += junk; -+ seed_flag = 1; - } -- srandom(seed + cur_time + (unsigned)getpid()); -+ if ( seed_flag == 0 ) { -+ if ( backup_seed != 0 ) { -+ seed = backup_seed; -+ log_info ("xid: rand init seed (0x%x) built using all" -+ " available interfaces",seed); -+ } -+ else { -+ seed = cur_time^((unsigned) gethostid()) ; -+ log_info ("xid: warning: no netdev with useable HWADDR found" -+ " for seed's uniqueness enforcement"); -+ log_info ("xid: rand init seed (0x%x) built using gethostid", -+ seed); -+ } -+ /* we only use seed and no current time as a broadcast reply */ -+ /* will certainly be used by the hwaddrless interface */ -+ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); -+ } -+ else -+ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); - - /* Setup specific Infiniband options */ - for (ip = interfaces; ip; ip = ip->next) { -@@ -1633,7 +1675,7 @@ void dhcpack (packet) - return; - } - -- log_info ("DHCPACK from %s", piaddr (packet -> client_addr)); -+ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid)); - - lease = packet_to_lease (packet, client); - if (!lease) { -@@ -2541,7 +2583,7 @@ void dhcpnak (packet) - return; - } - -- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr)); -+ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid)); - - if (!client -> active) { - #if defined (DEBUG) -@@ -2674,10 +2716,10 @@ void send_discover (cpp) - (long)(client -> interval)); - } else - #endif -- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld", -+ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (sockaddr_broadcast.sin_addr), -- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval)); -+ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), ntohl(client -> xid)); - - /* Send out a packet. */ - #if defined(DHCPv6) && defined(DHCP4o6) -@@ -2962,10 +3004,10 @@ void send_request (cpp) - log_info ("DHCPREQUEST"); - } else - #endif -- log_info ("DHCPREQUEST on %s to %s port %d", -+ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (destination.sin_addr), -- ntohs (destination.sin_port)); -+ ntohs (destination.sin_port), ntohl(client -> xid)); - - #if defined(DHCPv6) && defined(DHCP4o6) - if (dhcpv4_over_dhcpv6) { -@@ -3022,10 +3064,10 @@ void send_decline (cpp) - log_info ("DHCPDECLINE"); - } else - #endif -- log_info ("DHCPDECLINE on %s to %s port %d", -+ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)", - client->name ? client->name : client->interface->name, - inet_ntoa(sockaddr_broadcast.sin_addr), -- ntohs(sockaddr_broadcast.sin_port)); -+ ntohs(sockaddr_broadcast.sin_port), ntohl(client -> xid)); - - /* Send out a packet. */ - #if defined(DHCPv6) && defined(DHCP4o6) -@@ -3084,10 +3126,10 @@ void send_release (cpp) - log_info ("DHCPRELEASE"); - } else - #endif -- log_info ("DHCPRELEASE on %s to %s port %d", -+ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (destination.sin_addr), -- ntohs (destination.sin_port)); -+ ntohs (destination.sin_port), ntohl(client -> xid)); - - #if defined(DHCPv6) && defined(DHCP4o6) - if (dhcpv4_over_dhcpv6) { diff --git a/dhcp/patches/0023-dhcp-duidv4.patch b/dhcp/patches/0023-dhcp-duidv4.patch deleted file mode 100644 index 52fde3b07..000000000 --- a/dhcp/patches/0023-dhcp-duidv4.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up dhcp-4.3.1b1/client/dhclient.8.KrJcIv dhcp-4.3.1b1/client/dhclient.8 ---- dhcp-4.3.1b1/client/dhclient.8.KrJcIv 2014-07-10 17:39:25.852763873 +0200 -+++ dhcp-4.3.1b1/client/dhclient.8 2014-07-10 17:54:26.841012988 +0200 -@@ -458,6 +458,9 @@ used to construct a RFC4361 style client - in the client's messages. This client id can be overridden by - setting a client id in the configuration file. Overridding the - client id in this fashion is discouraged. -+This option is turned on by default, if you want to redefine or turn off -+sending of client id, use send dhcp-client-identifier = "better identifier" -+or send dhcp-client-identifier = "" in /etc/dhcp/dhclient.conf. - .TP - .BI \-I - Use the standard DDNS scheme from RFCs 4701 & 4702. -diff -up dhcp-4.3.1b1/client/dhclient.c.KrJcIv dhcp-4.3.1b1/client/dhclient.c ---- dhcp-4.3.1b1/client/dhclient.c.KrJcIv 2014-07-10 17:54:26.829013157 +0200 -+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:55:50.155835918 +0200 -@@ -73,7 +73,7 @@ struct sockaddr_in sockaddr_broadcast; - struct in_addr giaddr; - struct data_string default_duid; - int duid_type = 0; --int duid_v4 = 0; -+int duid_v4 = 1; - int std_dhcid = 0; - - /* ASSERT_STATE() does nothing now; it used to be -@@ -1301,7 +1301,7 @@ static void setup_ib_interface(struct in - } - - /* No client ID specified */ -- log_fatal("dhcp-client-identifier must be specified for InfiniBand"); -+ //log_fatal("dhcp-client-identifier must be specified for InfiniBand"); - } - - /* Individual States: diff --git a/dhcp/patches/0024-dhcp-duid_uuid.patch b/dhcp/patches/0024-dhcp-duid_uuid.patch deleted file mode 100644 index f90bc4a7b..000000000 --- a/dhcp/patches/0024-dhcp-duid_uuid.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.duid_uuid 2016-04-29 12:58:14.846150838 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:58:14.851150839 +0200 -@@ -3868,6 +3868,59 @@ write_options(struct client_state *clien - } - } - -+int unhexchar(char c) { -+ -+ if (c >= '0' && c <= '9') -+ return c - '0'; -+ -+ if (c >= 'a' && c <= 'f') -+ return c - 'a' + 10; -+ -+ if (c >= 'A' && c <= 'F') -+ return c - 'A' + 10; -+ -+ return -1; -+} -+ -+isc_result_t -+read_uuid(u_int8_t* uuid) { -+ const char *id_fname = "/etc/machine-id"; -+ char id[32]; -+ size_t nread; -+ FILE * file = fopen( id_fname , "r"); -+ if (!file) { -+ log_debug("Cannot open %s", id_fname); -+ return ISC_R_IOERROR; -+ } -+ nread = fread(id, 1, sizeof id, file); -+ fclose(file); -+ -+ if (nread < 32) { -+ log_debug("Not enough data in %s", id_fname); -+ return ISC_R_IOERROR; -+ } -+ -+ for (int j = 0; j < 16; j++) { -+ int a, b; -+ -+ a = unhexchar(id[j*2]); -+ b = unhexchar(id[j*2+1]); -+ -+ if (a < 0 || b < 0) { -+ log_debug("Wrong data in %s", id_fname); -+ return ISC_R_IOERROR; -+ } -+ uuid[j] = a << 4 | b; -+ } -+ -+ /* Set UUID version to 4 --- truly random generation */ -+ uuid[6] = (uuid[6] & 0x0F) | 0x40; -+ /* Set the UUID variant to DCE */ -+ uuid[8] = (uuid[8] & 0x3F) | 0x80; -+ -+ return ISC_R_SUCCESS; -+} -+ - /* - * The "best" default DUID, since we cannot predict any information - * about the system (such as whether or not the hardware addresses are -@@ -3888,6 +3941,7 @@ form_duid(struct data_string *duid, cons - struct interface_info *ip; - int len; - char *str; -+ u_int8_t uuid[16]; - - /* For now, just use the first interface on the list. */ - ip = interfaces; -@@ -3908,9 +3962,16 @@ form_duid(struct data_string *duid, cons - (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) - log_fatal("Impossible hardware address length at %s:%d.", MDL); - -- if (duid_type == 0) -- duid_type = stateless ? DUID_LL : DUID_LLT; -- -+ if (duid_type == 0) { -+ if (read_uuid(uuid) == ISC_R_SUCCESS) -+ duid_type = DUID_UUID; -+ else -+ duid_type = stateless ? DUID_LL : DUID_LLT; -+ } -+ -+ if (duid_type == DUID_UUID) -+ len = 2 + sizeof (uuid); -+ else { - /* - * 2 bytes for the 'duid type' field. - * 2 bytes for the 'htype' field. -@@ -3921,13 +3982,18 @@ form_duid(struct data_string *duid, cons - len = 4 + (ip->hw_address.hlen - 1); - if (duid_type == DUID_LLT) - len += 4; -+ } - if (!buffer_allocate(&duid->buffer, len, MDL)) - log_fatal("no memory for default DUID!"); - duid->data = duid->buffer->data; - duid->len = len; - -+ if (duid_type == DUID_UUID) { -+ putUShort(duid->buffer->data, DUID_UUID); -+ memcpy(duid->buffer->data + 2, uuid, sizeof(uuid)); -+ } - /* Basic Link Local Address type of DUID. */ -- if (duid_type == DUID_LLT) { -+ else if (duid_type == DUID_LLT) { - putUShort(duid->buffer->data, DUID_LLT); - putUShort(duid->buffer->data + 2, ip->hw_address.hbuf[0]); - putULong(duid->buffer->data + 4, cur_time - DUID_TIME_EPOCH); diff --git a/dhcp/patches/0025-dhcp-getifaddrs.patch b/dhcp/patches/0025-dhcp-getifaddrs.patch deleted file mode 100644 index 586c3b077..000000000 --- a/dhcp/patches/0025-dhcp-getifaddrs.patch +++ /dev/null @@ -1,429 +0,0 @@ -diff -up dhcp-4.3.5b1/common/discover.c.getifaddrs dhcp-4.3.5b1/common/discover.c ---- dhcp-4.3.5b1/common/discover.c.getifaddrs 2016-09-12 17:10:39.585374741 +0200 -+++ dhcp-4.3.5b1/common/discover.c 2016-09-12 17:15:56.160628636 +0200 -@@ -373,392 +373,13 @@ end_iface_scan(struct iface_conf_list *i - ifaces->sock = -1; - } - --#elif __linux /* !HAVE_SIOCGLIFCONF */ --/* -- * Linux support -- * ------------- -- * -- * In Linux, we use the /proc pseudo-filesystem to get information -- * about interfaces, along with selected ioctl() calls. -- * -- * Linux low level access is documented in the netdevice man page. -- */ -- --/* -- * Structure holding state about the scan. -- */ --struct iface_conf_list { -- int sock; /* file descriptor used to get information */ -- FILE *fp; /* input from /proc/net/dev */ --#ifdef DHCPv6 -- FILE *fp6; /* input from /proc/net/if_inet6 */ --#endif --}; -- --/* -- * Structure used to return information about a specific interface. -- */ --struct iface_info { -- char name[IFNAMSIZ]; /* name of the interface, e.g. "eth0" */ -- struct sockaddr_storage addr; /* address information */ -- isc_uint64_t flags; /* interface flags, e.g. IFF_LOOPBACK */ --}; -- --/* -- * Start a scan of interfaces. -- * -- * The iface_conf_list structure maintains state for this process. -- */ --int --begin_iface_scan(struct iface_conf_list *ifaces) { -- char buf[IF_LINE_LENGTH]; -- int len; -- int i; -- -- ifaces->fp = fopen("/proc/net/dev", "r"); -- if (ifaces->fp == NULL) { -- log_error("Error opening '/proc/net/dev' to list interfaces"); -- return 0; -- } -- -- /* -- * The first 2 lines are header information, so read and ignore them. -- */ -- for (i=0; i<2; i++) { -- if (fgets(buf, sizeof(buf), ifaces->fp) == NULL) { -- log_error("Error reading headers from '/proc/net/dev'"); -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- len = strlen(buf); -- if ((len <= 0) || (buf[len-1] != '\n')) { -- log_error("Bad header line in '/proc/net/dev'"); -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- } -- -- ifaces->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); -- if (ifaces->sock < 0) { -- log_error("Error creating socket to list interfaces; %m"); -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- --#ifdef DHCPv6 -- if (local_family == AF_INET6) { -- ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); -- if (ifaces->fp6 == NULL) { -- log_error("Error opening '/proc/net/if_inet6' to " -- "list IPv6 interfaces; %m"); -- close(ifaces->sock); -- ifaces->sock = -1; -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- } --#endif -- -- return 1; --} -- --/* -- * Read our IPv4 interfaces from /proc/net/dev. -- * -- * The file looks something like this: -- * -- * Inter-| Receive ... -- * face |bytes packets errs drop fifo frame ... -- * lo: 1580562 4207 0 0 0 0 ... -- * eth0: 0 0 0 0 0 0 ... -- * eth1:1801552440 37895 0 14 0 ... -- * -- * We only care about the interface name, which is at the start of -- * each line. -- * -- * We use an ioctl() to get the address and flags for each interface. -- */ --static int --next_iface4(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -- char buf[IF_LINE_LENGTH]; -- int len; -- char *p; -- char *name; -- struct ifreq tmp; -- -- /* -- * Loop exits when we find an interface that has an address, or -- * when we run out of interfaces. -- */ -- for (;;) { -- do { -- /* -- * Read the next line in the file. -- */ -- if (fgets(buf, sizeof(buf), ifaces->fp) == NULL) { -- if (ferror(ifaces->fp)) { -- *err = 1; -- log_error("Error reading interface " -- "information"); -- } else { -- *err = 0; -- } -- return 0; -- } -- -- /* -- * Make sure the line is a nice, -- * newline-terminated line. -- */ -- len = strlen(buf); -- if ((len <= 0) || (buf[len-1] != '\n')) { -- log_error("Bad line reading interface " -- "information"); -- *err = 1; -- return 0; -- } -- -- /* -- * Figure out our name. -- */ -- p = strrchr(buf, ':'); -- if (p == NULL) { -- log_error("Bad line reading interface " -- "information (no colon)"); -- *err = 1; -- return 0; -- } -- *p = '\0'; -- name = buf; -- while (isspace(*name)) { -- name++; -- } -- -- /* -- * Copy our name into our interface structure. -- */ -- len = p - name; -- if (len >= sizeof(info->name)) { -- *err = 1; -- log_error("Interface name '%s' too long", name); -- return 0; -- } -- strncpy(info->name, name, sizeof(info->name) - 1); -- --#ifdef ALIAS_NAMED_PERMUTED -- /* interface aliases look like "eth0:1" or "wlan1:3" */ -- s = strchr(info->name, ':'); -- if (s != NULL) { -- *s = '\0'; -- } --#endif -- --#ifdef SKIP_DUMMY_INTERFACES -- } while (strncmp(info->name, "dummy", 5) == 0); --#else -- } while (0); --#endif -- -- memset(&tmp, 0, sizeof(tmp)); -- strncpy(tmp.ifr_name, name, sizeof(tmp.ifr_name) - 1); -- if (ioctl(ifaces->sock, SIOCGIFADDR, &tmp) < 0) { -- if (errno == EADDRNOTAVAIL) { -- continue; -- } -- log_error("Error getting interface address " -- "for '%s'; %m", name); -- *err = 1; -- return 0; -- } -- memcpy(&info->addr, &tmp.ifr_addr, sizeof(tmp.ifr_addr)); -- -- memset(&tmp, 0, sizeof(tmp)); -- strncpy(tmp.ifr_name, name, sizeof(tmp.ifr_name) - 1); -- if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) { -- log_error("Error getting interface flags for '%s'; %m", -- name); -- *err = 1; -- return 0; -- } -- info->flags = tmp.ifr_flags; -- -- *err = 0; -- return 1; -- } --} -- --#ifdef DHCPv6 --/* -- * Read our IPv6 interfaces from /proc/net/if_inet6. -- * -- * The file looks something like this: -- * -- * fe80000000000000025056fffec00008 05 40 20 80 vmnet8 -- * 00000000000000000000000000000001 01 80 10 80 lo -- * fe80000000000000025056fffec00001 06 40 20 80 vmnet1 -- * 200108881936000202166ffffe497d9b 03 40 00 00 eth1 -- * fe8000000000000002166ffffe497d9b 03 40 20 80 eth1 -- * -- * We get IPv6 address from the start, the interface name from the end, -- * and ioctl() to get flags. -- */ --static int --next_iface6(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -- char buf[IF_LINE_LENGTH]; -- int len; -- char *p; -- char *name; -- int i; -- struct sockaddr_in6 addr; -- struct ifreq tmp; -- -- do { -- /* -- * Read the next line in the file. -- */ -- if (fgets(buf, sizeof(buf), ifaces->fp6) == NULL) { -- if (ferror(ifaces->fp6)) { -- *err = 1; -- log_error("Error reading IPv6 " -- "interface information"); -- } else { -- *err = 0; -- } -- return 0; -- } -- -- /* -- * Make sure the line is a nice, newline-terminated line. -- */ -- len = strlen(buf); -- if ((len <= 0) || (buf[len-1] != '\n')) { -- log_error("Bad line reading IPv6 " -- "interface information"); -- *err = 1; -- return 0; -- } -- -- /* -- * Figure out our name. -- */ -- buf[--len] = '\0'; -- p = strrchr(buf, ' '); -- if (p == NULL) { -- log_error("Bad line reading IPv6 interface " -- "information (no space)"); -- *err = 1; -- return 0; -- } -- name = p+1; -- -- /* -- * Copy our name into our interface structure. -- */ -- len = strlen(name); -- if (len >= sizeof(info->name)) { -- *err = 1; -- log_error("IPv6 interface name '%s' too long", name); -- return 0; -- } -- strncpy(info->name, name, sizeof(info->name) - 1); -- --#ifdef SKIP_DUMMY_INTERFACES -- } while (strncmp(info->name, "dummy", 5) == 0); --#else -- } while (0); --#endif -- -- /* -- * Double-check we start with the IPv6 address. -- */ -- for (i=0; i<32; i++) { -- if (!isxdigit(buf[i]) || isupper(buf[i])) { -- *err = 1; -- log_error("Bad line reading IPv6 interface address " -- "for '%s'", name); -- return 0; -- } -- } -- -- /* -- * Load our socket structure. -- */ -- memset(&addr, 0, sizeof(addr)); -- addr.sin6_family = AF_INET6; -- for (i=0; i<16; i++) { -- unsigned char byte; -- static const char hex[] = "0123456789abcdef"; -- byte = ((index(hex, buf[i * 2]) - hex) << 4) | -- (index(hex, buf[i * 2 + 1]) - hex); -- addr.sin6_addr.s6_addr[i] = byte; -- } -- memcpy(&info->addr, &addr, sizeof(addr)); -- -- /* -- * Get our flags. -- */ -- memset(&tmp, 0, sizeof(tmp)); -- strncpy(tmp.ifr_name, name, sizeof(tmp.ifr_name) - 1); -- if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) { -- log_error("Error getting interface flags for '%s'; %m", name); -- *err = 1; -- return 0; -- } -- info->flags = tmp.ifr_flags; -- -- *err = 0; -- return 1; --} --#endif /* DHCPv6 */ -- --/* -- * Retrieve the next interface. -- * -- * Returns information in the info structure. -- * Sets err to 1 if there is an error, otherwise 0. -- */ --int --next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -- memset(info, 0, sizeof(struct iface_info)); -- if (next_iface4(info, err, ifaces)) { -- return 1; -- } --#ifdef DHCPv6 -- if (!(*err)) { -- if (local_family == AF_INET6) -- return next_iface6(info, err, ifaces); -- } --#endif -- return 0; --} -- --/* -- * End scan of interfaces. -- */ --void --end_iface_scan(struct iface_conf_list *ifaces) { -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- close(ifaces->sock); -- ifaces->sock = -1; --#ifdef DHCPv6 -- if (local_family == AF_INET6) { -- fclose(ifaces->fp6); -- ifaces->fp6 = NULL; -- } --#endif --} - #else - - /* - * BSD support - * ----------- - * -- * FreeBSD, NetBSD, OpenBSD, and OS X all have the getifaddrs() -+ * FreeBSD, NetBSD, OpenBSD, OS X and Linux all have the getifaddrs() - * function. - * - * The getifaddrs() man page describes the use. -@@ -806,6 +427,8 @@ begin_iface_scan(struct iface_conf_list - */ - int - next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -+ size_t sa_len = 0; -+ - if (ifaces->next == NULL) { - *err = 0; - return 0; -@@ -818,8 +441,20 @@ next_iface(struct iface_info *info, int - } - memset(info, 0, sizeof(struct iface_info)); - strncpy(info->name, ifaces->next->ifa_name, sizeof(info->name) - 1); -- memcpy(&info->addr, ifaces->next->ifa_addr, -- ifaces->next->ifa_addr->sa_len); -+ -+ memset(&info->addr, 0 , sizeof(info->addr)); -+ -+ if (ifaces->next->ifa_addr != NULL) { -+#ifdef HAVE_SA_LEN -+ sa_len = ifaces->next->ifa_addr->sa_len; -+#else -+ if (ifaces->next->ifa_addr->sa_family == AF_INET) -+ sa_len = sizeof(struct sockaddr_in); -+ else if (ifaces->next->ifa_addr->sa_family == AF_INET6) -+ sa_len = sizeof(struct sockaddr_in6); -+#endif -+ memcpy(&info->addr, ifaces->next->ifa_addr, sa_len); -+ } - info->flags = ifaces->next->ifa_flags; - ifaces->next = ifaces->next->ifa_next; - *err = 0; diff --git a/dhcp/patches/0026-dhcp-client-request-release-bind-iface.patch b/dhcp/patches/0026-dhcp-client-request-release-bind-iface.patch deleted file mode 100644 index 7b9f27113..000000000 --- a/dhcp/patches/0026-dhcp-client-request-release-bind-iface.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.bind-iface dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.bind-iface 2016-04-29 13:06:50.595257108 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 13:08:30.237281528 +0200 -@@ -3023,6 +3023,14 @@ void send_request (cpp) - #endif - if (destination.sin_addr.s_addr != INADDR_BROADCAST && - fallback_interface) { -+#if defined(SO_BINDTODEVICE) -+ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, -+ SO_BINDTODEVICE, client->interface->name, -+ strlen(client->interface->name)) < 0) { -+ log_error("%s:%d: Failed to bind fallback interface" -+ " to %s: %m", MDL, client->interface->name); -+ } -+#endif - result = send_packet(fallback_interface, NULL, &client->packet, - client->packet_length, from, &destination, - NULL); -@@ -3032,6 +3040,13 @@ void send_request (cpp) - client->packet_length, - fallback_interface->name); - } -+#if defined(SO_BINDTODEVICE) -+ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, -+ SO_BINDTODEVICE, NULL, 0) < 0) { -+ log_fatal("%s:%d: Failed to unbind fallback interface:" -+ " %m", MDL); -+ } -+#endif - } - else { - /* Send out a packet. */ -@@ -3144,6 +3159,14 @@ void send_release (cpp) - } else - #endif - if (fallback_interface) { -+#if defined(SO_BINDTODEVICE) -+ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, -+ SO_BINDTODEVICE, client->interface->name, -+ strlen(client->interface->name)) < 0) { -+ log_error("%s:%d: Failed to bind fallback interface" -+ " to %s: %m", MDL, client->interface->name); -+ } -+#endif - result = send_packet(fallback_interface, NULL, &client->packet, - client->packet_length, from, &destination, - NULL); -@@ -3153,6 +3176,13 @@ void send_release (cpp) - client->packet_length, - fallback_interface->name); - } -+#if defined(SO_BINDTODEVICE) -+ if (setsockopt(fallback_interface -> wfdesc, SOL_SOCKET, -+ SO_BINDTODEVICE, NULL, 0) < 0) { -+ log_fatal("%s:%d: Failed to unbind fallback interface:" -+ " %m", MDL); -+ } -+#endif - } else { - /* Send out a packet. */ - result = send_packet(client->interface, NULL, &client->packet, diff --git a/dhcp/patches/0027-dhcp-interval.patch b/dhcp/patches/0027-dhcp-interval.patch deleted file mode 100644 index 8fff47c17..000000000 --- a/dhcp/patches/0027-dhcp-interval.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up dhcp-4.3.0a1/common/dispatch.c.interval dhcp-4.3.0a1/common/dispatch.c ---- dhcp-4.3.0a1/common/dispatch.c.interval 2013-12-20 13:51:14.385260622 +0100 -+++ dhcp-4.3.0a1/common/dispatch.c 2013-12-20 13:51:14.493259116 +0100 -@@ -343,7 +343,20 @@ void add_timeout (when, where, what, ref - q->next = timeouts; - timeouts = q; - -- isc_interval_set(&interval, sec & DHCP_SEC_MAX, usec * 1000); -+ /* isc_time_nowplusinterval() is not safe with 64-bit time_t and will -+ * return an error for sufficiently large intervals. We have to limit -+ * the interval to INT_MAX or less to ensure the interval doesn't -+ * overflow 32 bits, since the returned isc_time_t fields are -+ * 32-bit unsigned ints. -+ * -+ * HACK: The 9 is a magic number of seconds, since some time may have -+ * gone by since the last call to gettimeofday() and the one in -+ * isc_time_nowplusinterval(). -+ */ -+ if (sec > TIME_MAX) -+ sec = TIME_MAX - 9; -+ -+ isc_interval_set(&interval, sec, usec * 1000); - status = isc_time_nowplusinterval(&expires, &interval); - if (status != ISC_R_SUCCESS) { - /* diff --git a/dhcp/patches/0028-dhcp-no-subnet-error2info.patch b/dhcp/patches/0028-dhcp-no-subnet-error2info.patch deleted file mode 100644 index 975a4d409..000000000 --- a/dhcp/patches/0028-dhcp-no-subnet-error2info.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up dhcp-4.3.0a1/common/discover.c.error2info dhcp-4.3.0a1/common/discover.c ---- dhcp-4.3.0a1/common/discover.c.error2info 2013-12-20 13:59:15.148553898 +0100 -+++ dhcp-4.3.0a1/common/discover.c 2013-12-20 13:59:15.181553438 +0100 -@@ -779,9 +779,9 @@ discover_interfaces(int state) { - - /* We must have a subnet declaration for each interface. */ - if (!tmp->shared_network && (state == DISCOVER_SERVER)) { -- log_error("%s", ""); -+ log_info("%s", ""); - if (local_family == AF_INET) { -- log_error("No subnet declaration for %s (%s).", -+ log_info("No subnet declaration for %s (%s).", - tmp->name, - (tmp->addresses == NULL) ? - "no IPv4 addresses" : -@@ -796,26 +796,26 @@ discover_interfaces(int state) { - } else { - strcpy(abuf, "no IPv6 addresses"); - } -- log_error("No subnet6 declaration for %s (%s).", -+ log_info("No subnet6 declaration for %s (%s).", - tmp->name, - abuf); - #endif /* DHCPv6 */ - } - if (supports_multiple_interfaces(tmp)) { -- log_error ("** Ignoring requests on %s. %s", -+ log_info ("** Ignoring requests on %s. %s", - tmp -> name, "If this is not what"); -- log_error (" you want, please write %s", -+ log_info (" you want, please write %s", - #ifdef DHCPv6 - (local_family != AF_INET) ? - "a subnet6 declaration" : - #endif - "a subnet declaration"); -- log_error (" in your dhcpd.conf file %s", -+ log_info (" in your dhcpd.conf file %s", - "for the network segment"); -- log_error (" to %s %s %s", -+ log_info (" to %s %s %s", - "which interface", - tmp -> name, "is attached. **"); -- log_error ("%s", ""); -+ log_info ("%s", ""); - goto next; - } else { - log_error ("You must write a %s", diff --git a/dhcp/patches/0030-dhcp-option97-pxe-client-id.patch b/dhcp/patches/0030-dhcp-option97-pxe-client-id.patch deleted file mode 100644 index fac2ace5a..000000000 --- a/dhcp/patches/0030-dhcp-option97-pxe-client-id.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -up dhcp-4.3.5b1/common/options.c.option97 dhcp-4.3.5b1/common/options.c ---- dhcp-4.3.5b1/common/options.c.option97 2016-09-12 17:17:13.972691041 +0200 -+++ dhcp-4.3.5b1/common/options.c 2016-09-12 17:19:17.706790276 +0200 -@@ -4434,13 +4434,26 @@ int validate_packet(struct packet *packe - "a future version of ISC DHCP will reject this"); - } - } else { -- /* -- * If hlen is 0 we don't have any identifier, we warn the user -- * but continue processing the packet as we can. -- */ -- if (packet->raw->hlen == 0) { -- log_debug("Received DHCPv4 packet without client-id" -- " option and empty hlen field."); -+ oc = lookup_option (&dhcp_universe, packet->options, -+ DHO_PXE_CLIENT_ID); -+ if (oc) { -+ /* Let's check if pxe-client-id is sane */ -+ if ((oc->data.len < 2) || -+ (oc->data.data[0] == '\0' && -+ oc->data.len != 17)) { -+ log_debug("Dropped DHCPv4 packet with wrong " -+ "(len == %d) pxe-client-id", oc->data.len); -+ return (0); -+ } -+ } else { -+ /* -+ * If hlen is 0 we don't have any identifier, we warn the user -+ * but continue processing the packet as we can. -+ */ -+ if (packet->raw->hlen == 0) { -+ log_debug("Received DHCPv4 packet without client-id" -+ " option and empty hlen field."); -+ } - } - } - -diff -up dhcp-4.3.5b1/common/tables.c.option97 dhcp-4.3.5b1/common/tables.c ---- dhcp-4.3.5b1/common/tables.c.option97 2016-09-12 17:17:13.927691005 +0200 -+++ dhcp-4.3.5b1/common/tables.c 2016-09-12 17:17:13.972691041 +0200 -@@ -196,8 +196,9 @@ static struct option dhcp_options[] = { - /* Defined by RFC 4578 */ - { "pxe-system-type", "S", &dhcp_universe, 93, 1 }, - { "pxe-interface-id", "BBB", &dhcp_universe, 94, 1 }, -- { "pxe-client-id", "BX", &dhcp_universe, 97, 1 }, - #endif -+ { "pxe-client-id", "BX", &dhcp_universe, 97, 1 }, -+ - { "uap-servers", "t", &dhcp_universe, 98, 1 }, - #if defined(RFC4776_OPTIONS) - { "geoconf-civic", "X", &dhcp_universe, 99, 1 }, -diff -up dhcp-4.3.5b1/includes/dhcp.h.option97 dhcp-4.3.5b1/includes/dhcp.h ---- dhcp-4.3.5b1/includes/dhcp.h.option97 2016-09-12 17:17:13.936691013 +0200 -+++ dhcp-4.3.5b1/includes/dhcp.h 2016-09-12 17:17:13.972691041 +0200 -@@ -159,6 +159,7 @@ struct dhcp_packet { - #define DHO_AUTHENTICATE 90 /* RFC3118, was 210 */ - #define DHO_CLIENT_LAST_TRANSACTION_TIME 91 - #define DHO_ASSOCIATED_IP 92 -+#define DHO_PXE_CLIENT_ID 97 /* RFC4578 */ - #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ - #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ - #define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ -diff -up dhcp-4.3.5b1/server/dhcp.c.option97 dhcp-4.3.5b1/server/dhcp.c ---- dhcp-4.3.5b1/server/dhcp.c.option97 2016-09-12 17:17:13.947691021 +0200 -+++ dhcp-4.3.5b1/server/dhcp.c 2016-09-12 17:17:13.973691042 +0200 -@@ -221,6 +221,10 @@ dhcp (struct packet *packet) { - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); - if (!oc) -+ oc = lookup_option (&dhcp_universe, -+ packet -> options, -+ DHO_PXE_CLIENT_ID); -+ if (!oc) - goto nolease; - - memset (&data, 0, sizeof data); -@@ -818,6 +822,9 @@ void dhcprelease (packet, ms_nulltp) - - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset (&data, 0, sizeof data); - if (oc && - evaluate_option_cache (&data, packet, (struct lease *)0, -@@ -1286,6 +1293,9 @@ void dhcpinform (packet, ms_nulltp) - */ - oc = lookup_option(&dhcp_universe, packet->options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset(&d1, 0, sizeof(d1)); - if (oc && - evaluate_option_cache(&d1, packet, NULL, NULL, -@@ -2381,6 +2391,9 @@ void ack_lease (packet, lease, offer, wh - can be used. */ - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - if (oc && - evaluate_option_cache (&d1, packet, lease, - (struct client_state *)0, -@@ -2962,6 +2975,9 @@ void ack_lease (packet, lease, offer, wh - /* Record the uid, if given... */ - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - if (oc && - evaluate_option_cache(&d1, packet, lease, NULL, - packet->options, state->options, -@@ -4068,6 +4084,9 @@ int find_lease (struct lease **lp, - specified unique client identifier. */ - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset (&client_identifier, 0, sizeof client_identifier); - if (oc && - evaluate_option_cache (&client_identifier, -diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.option97 dhcp-4.3.5b1/server/dhcpd.conf.5 ---- dhcp-4.3.5b1/server/dhcpd.conf.5.option97 2016-09-12 17:17:13.885690972 +0200 -+++ dhcp-4.3.5b1/server/dhcpd.conf.5 2016-09-12 17:17:13.974691043 +0200 -@@ -1587,10 +1587,12 @@ should be a name identifying the host. - not specified for the host, \fIhostname\fR is used. - .PP - \fIHost\fR declarations are matched to actual DHCP or BOOTP clients --by matching the \fRdhcp-client-identifier\fR option specified in the -+by matching the \fIdhcp-client-identifier\fR or \fIpxe-client-id\fR -+options specified in the - \fIhost\fR declaration to the one supplied by the client, or, if the - \fIhost\fR declaration or the client does not provide a --\fRdhcp-client-identifier\fR option, by matching the \fIhardware\fR -+\fIdhcp-client-identifier\fR or \fIpxe-client-id\fR options, -+by matching the \fIhardware\fR - parameter in the \fIhost\fR declaration to the network hardware - address supplied by the client. BOOTP clients do not normally - provide a \fIdhcp-client-identifier\fR, so the hardware address must -@@ -1602,7 +1604,8 @@ to identify hosts. - .PP - Please be aware that - .B only --the \fIdhcp-client-identifier\fR option and the hardware address can be -+the \fIdhcp-client-identifier\fR and \fIpxe-client-id\fR -+options and the hardware address can be - used to match a host declaration, or the \fIhost-identifier option\fR - parameter for DHCPv6 servers. For example, it is not possible to - match a host declaration to a \fIhost-name\fR option. This is -diff -up dhcp-4.3.5b1/server/dhcpleasequery.c.option97 dhcp-4.3.5b1/server/dhcpleasequery.c ---- dhcp-4.3.5b1/server/dhcpleasequery.c.option97 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/dhcpleasequery.c 2016-09-12 17:17:13.974691043 +0200 -@@ -273,7 +273,7 @@ dhcpleasequery(struct packet *packet, in - */ - - memset(&uid, 0, sizeof(uid)); -- if (get_option(&uid, -+ i = get_option(&uid, - &dhcp_universe, - packet, - NULL, -@@ -283,8 +283,20 @@ dhcpleasequery(struct packet *packet, in - packet->options, - &global_scope, - DHO_DHCP_CLIENT_IDENTIFIER, -- MDL)) { -- -+ MDL); -+ if (!i) -+ i = get_option(&uid, -+ &dhcp_universe, -+ packet, -+ NULL, -+ NULL, -+ packet->options, -+ NULL, -+ packet->options, -+ &global_scope, -+ DHO_PXE_CLIENT_ID, -+ MDL); -+ if (i) { - snprintf(dbg_info, - sizeof(dbg_info), - "client-id %s", -diff -up dhcp-4.3.5b1/server/failover.c.option97 dhcp-4.3.5b1/server/failover.c ---- dhcp-4.3.5b1/server/failover.c.option97 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/failover.c 2016-09-12 17:17:13.975691044 +0200 -@@ -5957,6 +5957,9 @@ int load_balance_mine (struct packet *pa - - oc = lookup_option(&dhcp_universe, packet->options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option(&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset(&ds, 0, sizeof ds); - if (oc && - evaluate_option_cache(&ds, packet, NULL, NULL, -diff -up dhcp-4.3.5b1/server/mdb.c.option97 dhcp-4.3.5b1/server/mdb.c ---- dhcp-4.3.5b1/server/mdb.c.option97 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/mdb.c 2016-09-12 17:17:13.975691044 +0200 -@@ -129,8 +129,9 @@ static int find_uid_statement (struct ex - esp -> data.option && - (esp -> data.option -> option -> universe == - &dhcp_universe) && -- (esp -> data.option -> option -> code == -- DHO_DHCP_CLIENT_IDENTIFIER)) { -+ ((esp -> data.option -> option -> code == -+ DHO_DHCP_CLIENT_IDENTIFIER) || -+ (esp -> data.option -> option -> code == DHO_PXE_CLIENT_ID))) { - if (condp) { - log_error ("dhcp client identifier may not be %s", - "specified conditionally."); diff --git a/dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch b/dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch deleted file mode 100644 index 72b7b0f77..000000000 --- a/dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.stateless-DUID-LLT dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.stateless-DUID-LLT 2016-04-29 13:13:50.467360008 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 13:14:53.389375428 +0200 -@@ -1317,6 +1317,9 @@ void run_stateless(int exit_mode, u_int1 - data_string_forget(&default_duid, MDL); - - form_duid(&default_duid, MDL); -+ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS && -+ duid_type == DUID_LLT) -+ write_duid(&default_duid); - } - - #ifdef DHCP4o6 diff --git a/dhcp/patches/0032-dhcp-dhclient-preinit6s.patch b/dhcp/patches/0032-dhcp-dhclient-preinit6s.patch deleted file mode 100644 index 0ce1cf827..000000000 --- a/dhcp/patches/0032-dhcp-dhclient-preinit6s.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.preinit6s dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.preinit6s 2016-04-29 13:15:10.361379493 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 13:17:43.622415423 +0200 -@@ -812,6 +812,12 @@ main(int argc, char **argv) { - - inaddr_any.s_addr = INADDR_ANY; - -+ /* Discover all the network interfaces. */ -+ discover_interfaces(DISCOVER_UNCONFIGURED); -+ -+ /* Parse the dhclient.conf file. */ -+ read_client_conf(); -+ - /* Stateless special case. */ - if (stateless) { - if (release_mode || (wanted_ia_na > 0) || -@@ -828,12 +834,6 @@ main(int argc, char **argv) { - return 0; - } - -- /* Discover all the network interfaces. */ -- discover_interfaces(DISCOVER_UNCONFIGURED); -- -- /* Parse the dhclient.conf file. */ -- read_client_conf(); -- - /* Parse any extra command line configuration arguments: */ - if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) { - arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg); -@@ -1288,20 +1288,30 @@ void run_stateless(int exit_mode, u_int1 - IGNORE_UNUSED(port); - #endif - -- /* Discover the network interface. */ -- discover_interfaces(DISCOVER_REQUESTED); -+ struct interface_info *ip; - - if (!interfaces) - usage("No interfaces available for stateless command: %s", "-S"); - -- /* Parse the dhclient.conf file. */ - #ifdef DHCP4o6 - if (dhcpv4_over_dhcpv6) { - /* Mark we want to request IRT too! */ - dhcpv4_over_dhcpv6++; - } - #endif -- read_client_conf(); -+ -+ for (ip = interfaces; ip; ip = ip->next) { -+ if ((interfaces_requested > 0) && -+ ((ip->flags & (INTERFACE_REQUESTED | -+ INTERFACE_AUTOMATIC)) != -+ INTERFACE_REQUESTED)) -+ continue; -+ script_init(ip->client, "PREINIT6", NULL); -+ script_go(ip->client); -+ } -+ -+ /* Discover the network interface. */ -+ discover_interfaces(DISCOVER_REQUESTED); - - /* Parse the lease database. */ - read_client_leases(); diff --git a/gawk/gawk.nm b/gawk/gawk.nm index 8458b03a1..905b9e097 100644 --- a/gawk/gawk.nm +++ b/gawk/gawk.nm @@ -4,7 +4,7 @@ ############################################################################### name = gawk -version = 4.1.3 +version = 5.0.1 release = 1 groups = System/Tools @@ -13,8 +13,8 @@ license = GPLv3+ summary = The GNU version of the awk text processing utility. description - The gawk package contains the GNU version of awk, a text processing \ - utility. Awk interprets a special-purpose programming language to do \ + The gawk package contains the GNU version of awk, a text processing + utility. Awk interprets a special-purpose programming language to do quick and easy text pattern matching and reformatting jobs. end diff --git a/less/less.nm b/less/less.nm index e021e37ef..bd7272a76 100644 --- a/less/less.nm +++ b/less/less.nm @@ -4,7 +4,7 @@ ############################################################################### name = less -version = 530 +version = 551 release = 1 groups = Applications/Text @@ -13,10 +13,10 @@ license = GPLv3+ summary = A text file browser similar to more, but better. description - The less utility is a text file browser that resembles more, but has \ - more capabilities. Less allows you to move backwards in the file as \ - well as forwards. Since less doesn't have to read the entire input file \ - before it starts, less starts up more quickly than text editors (for \ + The less utility is a text file browser that resembles more, but has + more capabilities. Less allows you to move backwards in the file as + well as forwards. Since less doesn't have to read the entire input file + before it starts, less starts up more quickly than text editors (for example, vi). end @@ -24,7 +24,7 @@ source_dl = http://www.greenwoodsoftware.com/less/ build requires - ncurses-devel + ncurses-devel >= 6.1 pcre-devel end diff --git a/libyaml/libyaml.nm b/libyaml/libyaml.nm index 6a07ec851..88375fbb1 100644 --- a/libyaml/libyaml.nm +++ b/libyaml/libyaml.nm @@ -4,8 +4,8 @@ ############################################################################### name = libyaml -version = 0.1.3 -release = 2 +version = 0.2.2 +release = 1 groups = System/Libraries url = http://pyyaml.org/ @@ -13,12 +13,12 @@ license = MIT summary = YAML 1.1 parser and emitter written in C. description - YAML is a data serialization format designed for human readability \ - and interaction with scripting languages. LibYAML is a YAML parser \ + YAML is a data serialization format designed for human readability + and interaction with scripting languages. LibYAML is a YAML parser and emitter written in C. end -source_dl = +source_dl = http://pyyaml.org/download/libyaml/ sources = yaml-%{version}.tar.gz build @@ -32,7 +32,6 @@ end packages package %{name} - end package %{name}-devel template DEVEL diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index a54057458..4da26b72a 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -4,10 +4,9 @@ ############################################################################### name = ncurses -version = 5.9 -revision = 20150117 -release = 12.%{revision} -thisapp = %{name}-%{version}-%{revision} +version = 6.1 +release = 1 +thisapp = %{name}-%{version} groups = System/Base url = http://invisible-island.net/ncurses/ncurses.html @@ -21,8 +20,7 @@ description discontinued 4.4 BSD classic curses library. end -source_dl = ftp://invisible-island.net/ncurses/current/ -sources = %{thisapp}.tgz +source_dl = https://github.com/mirror/%{name}/archive/v%{version}.tar.gz#/ build requires diff --git a/nftables/nftables.nm b/nftables/nftables.nm index bca58c5f1..20b5947ac 100644 --- a/nftables/nftables.nm +++ b/nftables/nftables.nm @@ -5,7 +5,9 @@ name = nftables version = 0.9.0 -release = 1 +snapshot = 20190622 +release = 1.%{snapshot} +thisapp = %{name}-%{snapshot} groups = Networking/Tools url = http://netfilter.org/projects/nftables/ @@ -16,12 +18,15 @@ description %{summary} end -source_dl = http://ftp.netfilter.org/pub/nftables/ +source_dl = http://ftp.netfilter.org/pub/nftables/snapshot/ sources = %{thisapp}.tar.bz2 build requires + asciidoc + autoconf autogen + automake bison docbook2X docbook-xsl @@ -32,6 +37,10 @@ build libnftnl-devel >= 1.0.5 readline-devel end + + prepare_cmds + ./autogen.sh + end end packages diff --git a/python-yaml/python-yaml.nm b/python-yaml/python-yaml.nm new file mode 100644 index 000000000..9e777463b --- /dev/null +++ b/python-yaml/python-yaml.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = python-yaml +version = 5.1 +release = 1 + +groups = Development/Libraries +url = https://pyyaml.org/wiki/PyYAML +license = MIT +summary = PyYAML is a YAML parser and emitter for Python. + +description + PyYAML is a YAML parser and emitter for the Python programming language. +end + +source_dl = http://pyyaml.org/download/pyyaml/ +sources = PyYAML-%{version}.tar.gz + +build + requires + libyaml-devel + python-devel + end + + DIR_APP = %{DIR_SRC}/PyYAML-%{version} + + build + python setup.py build + end + + install + python setup.py install --root=%{BUILDROOT} + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index bd5e696b0..dfd1335a7 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,7 +4,7 @@ ############################################################################### name = strongswan -version = 5.7.2 +version = 5.8.0 release = 1 groups = Networking/VPN @@ -84,8 +84,6 @@ build #end install_cmds - mv -v %{BUILDROOT}%{unitdir}/strongswan{-swanctl,}.service - # Install network settings install -v -m 644 %{DIR_SOURCE}/network.conf \ %{BUILDROOT}%{sysconfdir}/strongswan.d/ diff --git a/suricata-update/suricata-update.nm b/suricata-update/suricata-update.nm new file mode 100644 index 000000000..35bd9599d --- /dev/null +++ b/suricata-update/suricata-update.nm @@ -0,0 +1,40 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = suricata-update +version = 1.0.5 +release = 1 +thisapp = %{name}-%{version} +arch = noarch + +groups = Development/Tools +url = https://github.com/OISF/suricata-update +license = LGPLv2+ +summary = A tool for updating Suricata rules. + +description + This package contains a Python written tool to update the used rules for + suricata. +end + +source_dl = https://github.com/OISF/%{name}/archive/%{version}.tar.gz#/ + +build + build + %{python3} setup.py build + end + + install + %{python3} setup.py install --root=%{BUILDROOT} + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm index f77311299..ebb31dac6 100644 --- a/xfsprogs/xfsprogs.nm +++ b/xfsprogs/xfsprogs.nm @@ -4,7 +4,7 @@ ############################################################################### name = xfsprogs -version = 4.9.0 +version = 5.0.0 release = 1 groups = System/Filesystems hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core134, updated. 4e69701332f4cee583752ed3ff3e4d44b129931d
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

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, core134 has been updated via 4e69701332f4cee583752ed3ff3e4d44b129931d (commit) via b10365c832420b09be9cb62161fa21aef89e4017 (commit) via 8c261d91e87a73804d11d71279ea103a4ac99fd6 (commit) from c6e032e13d5d1eff16189c50229f00522835aae5 (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 4e69701332f4cee583752ed3ff3e4d44b129931d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 20:59:32 2019 +0200 intel-microcode: update to 20190618 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b10365c832420b09be9cb62161fa21aef89e4017 Merge: 8c261d91e c6e032e13 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 16:01:16 2019 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 8c261d91e87a73804d11d71279ea103a4ac99fd6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 16:00:37 2019 +0200 kernel: 4.14.129 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{common => core/134/filelists}/i586/intel-microcode | 0 .../{oldcore/121 => core/134}/filelists/x86_64/intel-microcode | 0 lfs/intel-microcode | 9 ++++----- lfs/linux | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) copy config/rootfiles/{common => core/134/filelists}/i586/intel-microcode (100%) copy config/rootfiles/{oldcore/121 => core/134}/filelists/x86_64/intel-microcode (100%) Difference in files: diff --git a/config/rootfiles/core/134/filelists/i586/intel-microcode b/config/rootfiles/core/134/filelists/i586/intel-microcode new file mode 120000 index 000000000..1c5bc5743 --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/x86_64/intel-microcode b/config/rootfiles/core/134/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/134/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/lfs/intel-microcode b/lfs/intel-microcode index f2223148f..e01ea9934 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,10 +24,10 @@ include Config -VER = 20190514 +VER = 20190618 THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,8 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ad5fe712f54387c0737caef8131b4770 - +$(DL_FILE)_MD5 = 18af9bd8b6c7164f0cd917080a387244 install : $(TARGET) @@ -74,7 +73,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && tar axf $(DIR_DL)/$(DL_FILE) # Copy the firmware files into the right position cd $(DIR_APP) && cp -R intel-ucode /lib/firmware/ @rm -rf $(DIR_APP) diff --git a/lfs/linux b/lfs/linux index 6669cf220..91b014983 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.128 -ARM_PATCHES = 4.14.128-ipfire0 +VER = 4.14.129 +ARM_PATCHES = 4.14.129-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,7 +82,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 6c51d852170552a503b497766cfb632f +$(DL_FILE)_MD5 = e21f063410d670641b22512ae5219cd0 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 5c5f6da89606e63701cdcd84a500aca1 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4e69701332f4cee583752ed3ff3e4d44b129931d
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

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, master has been updated via 4e69701332f4cee583752ed3ff3e4d44b129931d (commit) via b10365c832420b09be9cb62161fa21aef89e4017 (commit) via 8c261d91e87a73804d11d71279ea103a4ac99fd6 (commit) from c6e032e13d5d1eff16189c50229f00522835aae5 (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 4e69701332f4cee583752ed3ff3e4d44b129931d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 20:59:32 2019 +0200 intel-microcode: update to 20190618 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b10365c832420b09be9cb62161fa21aef89e4017 Merge: 8c261d91e c6e032e13 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 16:01:16 2019 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 8c261d91e87a73804d11d71279ea103a4ac99fd6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 16:00:37 2019 +0200 kernel: 4.14.129 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{common => core/134/filelists}/i586/intel-microcode | 0 .../{oldcore/121 => core/134}/filelists/x86_64/intel-microcode | 0 lfs/intel-microcode | 9 ++++----- lfs/linux | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) copy config/rootfiles/{common => core/134/filelists}/i586/intel-microcode (100%) copy config/rootfiles/{oldcore/121 => core/134}/filelists/x86_64/intel-microcode (100%) Difference in files: diff --git a/config/rootfiles/core/134/filelists/i586/intel-microcode b/config/rootfiles/core/134/filelists/i586/intel-microcode new file mode 120000 index 000000000..1c5bc5743 --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/x86_64/intel-microcode b/config/rootfiles/core/134/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/134/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/lfs/intel-microcode b/lfs/intel-microcode index f2223148f..e01ea9934 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,10 +24,10 @@ include Config -VER = 20190514 +VER = 20190618 THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,8 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ad5fe712f54387c0737caef8131b4770 - +$(DL_FILE)_MD5 = 18af9bd8b6c7164f0cd917080a387244 install : $(TARGET) @@ -74,7 +73,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && tar axf $(DIR_DL)/$(DL_FILE) # Copy the firmware files into the right position cd $(DIR_APP) && cp -R intel-ucode /lib/firmware/ @rm -rf $(DIR_APP) diff --git a/lfs/linux b/lfs/linux index 6669cf220..91b014983 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.128 -ARM_PATCHES = 4.14.128-ipfire0 +VER = 4.14.129 +ARM_PATCHES = 4.14.129-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,7 +82,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 6c51d852170552a503b497766cfb632f +$(DL_FILE)_MD5 = e21f063410d670641b22512ae5219cd0 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 5c5f6da89606e63701cdcd84a500aca1 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e69701332f4cee583752ed3ff3e4d44b129931d
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

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 4e69701332f4cee583752ed3ff3e4d44b129931d (commit) from b10365c832420b09be9cb62161fa21aef89e4017 (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 4e69701332f4cee583752ed3ff3e4d44b129931d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 20:59:32 2019 +0200 intel-microcode: update to 20190618 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{common => core/134/filelists}/i586/intel-microcode | 0 .../{oldcore/121 => core/134}/filelists/x86_64/intel-microcode | 0 lfs/intel-microcode | 9 ++++----- 3 files changed, 4 insertions(+), 5 deletions(-) copy config/rootfiles/{common => core/134/filelists}/i586/intel-microcode (100%) copy config/rootfiles/{oldcore/121 => core/134}/filelists/x86_64/intel-microcode (100%) Difference in files: diff --git a/config/rootfiles/core/134/filelists/i586/intel-microcode b/config/rootfiles/core/134/filelists/i586/intel-microcode new file mode 120000 index 000000000..1c5bc5743 --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/x86_64/intel-microcode b/config/rootfiles/core/134/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/134/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/lfs/intel-microcode b/lfs/intel-microcode index f2223148f..e01ea9934 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,10 +24,10 @@ include Config -VER = 20190514 +VER = 20190618 THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,8 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ad5fe712f54387c0737caef8131b4770 - +$(DL_FILE)_MD5 = 18af9bd8b6c7164f0cd917080a387244 install : $(TARGET) @@ -74,7 +73,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && tar axf $(DIR_DL)/$(DL_FILE) # Copy the firmware files into the right position cd $(DIR_APP) && cp -R intel-ucode /lib/firmware/ @rm -rf $(DIR_APP) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b10365c832420b09be9cb62161fa21aef89e4017
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

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 b10365c832420b09be9cb62161fa21aef89e4017 (commit) via 8c261d91e87a73804d11d71279ea103a4ac99fd6 (commit) from c6e032e13d5d1eff16189c50229f00522835aae5 (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 b10365c832420b09be9cb62161fa21aef89e4017 Merge: 8c261d91e c6e032e13 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 16:01:16 2019 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 8c261d91e87a73804d11d71279ea103a4ac99fd6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 16:00:37 2019 +0200 kernel: 4.14.129 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 6669cf220..91b014983 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.128 -ARM_PATCHES = 4.14.128-ipfire0 +VER = 4.14.129 +ARM_PATCHES = 4.14.129-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,7 +82,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 6c51d852170552a503b497766cfb632f +$(DL_FILE)_MD5 = e21f063410d670641b22512ae5219cd0 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 5c5f6da89606e63701cdcd84a500aca1 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. aa7960eb1359f442ea41cf0d001550476db81c04
by Michael Tremer 22 Jun '19

22 Jun '19

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 3.x development tree". The branch, master has been updated via aa7960eb1359f442ea41cf0d001550476db81c04 (commit) from 2f875d48377bed73e2f198b2f3f26d07f844666b (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 aa7960eb1359f442ea41cf0d001550476db81c04 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 13:05:02 2019 +0100 kernel: add dependency to intel-microcode Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: kernel/kernel.nm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 033ef0e2e..aa52df1b1 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 5.0 -release = 2 +release = 3 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -311,6 +311,7 @@ packages dracut kernel-updater linux-firmware + intel-microcode end files hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2f875d48377bed73e2f198b2f3f26d07f844666b
by Michael Tremer 22 Jun '19

22 Jun '19

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 3.x development tree". The branch, master has been updated via 2f875d48377bed73e2f198b2f3f26d07f844666b (commit) via f2f0d669613632138aef186c6ec8d2be11efc41b (commit) via 9cbb2d8059fbdca4d90199684cc6bfc005ae99b4 (commit) via cbaab2907d4fba0e6221f88fc6625b033e35404a (commit) via cefc1a9b6602e7c9b505ddd6cd090b6616f8f32d (commit) via e8da1929e042ff98bf281f0ea10c6ff985e5e03f (commit) via 6d9201b0baf043238b9767093f5a48e0caefe205 (commit) via cb0c82aaa565dc134014aec898c706ea6ad2410a (commit) from 65e52362543425464bab0e1fd695e4a3cb0e89ac (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 2f875d48377bed73e2f198b2f3f26d07f844666b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 22 12:19:49 2019 +0200 curl: Update to 7.65.1 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f2f0d669613632138aef186c6ec8d2be11efc41b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 11:16:52 2019 +0100 intel-microcode: add new package Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9cbb2d8059fbdca4d90199684cc6bfc005ae99b4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 22 12:20:22 2019 +0200 openssh: Update to 8.0p1 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cbaab2907d4fba0e6221f88fc6625b033e35404a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Jun 21 23:11:32 2019 +0200 systemd: Enable libseccomp support Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cefc1a9b6602e7c9b505ddd6cd090b6616f8f32d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Jun 21 23:11:31 2019 +0200 systemd: Drop systemd-units package. * Rework build process to use meson and ninja macros. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e8da1929e042ff98bf281f0ea10c6ff985e5e03f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Jun 21 23:02:42 2019 +0200 coreutils: Update to 8.31 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6d9201b0baf043238b9767093f5a48e0caefe205 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Jun 21 23:01:58 2019 +0200 bash: Update to 5.0 This is a major update to the latest version of bash. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cb0c82aaa565dc134014aec898c706ea6ad2410a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Jun 21 23:01:05 2019 +0200 bash-completion: Remove file for rfkill. This is now shipped by util-linux. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: bash-completion/bash-completion.nm | 6 +- bash/bash.nm | 2 +- bash/patches/bash-2.05b-xcc.patch | 19 - bash/patches/bash-4.3-noecho.patch | 31 +- bash/patches/bash-5.0-patch-1.patch | 150 ++++ bash/patches/bash-5.0-patch-2.patch | 96 +++ bash/patches/bash-5.0-patch-3.patch | 202 +++++ bash/patches/bash-5.0-patch-4.patch | 42 + bash/patches/bash-5.0-patch-5.patch | 102 +++ bash/patches/bash-5.0-patch-6.patch | 39 + bash/patches/bash-5.0-patch-7.patch | 51 ++ bash/patches/bash-requires.patch | 155 ++-- bash/patches/bash-tty-tests.patch | 41 +- coreutils/coreutils.nm | 8 +- coreutils/patches/coreutils-i18n-cut-old.patch | 565 ++++++++++++++ .../patches/coreutils-i18n-expand-unexpand.patch | 848 +++++++++++++++++++++ .../patches/coreutils-i18n-fix-unexpand.patch | 28 + .../coreutils-i18n-fix2-expand-unexpand.patch | 108 +++ .../patches/coreutils-i18n-fold-newline.patch | 80 ++ coreutils/patches/coreutils-i18n-sort-human.patch | 35 + .../patches/coreutils-i18n-un-expand-BOM.patch | 456 +++++++++++ coreutils/patches/coreutils-i18n.patch | 190 ++--- curl/curl.nm | 2 +- .../intel-microcode.nm | 25 +- openssh/openssh.nm | 2 +- systemd/systemd.nm | 62 +- 26 files changed, 3035 insertions(+), 310 deletions(-) delete mode 100644 bash/patches/bash-2.05b-xcc.patch create mode 100644 bash/patches/bash-5.0-patch-1.patch create mode 100644 bash/patches/bash-5.0-patch-2.patch create mode 100644 bash/patches/bash-5.0-patch-3.patch create mode 100644 bash/patches/bash-5.0-patch-4.patch create mode 100644 bash/patches/bash-5.0-patch-5.patch create mode 100644 bash/patches/bash-5.0-patch-6.patch create mode 100644 bash/patches/bash-5.0-patch-7.patch create mode 100644 coreutils/patches/coreutils-i18n-cut-old.patch create mode 100644 coreutils/patches/coreutils-i18n-expand-unexpand.patch create mode 100644 coreutils/patches/coreutils-i18n-fix-unexpand.patch create mode 100644 coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch create mode 100644 coreutils/patches/coreutils-i18n-fold-newline.patch create mode 100644 coreutils/patches/coreutils-i18n-sort-human.patch create mode 100644 coreutils/patches/coreutils-i18n-un-expand-BOM.patch copy linux-firmware/linux-firmware.nm => intel-microcode/intel-microcode.nm (50%) Difference in files: diff --git a/bash-completion/bash-completion.nm b/bash-completion/bash-completion.nm index 867cbe669..f0c3f51f8 100644 --- a/bash-completion/bash-completion.nm +++ b/bash-completion/bash-completion.nm @@ -5,7 +5,7 @@ name = bash-completion version = 2.4 -release = 2 +release = 3 arch = noarch groups = Development/Languages @@ -25,8 +25,8 @@ build install_cmds rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{cawsay,cowthink} - # Drop files which are provided by util-linux >= 2.28 - rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{mount,umount} + # Drop files which are provided by util-linux >= 2.28 and 2.34 + rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{mount,umount,rfkill} install -Dpm 644 %{DIR_SOURCE}/bash-completion-1.99-redefine_filedir.bash \ %{BUILDROOT}%{sysconfdir}/bash_completion.d/redefine_filedir diff --git a/bash/bash.nm b/bash/bash.nm index 0ca9d1560..4179d3add 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -4,7 +4,7 @@ ############################################################################### name = bash -version = 4.4 +version = 5.0 release = 1 groups = System/Tools diff --git a/bash/patches/bash-2.05b-xcc.patch b/bash/patches/bash-2.05b-xcc.patch deleted file mode 100644 index ad4283260..000000000 --- a/bash/patches/bash-2.05b-xcc.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- bash-3.1/Makefile.in.xcc 2005-10-25 19:37:52.000000000 +0100 -+++ bash-3.1/Makefile.in 2005-12-23 16:11:09.000000000 +0000 -@@ -68,6 +68,7 @@ - ARFLAGS = @ARFLAGS@ - RANLIB = @RANLIB@ - SIZE = @SIZE@ -+STRIP = strip - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -535,7 +536,7 @@ - @chmod a+rx bashbug - - strip: $(Program) .made -- strip $(Program) -+ $(STRIP) $(Program) - ls -l $(Program) - -$(SIZE) $(Program) - diff --git a/bash/patches/bash-4.3-noecho.patch b/bash/patches/bash-4.3-noecho.patch index 8a2842ac5..8adf36d93 100644 --- a/bash/patches/bash-4.3-noecho.patch +++ b/bash/patches/bash-4.3-noecho.patch @@ -1,25 +1,29 @@ ---- bash-4.3/parse.y 2014-05-29 14:46:09.545543384 +0200 -+++ bash-4.3/parse.y 2014-05-29 14:48:40.758626213 +0200 -@@ -3858,6 +3858,8 @@ xparse_dolparen (base, string, indp, fla +diff --git a/parse.y b/parse.y +index 07e6e3e..4cd373f 100644 +--- a/parse.y ++++ b/parse.y +@@ -4410,6 +4410,8 @@ xparse_dolparen (base, string, indp, flags) save_parser_state (&ps); save_input_line_state (&ls); orig_eof_token = shell_eof_token; + /* avoid echoing every substitution again */ + echo_input_at_read = 0; - - /*(*/ - parser_state |= PST_CMDSUBST|PST_EOFTOKEN; /* allow instant ')' */ /*(*/ ---- bash-4.3/subst.c 2014-05-29 16:04:35.802784549 +0200 -+++ bash-4.3/subst.c 2014-05-29 16:08:25.021942676 +0200 -@@ -7103,6 +7103,7 @@ param_expand (string, sindex, quoted, ex + #if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + saved_pushed_strings = pushed_string_list; /* separate parsing context */ + pushed_string_list = (STRING_SAVER *)NULL; +diff --git a/subst.c b/subst.c +index 9559187..0c2caa6 100644 +--- a/subst.c ++++ b/subst.c +@@ -9145,6 +9145,7 @@ param_expand (string, sindex, quoted, expanded_something, WORD_LIST *list; WORD_DESC *tdesc, *ret; int tflag; + int old_echo_input; + /*itrace("param_expand: `%s' pflags = %d", string+*sindex, pflags);*/ zindex = *sindex; - c = string[++zindex]; -@@ -7401,6 +7402,9 @@ arithsub: +@@ -9514,6 +9515,9 @@ arithsub: } comsub: @@ -29,7 +33,7 @@ if (pflags & PF_NOCOMSUB) /* we need zindex+1 because string[zindex] == RPAREN */ temp1 = substring (string, *sindex, zindex+1); -@@ -7413,6 +7417,7 @@ comsub: +@@ -9526,6 +9530,7 @@ comsub: } FREE (temp); temp = temp1; @@ -37,3 +41,6 @@ break; /* Do POSIX.2d9-style arithmetic substitution. This will probably go +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-1.patch b/bash/patches/bash-5.0-patch-1.patch new file mode 100644 index 000000000..254fd9ee0 --- /dev/null +++ b/bash/patches/bash-5.0-patch-1.patch @@ -0,0 +1,150 @@ +From 4d2e315490b778707b3a3afdfc514d5083a97a11 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Fri, 18 Jan 2019 15:12:37 -0500 +Subject: [PATCH] Bash-5.0 patch 1: fix pathname expansion of directory names + containing backslashes + +--- + bashline.c | 62 +++++++++++++++++++++++++++++++++++++++++--- + lib/glob/glob_loop.c | 6 ----- + patchlevel.h | 2 +- + 3 files changed, 60 insertions(+), 10 deletions(-) + +diff --git a/bashline.c b/bashline.c +index 2846aabf..75e79f1a 100644 +--- a/bashline.c ++++ b/bashline.c +@@ -231,6 +231,7 @@ static int bash_possible_variable_completions __P((int, int)); + static int bash_complete_command __P((int, int)); + static int bash_possible_command_completions __P((int, int)); + ++static int completion_glob_pattern __P((char *)); + static char *glob_complete_word __P((const char *, int)); + static int bash_glob_completion_internal __P((int)); + static int bash_glob_complete_word __P((int, int)); +@@ -1741,7 +1742,7 @@ bash_default_completion (text, start, end, qc, compflags) + + /* This could be a globbing pattern, so try to expand it using pathname + expansion. */ +- if (!matches && glob_pattern_p (text)) ++ if (!matches && completion_glob_pattern ((char *)text)) + { + matches = rl_completion_matches (text, glob_complete_word); + /* A glob expression that matches more than one filename is problematic. +@@ -1850,7 +1851,7 @@ command_word_completion_function (hint_text, state) + glob_matches = (char **)NULL; + } + +- globpat = glob_pattern_p (hint_text); ++ globpat = completion_glob_pattern ((char *)hint_text); + + /* If this is an absolute program name, do not check it against + aliases, reserved words, functions or builtins. We must check +@@ -3713,6 +3714,61 @@ bash_complete_command_internal (what_to_do) + return bash_specific_completion (what_to_do, command_word_completion_function); + } + ++static int ++completion_glob_pattern (string) ++ char *string; ++{ ++ register int c; ++ char *send; ++ int open; ++ ++ DECLARE_MBSTATE; ++ ++ open = 0; ++ send = string + strlen (string); ++ ++ while (c = *string++) ++ { ++ switch (c) ++ { ++ case '?': ++ case '*': ++ return (1); ++ ++ case '[': ++ open++; ++ continue; ++ ++ case ']': ++ if (open) ++ return (1); ++ continue; ++ ++ case '+': ++ case '@': ++ case '!': ++ if (*string == '(') /*)*/ ++ return (1); ++ continue; ++ ++ case '\\': ++ if (*string == 0) ++ return (0); ++ } ++ ++ /* Advance one fewer byte than an entire multibyte character to ++ account for the auto-increment in the loop above. */ ++#ifdef HANDLE_MULTIBYTE ++ string--; ++ ADVANCE_CHAR_P (string, send - string); ++ string++; ++#else ++ ADVANCE_CHAR_P (string, send - string); ++#endif ++ } ++ return (0); ++} ++ + static char *globtext; + static char *globorig; + +@@ -3877,7 +3933,7 @@ bash_vi_complete (count, key) + t = substring (rl_line_buffer, p, rl_point); + } + +- if (t && glob_pattern_p (t) == 0) ++ if (t && completion_glob_pattern (t) == 0) + rl_explicit_arg = 1; /* XXX - force glob_complete_word to append `*' */ + FREE (t); + +diff --git a/lib/glob/glob_loop.c b/lib/glob/glob_loop.c +index 5f319cc2..7d6ae211 100644 +--- a/lib/glob/glob_loop.c ++++ b/lib/glob/glob_loop.c +@@ -54,17 +54,11 @@ INTERNAL_GLOB_PATTERN_P (pattern) + continue; + + case L('\\'): +-#if 0 + /* Don't let the pattern end in a backslash (GMATCH returns no match + if the pattern ends in a backslash anyway), but otherwise return 1, + since the matching engine uses backslash as an escape character + and it can be removed. */ + return (*p != L('\0')); +-#else +- /* The pattern may not end with a backslash. */ +- if (*p++ == L('\0')) +- return 0; +-#endif + } + + return 0; +diff --git a/patchlevel.h b/patchlevel.h +index 1cd7c96c..40db1a32 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 0 ++#define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-2.patch b/bash/patches/bash-5.0-patch-2.patch new file mode 100644 index 000000000..b9858ae18 --- /dev/null +++ b/bash/patches/bash-5.0-patch-2.patch @@ -0,0 +1,96 @@ +From ddf3f643cb9b9a2ca8e6d996c605e4332204874c Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Fri, 18 Jan 2019 15:13:57 -0500 +Subject: [PATCH] Bash-5.0 patch 2: fix expansion of aliases whose value ends + with an unquoted tab + +--- + parse.y | 5 ++++- + parser.h | 1 + + patchlevel.h | 2 +- + y.tab.c | 5 ++++- + 4 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/parse.y b/parse.y +index 3ff87bcc..07e6e3e4 100644 +--- a/parse.y ++++ b/parse.y +@@ -2557,12 +2557,14 @@ next_alias_char: + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE && + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && ++ (parser_state & PST_ENDALIAS) == 0 && /* only once */ + shell_input_line_index > 0 && +- shell_input_line[shell_input_line_index-1] != ' ' && ++ shellblank (shell_input_line[shell_input_line_index-1]) == 0 && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { ++ parser_state |= PST_ENDALIAS; + return ' '; /* END_ALIAS */ + } + #endif +@@ -2571,6 +2573,7 @@ pop_alias: + /* This case works for PSH_DPAREN as well */ + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) + { ++ parser_state &= ~PST_ENDALIAS; + pop_string (); + uc = shell_input_line[shell_input_line_index]; + if (uc) +diff --git a/parser.h b/parser.h +index 54dd2c88..6d08915d 100644 +--- a/parser.h ++++ b/parser.h +@@ -47,6 +47,7 @@ + #define PST_REPARSE 0x040000 /* re-parsing in parse_string_to_word_list */ + #define PST_REDIRLIST 0x080000 /* parsing a list of redirections preceding a simple command name */ + #define PST_COMMENT 0x100000 /* parsing a shell comment; used by aliases */ ++#define PST_ENDALIAS 0x200000 /* just finished expanding and consuming an alias */ + + /* Definition of the delimiter stack. Needed by parse.y and bashhist.c. */ + struct dstack { +diff --git a/patchlevel.h b/patchlevel.h +index 40db1a32..a988d852 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 1 ++#define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +diff --git a/y.tab.c b/y.tab.c +index 1abe2c50..7efce3c8 100644 +--- a/y.tab.c ++++ b/y.tab.c +@@ -4873,12 +4873,14 @@ next_alias_char: + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE && + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && ++ (parser_state & PST_ENDALIAS) == 0 && /* only once */ + shell_input_line_index > 0 && +- shell_input_line[shell_input_line_index-1] != ' ' && ++ shellblank (shell_input_line[shell_input_line_index-1]) == 0 && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { ++ parser_state |= PST_ENDALIAS; + return ' '; /* END_ALIAS */ + } + #endif +@@ -4887,6 +4889,7 @@ pop_alias: + /* This case works for PSH_DPAREN as well */ + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) + { ++ parser_state &= ~PST_ENDALIAS; + pop_string (); + uc = shell_input_line[shell_input_line_index]; + if (uc) +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-3.patch b/bash/patches/bash-5.0-patch-3.patch new file mode 100644 index 000000000..509f52efb --- /dev/null +++ b/bash/patches/bash-5.0-patch-3.patch @@ -0,0 +1,202 @@ +From fcf6ae7d069a64741e9484cf219d7fe95de9e796 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Tue, 19 Mar 2019 10:05:39 -0400 +Subject: [PATCH] Bash-5.0 patch 3: improvements when globbing directory names + containing backslashes + +--- + bashline.c | 2 +- + lib/glob/glob.c | 25 +++++++++++++++++++++---- + lib/glob/glob.h | 1 + + lib/glob/glob_loop.c | 23 ++++++++++++++++------- + patchlevel.h | 2 +- + pathexp.c | 16 ++++++++++++---- + 6 files changed, 52 insertions(+), 17 deletions(-) + +diff --git a/bashline.c b/bashline.c +index 75e79f1a..824ea9d9 100644 +--- a/bashline.c ++++ b/bashline.c +@@ -3752,7 +3752,7 @@ completion_glob_pattern (string) + continue; + + case '\\': +- if (*string == 0) ++ if (*string++ == 0) + return (0); + } + +diff --git a/lib/glob/glob.c b/lib/glob/glob.c +index 22d90a5c..398253b5 100644 +--- a/lib/glob/glob.c ++++ b/lib/glob/glob.c +@@ -1061,7 +1061,7 @@ glob_filename (pathname, flags) + char *directory_name, *filename, *dname, *fn; + unsigned int directory_len; + int free_dirname; /* flag */ +- int dflags; ++ int dflags, hasglob; + + result = (char **) malloc (sizeof (char *)); + result_size = 1; +@@ -1110,9 +1110,12 @@ glob_filename (pathname, flags) + free_dirname = 1; + } + ++ hasglob = 0; + /* If directory_name contains globbing characters, then we +- have to expand the previous levels. Just recurse. */ +- if (directory_len > 0 && glob_pattern_p (directory_name)) ++ have to expand the previous levels. Just recurse. ++ If glob_pattern_p returns != [0,1] we have a pattern that has backslash ++ quotes but no unquoted glob pattern characters. We dequote it below. */ ++ if (directory_len > 0 && (hasglob = glob_pattern_p (directory_name)) == 1) + { + char **directories, *d, *p; + register unsigned int i; +@@ -1175,7 +1178,7 @@ glob_filename (pathname, flags) + if (d[directory_len - 1] == '/') + d[directory_len - 1] = '\0'; + +- directories = glob_filename (d, dflags); ++ directories = glob_filename (d, dflags|GX_RECURSE); + + if (free_dirname) + { +@@ -1332,6 +1335,20 @@ only_filename: + free (directory_name); + return (NULL); + } ++ /* If we have a directory name with quoted characters, and we are ++ being called recursively to glob the directory portion of a pathname, ++ we need to dequote the directory name before returning it so the ++ caller can read the directory */ ++ if (directory_len > 0 && hasglob == 2 && (flags & GX_RECURSE) != 0) ++ { ++ dequote_pathname (directory_name); ++ directory_len = strlen (directory_name); ++ } ++ ++ /* We could check whether or not the dequoted directory_name is a ++ directory and return it here, returning the original directory_name ++ if not, but we don't do that yet. I'm not sure it matters. */ ++ + /* Handle GX_MARKDIRS here. */ + result[0] = (char *) malloc (directory_len + 1); + if (result[0] == NULL) +diff --git a/lib/glob/glob.h b/lib/glob/glob.h +index b9462333..56ac08ba 100644 +--- a/lib/glob/glob.h ++++ b/lib/glob/glob.h +@@ -30,6 +30,7 @@ + #define GX_NULLDIR 0x100 /* internal -- no directory preceding pattern */ + #define GX_ADDCURDIR 0x200 /* internal -- add passed directory name */ + #define GX_GLOBSTAR 0x400 /* turn on special handling of ** */ ++#define GX_RECURSE 0x800 /* internal -- glob_filename called recursively */ + + extern int glob_pattern_p __P((const char *)); + extern char **glob_vector __P((char *, char *, int)); +diff --git a/lib/glob/glob_loop.c b/lib/glob/glob_loop.c +index 7d6ae211..3a4f4f1e 100644 +--- a/lib/glob/glob_loop.c ++++ b/lib/glob/glob_loop.c +@@ -26,10 +26,10 @@ INTERNAL_GLOB_PATTERN_P (pattern) + { + register const GCHAR *p; + register GCHAR c; +- int bopen; ++ int bopen, bsquote; + + p = pattern; +- bopen = 0; ++ bopen = bsquote = 0; + + while ((c = *p++) != L('\0')) + switch (c) +@@ -55,13 +55,22 @@ INTERNAL_GLOB_PATTERN_P (pattern) + + case L('\\'): + /* Don't let the pattern end in a backslash (GMATCH returns no match +- if the pattern ends in a backslash anyway), but otherwise return 1, +- since the matching engine uses backslash as an escape character +- and it can be removed. */ +- return (*p != L('\0')); ++ if the pattern ends in a backslash anyway), but otherwise note that ++ we have seen this, since the matching engine uses backslash as an ++ escape character and it can be removed. We return 2 later if we ++ have seen only backslash-escaped characters, so interested callers ++ know they can shortcut and just dequote the pathname. */ ++ if (*p != L('\0')) ++ { ++ p++; ++ bsquote = 1; ++ continue; ++ } ++ else /* (*p == L('\0')) */ ++ return 0; + } + +- return 0; ++ return bsquote ? 2 : 0; + } + + #undef INTERNAL_GLOB_PATTERN_P +diff --git a/patchlevel.h b/patchlevel.h +index a988d852..e7e960c1 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 2 ++#define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ +diff --git a/pathexp.c b/pathexp.c +index b51729a7..c1bf2d89 100644 +--- a/pathexp.c ++++ b/pathexp.c +@@ -65,11 +65,11 @@ unquoted_glob_pattern_p (string) + { + register int c; + char *send; +- int open; ++ int open, bsquote; + + DECLARE_MBSTATE; + +- open = 0; ++ open = bsquote = 0; + send = string + strlen (string); + + while (c = *string++) +@@ -100,7 +100,14 @@ unquoted_glob_pattern_p (string) + can be removed by the matching engine, so we have to run it through + globbing. */ + case '\\': +- return (*string != 0); ++ if (*string != '\0' && *string != '/') ++ { ++ bsquote = 1; ++ string++; ++ continue; ++ } ++ else if (*string == 0) ++ return (0); + + case CTLESC: + if (*string++ == '\0') +@@ -117,7 +124,8 @@ unquoted_glob_pattern_p (string) + ADVANCE_CHAR_P (string, send - string); + #endif + } +- return (0); ++ ++ return (bsquote ? 2 : 0); + } + + /* Return 1 if C is a character that is `special' in a POSIX ERE and needs to +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-4.patch b/bash/patches/bash-5.0-patch-4.patch new file mode 100644 index 000000000..899383312 --- /dev/null +++ b/bash/patches/bash-5.0-patch-4.patch @@ -0,0 +1,42 @@ +From 16c907aa3bb427618733e5a6f2f4e2fc5a3488d3 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:24:28 -0400 +Subject: [PATCH] Bash-5.0 patch 4: the wait builtin without arguments only + waits for known children the shell started + +--- + jobs.c | 4 +--- + patchlevel.h | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/jobs.c b/jobs.c +index ce2bdf24..ae3c54c6 100644 +--- a/jobs.c ++++ b/jobs.c +@@ -2488,10 +2488,8 @@ wait_for_background_pids () + r = wait_for (last_procsub_child->pid); + wait_procsubs (); + reap_procsubs (); +-#if 1 ++#if 0 + /* We don't want to wait indefinitely if we have stopped children. */ +- /* XXX - should add a loop that goes through the list of process +- substitutions and waits for each proc in turn before this code. */ + if (any_stopped == 0) + { + /* Check whether or not we have any unreaped children. */ +diff --git a/patchlevel.h b/patchlevel.h +index e7e960c1..c059f0bd 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 3 ++#define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-5.patch b/bash/patches/bash-5.0-patch-5.patch new file mode 100644 index 000000000..1fb4fafaf --- /dev/null +++ b/bash/patches/bash-5.0-patch-5.patch @@ -0,0 +1,102 @@ +From 41f5420db7a911fb0833be693205f4db41f05434 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:25:52 -0400 +Subject: [PATCH] Bash-5.0 patch 5: prevent optimizing forks away too + aggressively + +--- + builtins/evalstring.c | 26 +++++++++++++++++++++++--- + command.h | 1 + + execute_cmd.c | 2 ++ + patchlevel.h | 2 +- + 4 files changed, 27 insertions(+), 4 deletions(-) + +diff --git a/builtins/evalstring.c b/builtins/evalstring.c +index 1496eeec..cadc9bc0 100644 +--- a/builtins/evalstring.c ++++ b/builtins/evalstring.c +@@ -100,12 +100,22 @@ should_suppress_fork (command) + ((command->flags & CMD_INVERT_RETURN) == 0)); + } + ++int ++can_optimize_connection (command) ++ COMMAND *command; ++{ ++ return (*bash_input.location.string == '\0' && ++ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && ++ command->value.Connection->second->type == cm_simple); ++} ++ + void + optimize_fork (command) + COMMAND *command; + { + if (command->type == cm_connection && +- (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR) && ++ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && ++ (command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) && + should_suppress_fork (command->value.Connection->second)) + { + command->value.Connection->second->flags |= CMD_NO_FORK; +@@ -412,8 +422,18 @@ parse_and_execute (string, from_file, flags) + command->flags |= CMD_NO_FORK; + command->value.Simple->flags |= CMD_NO_FORK; + } +- else if (command->type == cm_connection) +- optimize_fork (command); ++ ++ /* Can't optimize forks out here execept for simple commands. ++ This knows that the parser sets up commands as left-side heavy ++ (&& and || are left-associative) and after the single parse, ++ if we are at the end of the command string, the last in a ++ series of connection commands is ++ command->value.Connection->second. */ ++ else if (command->type == cm_connection && can_optimize_connection (command)) ++ { ++ command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING; ++ command->value.Connection->second->value.Simple->flags |= CMD_TRY_OPTIMIZING; ++ } + #endif /* ONESHOT */ + + /* See if this is a candidate for $( <file ). */ +diff --git a/command.h b/command.h +index 32495162..b9e9b669 100644 +--- a/command.h ++++ b/command.h +@@ -186,6 +186,7 @@ typedef struct element { + #define CMD_COPROC_SUBSHELL 0x1000 + #define CMD_LASTPIPE 0x2000 + #define CMD_STDPATH 0x4000 /* use standard path for command lookup */ ++#define CMD_TRY_OPTIMIZING 0x8000 /* try to optimize this simple command */ + + /* What a command looks like. */ + typedef struct command { +diff --git a/execute_cmd.c b/execute_cmd.c +index 8b3c83aa..f1d74bfe 100644 +--- a/execute_cmd.c ++++ b/execute_cmd.c +@@ -2767,6 +2767,8 @@ execute_connection (command, asynchronous, pipe_in, pipe_out, fds_to_close) + ((command->value.Connection->connector == OR_OR) && + (exec_result != EXECUTION_SUCCESS))) + { ++ optimize_fork (command); ++ + second = command->value.Connection->second; + if (ignore_return && second) + second->flags |= CMD_IGNORE_RETURN; +diff --git a/patchlevel.h b/patchlevel.h +index c059f0bd..1bc098b8 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 4 ++#define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-6.patch b/bash/patches/bash-5.0-patch-6.patch new file mode 100644 index 000000000..bfd84603b --- /dev/null +++ b/bash/patches/bash-5.0-patch-6.patch @@ -0,0 +1,39 @@ +From dfd2cc6ac5558e252af0a7cb829a9629bf782e17 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:27:00 -0400 +Subject: [PATCH] Bash-5.0 patch 6: allow building with SYSLOG_HISTORY defined + without defining SYSLOG_SHOPT + +--- + builtins/shopt.def | 2 +- + patchlevel.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/builtins/shopt.def b/builtins/shopt.def +index f6dc6f97..1c485361 100644 +--- a/builtins/shopt.def ++++ b/builtins/shopt.def +@@ -122,7 +122,7 @@ extern int assoc_expand_once; + extern int array_expand_once; + #endif + +-#if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT) ++#if defined (SYSLOG_HISTORY) + extern int syslog_history; + #endif + +diff --git a/patchlevel.h b/patchlevel.h +index 1bc098b8..14bff9fc 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 5 ++#define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-7.patch b/bash/patches/bash-5.0-patch-7.patch new file mode 100644 index 000000000..2a4315e71 --- /dev/null +++ b/bash/patches/bash-5.0-patch-7.patch @@ -0,0 +1,51 @@ +From 3ba697465bc74fab513a26dea700cc82e9f4724e Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:27:56 -0400 +Subject: [PATCH] Bash-5.0 patch 7: fix exec builtin leaving the terminal in + the wrong process group + +--- + jobs.c | 12 +++++------- + patchlevel.h | 2 +- + 2 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/jobs.c b/jobs.c +index ae3c54c6..6bc31dca 100644 +--- a/jobs.c ++++ b/jobs.c +@@ -4837,15 +4837,13 @@ void + end_job_control () + { + if (job_control) +- { +- terminate_stopped_jobs (); ++ terminate_stopped_jobs (); + +- if (original_pgrp >= 0) +- give_terminal_to (original_pgrp, 1); +- } ++ if (original_pgrp >= 0 && terminal_pgrp != original_pgrp) ++ give_terminal_to (original_pgrp, 1); + +- if (original_pgrp >= 0) +- setpgid (0, original_pgrp); ++ if (original_pgrp >= 0 && setpgid (0, original_pgrp) == 0) ++ shell_pgrp = original_pgrp; + } + + /* Restart job control by closing shell tty and reinitializing. This is +diff --git a/patchlevel.h b/patchlevel.h +index 14bff9fc..deb9c5b7 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 6 ++#define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-requires.patch b/bash/patches/bash-requires.patch index 888de173c..35670bd55 100644 --- a/bash/patches/bash-requires.patch +++ b/bash/patches/bash-requires.patch @@ -1,40 +1,32 @@ -commit efb0da0c0fee3e3ca21b21cd72f63cdfd7766d45 -Author: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sun Sep 18 14:12:44 2016 +0100 - - Implement --rpm-requires - - Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> - diff --git a/builtins.h b/builtins.h -index 0cfea18..c0c6acc 100644 +index dac95fd..5b7e811 100644 --- a/builtins.h +++ b/builtins.h -@@ -42,6 +42,7 @@ +@@ -45,6 +45,7 @@ #define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */ #define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */ #define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */ -+#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */ ++#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */ #define BASE_INDENT 4 diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c -index 4f51201..69707ec 100644 +index 4f51201..91c25db 100644 --- a/builtins/mkbuiltins.c +++ b/builtins/mkbuiltins.c @@ -69,10 +69,15 @@ extern char *strcpy (); #define whitespace(c) (((c) == ' ') || ((c) == '\t')) /* Flag values that builtins can have. */ -+/* These flags are for the C code generator, ++/* These flags are for the C code generator, + the C which is produced (./builtin.c) -+ includes the flags definitions found ++ includes the flags definitions found + in ../builtins.h */ #define BUILTIN_FLAG_SPECIAL 0x01 #define BUILTIN_FLAG_ASSIGNMENT 0x02 #define BUILTIN_FLAG_LOCALVAR 0x04 #define BUILTIN_FLAG_POSIX_BUILTIN 0x08 -+#define BUILTIN_FLAG_REQUIRES 0x16 ++#define BUILTIN_FLAG_REQUIRES 0x10 #define BASE_INDENT 4 @@ -58,17 +50,16 @@ index 4f51201..69707ec 100644 #if !defined (HAVE_RENAME) static int rename (); -@@ -831,6 +844,9 @@ builtin_handler (self, defs, arg) +@@ -831,6 +844,8 @@ builtin_handler (self, defs, arg) new->flags |= BUILTIN_FLAG_LOCALVAR; if (is_posix_builtin (name)) new->flags |= BUILTIN_FLAG_POSIX_BUILTIN; + if (is_requires_builtin (name)) + new->flags |= BUILTIN_FLAG_REQUIRES; -+ array_add ((char *)new, defs->builtins); building_builtin = 1; -@@ -1250,12 +1266,13 @@ write_builtins (defs, structfile, externfile) +@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, externfile) else fprintf (structfile, "(sh_builtin_func_t *)0x0, "); @@ -83,7 +74,7 @@ index 4f51201..69707ec 100644 document_name (builtin)); /* Don't translate short document summaries that are identical -@@ -1645,6 +1662,13 @@ is_posix_builtin (name) +@@ -1645,6 +1661,13 @@ is_posix_builtin (name) return (_find_in_table (name, posix_builtins)); } @@ -98,15 +89,15 @@ index 4f51201..69707ec 100644 static int rename (from, to) diff --git a/doc/bash.1 b/doc/bash.1 -index 9a7a384..1c738bb 100644 +index d91f1fd..111a66d 100644 --- a/doc/bash.1 +++ b/doc/bash.1 -@@ -238,6 +238,14 @@ The shell becomes restricted (see +@@ -239,6 +239,14 @@ The shell becomes restricted (see .B "RESTRICTED SHELL" below). .TP +.B \-\-rpm-requires -+Produce the list of files that are required for the ++Produce the list of files that are required for the +shell script to run. This implies '-n' and is subject +to the same limitations as compile time error checking checking; +Command substitutions, Conditional expressions and @@ -117,15 +108,15 @@ index 9a7a384..1c738bb 100644 Equivalent to \fB\-v\fP. .TP diff --git a/doc/bashref.texi b/doc/bashref.texi -index c0f4a2f..8e30d4f 100644 +index d33cd57..6fc4d18 100644 --- a/doc/bashref.texi +++ b/doc/bashref.texi -@@ -6243,6 +6243,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash +@@ -6453,6 +6453,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash @item --restricted Make the shell a restricted shell (@pxref{The Restricted Shell}). +@item --rpm-requires -+Produce the list of files that are required for the ++Produce the list of files that are required for the +shell script to run. This implies '-n' and is subject +to the same limitations as compile time error checking checking; +Command substitutions, Conditional expressions and @command{eval} @@ -135,31 +126,24 @@ index c0f4a2f..8e30d4f 100644 Equivalent to @option{-v}. Print shell input lines as they're read. diff --git a/eval.c b/eval.c -index db863e7..5a5af32 100644 +index f02d6e4..76c1e8d 100644 --- a/eval.c +++ b/eval.c -@@ -56,6 +56,7 @@ extern int need_here_doc; - extern int current_command_number, current_command_line_count, line_number; - extern int expand_aliases; - extern char *ps0_prompt; -+extern int rpm_requires; - - #if defined (HAVE_POSIX_SIGNALS) - extern sigset_t top_level_mask; -@@ -148,7 +149,7 @@ reader_loop () +@@ -142,7 +142,8 @@ reader_loop () if (read_command () == 0) { - if (interactive_shell == 0 && read_but_dont_execute) ++ + if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires)) { last_command_exit_value = EXECUTION_SUCCESS; dispose_command (global_command); diff --git a/execute_cmd.c b/execute_cmd.c -index 2a3df6d..2e3fb0c 100644 +index 8b3c83a..4eae19c 100644 --- a/execute_cmd.c +++ b/execute_cmd.c -@@ -529,6 +529,8 @@ async_redirect_stdin () +@@ -538,6 +538,8 @@ async_redirect_stdin () #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0) @@ -168,7 +152,7 @@ index 2a3df6d..2e3fb0c 100644 /* Execute the command passed in COMMAND, perhaps doing it asynchronously. COMMAND is exactly what read_command () places into GLOBAL_COMMAND. ASYNCHROUNOUS, if non-zero, says to do this command in the background. -@@ -561,7 +563,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out, +@@ -569,7 +571,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out, if (breaking || continuing) return (last_command_exit_value); @@ -178,14 +162,14 @@ index 2a3df6d..2e3fb0c 100644 + if (rpm_requires && command->type == cm_function_def) + return last_command_exit_value = + execute_intern_function (command->value.Function_def->name, -+ command->value.Function_def->command); ++ command->value.Function_def); + if (read_but_dont_execute) return (EXECUTION_SUCCESS); QUIT; -@@ -5609,7 +5617,7 @@ execute_intern_function (name, funcdef) - - if (check_identifier (name, posixly_correct) == 0) +@@ -2813,7 +2821,7 @@ execute_for_command (for_command) + save_line_number = line_number; + if (check_identifier (for_command->name, 1) == 0) { - if (posixly_correct && interactive_shell == 0) + if (posixly_correct && interactive_shell == 0 && rpm_requires == 0) @@ -193,53 +177,24 @@ index 2a3df6d..2e3fb0c 100644 last_command_exit_value = EX_BADUSAGE; jump_to_top_level (ERREXIT); diff --git a/execute_cmd.h b/execute_cmd.h -index 62bec82..d42dc85 100644 +index dc2f15e..506fff4 100644 --- a/execute_cmd.h +++ b/execute_cmd.h -@@ -22,6 +22,8 @@ +@@ -22,6 +22,9 @@ #define _EXECUTE_CMD_H_ #include "stdc.h" +#include "variables.h" +#include "command.h" ++ #if defined (ARRAY_VARS) struct func_array_state diff --git a/make_cmd.c b/make_cmd.c -index b42e9ff..95ec723 100644 +index ecbbfd6..3d8bfa4 100644 --- a/make_cmd.c +++ b/make_cmd.c -@@ -42,11 +42,15 @@ - #include "flags.h" - #include "make_cmd.h" - #include "dispose_cmd.h" -+#include "execute_cmd.h" - #include "variables.h" - #include "subst.h" - #include "input.h" - #include "ocache.h" - #include "externs.h" -+#include "builtins.h" -+ -+#include "builtins/common.h" - - #if defined (JOB_CONTROL) - #include "jobs.h" -@@ -57,9 +61,13 @@ - extern int line_number, current_command_line_count, parser_state; - extern int last_command_exit_value; - extern int shell_initialized; -+extern int rpm_requires; - - int here_doc_first_line = 0; - -+static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz" -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -+ - /* Object caching */ - sh_obj_cache_t wdcache = {0, 0, 0}; - sh_obj_cache_t wlcache = {0, 0, 0}; -@@ -839,6 +847,27 @@ make_coproc_command (name, command) +@@ -828,6 +828,27 @@ make_coproc_command (name, command) return (make_command (cm_coproc, (SIMPLE_COM *)temp)); } @@ -251,9 +206,9 @@ index b42e9ff..95ec723 100644 + if (strchr(filename, '$') || (filename[0] != '/' && strchr(filename, '/'))) + return; + -+ /* ++ /* + if the executable is called via variable substitution we can -+ not dermine what it is at compile time. ++ not dermine what it is at compile time. + + if the executable consists only of characters not in the + alphabet we do not consider it a dependency just an artifact @@ -267,7 +222,7 @@ index b42e9ff..95ec723 100644 /* Reverse the word list and redirection list in the simple command has just been parsed. It seems simpler to do this here the one time then by any other method that I can think of. */ -@@ -856,6 +885,27 @@ clean_simple_command (command) +@@ -845,6 +866,28 @@ clean_simple_command (command) REVERSE_LIST (command->value.Simple->redirects, REDIRECT *); } @@ -291,15 +246,16 @@ index b42e9ff..95ec723 100644 + output_requirement (find_function(cmd0) ? "function" : "executable", cmd0); + } + } /*rpm_requires*/ ++ + parser_state &= ~PST_REDIRLIST; return (command); } diff --git a/shell.c b/shell.c -index 45b77f9..b43de50 100644 +index a2b2a55..c5d99b3 100644 --- a/shell.c +++ b/shell.c -@@ -201,6 +201,9 @@ int have_devfd = 0; +@@ -193,6 +193,9 @@ int have_devfd = 0; /* The name of the .(shell)rc file. */ static char *bashrc_file = DEFAULT_BASHRC; @@ -309,7 +265,7 @@ index 45b77f9..b43de50 100644 /* Non-zero means to act more like the Bourne shell on startup. */ static int act_like_sh; -@@ -264,6 +267,7 @@ static const struct { +@@ -259,6 +262,7 @@ static const struct { { "protected", Int, &protected_mode, (char **)0x0 }, #endif { "rcfile", Charp, (int *)0x0, &bashrc_file }, @@ -317,7 +273,7 @@ index 45b77f9..b43de50 100644 #if defined (RESTRICTED_SHELL) { "restricted", Int, &restricted, (char **)0x0 }, #endif -@@ -500,6 +504,12 @@ main (argc, argv, env) +@@ -496,6 +500,12 @@ main (argc, argv, env) if (dump_translatable_strings) read_but_dont_execute = 1; @@ -330,3 +286,36 @@ index 45b77f9..b43de50 100644 if (running_setuid && privileged_mode == 0) disable_priv_mode (); +diff --git a/shell.h b/shell.h +index 8072605..6c4149d 100644 +--- a/shell.h ++++ b/shell.h +@@ -34,12 +34,15 @@ + #include "maxpath.h" + #include "unwind_prot.h" + #include "dispose_cmd.h" ++#include "execute_cmd.h" + #include "make_cmd.h" + #include "ocache.h" + #include "subst.h" + #include "sig.h" + #include "pathnames.h" + #include "externs.h" ++#include "builtins.h" ++#include "builtins/common.h" + + extern int EOF_Reached; + +@@ -99,6 +102,9 @@ extern int interactive, interactive_shell; + extern int startup_state; + extern int reading_shell_script; + extern int shell_initialized; ++extern int rpm_requires; ++static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz" ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + extern int bash_argv_initialized; + extern int subshell_environment; + extern int current_command_number; +-- +2.17.2 + diff --git a/bash/patches/bash-tty-tests.patch b/bash/patches/bash-tty-tests.patch index 984f1b40d..f9b653245 100644 --- a/bash/patches/bash-tty-tests.patch +++ b/bash/patches/bash-tty-tests.patch @@ -1,7 +1,8 @@ -diff -up bash-4.2-rc2/tests/exec.right.tty_tests bash-4.2-rc2/tests/exec.right ---- bash-4.2-rc2/tests/exec.right.tty_tests 2011-02-09 10:42:48.000000000 +0100 -+++ bash-4.2-rc2/tests/exec.right 2011-02-09 10:42:59.000000000 +0100 -@@ -50,7 +50,6 @@ this is ohio-state +diff --git a/tests/exec.right b/tests/exec.right +index 6075cc8..0b3f02c 100644 +--- a/tests/exec.right ++++ b/tests/exec.right +@@ -51,7 +51,6 @@ this is ohio-state 0 1 testb @@ -9,21 +10,23 @@ diff -up bash-4.2-rc2/tests/exec.right.tty_tests bash-4.2-rc2/tests/exec.right 1 1 1 -diff -up bash-4.2-rc2/tests/execscript.tty_tests bash-4.2-rc2/tests/execscript ---- bash-4.2-rc2/tests/execscript.tty_tests 2010-12-27 22:01:02.000000000 +0100 -+++ bash-4.2-rc2/tests/execscript 2011-02-09 10:42:34.000000000 +0100 -@@ -107,8 +107,6 @@ ${THIS_SH} ./exec6.sub +diff --git a/tests/execscript b/tests/execscript +index c1819de..9227a4a 100644 +--- a/tests/execscript ++++ b/tests/execscript +@@ -108,8 +108,6 @@ ${THIS_SH} ./exec6.sub # checks for properly deciding what constitutes an executable file ${THIS_SH} ./exec7.sub --${THIS_SH} -i ./exec8.sub +-${THIS_SH} -i ${PWD}/exec8.sub - ${THIS_SH} ./exec9.sub - true | `echo true` & -diff -up bash-4.2-rc2/tests/read.right.tty_tests bash-4.2-rc2/tests/read.right ---- bash-4.2-rc2/tests/read.right.tty_tests 2010-12-21 16:49:00.000000000 +0100 -+++ bash-4.2-rc2/tests/read.right 2011-02-09 10:42:34.000000000 +0100 + ${THIS_SH} ./exec10.sub +diff --git a/tests/read.right b/tests/read.right +index 73cb704..a92fe7f 100644 +--- a/tests/read.right ++++ b/tests/read.right @@ -33,14 +33,6 @@ a = abcdefg a = xyz a = -xyz 123- @@ -39,10 +42,11 @@ diff -up bash-4.2-rc2/tests/read.right.tty_tests bash-4.2-rc2/tests/read.right ./read3.sub: line 4: read: -1: invalid number abc ab -diff -up bash-4.2-rc2/tests/read.tests.tty_tests bash-4.2-rc2/tests/read.tests ---- bash-4.2-rc2/tests/read.tests.tty_tests 2008-09-06 19:09:11.000000000 +0200 -+++ bash-4.2-rc2/tests/read.tests 2011-02-09 10:42:34.000000000 +0100 -@@ -82,9 +82,6 @@ echo " foo" | { IFS=$':' ; read line; re +diff --git a/tests/read.tests b/tests/read.tests +index f67cd00..083f4a4 100644 +--- a/tests/read.tests ++++ b/tests/read.tests +@@ -82,9 +82,6 @@ echo " foo" | { IFS=$':' ; read line; recho "$line"; } # test read -d delim behavior ${THIS_SH} ./read1.sub @@ -52,3 +56,6 @@ diff -up bash-4.2-rc2/tests/read.tests.tty_tests bash-4.2-rc2/tests/read.tests # test read -n nchars behavior ${THIS_SH} ./read3.sub +-- +2.17.2 + diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index a85b6a872..026bc14da 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,7 +4,7 @@ ############################################################################### name = coreutils -version = 8.30 +version = 8.31 release = 1 groups = System/Base @@ -23,7 +23,7 @@ sources = %{thisapp}.tar.xz build requires autoconf - automake + automake >= 1.15 e2fsprogs-devel gettext-devel gmp-devel @@ -43,6 +43,10 @@ build --enable-no-install-program=hostname,kill,uptime \ --with-tty-group + prepare_cmds + autoreconf -vfi + end + test make check RUN_VERY_EXPENSIVE_TESTS=yes || true end diff --git a/coreutils/patches/coreutils-i18n-cut-old.patch b/coreutils/patches/coreutils-i18n-cut-old.patch new file mode 100644 index 000000000..757ee0fbb --- /dev/null +++ b/coreutils/patches/coreutils-i18n-cut-old.patch @@ -0,0 +1,565 @@ +diff --git a/src/cut.c b/src/cut.c +index 7ab6be4..022d0ad 100644 +--- a/src/cut.c ++++ b/src/cut.c +@@ -28,6 +28,11 @@ + #include <assert.h> + #include <getopt.h> + #include <sys/types.h> ++ ++/* Get mbstate_t, mbrtowc(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif + #include "system.h" + + #include "error.h" +@@ -38,6 +43,18 @@ + + #include "set-fields.h" + ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 ++# undef MB_LEN_MAX ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + /* The official name of this program (e.g., no 'g' prefix). */ + #define PROGRAM_NAME "cut" + +@@ -54,6 +71,52 @@ + } \ + while (0) + ++/* Refill the buffer BUF to get a multibyte character. */ ++#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM) \ ++ do \ ++ { \ ++ if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM)) \ ++ { \ ++ memmove (BUF, BUFPOS, BUFLEN); \ ++ BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \ ++ BUFPOS = BUF; \ ++ } \ ++ } \ ++ while (0) ++ ++/* Get wide character on BUFPOS. BUFPOS is not included after that. ++ If byte sequence is not valid as a character, CONVFAIL is true. Otherwise false. */ ++#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \ ++ do \ ++ { \ ++ mbstate_t state_bak; \ ++ \ ++ if (BUFLEN < 1) \ ++ { \ ++ WC = WEOF; \ ++ break; \ ++ } \ ++ \ ++ /* Get a wide character. */ \ ++ CONVFAIL = false; \ ++ state_bak = STATE; \ ++ MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE); \ ++ \ ++ switch (MBLENGTH) \ ++ { \ ++ case (size_t)-1: \ ++ case (size_t)-2: \ ++ CONVFAIL = true; \ ++ STATE = state_bak; \ ++ /* Fall througn. */ \ ++ \ ++ case 0: \ ++ MBLENGTH = 1; \ ++ break; \ ++ } \ ++ } \ ++ while (0) ++ + + /* Pointer inside RP. When checking if a byte or field is selected + by a finite range, we check if it is between CURRENT_RP.LO +@@ -61,6 +124,9 @@ + CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */ + static struct field_range_pair *current_rp; + ++/* Length of the delimiter given as argument to -d. */ ++size_t delimlen; ++ + /* This buffer is used to support the semantics of the -s option + (or lack of same) when the specified field list includes (does + not include) the first field. In both of those cases, the entire +@@ -77,15 +143,25 @@ enum operating_mode + { + undefined_mode, + +- /* Output characters that are in the given bytes. */ ++ /* Output bytes that are at the given positions. */ + byte_mode, + ++ /* Output characters that are at the given positions. */ ++ character_mode, ++ + /* Output the given delimiter-separated fields. */ + field_mode + }; + + static enum operating_mode operating_mode; + ++/* If nonzero, when in byte mode, don't split multibyte characters. */ ++static int byte_mode_character_aware; ++ ++/* If nonzero, the function for single byte locale is work ++ if this program runs on multibyte locale. */ ++static int force_singlebyte_mode; ++ + /* If true do not output lines containing no delimiter characters. + Otherwise, all such lines are printed. This option is valid only + with field mode. */ +@@ -97,6 +173,9 @@ static bool complement; + + /* The delimiter character for field mode. */ + static unsigned char delim; ++#if HAVE_WCHAR_H ++static wchar_t wcdelim; ++#endif + + /* The delimiter for each line/record. */ + static unsigned char line_delim = '\n'; +@@ -164,7 +243,7 @@ Print selected parts of lines from each FILE to standard output.\n\ + -f, --fields=LIST select only these fields; also print any line\n\ + that contains no delimiter character, unless\n\ + the -s option is specified\n\ +- -n (ignored)\n\ ++ -n with -b: don't split multibyte characters\n\ + "), stdout); + fputs (_("\ + --complement complement the set of selected bytes, characters\n\ +@@ -280,6 +359,82 @@ cut_bytes (FILE *stream) + } + } + ++#if HAVE_MBRTOWC ++/* This function is in use for the following case. ++ ++ 1. Read from the stream STREAM, printing to standard output any selected ++ characters. ++ ++ 2. Read from stream STREAM, printing to standard output any selected bytes, ++ without splitting multibyte characters. */ ++ ++static void ++cut_characters_or_cut_bytes_no_split (FILE *stream) ++{ ++ uintmax_t idx; /* number of bytes or characters in the line so far. */ ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen; /* The length of the byte sequence in buf. */ ++ wint_t wc; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character which shows ++ as same character as WC. */ ++ mbstate_t state; /* State of the stream. */ ++ bool convfail = false; /* true, when conversion failed. Otherwise false. */ ++ /* Whether to begin printing delimiters between ranges for the current line. ++ Set after we've begun printing data corresponding to the first range. */ ++ bool print_delimiter = false; ++ ++ idx = 0; ++ buflen = 0; ++ bufpos = buf; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ current_rp = frp; ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail); ++ (void) convfail; /* ignore unused */ ++ ++ if (wc == WEOF) ++ { ++ if (idx > 0) ++ putchar (line_delim); ++ break; ++ } ++ else if (wc == line_delim) ++ { ++ putchar (line_delim); ++ idx = 0; ++ print_delimiter = false; ++ current_rp = frp; ++ } ++ else ++ { ++ next_item (&idx); ++ if (print_kth (idx)) ++ { ++ if (output_delimiter_specified) ++ { ++ if (print_delimiter && is_range_start_index (idx)) ++ { ++ fwrite (output_delimiter_string, sizeof (char), ++ output_delimiter_length, stdout); ++ } ++ print_delimiter = true; ++ } ++ fwrite (bufpos, mblength, sizeof(char), stdout); ++ } ++ } ++ ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++} ++#endif ++ + /* Read from stream STREAM, printing to standard output any selected fields. */ + + static void +@@ -425,13 +580,211 @@ cut_fields (FILE *stream) + } + } + ++#if HAVE_MBRTOWC ++static void ++cut_fields_mb (FILE *stream) ++{ ++ int c; ++ uintmax_t field_idx; ++ int found_any_selected_field; ++ int buffer_first_field; ++ int empty_input; ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen; /* The length of the byte sequence in buf. */ ++ wint_t wc = 0; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character which shows ++ as same character as WC. */ ++ mbstate_t state; /* State of the stream. */ ++ bool convfail = false; /* true, when conversion failed. Otherwise false. */ ++ ++ current_rp = frp; ++ ++ found_any_selected_field = 0; ++ field_idx = 1; ++ bufpos = buf; ++ buflen = 0; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ c = getc (stream); ++ empty_input = (c == EOF); ++ if (c != EOF) ++ { ++ ungetc (c, stream); ++ wc = 0; ++ } ++ else ++ wc = WEOF; ++ ++ /* To support the semantics of the -s flag, we may have to buffer ++ all of the first field to determine whether it is `delimited.' ++ But that is unnecessary if all non-delimited lines must be printed ++ and the first field has been selected, or if non-delimited lines ++ must be suppressed and the first field has *not* been selected. ++ That is because a non-delimited line has exactly one field. */ ++ buffer_first_field = (suppress_non_delimited ^ !print_kth (1)); ++ ++ while (1) ++ { ++ if (field_idx == 1 && buffer_first_field) ++ { ++ int len = 0; ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER ++ (wc, bufpos, buflen, mblength, state, convfail); ++ ++ if (wc == WEOF) ++ break; ++ ++ field_1_buffer = xrealloc (field_1_buffer, len + mblength); ++ memcpy (field_1_buffer + len, bufpos, mblength); ++ len += mblength; ++ buflen -= mblength; ++ bufpos += mblength; ++ ++ if (!convfail && (wc == line_delim || wc == wcdelim)) ++ break; ++ } ++ ++ if (len <= 0 && wc == WEOF) ++ break; ++ ++ /* If the first field extends to the end of line (it is not ++ delimited) and we are printing all non-delimited lines, ++ print this one. */ ++ if (convfail || (!convfail && wc != wcdelim)) ++ { ++ if (suppress_non_delimited) ++ { ++ /* Empty. */ ++ } ++ else ++ { ++ fwrite (field_1_buffer, sizeof (char), len, stdout); ++ /* Make sure the output line is newline terminated. */ ++ if (convfail || (!convfail && wc != line_delim)) ++ putchar (line_delim); ++ } ++ continue; ++ } ++ ++ if (print_kth (1)) ++ { ++ /* Print the field, but not the trailing delimiter. */ ++ fwrite (field_1_buffer, sizeof (char), len - 1, stdout); ++ found_any_selected_field = 1; ++ } ++ next_item (&field_idx); ++ } ++ ++ if (wc != WEOF) ++ { ++ if (print_kth (field_idx)) ++ { ++ if (found_any_selected_field) ++ { ++ fwrite (output_delimiter_string, sizeof (char), ++ output_delimiter_length, stdout); ++ } ++ found_any_selected_field = 1; ++ } ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER ++ (wc, bufpos, buflen, mblength, state, convfail); ++ ++ if (wc == WEOF) ++ break; ++ else if (!convfail && (wc == wcdelim || wc == line_delim)) ++ { ++ buflen -= mblength; ++ bufpos += mblength; ++ break; ++ } ++ ++ if (print_kth (field_idx)) ++ fwrite (bufpos, mblength, sizeof(char), stdout); ++ ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++ } ++ ++ if ((!convfail || wc == line_delim) && buflen < 1) ++ wc = WEOF; ++ ++ if (!convfail && wc == wcdelim) ++ next_item (&field_idx); ++ else if (wc == WEOF || (!convfail && wc == line_delim)) ++ { ++ if (found_any_selected_field ++ || (!empty_input && !(suppress_non_delimited && field_idx == 1))) ++ putchar (line_delim); ++ if (wc == WEOF) ++ break; ++ field_idx = 1; ++ current_rp = frp; ++ found_any_selected_field = 0; ++ } ++ } ++} ++#endif ++ + static void + cut_stream (FILE *stream) + { +- if (operating_mode == byte_mode) +- cut_bytes (stream); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) ++ { ++ switch (operating_mode) ++ { ++ case byte_mode: ++ if (byte_mode_character_aware) ++ cut_characters_or_cut_bytes_no_split (stream); ++ else ++ cut_bytes (stream); ++ break; ++ ++ case character_mode: ++ cut_characters_or_cut_bytes_no_split (stream); ++ break; ++ ++ case field_mode: ++ if (delimlen == 1) ++ { ++ /* Check if we have utf8 multibyte locale, so we can use this ++ optimization because of uniqueness of characters, which is ++ not true for e.g. SJIS */ ++ char * loc = setlocale(LC_CTYPE, NULL); ++ if (loc && (strstr (loc, "UTF-8") || strstr (loc, "utf-8") || ++ strstr (loc, "UTF8") || strstr (loc, "utf8"))) ++ { ++ cut_fields (stream); ++ break; ++ } ++ } ++ cut_fields_mb (stream); ++ break; ++ ++ default: ++ abort (); ++ } ++ } + else +- cut_fields (stream); ++#endif ++ { ++ if (operating_mode == field_mode) ++ cut_fields (stream); ++ else ++ cut_bytes (stream); ++ } + } + + /* Process file FILE to standard output. +@@ -483,6 +836,7 @@ main (int argc, char **argv) + bool ok; + bool delim_specified = false; + char *spec_list_string IF_LINT ( = NULL); ++ char mbdelim[MB_LEN_MAX + 1]; + + initialize_main (&argc, &argv); + set_program_name (argv[0]); +@@ -505,7 +859,6 @@ main (int argc, char **argv) + switch (optc) + { + case 'b': +- case 'c': + /* Build the byte list. */ + if (operating_mode != undefined_mode) + FATAL_ERROR (_("only one type of list may be specified")); +@@ -513,6 +866,14 @@ main (int argc, char **argv) + spec_list_string = optarg; + break; + ++ case 'c': ++ /* Build the character list. */ ++ if (operating_mode != undefined_mode) ++ FATAL_ERROR (_("only one type of list may be specified")); ++ operating_mode = character_mode; ++ spec_list_string = optarg; ++ break; ++ + case 'f': + /* Build the field list. */ + if (operating_mode != undefined_mode) +@@ -524,10 +885,38 @@ main (int argc, char **argv) + case 'd': + /* New delimiter. */ + /* Interpret -d '' to mean 'use the NUL byte as the delimiter.' */ +- if (optarg[0] != '\0' && optarg[1] != '\0') +- FATAL_ERROR (_("the delimiter must be a single character")); +- delim = optarg[0]; +- delim_specified = true; ++ { ++#if HAVE_MBRTOWC ++ if(MB_CUR_MAX > 1) ++ { ++ mbstate_t state; ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state); ++ ++ if (delimlen == (size_t)-1 || delimlen == (size_t)-2) ++ ++force_singlebyte_mode; ++ else ++ { ++ delimlen = (delimlen < 1) ? 1 : delimlen; ++ if (wcdelim != L'\0' && *(optarg + delimlen) != '\0') ++ FATAL_ERROR (_("the delimiter must be a single character")); ++ memcpy (mbdelim, optarg, delimlen); ++ mbdelim[delimlen] = '\0'; ++ if (delimlen == 1) ++ delim = *optarg; ++ } ++ } ++ ++ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) ++#endif ++ { ++ if (optarg[0] != '\0' && optarg[1] != '\0') ++ FATAL_ERROR (_("the delimiter must be a single character")); ++ delim = (unsigned char) optarg[0]; ++ } ++ delim_specified = true; ++ } + break; + + case OUTPUT_DELIMITER_OPTION: +@@ -540,6 +929,7 @@ main (int argc, char **argv) + break; + + case 'n': ++ byte_mode_character_aware = 1; + break; + + case 's': +@@ -579,15 +969,34 @@ main (int argc, char **argv) + | (complement ? SETFLD_COMPLEMENT : 0) ); + + if (!delim_specified) +- delim = '\t'; ++ { ++ delim = '\t'; ++#ifdef HAVE_MBRTOWC ++ wcdelim = L'\t'; ++ mbdelim[0] = '\t'; ++ mbdelim[1] = '\0'; ++ delimlen = 1; ++#endif ++ } + + if (output_delimiter_string == NULL) + { +- static char dummy[2]; +- dummy[0] = delim; +- dummy[1] = '\0'; +- output_delimiter_string = dummy; +- output_delimiter_length = 1; ++#ifdef HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) ++ { ++ output_delimiter_string = xstrdup(mbdelim); ++ output_delimiter_length = delimlen; ++ } ++ ++ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) ++#endif ++ { ++ static char dummy[2]; ++ dummy[0] = delim; ++ dummy[1] = '\0'; ++ output_delimiter_string = dummy; ++ output_delimiter_length = 1; ++ } + } + + if (optind == argc) diff --git a/coreutils/patches/coreutils-i18n-expand-unexpand.patch b/coreutils/patches/coreutils-i18n-expand-unexpand.patch new file mode 100644 index 000000000..b5f571f5f --- /dev/null +++ b/coreutils/patches/coreutils-i18n-expand-unexpand.patch @@ -0,0 +1,848 @@ +From e87ab5b991b08092a7e07af82b3ec822a8604151 Mon Sep 17 00:00:00 2001 +From: Ondrej Oprala <ooprala(a)redhat.com> +Date: Wed, 5 Aug 2015 09:15:09 +0200 +Subject: [PATCH] expand,unexpand: add multibyte support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* NEWS: Mention the changes. +* bootstrap.conf: Add mbfile to the list of modules. +* configure.ac: Properly initialize mbfile. +* src/expand.c (expand): Iterate over multibyte characters properly. +* src/unexpand.c (unexpand): Iterate over multibyte characters +properly. +* tests/local.mk: Add new tests. +* tests/{expand,unexpand}/mb.sh: New tests. + +Co-authored-by: Pádraig Brady <pbrady(a)redhat.com> +--- + bootstrap.conf | 1 + + configure.ac | 2 + + lib/mbfile.c | 3 + + lib/mbfile.h | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++ + m4/mbfile.m4 | 14 +++ + src/expand.c | 43 +++++---- + src/unexpand.c | 54 +++++++---- + tests/expand/mb.sh | 98 ++++++++++++++++++++ + tests/local.mk | 2 + + tests/unexpand/mb.sh | 97 ++++++++++++++++++++ + 10 files changed, 535 insertions(+), 34 deletions(-) + create mode 100644 lib/mbfile.c + create mode 100644 lib/mbfile.h + create mode 100644 m4/mbfile.m4 + create mode 100755 tests/expand/mb.sh + create mode 100755 tests/unexpand/mb.sh + +diff --git a/bootstrap.conf b/bootstrap.conf +index 8a0ff31..a1c78b2 100644 +--- a/bootstrap.conf ++++ b/bootstrap.conf +@@ -152,6 +152,7 @@ gnulib_modules=" + maintainer-makefile + malloc-gnu + manywarnings ++ mbfile + mbrlen + mbrtowc + mbsalign +diff --git a/configure.ac b/configure.ac +index 1e74b36..24c9725 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -427,6 +427,8 @@ fi + # I'm leaving it here for now. This whole thing needs to be modernized... + gl_WINSIZE_IN_PTEM + ++gl_MBFILE ++ + gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H + + if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \ +diff --git a/lib/mbfile.c b/lib/mbfile.c +new file mode 100644 +index 0000000..b0a468e +--- /dev/null ++++ b/lib/mbfile.c +@@ -0,0 +1,3 @@ ++#include <config.h> ++#define MBFILE_INLINE _GL_EXTERN_INLINE ++#include "mbfile.h" +diff --git a/lib/mbfile.h b/lib/mbfile.h +new file mode 100644 +index 0000000..11f1b12 +--- /dev/null ++++ b/lib/mbfile.h +@@ -0,0 +1,255 @@ ++/* Multibyte character I/O: macros for multi-byte encodings. ++ Copyright (C) 2001, 2005, 2009-2015 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see <http://www.gnu.org/licenses/>. */ ++ ++/* Written by Mitsuru Chinen <mchinen(a)yamato.ibm.com> ++ and Bruno Haible <bruno(a)clisp.org>. */ ++ ++/* The macros in this file implement multi-byte character input from a ++ stream. ++ ++ mb_file_t ++ is the type for multibyte character input stream, usable for variable ++ declarations. ++ ++ mbf_char_t ++ is the type for multibyte character or EOF, usable for variable ++ declarations. ++ ++ mbf_init (mbf, stream) ++ initializes the MB_FILE for reading from stream. ++ ++ mbf_getc (mbc, mbf) ++ reads the next multibyte character from mbf and stores it in mbc. ++ ++ mb_iseof (mbc) ++ returns true if mbc represents the EOF value. ++ ++ Here are the function prototypes of the macros. ++ ++ extern void mbf_init (mb_file_t mbf, FILE *stream); ++ extern void mbf_getc (mbf_char_t mbc, mb_file_t mbf); ++ extern bool mb_iseof (const mbf_char_t mbc); ++ */ ++ ++#ifndef _MBFILE_H ++#define _MBFILE_H 1 ++ ++#include <assert.h> ++#include <stdbool.h> ++#include <stdio.h> ++#include <string.h> ++ ++/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before ++ <wchar.h>. ++ BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before ++ <wchar.h>. */ ++#include <stdio.h> ++#include <time.h> ++#include <wchar.h> ++ ++#include "mbchar.h" ++ ++#ifndef _GL_INLINE_HEADER_BEGIN ++ #error "Please include config.h first." ++#endif ++_GL_INLINE_HEADER_BEGIN ++#ifndef MBFILE_INLINE ++# define MBFILE_INLINE _GL_INLINE ++#endif ++ ++struct mbfile_multi { ++ FILE *fp; ++ bool eof_seen; ++ bool have_pushback; ++ mbstate_t state; ++ unsigned int bufcount; ++ char buf[MBCHAR_BUF_SIZE]; ++ struct mbchar pushback; ++}; ++ ++MBFILE_INLINE void ++mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf) ++{ ++ size_t bytes; ++ ++ /* If EOF has already been seen, don't use getc. This matters if ++ mbf->fp is connected to an interactive tty. */ ++ if (mbf->eof_seen) ++ goto eof; ++ ++ /* Return character pushed back, if there is one. */ ++ if (mbf->have_pushback) ++ { ++ mb_copy (mbc, &mbf->pushback); ++ mbf->have_pushback = false; ++ return; ++ } ++ ++ /* Before using mbrtowc, we need at least one byte. */ ++ if (mbf->bufcount == 0) ++ { ++ int c = getc (mbf->fp); ++ if (c == EOF) ++ { ++ mbf->eof_seen = true; ++ goto eof; ++ } ++ mbf->buf[0] = (unsigned char) c; ++ mbf->bufcount++; ++ } ++ ++ /* Handle most ASCII characters quickly, without calling mbrtowc(). */ ++ if (mbf->bufcount == 1 && mbsinit (&mbf->state) && is_basic (mbf->buf[0])) ++ { ++ /* These characters are part of the basic character set. ISO C 99 ++ guarantees that their wide character code is identical to their ++ char code. */ ++ mbc->wc = mbc->buf[0] = mbf->buf[0]; ++ mbc->wc_valid = true; ++ mbc->ptr = &mbc->buf[0]; ++ mbc->bytes = 1; ++ mbf->bufcount = 0; ++ return; ++ } ++ ++ /* Use mbrtowc on an increasing number of bytes. Read only as many bytes ++ from mbf->fp as needed. This is needed to give reasonable interactive ++ behaviour when mbf->fp is connected to an interactive tty. */ ++ for (;;) ++ { ++ /* We don't know whether the 'mbrtowc' function updates the state when ++ it returns -2, - this is the ISO C 99 and glibc-2.2 behaviour - or ++ not - amended ANSI C, glibc-2.1 and Solaris 2.7 behaviour. We ++ don't have an autoconf test for this, yet. ++ The new behaviour would allow us to feed the bytes one by one into ++ mbrtowc. But the old behaviour forces us to feed all bytes since ++ the end of the last character into mbrtowc. Since we want to retry ++ with more bytes when mbrtowc returns -2, we must backup the state ++ before calling mbrtowc, because implementations with the new ++ behaviour will clobber it. */ ++ mbstate_t backup_state = mbf->state; ++ ++ bytes = mbrtowc (&mbc->wc, &mbf->buf[0], mbf->bufcount, &mbf->state); ++ ++ if (bytes == (size_t) -1) ++ { ++ /* An invalid multibyte sequence was encountered. */ ++ /* Return a single byte. */ ++ bytes = 1; ++ mbc->wc_valid = false; ++ break; ++ } ++ else if (bytes == (size_t) -2) ++ { ++ /* An incomplete multibyte character. */ ++ mbf->state = backup_state; ++ if (mbf->bufcount == MBCHAR_BUF_SIZE) ++ { ++ /* An overlong incomplete multibyte sequence was encountered. */ ++ /* Return a single byte. */ ++ bytes = 1; ++ mbc->wc_valid = false; ++ break; ++ } ++ else ++ { ++ /* Read one more byte and retry mbrtowc. */ ++ int c = getc (mbf->fp); ++ if (c == EOF) ++ { ++ /* An incomplete multibyte character at the end. */ ++ mbf->eof_seen = true; ++ bytes = mbf->bufcount; ++ mbc->wc_valid = false; ++ break; ++ } ++ mbf->buf[mbf->bufcount] = (unsigned char) c; ++ mbf->bufcount++; ++ } ++ } ++ else ++ { ++ if (bytes == 0) ++ { ++ /* A null wide character was encountered. */ ++ bytes = 1; ++ assert (mbf->buf[0] == '\0'); ++ assert (mbc->wc == 0); ++ } ++ mbc->wc_valid = true; ++ break; ++ } ++ } ++ ++ /* Return the multibyte sequence mbf->buf[0..bytes-1]. */ ++ mbc->ptr = &mbc->buf[0]; ++ memcpy (&mbc->buf[0], &mbf->buf[0], bytes); ++ mbc->bytes = bytes; ++ ++ mbf->bufcount -= bytes; ++ if (mbf->bufcount > 0) ++ { ++ /* It's not worth calling memmove() for so few bytes. */ ++ unsigned int count = mbf->bufcount; ++ char *p = &mbf->buf[0]; ++ ++ do ++ { ++ *p = *(p + bytes); ++ p++; ++ } ++ while (--count > 0); ++ } ++ return; ++ ++eof: ++ /* An mbchar_t with bytes == 0 is used to indicate EOF. */ ++ mbc->ptr = NULL; ++ mbc->bytes = 0; ++ mbc->wc_valid = false; ++ return; ++} ++ ++MBFILE_INLINE void ++mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf) ++{ ++ mb_copy (&mbf->pushback, mbc); ++ mbf->have_pushback = true; ++} ++ ++typedef struct mbfile_multi mb_file_t; ++ ++typedef mbchar_t mbf_char_t; ++ ++#define mbf_init(mbf, stream) \ ++ ((mbf).fp = (stream), \ ++ (mbf).eof_seen = false, \ ++ (mbf).have_pushback = false, \ ++ memset (&(mbf).state, '\0', sizeof (mbstate_t)), \ ++ (mbf).bufcount = 0) ++ ++#define mbf_getc(mbc, mbf) mbfile_multi_getc (&(mbc), &(mbf)) ++ ++#define mbf_ungetc(mbc, mbf) mbfile_multi_ungetc (&(mbc), &(mbf)) ++ ++#define mb_iseof(mbc) ((mbc).bytes == 0) ++ ++#ifndef _GL_INLINE_HEADER_BEGIN ++ #error "Please include config.h first." ++#endif ++_GL_INLINE_HEADER_BEGIN ++ ++#endif /* _MBFILE_H */ +diff --git a/m4/mbfile.m4 b/m4/mbfile.m4 +new file mode 100644 +index 0000000..8589902 +--- /dev/null ++++ b/m4/mbfile.m4 +@@ -0,0 +1,14 @@ ++# mbfile.m4 serial 7 ++dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl autoconf tests required for use of mbfile.h ++dnl From Bruno Haible. ++ ++AC_DEFUN([gl_MBFILE], ++[ ++ AC_REQUIRE([AC_TYPE_MBSTATE_T]) ++ : ++]) +diff --git a/src/expand.c b/src/expand.c +index 9fa2e10..380e020 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -37,6 +37,9 @@ + #include <stdio.h> + #include <getopt.h> + #include <sys/types.h> ++ ++#include <mbfile.h> ++ + #include "system.h" + #include "die.h" + #include "xstrndup.h" +@@ -100,19 +103,19 @@ expand (void) + { + /* Input stream. */ + FILE *fp = next_file (NULL); ++ mb_file_t mbf; ++ mbf_char_t c; + + if (!fp) + return; + ++ mbf_init (mbf, fp); ++ + while (true) + { +- /* Input character, or EOF. */ +- int c; +- + /* If true, perform translations. */ + bool convert = true; + +- + /* The following variables have valid values only when CONVERT + is true: */ + +@@ -122,17 +125,23 @@ expand (void) + /* Index in TAB_LIST of next tab stop to examine. */ + size_t tab_index = 0; + +- + /* Convert a line of text. */ + + do + { +- while ((c = getc (fp)) < 0 && (fp = next_file (fp))) +- continue; ++ do { ++ mbf_getc (c, mbf); ++ if (mb_iseof (c)) ++ { ++ mbf_init (mbf, fp = next_file (fp)); ++ continue; ++ } ++ } ++ while (false); + + if (convert) + { +- if (c == '\t') ++ if (mb_iseq (c, '\t')) + { + /* Column the next input tab stop is on. */ + uintmax_t next_tab_column; +@@ -151,32 +160,34 @@ expand (void) + if (putchar (' ') < 0) + die (EXIT_FAILURE, errno, _("write error")); + +- c = ' '; ++ mb_setascii (&c, ' '); + } +- else if (c == '\b') ++ else if (mb_iseq (c, '\b')) + { + /* Go back one column, and force recalculation of the + next tab stop. */ + column -= !!column; + tab_index -= !!tab_index; + } +- else ++ /* A leading control character could make us trip over. */ ++ else if (!mb_iscntrl (c)) + { +- column++; ++ column += mb_width (c); + if (!column) + die (EXIT_FAILURE, 0, _("input line is too long")); + } + +- convert &= convert_entire_line || !! isblank (c); ++ convert &= convert_entire_line || mb_isblank (c); + } + +- if (c < 0) ++ if (mb_iseof (c)) + return; + +- if (putchar (c) < 0) ++ mb_putc (c, stdout); ++ if (ferror (stdout)) + die (EXIT_FAILURE, errno, _("write error")); + } +- while (c != '\n'); ++ while (!mb_iseq (c, '\n')); + } + } + +diff --git a/src/unexpand.c b/src/unexpand.c +index 7801274..569a7ee 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -38,6 +38,9 @@ + #include <stdio.h> + #include <getopt.h> + #include <sys/types.h> ++ ++#include <mbfile.h> ++ + #include "system.h" + #include "die.h" + #include "xstrndup.h" +@@ -107,11 +110,12 @@ unexpand (void) + { + /* Input stream. */ + FILE *fp = next_file (NULL); ++ mb_file_t mbf; + + /* The array of pending blanks. In non-POSIX locales, blanks can + include characters other than spaces, so the blanks must be + stored, not merely counted. */ +- char *pending_blank; ++ mbf_char_t *pending_blank; + + if (!fp) + return; +@@ -119,12 +123,14 @@ unexpand (void) + /* The worst case is a non-blank character, then one blank, then a + tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so + allocate MAX_COLUMN_WIDTH bytes to store the blanks. */ +- pending_blank = xmalloc (max_column_width); ++ pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t)); ++ ++ mbf_init (mbf, fp); + + while (true) + { + /* Input character, or EOF. */ +- int c; ++ mbf_char_t c; + + /* If true, perform translations. */ + bool convert = true; +@@ -158,12 +164,19 @@ unexpand (void) + + do + { +- while ((c = getc (fp)) < 0 && (fp = next_file (fp))) +- continue; ++ do { ++ mbf_getc (c, mbf); ++ if (mb_iseof (c)) ++ { ++ mbf_init (mbf, fp = next_file (fp)); ++ continue; ++ } ++ } ++ while (false); + + if (convert) + { +- bool blank = !! isblank (c); ++ bool blank = mb_isblank (c); + + if (blank) + { +@@ -180,16 +193,16 @@ unexpand (void) + if (next_tab_column < column) + die (EXIT_FAILURE, 0, _("input line is too long")); + +- if (c == '\t') ++ if (mb_iseq (c, '\t')) + { + column = next_tab_column; + + if (pending) +- pending_blank[0] = '\t'; ++ mb_setascii (&pending_blank[0], '\t'); + } + else + { +- column++; ++ column += mb_width (c); + + if (! (prev_blank && column == next_tab_column)) + { +@@ -197,13 +210,14 @@ unexpand (void) + will be replaced by tabs. */ + if (column == next_tab_column) + one_blank_before_tab_stop = true; +- pending_blank[pending++] = c; ++ mb_copy (&pending_blank[pending++], &c); + prev_blank = true; + continue; + } + + /* Replace the pending blanks by a tab or two. */ +- pending_blank[0] = c = '\t'; ++ mb_setascii (&c, '\t'); ++ mb_setascii (&pending_blank[0], '\t'); + } + + /* Discard pending blanks, unless it was a single +@@ -211,7 +225,7 @@ unexpand (void) + pending = one_blank_before_tab_stop; + } + } +- else if (c == '\b') ++ else if (mb_iseq (c, '\b')) + { + /* Go back one column, and force recalculation of the + next tab stop. */ +@@ -221,7 +235,7 @@ unexpand (void) + } + else + { +- column++; ++ column += mb_width (c); + if (!column) + die (EXIT_FAILURE, 0, _("input line is too long")); + } +@@ -229,8 +243,11 @@ unexpand (void) + if (pending) + { + if (pending > 1 && one_blank_before_tab_stop) +- pending_blank[0] = '\t'; +- if (fwrite (pending_blank, 1, pending, stdout) != pending) ++ mb_setascii (&pending_blank[0], '\t'); ++ ++ for (int n = 0; n < pending; ++n) ++ mb_putc (pending_blank[n], stdout); ++ if (ferror (stdout)) + die (EXIT_FAILURE, errno, _("write error")); + pending = 0; + one_blank_before_tab_stop = false; +@@ -240,16 +257,17 @@ unexpand (void) + convert &= convert_entire_line || blank; + } + +- if (c < 0) ++ if (mb_iseof (c)) + { + free (pending_blank); + return; + } + +- if (putchar (c) < 0) ++ mb_putc (c, stdout); ++ if (ferror (stdout)) + die (EXIT_FAILURE, errno, _("write error")); + } +- while (c != '\n'); ++ while (!mb_iseq (c, '\n')); + } + } + +diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh +new file mode 100755 +index 0000000..7971e18 +--- /dev/null ++++ b/tests/expand/mb.sh +@@ -0,0 +1,98 @@ ++#!/bin/sh ++ ++# Copyright (C) 2012-2015 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src ++print_ver_ expand ++ ++export LC_ALL=en_US.UTF-8 ++ ++#input containing multibyte characters ++cat <<\EOF > in || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ ++ ++cat <<\EOF > exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#test characters with display widths != 1 ++env printf '12345678 ++e\t|ascii(1) ++\u00E9\t|composed(1) ++e\u0301\t|decomposed(1) ++\u3000\t|ideo-space(2) ++\uFF0D\t|full-hypen(2) ++' > in || framework_failure_ ++ ++env printf '12345678 ++e |ascii(1) ++\u00E9 |composed(1) ++e\u0301 |decomposed(1) ++\u3000 |ideo-space(2) ++\uFF0D |full-hypen(2) ++' > exp || framework_failure_ ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#shouldn't fail with "input line too long" ++#when a line starts with a control character ++env printf '\n' > in || framework_failure_ ++ ++expand < in > out || fail=1 ++compare in out > /dev/null 2>&1 || fail=1 ++ ++#non-Unicode characters interspersed between Unicode ones ++env printf '12345678 ++\t\xFF| ++\xFF\t| ++\t\xFFä| ++ä\xFF\t| ++\tä\xFF| ++\xFF\tä| ++äbcdef\xFF\t| ++' > in || framework_failure_ ++ ++env printf '12345678 ++ \xFF| ++\xFF | ++ \xFFä| ++ä\xFF | ++ ä\xFF| ++\xFF ä| ++äbcdef\xFF | ++' > exp || framework_failure_ ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++exit $fail +diff --git a/tests/local.mk b/tests/local.mk +index 192f776..8053397 100644 +--- a/tests/local.mk ++++ b/tests/local.mk +@@ -544,6 +544,7 @@ all_tests = \ + tests/du/threshold.sh \ + tests/du/trailing-slash.sh \ + tests/du/two-args.sh \ ++ tests/expand/mb.sh \ + tests/id/gnu-zero-uids.sh \ + tests/id/no-context.sh \ + tests/id/context.sh \ +@@ -684,6 +685,7 @@ all_tests = \ + tests/touch/read-only.sh \ + tests/touch/relative.sh \ + tests/touch/trailing-slash.sh \ ++ tests/unexpand/mb.sh \ + $(all_root_tests) + + # See tests/factor/create-test.sh. +diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh +new file mode 100755 +index 0000000..60d4c1a +--- /dev/null ++++ b/tests/unexpand/mb.sh +@@ -0,0 +1,97 @@ ++#!/bin/sh ++ ++# Copyright (C) 2012-2015 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src ++print_ver_ unexpand ++ ++export LC_ALL=en_US.UTF-8 ++ ++#input containing multibyte characters ++cat > in <<\EOF ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++cat > exp <<\EOF ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#test characters with a display width larger than 1 ++ ++env printf '12345678 ++e |ascii(1) ++\u00E9 |composed(1) ++e\u0301 |decomposed(1) ++\u3000 |ideo-space(2) ++\uFF0D |full-hypen(2) ++' > in || framework_failure_ ++ ++env printf '12345678 ++e\t|ascii(1) ++\u00E9\t|composed(1) ++e\u0301\t|decomposed(1) ++\u3000\t|ideo-space(2) ++\uFF0D\t|full-hypen(2) ++' > exp || framework_failure_ ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#test input where a blank of width > 1 is not being substituted ++in="$(LC_ALL=en_US.UTF-8 printf ' \u3000 ö ü ß')" ++exp=' 　 ö ü ß' ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#non-Unicode characters interspersed between Unicode ones ++env printf '12345678 ++ \xFF| ++\xFF | ++ \xFFä| ++ä\xFF | ++ ä\xFF| ++\xFF ä| ++äbcdef\xFF | ++' > in || framework_failure_ ++ ++env printf '12345678 ++\t\xFF| ++\xFF\t| ++\t\xFFä| ++ä\xFF\t| ++\tä\xFF| ++\xFF\tä| ++äbcdef\xFF\t| ++' > exp || framework_failure_ ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 +-- +2.7.4 + diff --git a/coreutils/patches/coreutils-i18n-fix-unexpand.patch b/coreutils/patches/coreutils-i18n-fix-unexpand.patch new file mode 100644 index 000000000..f0c347cd2 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-fix-unexpand.patch @@ -0,0 +1,28 @@ +From 02424bfcd719bbaa695f4e1c3ef17ad91b0d23c0 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel <lkundrak(a)v3.sk> +Date: Thu, 28 Jan 2016 20:57:22 +0100 +Subject: [PATCH] unexpand: fix blank line handling + + echo '' |./src/unexpand -a + +Really? +--- + src/unexpand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unexpand.c b/src/unexpand.c +index 569a7ee..3bbbd66 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -233,7 +233,7 @@ unexpand (void) + next_tab_column = column; + tab_index -= !!tab_index; + } +- else ++ else if (!mb_iseq (c, '\n')) + { + column += mb_width (c); + if (!column) +-- +2.7.4 + diff --git a/coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch b/coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch new file mode 100644 index 000000000..b34d7b74f --- /dev/null +++ b/coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch @@ -0,0 +1,108 @@ +diff --git a/src/expand.c b/src/expand.c +index 380e020..310b349 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -129,15 +129,19 @@ expand (void) + + do + { +- do { ++ while (true) { + mbf_getc (c, mbf); +- if (mb_iseof (c)) ++ if ((mb_iseof (c)) && (fp = next_file (fp))) + { +- mbf_init (mbf, fp = next_file (fp)); ++ mbf_init (mbf, fp); + continue; + } ++ else ++ { ++ break; ++ } + } +- while (false); ++ + + if (convert) + { +diff --git a/src/unexpand.c b/src/unexpand.c +index 3bbbd66..863a90a 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -164,15 +164,19 @@ unexpand (void) + + do + { +- do { ++ while (true) { + mbf_getc (c, mbf); +- if (mb_iseof (c)) ++ if ((mb_iseof (c)) && (fp = next_file (fp))) + { +- mbf_init (mbf, fp = next_file (fp)); ++ mbf_init (mbf, fp); + continue; + } ++ else ++ { ++ break; ++ } + } +- while (false); ++ + + if (convert) + { +diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh +index 7971e18..031be7a 100755 +--- a/tests/expand/mb.sh ++++ b/tests/expand/mb.sh +@@ -44,6 +44,20 @@ EOF + expand < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 + ++#multiple files as an input ++cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++expand ./in ./in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ + #test characters with display widths != 1 + env printf '12345678 + e\t|ascii(1) +diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh +index 60d4c1a..8d75652 100755 +--- a/tests/unexpand/mb.sh ++++ b/tests/unexpand/mb.sh +@@ -44,6 +44,22 @@ EOF + unexpand -a < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 + ++ ++#multiple files as an input ++cat >> exp <<\EOF ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++ ++unexpand -a ./in ./in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ + #test characters with a display width larger than 1 + + env printf '12345678 diff --git a/coreutils/patches/coreutils-i18n-fold-newline.patch b/coreutils/patches/coreutils-i18n-fold-newline.patch new file mode 100644 index 000000000..f7286efe0 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-fold-newline.patch @@ -0,0 +1,80 @@ +From ff424639fe863cbd6963add1a79b97290c1606c6 Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Fri, 3 Feb 2017 12:26:53 +0100 +Subject: [PATCH] fold.c: preserve new-lines in mutlibyte text + +--- + src/fold.c | 49 ++++++++++++++++++++++++------------------------- + 1 file changed, 24 insertions(+), 25 deletions(-) + +diff --git a/src/fold.c b/src/fold.c +index d23edd5..8c232a7 100644 +--- a/src/fold.c ++++ b/src/fold.c +@@ -342,39 +342,38 @@ fold_multibyte_text (FILE *istream, size_t width, int *saved_errno) + } + + rescan: +- if (operating_mode == byte_mode) /* byte mode */ ++ if (convfail) ++ increment = 1; ++ else if (wc == L'\n') ++ { ++ /* preserve newline */ ++ fwrite (line_out, sizeof(char), offset_out, stdout); ++ START_NEW_LINE; ++ continue; ++ } ++ else if (operating_mode == byte_mode) /* byte mode */ + increment = mblength; + else if (operating_mode == character_mode) /* character mode */ + increment = 1; +- else /* column mode */ ++ else /* column mode */ + { +- if (convfail) +- increment = 1; +- else ++ switch (wc) + { +- switch (wc) +- { +- case L'\n': +- fwrite (line_out, sizeof(char), offset_out, stdout); +- START_NEW_LINE; +- continue; ++ case L'\b': ++ increment = (column > 0) ? -1 : 0; ++ break; + +- case L'\b': +- increment = (column > 0) ? -1 : 0; +- break; ++ case L'\r': ++ increment = -1 * column; ++ break; + +- case L'\r': +- increment = -1 * column; +- break; ++ case L'\t': ++ increment = 8 - column % 8; ++ break; + +- case L'\t': +- increment = 8 - column % 8; +- break; +- +- default: +- increment = wcwidth (wc); +- increment = (increment < 0) ? 0 : increment; +- } ++ default: ++ increment = wcwidth (wc); ++ increment = (increment < 0) ? 0 : increment; + } + } + +-- +2.7.4 + diff --git a/coreutils/patches/coreutils-i18n-sort-human.patch b/coreutils/patches/coreutils-i18n-sort-human.patch new file mode 100644 index 000000000..675249315 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-sort-human.patch @@ -0,0 +1,35 @@ +From 3976ef5a20369d8b490907ab2cba2d617305a5e0 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka(a)redhat.com> +Date: Mon, 30 May 2016 16:19:20 +0200 +Subject: [PATCH] sort: do not use static array 'blanks' in human_numcompare() + +... because the array is not initialized with MB locales. Note this is +rather a conservative fix. I plan to do more cleanup of the i18n patch +in Fedora to prevent mistakes like this in future updates of coreutils. +--- + src/sort.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/sort.c b/src/sort.c +index 9e07ad8..e47b039 100644 +--- a/src/sort.c ++++ b/src/sort.c +@@ -2304,12 +2304,10 @@ find_unit_order (char const *number) + <none/unknown> < K/k < M < G < T < P < E < Z < Y */ + + static int +-human_numcompare (char const *a, char const *b) ++human_numcompare (char *a, char *b) + { +- while (blanks[to_uchar (*a)]) +- a++; +- while (blanks[to_uchar (*b)]) +- b++; ++ skipblanks(&a, a + strlen(a)); ++ skipblanks(&b, b + strlen(b)); + + int diff = find_unit_order (a) - find_unit_order (b); + return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep)); +-- +2.5.5 + diff --git a/coreutils/patches/coreutils-i18n-un-expand-BOM.patch b/coreutils/patches/coreutils-i18n-un-expand-BOM.patch new file mode 100644 index 000000000..6210ce7e8 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-un-expand-BOM.patch @@ -0,0 +1,456 @@ +From 7a7c776a4e228d180e74614fd8c8afcad5d4bdf7 Mon Sep 17 00:00:00 2001 +From: Jakub Martisko <jamartis(a)redhat.com> +Date: Thu, 7 Jul 2016 12:53:26 +0200 +Subject: [PATCH] coreutils-i18n-un-expand-BOM.patch + +--- + src/expand-common.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/expand-common.h | 12 ++++++ + src/expand.c | 45 +++++++++++++++++++- + src/unexpand.c | 43 ++++++++++++++++++- + tests/expand/mb.sh | 71 ++++++++++++++++++++++++++++++++ + tests/unexpand/mb.sh | 59 ++++++++++++++++++++++++++ + 6 files changed, 342 insertions(+), 2 deletions(-) + +diff --git a/src/expand-common.c b/src/expand-common.c +index 4657e46..97cbb09 100644 +--- a/src/expand-common.c ++++ b/src/expand-common.c +@@ -19,6 +19,7 @@ + #include <assert.h> + #include <stdio.h> + #include <sys/types.h> ++#include <mbfile.h> + #include "system.h" + #include "die.h" + #include "error.h" +@@ -126,6 +127,119 @@ set_increment_size (uintmax_t tabval) + return ok; + } + ++extern int ++set_utf_locale (void) ++{ ++ /*try using some predefined locale */ ++ const char* predef_locales[] = {"C.UTF8","en_US.UTF8","en_GB.UTF8"}; ++ ++ const int predef_locales_count=3; ++ for (int i=0;i<predef_locales_count;i++) ++ { ++ if (setlocale(LC_ALL,predef_locales[i])!=NULL) ++ { ++ break; ++ } ++ else if (i==predef_locales_count-1) ++ { ++ return 1; ++ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); ++ } ++ } ++ return 0; ++} ++ ++extern bool ++check_utf_locale(void) ++{ ++ char* locale = setlocale (LC_CTYPE , NULL); ++ if (locale == NULL) ++ { ++ return false; ++ } ++ else if (strcasestr(locale, "utf8") == NULL && strcasestr(locale, "utf-8") == NULL) ++ { ++ return false; ++ } ++ return true; ++} ++ ++extern bool ++check_bom(FILE* fp, mb_file_t *mbf) ++{ ++ int c; ++ ++ ++ c=fgetc(fp); ++ ++ /*test BOM header of the first file */ ++ mbf->bufcount=0; ++ if (c == 0xEF) ++ { ++ c=fgetc(fp); ++ } ++ else ++ { ++ if (c != EOF) ++ { ++ ungetc(c,fp); ++ } ++ return false; ++ } ++ ++ if (c == 0xBB) ++ { ++ c=fgetc(fp); ++ } ++ else ++ { ++ if ( c!= EOF ) ++ { ++ mbf->buf[0]=(unsigned char) 0xEF; ++ mbf->bufcount=1; ++ ungetc(c,fp); ++ return false; ++ } ++ else ++ { ++ ungetc(0xEF,fp); ++ return false; ++ } ++ } ++ if (c == 0xBF) ++ { ++ mbf->bufcount=0; ++ return true; ++ } ++ else ++ { ++ if (c != EOF) ++ { ++ mbf->buf[0]=(unsigned char) 0xEF; ++ mbf->buf[1]=(unsigned char) 0xBB; ++ mbf->bufcount=2; ++ ungetc(c,fp); ++ return false; ++ } ++ else ++ { ++ mbf->buf[0]=(unsigned char) 0xEF; ++ mbf->bufcount=1; ++ ungetc(0xBB,fp); ++ return false; ++ } ++ } ++ return false; ++} ++ ++extern void ++print_bom(void) ++{ ++ putc (0xEF, stdout); ++ putc (0xBB, stdout); ++ putc (0xBF, stdout); ++} ++ + /* Add the comma or blank separated list of tab stops STOPS + to the list of tab stops. */ + extern void +diff --git a/src/expand-common.h b/src/expand-common.h +index 8cb2079..763bfda 100644 +--- a/src/expand-common.h ++++ b/src/expand-common.h +@@ -34,6 +34,18 @@ extern size_t max_column_width; + /* The desired exit status. */ + extern int exit_status; + ++extern int ++set_utf_locale (void); ++ ++extern bool ++check_utf_locale(void); ++ ++extern bool ++check_bom(FILE* fp, mb_file_t *mbf); ++ ++extern void ++print_bom(void); ++ + /* Add tab stop TABVAL to the end of 'tab_list'. */ + extern void + add_tab_stop (uintmax_t tabval); +diff --git a/src/expand.c b/src/expand.c +index 310b349..4136824 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -103,11 +103,33 @@ expand (void) + FILE *fp = next_file (NULL); + mb_file_t mbf; + mbf_char_t c; ++ /* True if the starting locale is utf8. */ ++ bool using_utf_locale; ++ ++ /* True if the first file contains BOM header. */ ++ bool found_bom; ++ using_utf_locale=check_utf_locale(); + + if (!fp) + return; +- + mbf_init (mbf, fp); ++ found_bom=check_bom(fp,&mbf); ++ ++ if (using_utf_locale == false && found_bom == true) ++ { ++ /*try using some predefined locale */ ++ ++ if (set_utf_locale () != 0) ++ { ++ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); ++ } ++ } ++ ++ ++ if (found_bom == true) ++ { ++ print_bom(); ++ } + + while (true) + { +@@ -132,6 +154,27 @@ expand (void) + if ((mb_iseof (c)) && (fp = next_file (fp))) + { + mbf_init (mbf, fp); ++ if (fp!=NULL) ++ { ++ if (check_bom(fp,&mbf)==true) ++ { ++ /*Not the first file - check BOM header*/ ++ if (using_utf_locale==false && found_bom==false) ++ { ++ /*BOM header in subsequent file but not in the first one. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ else ++ { ++ if(using_utf_locale==false && found_bom==true) ++ { ++ /*First file conatined BOM header - locale was switched to UTF ++ *all subsequent files should contain BOM. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ } + continue; + } + else +diff --git a/src/unexpand.c b/src/unexpand.c +index 863a90a..5681b58 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -116,16 +116,36 @@ unexpand (void) + include characters other than spaces, so the blanks must be + stored, not merely counted. */ + mbf_char_t *pending_blank; ++ /* True if the starting locale is utf8. */ ++ bool using_utf_locale; ++ ++ /* True if the first file contains BOM header. */ ++ bool found_bom; ++ using_utf_locale=check_utf_locale(); + + if (!fp) + return; ++ mbf_init (mbf, fp); ++ found_bom=check_bom(fp,&mbf); ++ ++ if (using_utf_locale == false && found_bom == true) ++ { ++ /*try using some predefined locale */ + ++ if (set_utf_locale () != 0) ++ { ++ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); ++ } ++ } + /* The worst case is a non-blank character, then one blank, then a + tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so + allocate MAX_COLUMN_WIDTH bytes to store the blanks. */ + pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t)); + +- mbf_init (mbf, fp); ++ if (found_bom == true) ++ { ++ print_bom(); ++ } + + while (true) + { +@@ -169,6 +189,27 @@ unexpand (void) + if ((mb_iseof (c)) && (fp = next_file (fp))) + { + mbf_init (mbf, fp); ++ if (fp!=NULL) ++ { ++ if (check_bom(fp,&mbf)==true) ++ { ++ /*Not the first file - check BOM header*/ ++ if (using_utf_locale==false && found_bom==false) ++ { ++ /*BOM header in subsequent file but not in the first one. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ else ++ { ++ if(using_utf_locale==false && found_bom==true) ++ { ++ /*First file conatined BOM header - locale was switched to UTF ++ *all subsequent files should contain BOM. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ } + continue; + } + else +diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh +index 031be7a..1621c84 100755 +--- a/tests/expand/mb.sh ++++ b/tests/expand/mb.sh +@@ -109,4 +109,75 @@ env printf '12345678 + expand < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 + ++ ++ ++#BOM header test 1 ++printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ ++ ++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++ ++printf '\xEF\xBB\xBF' > in1; cat <<\EOF >> in1 || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in1 || framework_failure_ ++ ++ ++printf '\xEF\xBB\xBF' > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++expand in1 in1 > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C expand in1 in1 > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C expand in1 in1 > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ + exit $fail +diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh +index 8d75652..9d4ee3e 100755 +--- a/tests/unexpand/mb.sh ++++ b/tests/unexpand/mb.sh +@@ -111,3 +111,62 @@ env printf '12345678 + + unexpand -a < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 ++ ++#BOM header test 1 ++printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ ++ ++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++unexpand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C unexpand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C unexpand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++ ++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++ ++unexpand in in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C unexpand in in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C unexpand in in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 +-- +2.9.3 + diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch index d7cf59ce1..e3428d933 100644 --- a/coreutils/patches/coreutils-i18n.patch +++ b/coreutils/patches/coreutils-i18n.patch @@ -13,7 +13,6 @@ TODO: merge upstream src/uniq.c | 265 ++++++++++++++- tests/i18n/sort.sh | 29 ++ tests/local.mk | 2 + - tests/misc/cut.pl | 7 +- tests/misc/expand.pl | 42 +++ tests/misc/fold.pl | 50 ++- tests/misc/join.pl | 50 +++ @@ -23,9 +22,9 @@ TODO: merge upstream tests/misc/unexpand.pl | 39 +++ tests/misc/uniq.pl | 55 ++++ tests/pr/pr-tests.pl | 49 +++ - 18 files changed, 2435 insertions(+), 162 deletions(-) - create mode 100644 tests/i18n/sort.sh - create mode 100644 tests/misc/sort-mb-tests.sh + 17 files changed, 2430 insertions(+), 160 deletions(-) + create mode 100755 tests/i18n/sort.sh + create mode 100755 tests/misc/sort-mb-tests.sh diff --git a/lib/linebuffer.h b/lib/linebuffer.h index 64181af..9b8fe5a 100644 @@ -315,7 +314,7 @@ index 8cd0d6b..d23edd5 100644 + fwrite (line_out, sizeof(char), offset_out, stdout); + START_NEW_LINE; + continue; -+ ++ + case L'\b': + increment = (column > 0) ? -1 : 0; + break; @@ -672,7 +671,7 @@ index 98b461c..9990f38 100644 + extract_field (line, ptr, lim - ptr); +} +#endif -+ ++ static void freeline (struct line *line) { @@ -845,7 +844,7 @@ index 98b461c..9990f38 100644 xfields (line); if (prevline[which - 1]) -@@ -567,21 +807,28 @@ prfield (size_t n, struct line const *line) +@@ -563,21 +803,28 @@ prfield (size_t n, struct line const *line) /* Output all the fields in line, other than the join field. */ @@ -877,7 +876,7 @@ index 98b461c..9990f38 100644 prfield (i, line); } } -@@ -592,7 +839,6 @@ static void +@@ -588,7 +835,6 @@ static void prjoin (struct line const *line1, struct line const *line2) { const struct outlist *outlist; @@ -885,7 +884,7 @@ index 98b461c..9990f38 100644 size_t field; struct line const *line; -@@ -626,7 +872,7 @@ prjoin (struct line const *line1, struct line const *line2) +@@ -622,7 +868,7 @@ prjoin (struct line const *line1, struct line const *line2) o = o->next; if (o == NULL) break; @@ -894,7 +893,7 @@ index 98b461c..9990f38 100644 } putchar (eolchar); } -@@ -1104,20 +1350,43 @@ main (int argc, char **argv) +@@ -1099,20 +1345,43 @@ main (int argc, char **argv) case 't': { @@ -1171,7 +1170,7 @@ index 26f221f..633f50e 100644 use_col_separator = true; if (optarg) separator_string (optarg); -@@ -1166,10 +1250,45 @@ getoptnum (const char *n_str, int min, int *num, const char *err) +@@ -1165,10 +1249,45 @@ getoptnum (const char *n_str, int min, int *num, const char *err) a number. */ static void @@ -1219,7 +1218,7 @@ index 26f221f..633f50e 100644 if (*arg) { long int tmp_long; -@@ -1191,6 +1310,11 @@ static void +@@ -1190,6 +1309,11 @@ static void init_parameters (int number_of_files) { int chars_used_by_number = 0; @@ -1231,7 +1230,7 @@ index 26f221f..633f50e 100644 lines_per_body = lines_per_page - lines_per_header - lines_per_footer; if (lines_per_body <= 0) -@@ -1228,7 +1352,7 @@ init_parameters (int number_of_files) +@@ -1227,7 +1351,7 @@ init_parameters (int number_of_files) else col_sep_string = column_separator; @@ -1240,7 +1239,7 @@ index 26f221f..633f50e 100644 use_col_separator = true; } /* It's rather pointless to define a TAB separator with column -@@ -1258,11 +1382,11 @@ init_parameters (int number_of_files) +@@ -1257,11 +1381,11 @@ init_parameters (int number_of_files) + TAB_WIDTH (chars_per_input_tab, chars_per_number); */ /* Estimate chars_per_text without any margin and keep it constant. */ @@ -1254,7 +1253,7 @@ index 26f221f..633f50e 100644 /* The number is part of the column width unless we are printing files in parallel. */ -@@ -1271,7 +1395,7 @@ init_parameters (int number_of_files) +@@ -1270,7 +1394,7 @@ init_parameters (int number_of_files) } int sep_chars, useful_chars; @@ -1263,7 +1262,7 @@ index 26f221f..633f50e 100644 sep_chars = INT_MAX; if (INT_SUBTRACT_WRAPV (chars_per_line - chars_used_by_number, sep_chars, &useful_chars)) -@@ -1294,7 +1418,7 @@ init_parameters (int number_of_files) +@@ -1293,7 +1417,7 @@ init_parameters (int number_of_files) We've to use 8 as the lower limit, if we use chars_per_default_tab = 8 to expand a tab which is not an input_tab-char. */ free (clump_buff); @@ -1272,7 +1271,7 @@ index 26f221f..633f50e 100644 } /* Open the necessary files, -@@ -1402,7 +1526,7 @@ init_funcs (void) +@@ -1399,7 +1523,7 @@ init_funcs (void) /* Enlarge p->start_position of first column to use the same form of padding_not_printed with all columns. */ @@ -1281,7 +1280,7 @@ index 26f221f..633f50e 100644 /* This loop takes care of all but the rightmost column. */ -@@ -1436,7 +1560,7 @@ init_funcs (void) +@@ -1433,7 +1557,7 @@ init_funcs (void) } else { @@ -1290,7 +1289,7 @@ index 26f221f..633f50e 100644 h_next = h + chars_per_column; } } -@@ -1727,9 +1851,9 @@ static void +@@ -1724,9 +1848,9 @@ static void align_column (COLUMN *p) { padding_not_printed = p->start_position; @@ -1302,7 +1301,7 @@ index 26f221f..633f50e 100644 padding_not_printed = ANYWHERE; } -@@ -2004,13 +2128,13 @@ store_char (char c) +@@ -2001,13 +2125,13 @@ store_char (char c) /* May be too generous. */ buff = X2REALLOC (buff, &buff_allocated); } @@ -1318,7 +1317,7 @@ index 26f221f..633f50e 100644 char *s; int num_width; -@@ -2027,22 +2151,24 @@ add_line_number (COLUMN *p) +@@ -2024,22 +2148,24 @@ add_line_number (COLUMN *p) /* Tabification is assumed for multiple columns, also for n-separators, but 'default n-separator = TAB' hasn't been given priority over equal column_width also specified by POSIX. */ @@ -1347,7 +1346,7 @@ index 26f221f..633f50e 100644 output_position = POS_AFTER_TAB (chars_per_output_tab, output_position); } -@@ -2203,7 +2329,7 @@ print_white_space (void) +@@ -2198,7 +2324,7 @@ print_white_space (void) while (goal - h_old > 1 && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal) { @@ -1356,7 +1355,7 @@ index 26f221f..633f50e 100644 h_old = h_new; } while (++h_old <= goal) -@@ -2223,6 +2349,7 @@ print_sep_string (void) +@@ -2218,6 +2344,7 @@ print_sep_string (void) { char const *s = col_sep_string; int l = col_sep_length; @@ -1364,7 +1363,7 @@ index 26f221f..633f50e 100644 if (separators_not_printed <= 0) { -@@ -2234,6 +2361,7 @@ print_sep_string (void) +@@ -2229,6 +2356,7 @@ print_sep_string (void) { for (; separators_not_printed > 0; --separators_not_printed) { @@ -1372,7 +1371,7 @@ index 26f221f..633f50e 100644 while (l-- > 0) { /* 3 types of sep_strings: spaces only, spaces and chars, -@@ -2247,12 +2375,15 @@ print_sep_string (void) +@@ -2242,12 +2370,15 @@ print_sep_string (void) } else { @@ -1389,7 +1388,7 @@ index 26f221f..633f50e 100644 /* sep_string ends with some spaces */ if (spaces_not_printed > 0) print_white_space (); -@@ -2280,7 +2411,7 @@ print_clump (COLUMN *p, int n, char *clump) +@@ -2275,7 +2406,7 @@ print_clump (COLUMN *p, int n, char *clump) required number of tabs and spaces. */ static void @@ -1398,7 +1397,7 @@ index 26f221f..633f50e 100644 { if (tabify_output) { -@@ -2304,6 +2435,74 @@ print_char (char c) +@@ -2299,6 +2430,74 @@ print_char (char c) putchar (c); } @@ -1473,7 +1472,7 @@ index 26f221f..633f50e 100644 /* Skip to page PAGE before printing. PAGE may be larger than total number of pages. */ -@@ -2483,9 +2682,9 @@ read_line (COLUMN *p) +@@ -2476,9 +2675,9 @@ read_line (COLUMN *p) align_empty_cols = false; } @@ -1485,8 +1484,8 @@ index 26f221f..633f50e 100644 padding_not_printed = ANYWHERE; } -@@ -2555,7 +2754,7 @@ print_stored (COLUMN *p) - int i; +@@ -2547,7 +2746,7 @@ print_stored (COLUMN *p) + COLUMN *q; int line = p->current_line++; - char *first = &buff[line_vector[line]]; @@ -1494,7 +1493,7 @@ index 26f221f..633f50e 100644 /* FIXME UMR: Uninitialized memory read: * This is occurring while in: -@@ -2567,7 +2766,7 @@ print_stored (COLUMN *p) +@@ -2559,7 +2758,7 @@ print_stored (COLUMN *p) xmalloc [xmalloc.c:94] init_store_cols [pr.c:1648] */ @@ -1503,7 +1502,7 @@ index 26f221f..633f50e 100644 pad_vertically = true; -@@ -2586,9 +2785,9 @@ print_stored (COLUMN *p) +@@ -2579,9 +2778,9 @@ print_stored (COLUMN *p) } } @@ -1515,7 +1514,7 @@ index 26f221f..633f50e 100644 padding_not_printed = ANYWHERE; } -@@ -2601,8 +2800,8 @@ print_stored (COLUMN *p) +@@ -2594,8 +2793,8 @@ print_stored (COLUMN *p) if (spaces_not_printed == 0) { output_position = p->start_position + end_vector[line]; @@ -1526,7 +1525,7 @@ index 26f221f..633f50e 100644 } return true; -@@ -2621,7 +2820,7 @@ print_stored (COLUMN *p) +@@ -2614,7 +2813,7 @@ print_stored (COLUMN *p) number of characters is 1.) */ static int @@ -1535,7 +1534,7 @@ index 26f221f..633f50e 100644 { unsigned char uc = c; char *s = clump_buff; -@@ -2631,10 +2830,10 @@ char_to_clump (char c) +@@ -2624,10 +2823,10 @@ char_to_clump (char c) int chars; int chars_per_c = 8; @@ -1548,7 +1547,7 @@ index 26f221f..633f50e 100644 { width = TAB_WIDTH (chars_per_c, input_position); -@@ -2715,6 +2914,164 @@ char_to_clump (char c) +@@ -2708,6 +2907,164 @@ char_to_clump (char c) return chars; } @@ -1732,7 +1731,7 @@ index 6d2eec5..f189a0d 100644 #include "system.h" #include "argmatch.h" #include "die.h" -@@ -165,14 +173,39 @@ static int decimal_point; +@@ -161,14 +169,39 @@ static int decimal_point; /* Thousands separator; if -1, then there isn't one. */ static int thousands_sep; @@ -1773,7 +1772,7 @@ index 6d2eec5..f189a0d 100644 /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -346,13 +379,11 @@ static bool reverse; +@@ -342,13 +375,11 @@ static bool reverse; they were read if all keys compare equal. */ static bool stable; @@ -1790,7 +1789,7 @@ index 6d2eec5..f189a0d 100644 /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -811,6 +842,46 @@ reap_all (void) +@@ -806,6 +837,46 @@ reap_all (void) reap (-1); } @@ -1837,7 +1836,7 @@ index 6d2eec5..f189a0d 100644 /* Clean up any remaining temporary files. */ static void -@@ -1255,7 +1326,7 @@ zaptemp (char const *name) +@@ -1274,7 +1345,7 @@ zaptemp (char const *name) free (node); } @@ -1846,7 +1845,7 @@ index 6d2eec5..f189a0d 100644 static int struct_month_cmp (void const *m1, void const *m2) -@@ -1270,7 +1341,7 @@ struct_month_cmp (void const *m1, void const *m2) +@@ -1289,7 +1360,7 @@ struct_month_cmp (void const *m1, void const *m2) /* Initialize the character class tables. */ static void @@ -1855,7 +1854,7 @@ index 6d2eec5..f189a0d 100644 { size_t i; -@@ -1282,7 +1353,7 @@ inittables (void) +@@ -1301,7 +1372,7 @@ inittables (void) fold_toupper[i] = toupper (i); } @@ -1864,7 +1863,7 @@ index 6d2eec5..f189a0d 100644 /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -1364,6 +1435,84 @@ specify_nmerge (int oi, char c, char const *s) +@@ -1383,6 +1454,84 @@ specify_nmerge (int oi, char c, char const *s) xstrtol_fatal (e, oi, c, long_options, s); } @@ -1949,7 +1948,7 @@ index 6d2eec5..f189a0d 100644 /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (int oi, char c, char const *s) -@@ -1597,7 +1746,7 @@ buffer_linelim (struct buffer const *buf) +@@ -1614,7 +1763,7 @@ buffer_linelim (struct buffer const *buf) by KEY in LINE. */ static char * @@ -1958,7 +1957,7 @@ index 6d2eec5..f189a0d 100644 { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -1606,10 +1755,10 @@ begfield (struct line const *line, struct keyfield const *key) +@@ -1623,10 +1772,10 @@ begfield (struct line const *line, struct keyfield const *key) /* The leading field separator itself is included in a field when -t is absent. */ @@ -1971,7 +1970,7 @@ index 6d2eec5..f189a0d 100644 ++ptr; if (ptr < lim) ++ptr; -@@ -1635,11 +1784,70 @@ begfield (struct line const *line, struct keyfield const *key) +@@ -1652,11 +1801,70 @@ begfield (struct line const *line, struct keyfield const *key) return ptr; } @@ -2043,7 +2042,7 @@ index 6d2eec5..f189a0d 100644 { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -1654,10 +1862,10 @@ limfield (struct line const *line, struct keyfield const *key) +@@ -1671,10 +1879,10 @@ limfield (struct line const *line, struct keyfield const *key) 'beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first 'blank' character after the preceding field. */ @@ -2056,7 +2055,7 @@ index 6d2eec5..f189a0d 100644 ++ptr; if (ptr < lim && (eword || echar)) ++ptr; -@@ -1703,10 +1911,10 @@ limfield (struct line const *line, struct keyfield const *key) +@@ -1720,10 +1928,10 @@ limfield (struct line const *line, struct keyfield const *key) */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -2069,7 +2068,7 @@ index 6d2eec5..f189a0d 100644 if (newlim) lim = newlim; } -@@ -1737,6 +1945,130 @@ limfield (struct line const *line, struct keyfield const *key) +@@ -1754,6 +1962,130 @@ limfield (struct line const *line, struct keyfield const *key) return ptr; } @@ -2200,7 +2199,7 @@ index 6d2eec5..f189a0d 100644 /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1823,8 +2155,22 @@ fillbuf (struct buffer *buf, FILE *fp, char const *file) +@@ -1840,8 +2172,22 @@ fillbuf (struct buffer *buf, FILE *fp, char const *file) else { if (key->skipsblanks) @@ -2225,7 +2224,7 @@ index 6d2eec5..f189a0d 100644 line->keybeg = line_start; } } -@@ -1974,7 +2320,7 @@ human_numcompare (char const *a, char const *b) +@@ -1991,7 +2337,7 @@ human_numcompare (char const *a, char const *b) hideously fast. */ static int @@ -2234,7 +2233,7 @@ index 6d2eec5..f189a0d 100644 { while (blanks[to_uchar (*a)]) a++; -@@ -1984,6 +2330,25 @@ numcompare (char const *a, char const *b) +@@ -2001,6 +2347,25 @@ numcompare (char const *a, char const *b) return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -2259,8 +2258,8 @@ index 6d2eec5..f189a0d 100644 + /* Work around a problem whereby the long double value returned by glibc's strtold ("NaN", ...) contains uninitialized bits: clear all bytes of - A and B before calling strtold. FIXME: remove this function once -@@ -2034,7 +2399,7 @@ general_numcompare (char const *sa, char const *sb) + A and B before calling strtold. FIXME: remove this function if +@@ -2051,7 +2416,7 @@ general_numcompare (char const *sa, char const *sb) Return 0 if the name in S is not recognized. */ static int @@ -2269,7 +2268,7 @@ index 6d2eec5..f189a0d 100644 { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -2310,15 +2675,14 @@ debug_key (struct line const *line, struct keyfield const *key) +@@ -2327,15 +2692,14 @@ debug_key (struct line const *line, struct keyfield const *key) char saved = *lim; *lim = '\0'; @@ -2287,7 +2286,7 @@ index 6d2eec5..f189a0d 100644 else if (key->general_numeric) ignore_value (strtold (beg, &tighter_lim)); else if (key->numeric || key->human_numeric) -@@ -2452,7 +2816,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) +@@ -2469,7 +2833,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) /* Warn about significant leading blanks. */ bool implicit_skip = key_numeric (key) || key->month; bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ @@ -2296,7 +2295,7 @@ index 6d2eec5..f189a0d 100644 && ((!key->skipsblanks && !implicit_skip) || (!key->skipsblanks && key->schar) || (!key->skipeblanks && key->echar))) -@@ -2510,11 +2874,87 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) +@@ -2527,11 +2891,87 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) error (0, 0, _("option '-r' only applies to last-resort comparison")); } @@ -2385,7 +2384,7 @@ index 6d2eec5..f189a0d 100644 { struct keyfield *key = keylist; -@@ -2599,7 +3039,7 @@ keycompare (struct line const *a, struct line const *b) +@@ -2616,7 +3056,7 @@ keycompare (struct line const *a, struct line const *b) else if (key->human_numeric) diff = human_numcompare (ta, tb); else if (key->month) @@ -2394,7 +2393,7 @@ index 6d2eec5..f189a0d 100644 else if (key->random) diff = compare_random (ta, tlena, tb, tlenb); else if (key->version) -@@ -2715,6 +3155,211 @@ keycompare (struct line const *a, struct line const *b) +@@ -2732,6 +3172,211 @@ keycompare (struct line const *a, struct line const *b) return key->reverse ? -diff : diff; } @@ -2606,16 +2605,16 @@ index 6d2eec5..f189a0d 100644 /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -2742,7 +3387,7 @@ compare (struct line const *a, struct line const *b) +@@ -2759,7 +3404,7 @@ compare (struct line const *a, struct line const *b) diff = - NONZERO (blen); else if (blen == 0) diff = 1; - else if (hard_LC_COLLATE) + else if (hard_LC_COLLATE && !folding) { - /* Note xmemcoll0 is a performance enhancement as + /* xmemcoll0 is a performance enhancement as it will not unconditionally write '\0' after the -@@ -4139,6 +4784,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype) +@@ -4149,6 +4794,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype) break; case 'f': key->translate = fold_toupper; @@ -2623,7 +2622,7 @@ index 6d2eec5..f189a0d 100644 break; case 'g': key->general_numeric = true; -@@ -4218,7 +4864,7 @@ main (int argc, char **argv) +@@ -4228,7 +4874,7 @@ main (int argc, char **argv) initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -2632,7 +2631,7 @@ index 6d2eec5..f189a0d 100644 hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -4239,6 +4885,29 @@ main (int argc, char **argv) +@@ -4249,6 +4895,29 @@ main (int argc, char **argv) thousands_sep = -1; } @@ -2662,7 +2661,7 @@ index 6d2eec5..f189a0d 100644 have_read_stdin = false; inittables (); -@@ -4513,13 +5182,34 @@ main (int argc, char **argv) +@@ -4523,13 +5192,34 @@ main (int argc, char **argv) case 't': { @@ -2701,7 +2700,7 @@ index 6d2eec5..f189a0d 100644 else { /* Provoke with 'sort -txx'. Complain about -@@ -4530,9 +5220,11 @@ main (int argc, char **argv) +@@ -4540,9 +5230,11 @@ main (int argc, char **argv) quote (optarg)); } } @@ -2715,7 +2714,7 @@ index 6d2eec5..f189a0d 100644 } break; -@@ -4770,12 +5462,10 @@ main (int argc, char **argv) +@@ -4771,12 +5463,10 @@ main (int argc, char **argv) sort (files, nfiles, outfile, nthreads); } @@ -2843,7 +2842,7 @@ index 87a0c93..9f755d9 100644 + while (pos < size) + { + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); -+ ++ + if (convfail || !(iswblank (wc) || wc == '\n')) + { + pos += mblength; @@ -2886,7 +2885,7 @@ index 87a0c93..9f755d9 100644 if (check_chars < oldlen) oldlen = check_chars; if (check_chars < newlen) -@@ -295,14 +401,103 @@ different (char *old, char *new, size_t oldlen, size_t newlen) +@@ -295,15 +401,104 @@ different (char *old, char *new, size_t oldlen, size_t newlen) if (ignore_case) { @@ -2918,8 +2917,8 @@ index 87a0c93..9f755d9 100644 + + return xmemcoll (copy_old, oldlen, copy_new, newlen); + -+} -+ + } + +#if HAVE_MBRTOWC +static int +different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate) @@ -2990,11 +2989,12 @@ index 87a0c93..9f755d9 100644 + free (copy[1]); + return rc; + - } ++} +#endif - ++ /* Output the line in linebuffer LINE to standard output provided that the switches say it should be output. + MATCH is true if the line matches the previous line. @@ -367,19 +562,38 @@ check_file (const char *infile, const char *outfile, char delimiter) char *prevfield IF_LINT ( = NULL); size_t prevlen IF_LINT ( = 0); @@ -3118,7 +3118,7 @@ index 87a0c93..9f755d9 100644 skip_fields = 0; check_chars = SIZE_MAX; diff --git a/tests/i18n/sort.sh b/tests/i18n/sort.sh -new file mode 100644 +new file mode 100755 index 0000000..26c95de --- /dev/null +++ b/tests/i18n/sort.sh @@ -3156,7 +3156,7 @@ diff --git a/tests/local.mk b/tests/local.mk index 568944e..192f776 100644 --- a/tests/local.mk +++ b/tests/local.mk -@@ -350,6 +350,8 @@ all_tests = \ +@@ -368,6 +368,8 @@ all_tests = \ tests/misc/sort-discrim.sh \ tests/misc/sort-files0-from.pl \ tests/misc/sort-float.sh \ @@ -3165,32 +3165,6 @@ index 568944e..192f776 100644 tests/misc/sort-h-thousands-sep.sh \ tests/misc/sort-merge.pl \ tests/misc/sort-merge-fdlimit.sh \ -diff --git a/tests/misc/cut.pl b/tests/misc/cut.pl -index f6f8a56..b426a80 100755 ---- a/tests/misc/cut.pl -+++ b/tests/misc/cut.pl -@@ -23,9 +23,11 @@ use strict; - # Turn off localization of executable's output. - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - --my $mb_locale = $ENV{LOCALE_FR_UTF8}; -+my $mb_locale; -+# uncommented enable multibyte paths -+$mb_locale = $ENV{LOCALE_FR_UTF8}; - ! defined $mb_locale || $mb_locale eq 'none' -- and $mb_locale = 'C'; -+ and $mb_locale = 'C'; - - my $prog = 'cut'; - my $try = "Try '$prog --help' for more information.\n"; -@@ -240,6 +242,7 @@ if ($mb_locale ne 'C') - my @new_t = @$t; - my $test_name = shift @new_t; - -+ next if ($test_name =~ "newline-[12][0-9]"); - push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; - } - push @Tests, @new; diff --git a/tests/misc/expand.pl b/tests/misc/expand.pl index 8a9cad1..9293e39 100755 --- a/tests/misc/expand.pl @@ -3211,7 +3185,7 @@ index 8a9cad1..9293e39 100755 my @Tests = ( ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], -@@ -140,6 +149,8 @@ my @Tests = +@@ -168,6 +177,8 @@ my @Tests = # Test errors @@ -3220,8 +3194,8 @@ index 8a9cad1..9293e39 100755 ['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR => "$prog: tab size contains invalid character(s): 'a'\n"}], ['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1}, -@@ -150,6 +161,37 @@ my @Tests = - {ERR => "$prog: tab sizes must be ascending\n"}], +@@ -184,6 +195,37 @@ my @Tests = + {ERR => "$prog: '/' specifier not at start of number: '/'\n"}], ); +if ($mb_locale ne 'C') @@ -3351,7 +3325,7 @@ index 4d399d8..07f2823 100755 my $delim = chr 0247; sub t_subst ($) { -@@ -329,8 +338,49 @@ foreach my $t (@tv) +@@ -333,8 +342,49 @@ foreach my $t (@tv) push @Tests, $new_ent; } @@ -3402,7 +3376,7 @@ index 4d399d8..07f2823 100755 my $verbose = $ENV{VERBOSE}; diff --git a/tests/misc/sort-mb-tests.sh b/tests/misc/sort-mb-tests.sh -new file mode 100644 +new file mode 100755 index 0000000..11836ba --- /dev/null +++ b/tests/misc/sort-mb-tests.sh @@ -3533,7 +3507,7 @@ index c3e7f8e..6ecd3ff 100755 # Since each test is run with a file name and with redirected stdin, # the name in the diagnostic is either the file name or "-". # Normalize each diagnostic to use '-'. -@@ -424,6 +429,38 @@ foreach my $t (@Tests) +@@ -423,6 +428,38 @@ foreach my $t (@Tests) } } @@ -3572,7 +3546,7 @@ index c3e7f8e..6ecd3ff 100755 @Tests = triple_test \@Tests; # Remember that triple_test creates from each test with exactly one "IN" -@@ -433,6 +470,7 @@ foreach my $t (@Tests) +@@ -432,6 +469,7 @@ foreach my $t (@Tests) # Remove the IN_PIPE version of the "output-is-input" test above. # The others aren't susceptible because they have three inputs each. @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; diff --git a/curl/curl.nm b/curl/curl.nm index da7512e31..8ff369aed 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,7 +4,7 @@ ############################################################################### name = curl -version = 7.64.1 +version = 7.65.1 release = 1 groups = Application/Internet diff --git a/intel-microcode/intel-microcode.nm b/intel-microcode/intel-microcode.nm new file mode 100644 index 000000000..1232a9311 --- /dev/null +++ b/intel-microcode/intel-microcode.nm @@ -0,0 +1,40 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = intel-microcode +version = 20190618 +release = 1 +arch = noarch +thisapp = microcode-%{version} + +maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> +groups = System/Libraries +url = https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases +license = Non-GPL +summary = Microcode update for Intel CPU's. + +description + intel-microcode provides some binaries that + are loaded into the Intel CPU at startup. +end + +source_dl = https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/ + +build + build + : # Nothing to do. + end + + DIR_APP = %{DIR_SRC}/Intel-Linux-Processor-Microcode-Data-Files-%{thisapp} + + install + mkdir -pv %{BUILDROOT}%{prefix}/lib/firmware + cp -prv intel-ucode %{BUILDROOT}%{prefix}/lib/firmware + end +end + +packages + package %{name} +end diff --git a/openssh/openssh.nm b/openssh/openssh.nm index cd5f32dad..0cb49bcbf 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -4,7 +4,7 @@ ############################################################################### name = openssh -version = 7.5p1 +version = 8.0p1 release = 1 groups = Application/Internet diff --git a/systemd/systemd.nm b/systemd/systemd.nm index a1c3677d0..cd82ba000 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 242 -release = 2 +release = 4 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -52,15 +52,17 @@ build libblkid-devel libcap-devel libgcrypt-devel - libmount-devel - libuuid-devel + libmount-devel >= 2.34-2 + libseccomp-devel + libuuid-devel >= 2.34-2 m4 - meson - ninja >= 1.5 + meson >= 0.50.1 + ninja >= 1.9.0 pam-devel pciutils-devel python3-devel python3-lxml + setup >= 3.0-13 usbutils vala xz-devel @@ -95,10 +97,10 @@ build build # Call meson and pass configure options. - meson --buildtype=plain %{configure_options} . build + %{meson} %{configure_options} # Call ninja to start build - ninja -v %{PARALLELISMFLAGS} -C build + %{meson_build} end test @@ -113,11 +115,8 @@ build end install - # Export destdir. - export DESTDIR=%{BUILDROOT} - - # Call ninja to perform installation - ninja install -v %{PARALLELISMFLAGS} -C build + # Install systemd. + %{meson_install} # Create folder in log to store the journal. mkdir -pv %{BUILDROOT}/var/log/journal @@ -242,7 +241,6 @@ packages python-dbus python-gobject3 %{name}-libs=%{thisver} - %{name}-units=%{thisver} util-linux>=2.19 end @@ -269,6 +267,7 @@ packages obsoletes udev < 183 + systemd-units <= 242 end configfiles @@ -339,43 +338,6 @@ packages end end - # Package information for systemd-units - package %{name}-units - summary = Configuration files, directories and installation tool for systemd. - description - This package contains all needed configuration files, directories - and installation / configuration tool for systemd. - end - - prerequires - /bin/sh - coreutils - end - - provides - /bin/systemctl - end - - conflicts - filesystem < 002 - end - - files - %{sysconfdir}/etc/systemd/system - %{sysconfdir}/tmpfiles.d - %{sysconfdir}/bash_completion.d/systemctl-bash-completion.sh - %{unitdir} - %{bindir}/systemctl - %{bindir}/systemd-tmpfiles - %{mandir}/man1/systemctl.* - end - - script postup - # Reload service files - /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : - end - end - package %{name}-libs template LIBS hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.23-core133, created. 0dd16f4047789c69a3234eec0fdb963509f3fedd
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

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 tag, v2.23-core133 has been created at 0dd16f4047789c69a3234eec0fdb963509f3fedd (commit) - Log ----------------------------------------------------------------- commit 0dd16f4047789c69a3234eec0fdb963509f3fedd Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Jun 17 14:08:00 2019 +0000 vpnmain.cgi: Fix writing ESP settings for PFS ciphers The changes introduced due to #12091 caused IPsec ESP to be invalid if PFS ciphers were selected. Code has to read "!$pfs" instead of just "$pfs", as it should trigger for ciphers _without_ Perfect Forward Secrecy. Fixes #12099 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Cc: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core134, created. c6e032e13d5d1eff16189c50229f00522835aae5
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c6e032e13d5d1eff16189c50229f00522835aae5
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

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, master has been updated via c6e032e13d5d1eff16189c50229f00522835aae5 (commit) via c8ee8f37d401a16db0a3a784301f94b71964860c (commit) via 92f6c5ed861c9e7597cf8e882d96277a8b40e494 (commit) via 7866fa2513693d7bde786c2924b1118f0488c30c (commit) via f3959d13e858f4768f45244a3792851acda740d8 (commit) via 1722701a9aab07e1a96ae25d2cedcbac403ddb76 (commit) via 744f16e45a9d7923f99ee8ce6e2cbebda131824c (commit) via 70dd356329f2f5617a0f4572d15c2d6ae94e1c6f (commit) via 3a8fef331dd2950705c1d32ec314fa72a84463d9 (commit) via 70590cef482e17063838e62ad1aad349ef1133b5 (commit) via 4b64da2914c53c4fad16341c17fc23b88f356f4e (commit) via beac38454154ceb878c9f73dd9834f3324f086be (commit) via 98f55e136fe482f8c191ba5c541887ce2d0007ec (commit) via d3e88203308ea22105d12d6ebfb08f81e0efbdc8 (commit) via a04eedfe7da2719452d6f683c05ca644cda71195 (commit) via 15ca18a3d9efbe8879e8b22f1f72eaeb596ca2f9 (commit) via 82c279a518613a2a9ba200e14629c0171d0c4233 (commit) via 1a129822af7e4e574ee5ca8e6c973b560d563324 (commit) via 7516e8b7f1edff1ff59c1e8ac3f342c66bada85d (commit) via cc724c142aa71d9e33d923599f31ec19bd2072e2 (commit) via 82899ad1ce895d3b2348b6c7eb6179096e3724aa (commit) via 2f278de868f0a62f03bf6f32d76309a0c1d8f9fe (commit) via 1307df22574f5c4a04b79510b181e17fa33bad5d (commit) via f5662122b5d5e1dba35d8de599597ac9f1870623 (commit) via 527078e439fc7376c3a7da3ae8551c853e99e2b7 (commit) via 69772b7dda05726077fa5c70e86f41169a91534f (commit) via ce46df9b83d15033156845e19e9a386e52a0a1cd (commit) via e263c29c929e69e345833f436d4958d88264020c (commit) via 91056adea5d6e203f41e7743443eb61ed2b885cf (commit) via 043e7aa50ff36e65eb0d6a341b09301ce25795f0 (commit) from 0dd16f4047789c69a3234eec0fdb963509f3fedd (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 c6e032e13d5d1eff16189c50229f00522835aae5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 22 08:47:55 2019 +0200 finish core134 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit c8ee8f37d401a16db0a3a784301f94b71964860c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 21 01:39:42 2019 +0100 Update contributors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 92f6c5ed861c9e7597cf8e882d96277a8b40e494 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 21 01:38:59 2019 +0100 core134: Ship updated firewall initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7866fa2513693d7bde786c2924b1118f0488c30c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 21 01:38:22 2019 +0100 core134: Ship updated bind Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f3959d13e858f4768f45244a3792851acda740d8 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jun 21 14:31:26 2019 +0200 bind: Update to 9.11.8 For Details see: https://downloads.isc.org/isc/bind9/9.11.8/RELEASE-NOTES-bind-9.11.8.html "Security Fixes A race condition could trigger an assertion failure when a large number of incoming packets were being rejected. This flaw is disclosed in CVE-2019-6471. [GL #942]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1722701a9aab07e1a96ae25d2cedcbac403ddb76 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Jun 20 07:04:30 2019 +0200 BUG12015: Redirecting to Captive portal does not work after IPFire restart When the Captive portal is enabled, the needed firewall rules are applied. But when restarting IPFire, the rules are not applied because there is no call to do so. Added call to captivectrl in the initscrip 'firewall'. Fixes: #12015 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 744f16e45a9d7923f99ee8ce6e2cbebda131824c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 21 11:58:58 2019 +0200 core134: ship core133 late fixes again Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 70dd356329f2f5617a0f4572d15c2d6ae94e1c6f Merge: 3a8fef331 0dd16f404 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 20 09:35:59 2019 +0200 Merge remote-tracking branch 'origin/master' into next commit 3a8fef331dd2950705c1d32ec314fa72a84463d9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 20 09:33:17 2019 +0200 kernel: remove RPi DMA allignment revert TODO: test if RPi works without now or if we need to revert more of the allignment patches. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 70590cef482e17063838e62ad1aad349ef1133b5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 19 21:01:29 2019 +0200 Kernel: update to 4.14.128 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4b64da2914c53c4fad16341c17fc23b88f356f4e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 18 22:35:23 2019 +0100 core134: Ship updated vim Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit beac38454154ceb878c9f73dd9834f3324f086be Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Jun 19 13:24:06 2019 +0200 Remove old vim 7.4 data Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 98f55e136fe482f8c191ba5c541887ce2d0007ec Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Jun 19 13:24:05 2019 +0200 vim: Update to 8.1 Please note: If this gets merged, the update process must deal with the otherwise remaining files in '/usr/share/vim74' (~16 MB). Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d3e88203308ea22105d12d6ebfb08f81e0efbdc8 Author: Stéphane Pautrel <stephane.pautrel(a)gmail.com> Date: Tue Jun 18 20:01:23 2019 +0100 Update French translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a04eedfe7da2719452d6f683c05ca644cda71195 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 18 18:49:46 2019 +0200 core134: add kernel to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 15ca18a3d9efbe8879e8b22f1f72eaeb596ca2f9 Merge: 82c279a51 7516e8b7f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 18 18:42:02 2019 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 82c279a518613a2a9ba200e14629c0171d0c4233 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 18 18:41:19 2019 +0200 kernel: update to 4.14.127 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1a129822af7e4e574ee5ca8e6c973b560d563324 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 18 14:36:02 2019 +0200 linux-pae: fix grub.conf creation on pv machines on some systems it seems that grub2 and it config also exist. commit 7516e8b7f1edff1ff59c1e8ac3f342c66bada85d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 18 09:13:21 2019 +0100 core134: Ship changed general-functions.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc724c142aa71d9e33d923599f31ec19bd2072e2 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Jun 18 09:55:35 2019 +0200 BUG12070: Its not possible to use the underscore in email addresses Using IPFire's Mailservice does not allow to enter a senders mail address with the underscore. The function used to verify that is used from general-functions.pl. Now the function 'validemail' allows the underscore in the address. Fixes: #12070 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 82899ad1ce895d3b2348b6c7eb6179096e3724aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 17 17:40:37 2019 +0100 core134: Ship updated unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2f278de868f0a62f03bf6f32d76309a0c1d8f9fe Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Jun 17 21:11:00 2019 +0200 unbound: Update to 1.9.2 For details see: https://nlnetlabs.nl/pipermail/unbound-users/2019-June/011632.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1307df22574f5c4a04b79510b181e17fa33bad5d Merge: f5662122b faec909e1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 15 18:09:06 2019 +0200 Merge branch 'master' into next commit f5662122b5d5e1dba35d8de599597ac9f1870623 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 14 22:09:47 2019 +0200 hyperscan: increase min RAM per buildprocess to 1GB Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 527078e439fc7376c3a7da3ae8551c853e99e2b7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 12 17:25:13 2019 +0100 core134: Ship updated OpenSSL Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 69772b7dda05726077fa5c70e86f41169a91534f Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Jun 10 18:55:00 2019 +0000 OpenSSL: lower priority for CBC ciphers in default cipherlist In order to avoid CBC ciphers as often as possible (they contain some known vulnerabilities), this changes the OpenSSL default ciphersuite to: TLS_CHACHA20_POLY1305_SHA256 TLSv1.3 Kx=any Au=any Enc=CHACHA20/POLY1305(256) Mac=AEAD TLS_AES_256_GCM_SHA384 TLSv1.3 Kx=any Au=any Enc=AESGCM(256) Mac=AEAD TLS_AES_128_GCM_SHA256 TLSv1.3 Kx=any Au=any Enc=AESGCM(128) Mac=AEAD ECDHE-ECDSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=ECDSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-ECDSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(256) Mac=AEAD ECDHE-ECDSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(128) Mac=AEAD ECDHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=RSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(256) Mac=AEAD ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(128) Mac=AEAD ECDHE-ECDSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(256) Mac=SHA384 ECDHE-ECDSA-CAMELLIA256-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=Camellia(256) Mac=SHA384 ECDHE-RSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(256) Mac=SHA384 ECDHE-RSA-CAMELLIA256-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=Camellia(256) Mac=SHA384 ECDHE-ECDSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(128) Mac=SHA256 ECDHE-ECDSA-CAMELLIA128-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=Camellia(128) Mac=SHA256 ECDHE-RSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(128) Mac=SHA256 ECDHE-RSA-CAMELLIA128-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=Camellia(128) Mac=SHA256 DHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=DH Au=RSA Enc=CHACHA20/POLY1305(256) Mac=AEAD DHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=DH Au=RSA Enc=AESGCM(256) Mac=AEAD DHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AESGCM(128) Mac=AEAD DHE-RSA-AES256-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AES(256) Mac=SHA256 DHE-RSA-CAMELLIA256-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=Camellia(256) Mac=SHA256 DHE-RSA-AES128-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AES(128) Mac=SHA256 DHE-RSA-CAMELLIA128-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=Camellia(128) Mac=SHA256 ECDHE-ECDSA-AES256-SHA TLSv1 Kx=ECDH Au=ECDSA Enc=AES(256) Mac=SHA1 ECDHE-ECDSA-AES128-SHA TLSv1 Kx=ECDH Au=ECDSA Enc=AES(128) Mac=SHA1 ECDHE-RSA-AES256-SHA TLSv1 Kx=ECDH Au=RSA Enc=AES(256) Mac=SHA1 ECDHE-RSA-AES128-SHA TLSv1 Kx=ECDH Au=RSA Enc=AES(128) Mac=SHA1 DHE-RSA-AES256-SHA SSLv3 Kx=DH Au=RSA Enc=AES(256) Mac=SHA1 DHE-RSA-CAMELLIA256-SHA SSLv3 Kx=DH Au=RSA Enc=Camellia(256) Mac=SHA1 DHE-RSA-AES128-SHA SSLv3 Kx=DH Au=RSA Enc=AES(128) Mac=SHA1 DHE-RSA-CAMELLIA128-SHA SSLv3 Kx=DH Au=RSA Enc=Camellia(128) Mac=SHA1 AES256-GCM-SHA384 TLSv1.2 Kx=RSA Au=RSA Enc=AESGCM(256) Mac=AEAD AES128-GCM-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=AESGCM(128) Mac=AEAD AES256-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=AES(256) Mac=SHA256 CAMELLIA256-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=Camellia(256) Mac=SHA256 AES128-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=AES(128) Mac=SHA256 CAMELLIA128-SHA256 TLSv1.2 Kx=RSA Au=RSA Enc=Camellia(128) Mac=SHA256 AES256-SHA SSLv3 Kx=RSA Au=RSA Enc=AES(256) Mac=SHA1 CAMELLIA256-SHA SSLv3 Kx=RSA Au=RSA Enc=Camellia(256) Mac=SHA1 AES128-SHA SSLv3 Kx=RSA Au=RSA Enc=AES(128) Mac=SHA1 CAMELLIA128-SHA SSLv3 Kx=RSA Au=RSA Enc=Camellia(128) Mac=SHA1 Since TLS servers usually override the clients' preference with their own, this will neither break existing setups nor introduce huge differences in the wild. Unfortunately, CBC ciphers cannot be disabled at all, as they are still used by popular web sites. TLS 1.3 ciphers will be added implicitly and can be omitted in the ciphersting. Chacha20/Poly1305 is preferred over AES-GCM due to missing AES-NI support for the majority of installations reporting to Fireinfo (see https://fireinfo.ipfire.org/processors for details, AES-NI support is 28.22% at the time of writing). Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ce46df9b83d15033156845e19e9a386e52a0a1cd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 12 17:18:23 2019 +0100 Start Core Update 134 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e263c29c929e69e345833f436d4958d88264020c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 12 17:14:28 2019 +0100 unbound: Make some zones type-transparent If we remove other records (like MX) from the response, we won't be able to send mail to those hosts any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 91056adea5d6e203f41e7743443eb61ed2b885cf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 12 17:11:32 2019 +0100 unbound: Add yandex.com to safe search feature Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 043e7aa50ff36e65eb0d6a341b09301ce25795f0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 13 11:12:07 2019 +0100 unbound: safe search: Resolve hosts at startup unbound is not able to expand CNAMEs in local-data. Therefore we have to do it manually at startup. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 2 +- config/kernel/kernel.config.i586-ipfire | 3 +- config/kernel/kernel.config.i586-ipfire-pae | 3 +- config/kernel/kernel.config.x86_64-ipfire | 3 +- config/rootfiles/common/aarch64/linux | 1 + config/rootfiles/common/armv5tel/linux-kirkwood | 1 + config/rootfiles/common/armv5tel/linux-multi | 1 + config/rootfiles/common/bind | 2 +- config/rootfiles/common/i586/linux | 4 + config/rootfiles/common/unbound | 2 +- config/rootfiles/common/vim | 2759 ++++++++++---------- config/rootfiles/common/x86_64/linux | 4 + config/rootfiles/core/133/filelists/jansson | 1 - config/rootfiles/core/{133 => 134}/exclude | 0 .../124 => core/134}/filelists/aarch64/linux | 0 .../134}/filelists/aarch64/linux-initrd | 0 .../134}/filelists/armv5tel/linux-initrd-kirkwood | 0 .../134}/filelists/armv5tel/linux-initrd-multi | 0 .../134}/filelists/armv5tel/linux-kirkwood | 0 .../134}/filelists/armv5tel/linux-multi | 0 config/rootfiles/core/{133 => 134}/filelists/bind | 0 .../{oldcore/64 => core/134}/filelists/files | 5 +- .../{oldcore/100 => core/134}/filelists/i586/linux | 0 .../100 => core/134}/filelists/i586/linux-initrd | 0 .../100 => core/134}/filelists/i586/openssl-sse2 | 0 .../rootfiles/core/{133 => 134}/filelists/openssl | 0 .../{oldcore/106 => core/134}/filelists/unbound | 0 .../{oldcore/44 => core/134}/filelists/vim | 0 .../100 => core/134}/filelists/x86_64/linux | 0 .../100 => core/134}/filelists/x86_64/linux-initrd | 0 .../rootfiles/{oldcore/126 => core/134}/update.sh | 14 +- config/rootfiles/{core => oldcore}/133/exclude | 0 .../133/filelists/aarch64/binutils | 0 .../{core => oldcore}/133/filelists/aarch64/gcc | 0 .../{core => oldcore}/133/filelists/aarch64/glibc | 0 .../133/filelists/armv5tel/binutils | 0 .../{core => oldcore}/133/filelists/armv5tel/gcc | 0 .../{core => oldcore}/133/filelists/armv5tel/glibc | 0 .../rootfiles/{core => oldcore}/133/filelists/bind | 0 .../{core => oldcore}/133/filelists/files | 0 .../{core => oldcore}/133/filelists/i586/binutils | 0 .../{core => oldcore}/133/filelists/i586/gcc | 0 .../{core => oldcore}/133/filelists/i586/glibc | 0 .../{core => oldcore}/133/filelists/i586/hyperscan | 0 .../133/filelists/ids-ruleset-sources | 0 .../rootfiles/{core => oldcore}/133/filelists/knot | 0 .../{core => oldcore}/133/filelists/openssl | 0 .../rootfiles/{core => oldcore}/133/filelists/pam | 0 .../{core => oldcore}/133/filelists/rrdtool | 0 .../{core => oldcore}/133/filelists/squid | 0 .../{core => oldcore}/133/filelists/strongswan | 0 .../{core => oldcore}/133/filelists/suricata | 0 .../{core => oldcore}/133/filelists/wpa_supplicant | 0 .../133/filelists/x86_64/binutils | 0 .../{core => oldcore}/133/filelists/x86_64/gcc | 0 .../{core => oldcore}/133/filelists/x86_64/glibc | 0 .../133/filelists/x86_64/hyperscan | 0 config/rootfiles/{core => oldcore}/133/update.sh | 0 config/rootfiles/packages/linux-pae | 4 + doc/language_issues.fr | 86 +- doc/language_missings | 78 - html/cgi-bin/credits.cgi | 2 +- langs/fr/cgi-bin/fr.pl | 146 +- lfs/bind | 4 +- lfs/hyperscan | 4 +- lfs/linux | 13 +- lfs/openssl | 2 +- lfs/unbound | 4 +- lfs/vim | 8 +- make.sh | 4 +- src/initscripts/system/firewall | 3 + src/initscripts/system/unbound | 54 +- src/paks/linux-pae/install.sh | 4 +- ...tch => openssl-1.1.1c-default-cipherlist.patch} | 8 +- 74 files changed, 1686 insertions(+), 1543 deletions(-) delete mode 120000 config/rootfiles/core/133/filelists/jansson copy config/rootfiles/core/{133 => 134}/exclude (100%) copy config/rootfiles/{oldcore/124 => core/134}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/124 => core/134}/filelists/aarch64/linux-initrd (100%) copy config/rootfiles/{oldcore/121 => core/134}/filelists/armv5tel/linux-initrd-kirkwood (100%) copy config/rootfiles/{oldcore/121 => core/134}/filelists/armv5tel/linux-initrd-multi (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/core/{133 => 134}/filelists/bind (100%) copy config/rootfiles/{oldcore/64 => core/134}/filelists/files (53%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/core/{133 => 134}/filelists/openssl (100%) copy config/rootfiles/{oldcore/106 => core/134}/filelists/unbound (100%) copy config/rootfiles/{oldcore/44 => core/134}/filelists/vim (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/x86_64/linux-initrd (100%) copy config/rootfiles/{oldcore/126 => core/134}/update.sh (94%) rename config/rootfiles/{core => oldcore}/133/exclude (100%) rename config/rootfiles/{core => oldcore}/133/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/133/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/armv5tel/binutils (100%) rename config/rootfiles/{core => oldcore}/133/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/133/filelists/files (100%) rename config/rootfiles/{core => oldcore}/133/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/133/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/i586/hyperscan (100%) rename config/rootfiles/{core => oldcore}/133/filelists/ids-ruleset-sources (100%) rename config/rootfiles/{core => oldcore}/133/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/133/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/133/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/133/filelists/rrdtool (100%) rename config/rootfiles/{core => oldcore}/133/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/133/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/133/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/133/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/133/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/133/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/133/filelists/x86_64/hyperscan (100%) rename config/rootfiles/{core => oldcore}/133/update.sh (100%) rename src/patches/{openssl-1.1.1a-default-cipherlist.patch => openssl-1.1.1c-default-cipherlist.patch} (66%) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 04e36969c..aefcfb687 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -784,7 +784,7 @@ sub validemail { return 0 if ( substr($parts[1],-1,1) eq '.' ); #check first addresspart (before '@' sign) - return 0 if ( $parts[0] !~ m/^[a-zA-Z0-9\.!\-\+#]+$/ ); + return 0 if ( $parts[0] !~ m/^[a-zA-Z0-9\.!\-\_\+#]+$/ ); #check second addresspart (after '@' sign) return 0 if ( $parts[1] !~ m/^[a-zA-Z0-9\.\-]+$/ ); diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 82ee92ea7..ff07cdc0b 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.121-ipfire Kernel Configuration +# Linux/x86 4.14.128-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4522,6 +4522,7 @@ CONFIG_DRM_AMDGPU=m # # CONFIG_DRM_AMD_ACP is not set CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 13675255e..267438631 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.121-ipfire-pae Kernel Configuration +# Linux/x86 4.14.128-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4507,6 +4507,7 @@ CONFIG_DRM_AMDGPU=m # # CONFIG_DRM_AMD_ACP is not set CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 066832670..00314c7c9 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.121-ipfire Kernel Configuration +# Linux/x86 4.14.128-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4408,6 +4408,7 @@ CONFIG_DRM_AMDGPU=m # # CONFIG_DRM_AMD_ACP is not set CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 3c5f6d08d..0451cadcd 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -16173,6 +16173,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/free #lib/modules/KVER-ipfire/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 98cec076a..78d0050de 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -15469,6 +15469,7 @@ boot/vmlinuz-KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/free #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 986de4972..ec260e8c9 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -17207,6 +17207,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/free #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index af57b88ca..e1870e4af 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -270,7 +270,7 @@ usr/lib/libbind9.so.161.0.2 #usr/lib/libdns.la #usr/lib/libdns.so usr/lib/libdns.so.1106 -usr/lib/libdns.so.1106.0.0 +usr/lib/libdns.so.1106.0.1 #usr/lib/libisc.la #usr/lib/libisc.so usr/lib/libisc.so.1100 diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 22056e63e..1a1ca83a7 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -9763,6 +9763,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/nouveau/debug #lib/modules/KVER-ipfire/build/include/config/nouveau/debug.h #lib/modules/KVER-ipfire/build/include/config/nouveau/debug/default.h +#lib/modules/KVER-ipfire/build/include/config/nouveau/legacy +#lib/modules/KVER-ipfire/build/include/config/nouveau/legacy/ctx +#lib/modules/KVER-ipfire/build/include/config/nouveau/legacy/ctx/support.h #lib/modules/KVER-ipfire/build/include/config/nozomi.h #lib/modules/KVER-ipfire/build/include/config/nr #lib/modules/KVER-ipfire/build/include/config/nr/cpus.h @@ -17469,6 +17472,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/free #lib/modules/KVER-ipfire/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index a130a059b..7bab5a7dc 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.1 +usr/lib/libunbound.so.8.1.2 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/common/vim b/config/rootfiles/common/vim index 215f68929..85f57c32e 100644 --- a/config/rootfiles/common/vim +++ b/config/rootfiles/common/vim @@ -18,1311 +18,1454 @@ usr/bin/xxd #usr/share/man/man1/vimtutor.1 #usr/share/man/man1/xxd.1 usr/share/vim -#usr/share/vim/vim74 -#usr/share/vim/vim74/autoload -#usr/share/vim/vim74/autoload/README.txt -#usr/share/vim/vim74/autoload/ada.vim -#usr/share/vim/vim74/autoload/adacomplete.vim -#usr/share/vim/vim74/autoload/ccomplete.vim -#usr/share/vim/vim74/autoload/clojurecomplete.vim -#usr/share/vim/vim74/autoload/csscomplete.vim -#usr/share/vim/vim74/autoload/decada.vim -#usr/share/vim/vim74/autoload/getscript.vim -#usr/share/vim/vim74/autoload/gnat.vim -#usr/share/vim/vim74/autoload/gzip.vim -#usr/share/vim/vim74/autoload/htmlcomplete.vim -#usr/share/vim/vim74/autoload/javascriptcomplete.vim -#usr/share/vim/vim74/autoload/netrw.vim -#usr/share/vim/vim74/autoload/netrwFileHandlers.vim -#usr/share/vim/vim74/autoload/netrwSettings.vim -#usr/share/vim/vim74/autoload/paste.vim -#usr/share/vim/vim74/autoload/phpcomplete.vim -#usr/share/vim/vim74/autoload/python3complete.vim -#usr/share/vim/vim74/autoload/pythoncomplete.vim -#usr/share/vim/vim74/autoload/rubycomplete.vim -#usr/share/vim/vim74/autoload/spellfile.vim -#usr/share/vim/vim74/autoload/sqlcomplete.vim -#usr/share/vim/vim74/autoload/syntaxcomplete.vim -#usr/share/vim/vim74/autoload/tar.vim -#usr/share/vim/vim74/autoload/tohtml.vim -#usr/share/vim/vim74/autoload/vimball.vim -#usr/share/vim/vim74/autoload/xml -#usr/share/vim/vim74/autoload/xml/html32.vim -#usr/share/vim/vim74/autoload/xml/html401f.vim -#usr/share/vim/vim74/autoload/xml/html401s.vim -#usr/share/vim/vim74/autoload/xml/html401t.vim -#usr/share/vim/vim74/autoload/xml/html40f.vim -#usr/share/vim/vim74/autoload/xml/html40s.vim -#usr/share/vim/vim74/autoload/xml/html40t.vim -#usr/share/vim/vim74/autoload/xml/xhtml10f.vim -#usr/share/vim/vim74/autoload/xml/xhtml10s.vim -#usr/share/vim/vim74/autoload/xml/xhtml10t.vim -#usr/share/vim/vim74/autoload/xml/xhtml11.vim -#usr/share/vim/vim74/autoload/xml/xsd.vim -#usr/share/vim/vim74/autoload/xml/xsl.vim -#usr/share/vim/vim74/autoload/xmlcomplete.vim -#usr/share/vim/vim74/autoload/zip.vim -#usr/share/vim/vim74/bugreport.vim -#usr/share/vim/vim74/colors -#usr/share/vim/vim74/colors/README.txt -#usr/share/vim/vim74/colors/blue.vim -#usr/share/vim/vim74/colors/darkblue.vim -#usr/share/vim/vim74/colors/default.vim -#usr/share/vim/vim74/colors/delek.vim -#usr/share/vim/vim74/colors/desert.vim -#usr/share/vim/vim74/colors/elflord.vim -#usr/share/vim/vim74/colors/evening.vim -#usr/share/vim/vim74/colors/koehler.vim -#usr/share/vim/vim74/colors/morning.vim -#usr/share/vim/vim74/colors/murphy.vim -#usr/share/vim/vim74/colors/pablo.vim -#usr/share/vim/vim74/colors/peachpuff.vim -#usr/share/vim/vim74/colors/ron.vim -#usr/share/vim/vim74/colors/shine.vim -#usr/share/vim/vim74/colors/slate.vim -#usr/share/vim/vim74/colors/torte.vim -#usr/share/vim/vim74/colors/zellner.vim -#usr/share/vim/vim74/compiler -#usr/share/vim/vim74/compiler/README.txt -#usr/share/vim/vim74/compiler/ant.vim -#usr/share/vim/vim74/compiler/bcc.vim -#usr/share/vim/vim74/compiler/bdf.vim -#usr/share/vim/vim74/compiler/checkstyle.vim -#usr/share/vim/vim74/compiler/cs.vim -#usr/share/vim/vim74/compiler/cucumber.vim -#usr/share/vim/vim74/compiler/decada.vim -#usr/share/vim/vim74/compiler/dot.vim -#usr/share/vim/vim74/compiler/erlang.vim -#usr/share/vim/vim74/compiler/eruby.vim -#usr/share/vim/vim74/compiler/fortran_F.vim -#usr/share/vim/vim74/compiler/fortran_cv.vim -#usr/share/vim/vim74/compiler/fortran_elf90.vim -#usr/share/vim/vim74/compiler/fortran_g77.vim -#usr/share/vim/vim74/compiler/fortran_lf95.vim -#usr/share/vim/vim74/compiler/fpc.vim -#usr/share/vim/vim74/compiler/g95.vim -#usr/share/vim/vim74/compiler/gcc.vim -#usr/share/vim/vim74/compiler/gfortran.vim -#usr/share/vim/vim74/compiler/gnat.vim -#usr/share/vim/vim74/compiler/haml.vim -#usr/share/vim/vim74/compiler/hp_acc.vim -#usr/share/vim/vim74/compiler/icc.vim -#usr/share/vim/vim74/compiler/ifort.vim -#usr/share/vim/vim74/compiler/intel.vim -#usr/share/vim/vim74/compiler/irix5_c.vim -#usr/share/vim/vim74/compiler/irix5_cpp.vim -#usr/share/vim/vim74/compiler/javac.vim -#usr/share/vim/vim74/compiler/jikes.vim -#usr/share/vim/vim74/compiler/mcs.vim -#usr/share/vim/vim74/compiler/mips_c.vim -#usr/share/vim/vim74/compiler/mipspro_c89.vim -#usr/share/vim/vim74/compiler/mipspro_cpp.vim -#usr/share/vim/vim74/compiler/modelsim_vcom.vim -#usr/share/vim/vim74/compiler/msbuild.vim -#usr/share/vim/vim74/compiler/msvc.vim -#usr/share/vim/vim74/compiler/neato.vim -#usr/share/vim/vim74/compiler/ocaml.vim -#usr/share/vim/vim74/compiler/onsgmls.vim -#usr/share/vim/vim74/compiler/pbx.vim -#usr/share/vim/vim74/compiler/perl.vim -#usr/share/vim/vim74/compiler/php.vim -#usr/share/vim/vim74/compiler/pyunit.vim -#usr/share/vim/vim74/compiler/rake.vim -#usr/share/vim/vim74/compiler/rspec.vim -#usr/share/vim/vim74/compiler/rst.vim -#usr/share/vim/vim74/compiler/ruby.vim -#usr/share/vim/vim74/compiler/rubyunit.vim -#usr/share/vim/vim74/compiler/sass.vim -#usr/share/vim/vim74/compiler/se.vim -#usr/share/vim/vim74/compiler/splint.vim -#usr/share/vim/vim74/compiler/tcl.vim -#usr/share/vim/vim74/compiler/tex.vim -#usr/share/vim/vim74/compiler/tidy.vim -#usr/share/vim/vim74/compiler/xbuild.vim -#usr/share/vim/vim74/compiler/xmllint.vim -#usr/share/vim/vim74/compiler/xmlwf.vim -#usr/share/vim/vim74/delmenu.vim -#usr/share/vim/vim74/doc -#usr/share/vim/vim74/doc/arabic.txt -#usr/share/vim/vim74/doc/autocmd.txt -#usr/share/vim/vim74/doc/change.txt -#usr/share/vim/vim74/doc/cmdline.txt -#usr/share/vim/vim74/doc/debug.txt -#usr/share/vim/vim74/doc/debugger.txt -#usr/share/vim/vim74/doc/develop.txt -#usr/share/vim/vim74/doc/diff.txt -#usr/share/vim/vim74/doc/digraph.txt -#usr/share/vim/vim74/doc/editing.txt -#usr/share/vim/vim74/doc/eval.txt -#usr/share/vim/vim74/doc/farsi.txt -#usr/share/vim/vim74/doc/filetype.txt -#usr/share/vim/vim74/doc/fold.txt -#usr/share/vim/vim74/doc/ft_ada.txt -#usr/share/vim/vim74/doc/ft_sql.txt -#usr/share/vim/vim74/doc/gui.txt -#usr/share/vim/vim74/doc/gui_w16.txt -#usr/share/vim/vim74/doc/gui_w32.txt -#usr/share/vim/vim74/doc/gui_x11.txt -#usr/share/vim/vim74/doc/hangulin.txt -#usr/share/vim/vim74/doc/hebrew.txt -#usr/share/vim/vim74/doc/help.txt -#usr/share/vim/vim74/doc/helphelp.txt -#usr/share/vim/vim74/doc/howto.txt -#usr/share/vim/vim74/doc/if_cscop.txt -#usr/share/vim/vim74/doc/if_lua.txt -#usr/share/vim/vim74/doc/if_mzsch.txt -#usr/share/vim/vim74/doc/if_ole.txt -#usr/share/vim/vim74/doc/if_perl.txt -#usr/share/vim/vim74/doc/if_pyth.txt -#usr/share/vim/vim74/doc/if_ruby.txt -#usr/share/vim/vim74/doc/if_sniff.txt -#usr/share/vim/vim74/doc/if_tcl.txt -#usr/share/vim/vim74/doc/indent.txt -#usr/share/vim/vim74/doc/index.txt -#usr/share/vim/vim74/doc/insert.txt -#usr/share/vim/vim74/doc/intro.txt -#usr/share/vim/vim74/doc/map.txt -#usr/share/vim/vim74/doc/mbyte.txt -#usr/share/vim/vim74/doc/message.txt -#usr/share/vim/vim74/doc/mlang.txt -#usr/share/vim/vim74/doc/motion.txt -#usr/share/vim/vim74/doc/netbeans.txt -#usr/share/vim/vim74/doc/options.txt -#usr/share/vim/vim74/doc/os_390.txt -#usr/share/vim/vim74/doc/os_amiga.txt -#usr/share/vim/vim74/doc/os_beos.txt -#usr/share/vim/vim74/doc/os_dos.txt -#usr/share/vim/vim74/doc/os_mac.txt -#usr/share/vim/vim74/doc/os_mint.txt -#usr/share/vim/vim74/doc/os_msdos.txt -#usr/share/vim/vim74/doc/os_os2.txt -#usr/share/vim/vim74/doc/os_qnx.txt -#usr/share/vim/vim74/doc/os_risc.txt -#usr/share/vim/vim74/doc/os_unix.txt -#usr/share/vim/vim74/doc/os_vms.txt -#usr/share/vim/vim74/doc/os_win32.txt -#usr/share/vim/vim74/doc/pattern.txt -#usr/share/vim/vim74/doc/pi_getscript.txt -#usr/share/vim/vim74/doc/pi_gzip.txt -#usr/share/vim/vim74/doc/pi_netrw.txt -#usr/share/vim/vim74/doc/pi_paren.txt -#usr/share/vim/vim74/doc/pi_spec.txt -#usr/share/vim/vim74/doc/pi_tar.txt -#usr/share/vim/vim74/doc/pi_vimball.txt -#usr/share/vim/vim74/doc/pi_zip.txt -#usr/share/vim/vim74/doc/print.txt -#usr/share/vim/vim74/doc/quickfix.txt -#usr/share/vim/vim74/doc/quickref.txt -#usr/share/vim/vim74/doc/quotes.txt -#usr/share/vim/vim74/doc/recover.txt -#usr/share/vim/vim74/doc/remote.txt -#usr/share/vim/vim74/doc/repeat.txt -#usr/share/vim/vim74/doc/rileft.txt -#usr/share/vim/vim74/doc/russian.txt -#usr/share/vim/vim74/doc/scroll.txt -#usr/share/vim/vim74/doc/sign.txt -#usr/share/vim/vim74/doc/spell.txt -#usr/share/vim/vim74/doc/sponsor.txt -#usr/share/vim/vim74/doc/starting.txt -#usr/share/vim/vim74/doc/syntax.txt -#usr/share/vim/vim74/doc/tabpage.txt -#usr/share/vim/vim74/doc/tags -#usr/share/vim/vim74/doc/tagsrch.txt -#usr/share/vim/vim74/doc/term.txt -#usr/share/vim/vim74/doc/tips.txt -#usr/share/vim/vim74/doc/todo.txt -#usr/share/vim/vim74/doc/uganda.txt -#usr/share/vim/vim74/doc/undo.txt -#usr/share/vim/vim74/doc/usr_01.txt -#usr/share/vim/vim74/doc/usr_02.txt -#usr/share/vim/vim74/doc/usr_03.txt -#usr/share/vim/vim74/doc/usr_04.txt -#usr/share/vim/vim74/doc/usr_05.txt -#usr/share/vim/vim74/doc/usr_06.txt -#usr/share/vim/vim74/doc/usr_07.txt -#usr/share/vim/vim74/doc/usr_08.txt -#usr/share/vim/vim74/doc/usr_09.txt -#usr/share/vim/vim74/doc/usr_10.txt -#usr/share/vim/vim74/doc/usr_11.txt -#usr/share/vim/vim74/doc/usr_12.txt -#usr/share/vim/vim74/doc/usr_20.txt -#usr/share/vim/vim74/doc/usr_21.txt -#usr/share/vim/vim74/doc/usr_22.txt -#usr/share/vim/vim74/doc/usr_23.txt -#usr/share/vim/vim74/doc/usr_24.txt -#usr/share/vim/vim74/doc/usr_25.txt -#usr/share/vim/vim74/doc/usr_26.txt -#usr/share/vim/vim74/doc/usr_27.txt -#usr/share/vim/vim74/doc/usr_28.txt -#usr/share/vim/vim74/doc/usr_29.txt -#usr/share/vim/vim74/doc/usr_30.txt -#usr/share/vim/vim74/doc/usr_31.txt -#usr/share/vim/vim74/doc/usr_32.txt -#usr/share/vim/vim74/doc/usr_40.txt -#usr/share/vim/vim74/doc/usr_41.txt -#usr/share/vim/vim74/doc/usr_42.txt -#usr/share/vim/vim74/doc/usr_43.txt -#usr/share/vim/vim74/doc/usr_44.txt -#usr/share/vim/vim74/doc/usr_45.txt -#usr/share/vim/vim74/doc/usr_90.txt -#usr/share/vim/vim74/doc/usr_toc.txt -#usr/share/vim/vim74/doc/various.txt -#usr/share/vim/vim74/doc/version4.txt -#usr/share/vim/vim74/doc/version5.txt -#usr/share/vim/vim74/doc/version6.txt -#usr/share/vim/vim74/doc/version7.txt -#usr/share/vim/vim74/doc/vi_diff.txt -#usr/share/vim/vim74/doc/vim2html.pl -#usr/share/vim/vim74/doc/visual.txt -#usr/share/vim/vim74/doc/windows.txt -#usr/share/vim/vim74/doc/workshop.txt -#usr/share/vim/vim74/evim.vim -#usr/share/vim/vim74/filetype.vim -#usr/share/vim/vim74/ftoff.vim -#usr/share/vim/vim74/ftplugin -#usr/share/vim/vim74/ftplugin.vim -#usr/share/vim/vim74/ftplugin/README.txt -#usr/share/vim/vim74/ftplugin/a2ps.vim -#usr/share/vim/vim74/ftplugin/aap.vim -#usr/share/vim/vim74/ftplugin/abap.vim -#usr/share/vim/vim74/ftplugin/abaqus.vim -#usr/share/vim/vim74/ftplugin/ada.vim -#usr/share/vim/vim74/ftplugin/alsaconf.vim -#usr/share/vim/vim74/ftplugin/ant.vim -#usr/share/vim/vim74/ftplugin/arch.vim -#usr/share/vim/vim74/ftplugin/art.vim -#usr/share/vim/vim74/ftplugin/aspvbs.vim -#usr/share/vim/vim74/ftplugin/automake.vim -#usr/share/vim/vim74/ftplugin/bdf.vim -#usr/share/vim/vim74/ftplugin/bst.vim -#usr/share/vim/vim74/ftplugin/btm.vim -#usr/share/vim/vim74/ftplugin/c.vim -#usr/share/vim/vim74/ftplugin/calendar.vim -#usr/share/vim/vim74/ftplugin/cdrdaoconf.vim -#usr/share/vim/vim74/ftplugin/ch.vim -#usr/share/vim/vim74/ftplugin/changelog.vim -#usr/share/vim/vim74/ftplugin/clojure.vim -#usr/share/vim/vim74/ftplugin/cobol.vim -#usr/share/vim/vim74/ftplugin/conf.vim -#usr/share/vim/vim74/ftplugin/config.vim -#usr/share/vim/vim74/ftplugin/context.vim -#usr/share/vim/vim74/ftplugin/cpp.vim -#usr/share/vim/vim74/ftplugin/crm.vim -#usr/share/vim/vim74/ftplugin/cs.vim -#usr/share/vim/vim74/ftplugin/csc.vim -#usr/share/vim/vim74/ftplugin/csh.vim -#usr/share/vim/vim74/ftplugin/css.vim -#usr/share/vim/vim74/ftplugin/cucumber.vim -#usr/share/vim/vim74/ftplugin/cvsrc.vim -#usr/share/vim/vim74/ftplugin/debchangelog.vim -#usr/share/vim/vim74/ftplugin/debcontrol.vim -#usr/share/vim/vim74/ftplugin/denyhosts.vim -#usr/share/vim/vim74/ftplugin/dictconf.vim -#usr/share/vim/vim74/ftplugin/dictdconf.vim -#usr/share/vim/vim74/ftplugin/diff.vim -#usr/share/vim/vim74/ftplugin/dircolors.vim -#usr/share/vim/vim74/ftplugin/docbk.vim -#usr/share/vim/vim74/ftplugin/dosbatch.vim -#usr/share/vim/vim74/ftplugin/dosini.vim -#usr/share/vim/vim74/ftplugin/dtd.vim -#usr/share/vim/vim74/ftplugin/dtrace.vim -#usr/share/vim/vim74/ftplugin/elinks.vim -#usr/share/vim/vim74/ftplugin/erlang.vim -#usr/share/vim/vim74/ftplugin/eruby.vim -#usr/share/vim/vim74/ftplugin/eterm.vim -#usr/share/vim/vim74/ftplugin/falcon.vim -#usr/share/vim/vim74/ftplugin/fetchmail.vim -#usr/share/vim/vim74/ftplugin/flexwiki.vim -#usr/share/vim/vim74/ftplugin/fortran.vim -#usr/share/vim/vim74/ftplugin/framescript.vim -#usr/share/vim/vim74/ftplugin/fvwm.vim -#usr/share/vim/vim74/ftplugin/git.vim -#usr/share/vim/vim74/ftplugin/gitcommit.vim -#usr/share/vim/vim74/ftplugin/gitconfig.vim -#usr/share/vim/vim74/ftplugin/gitrebase.vim -#usr/share/vim/vim74/ftplugin/gitsendemail.vim -#usr/share/vim/vim74/ftplugin/gpg.vim -#usr/share/vim/vim74/ftplugin/gprof.vim -#usr/share/vim/vim74/ftplugin/group.vim -#usr/share/vim/vim74/ftplugin/grub.vim -#usr/share/vim/vim74/ftplugin/haml.vim -#usr/share/vim/vim74/ftplugin/hamster.vim -#usr/share/vim/vim74/ftplugin/haskell.vim -#usr/share/vim/vim74/ftplugin/help.vim -#usr/share/vim/vim74/ftplugin/hostconf.vim -#usr/share/vim/vim74/ftplugin/hostsaccess.vim -#usr/share/vim/vim74/ftplugin/html.vim -#usr/share/vim/vim74/ftplugin/htmldjango.vim -#usr/share/vim/vim74/ftplugin/indent.vim -#usr/share/vim/vim74/ftplugin/initex.vim -#usr/share/vim/vim74/ftplugin/ishd.vim -#usr/share/vim/vim74/ftplugin/java.vim -#usr/share/vim/vim74/ftplugin/javascript.vim -#usr/share/vim/vim74/ftplugin/jsp.vim -#usr/share/vim/vim74/ftplugin/kconfig.vim -#usr/share/vim/vim74/ftplugin/kwt.vim -#usr/share/vim/vim74/ftplugin/ld.vim -#usr/share/vim/vim74/ftplugin/lftp.vim -#usr/share/vim/vim74/ftplugin/libao.vim -#usr/share/vim/vim74/ftplugin/limits.vim -#usr/share/vim/vim74/ftplugin/liquid.vim -#usr/share/vim/vim74/ftplugin/lisp.vim -#usr/share/vim/vim74/ftplugin/logcheck.vim -#usr/share/vim/vim74/ftplugin/loginaccess.vim -#usr/share/vim/vim74/ftplugin/logindefs.vim -#usr/share/vim/vim74/ftplugin/logtalk.dict -#usr/share/vim/vim74/ftplugin/logtalk.vim -#usr/share/vim/vim74/ftplugin/lprolog.vim -#usr/share/vim/vim74/ftplugin/lua.vim -#usr/share/vim/vim74/ftplugin/m4.vim -#usr/share/vim/vim74/ftplugin/mail.vim -#usr/share/vim/vim74/ftplugin/mailaliases.vim -#usr/share/vim/vim74/ftplugin/mailcap.vim -#usr/share/vim/vim74/ftplugin/make.vim -#usr/share/vim/vim74/ftplugin/man.vim -#usr/share/vim/vim74/ftplugin/manconf.vim -#usr/share/vim/vim74/ftplugin/markdown.vim -#usr/share/vim/vim74/ftplugin/matlab.vim -#usr/share/vim/vim74/ftplugin/mf.vim -#usr/share/vim/vim74/ftplugin/modconf.vim -#usr/share/vim/vim74/ftplugin/mp.vim -#usr/share/vim/vim74/ftplugin/mplayerconf.vim -#usr/share/vim/vim74/ftplugin/mrxvtrc.vim -#usr/share/vim/vim74/ftplugin/msmessages.vim -#usr/share/vim/vim74/ftplugin/muttrc.vim -#usr/share/vim/vim74/ftplugin/nanorc.vim -#usr/share/vim/vim74/ftplugin/netrc.vim -#usr/share/vim/vim74/ftplugin/nsis.vim -#usr/share/vim/vim74/ftplugin/objc.vim -#usr/share/vim/vim74/ftplugin/ocaml.vim -#usr/share/vim/vim74/ftplugin/occam.vim -#usr/share/vim/vim74/ftplugin/pamconf.vim -#usr/share/vim/vim74/ftplugin/pascal.vim -#usr/share/vim/vim74/ftplugin/passwd.vim -#usr/share/vim/vim74/ftplugin/pdf.vim -#usr/share/vim/vim74/ftplugin/perl.vim -#usr/share/vim/vim74/ftplugin/perl6.vim -#usr/share/vim/vim74/ftplugin/php.vim -#usr/share/vim/vim74/ftplugin/pinfo.vim -#usr/share/vim/vim74/ftplugin/plaintex.vim -#usr/share/vim/vim74/ftplugin/postscr.vim -#usr/share/vim/vim74/ftplugin/procmail.vim -#usr/share/vim/vim74/ftplugin/prolog.vim -#usr/share/vim/vim74/ftplugin/protocols.vim -#usr/share/vim/vim74/ftplugin/pyrex.vim -#usr/share/vim/vim74/ftplugin/python.vim -#usr/share/vim/vim74/ftplugin/qf.vim -#usr/share/vim/vim74/ftplugin/quake.vim -#usr/share/vim/vim74/ftplugin/racc.vim -#usr/share/vim/vim74/ftplugin/readline.vim -#usr/share/vim/vim74/ftplugin/reva.vim -#usr/share/vim/vim74/ftplugin/rnc.vim -#usr/share/vim/vim74/ftplugin/rpl.vim -#usr/share/vim/vim74/ftplugin/rst.vim -#usr/share/vim/vim74/ftplugin/ruby.vim -#usr/share/vim/vim74/ftplugin/sass.vim -#usr/share/vim/vim74/ftplugin/scheme.vim -#usr/share/vim/vim74/ftplugin/screen.vim -#usr/share/vim/vim74/ftplugin/scss.vim -#usr/share/vim/vim74/ftplugin/sensors.vim -#usr/share/vim/vim74/ftplugin/services.vim -#usr/share/vim/vim74/ftplugin/setserial.vim -#usr/share/vim/vim74/ftplugin/sgml.vim -#usr/share/vim/vim74/ftplugin/sh.vim -#usr/share/vim/vim74/ftplugin/sieve.vim -#usr/share/vim/vim74/ftplugin/slpconf.vim -#usr/share/vim/vim74/ftplugin/slpreg.vim -#usr/share/vim/vim74/ftplugin/slpspi.vim -#usr/share/vim/vim74/ftplugin/spec.vim -#usr/share/vim/vim74/ftplugin/sql.vim -#usr/share/vim/vim74/ftplugin/sshconfig.vim -#usr/share/vim/vim74/ftplugin/sudoers.vim -#usr/share/vim/vim74/ftplugin/svg.vim -#usr/share/vim/vim74/ftplugin/sysctl.vim -#usr/share/vim/vim74/ftplugin/tcl.vim -#usr/share/vim/vim74/ftplugin/tcsh.vim -#usr/share/vim/vim74/ftplugin/terminfo.vim -#usr/share/vim/vim74/ftplugin/tex.vim -#usr/share/vim/vim74/ftplugin/treetop.vim -#usr/share/vim/vim74/ftplugin/tt2html.vim -#usr/share/vim/vim74/ftplugin/udevconf.vim -#usr/share/vim/vim74/ftplugin/udevperm.vim -#usr/share/vim/vim74/ftplugin/udevrules.vim -#usr/share/vim/vim74/ftplugin/updatedb.vim -#usr/share/vim/vim74/ftplugin/vb.vim -#usr/share/vim/vim74/ftplugin/verilog.vim -#usr/share/vim/vim74/ftplugin/vhdl.vim -#usr/share/vim/vim74/ftplugin/vim.vim -#usr/share/vim/vim74/ftplugin/xdefaults.vim -#usr/share/vim/vim74/ftplugin/xf86conf.vim -#usr/share/vim/vim74/ftplugin/xhtml.vim -#usr/share/vim/vim74/ftplugin/xinetd.vim -#usr/share/vim/vim74/ftplugin/xml.vim -#usr/share/vim/vim74/ftplugin/xmodmap.vim -#usr/share/vim/vim74/ftplugin/xs.vim -#usr/share/vim/vim74/ftplugin/xsd.vim -#usr/share/vim/vim74/ftplugin/xslt.vim -#usr/share/vim/vim74/ftplugin/yaml.vim -#usr/share/vim/vim74/ftplugin/zimbu.vim -#usr/share/vim/vim74/ftplugin/zsh.vim -#usr/share/vim/vim74/ftplugof.vim -#usr/share/vim/vim74/gvimrc_example.vim -#usr/share/vim/vim74/indent -#usr/share/vim/vim74/indent.vim -#usr/share/vim/vim74/indent/README.txt -#usr/share/vim/vim74/indent/aap.vim -#usr/share/vim/vim74/indent/ada.vim -#usr/share/vim/vim74/indent/ant.vim -#usr/share/vim/vim74/indent/automake.vim -#usr/share/vim/vim74/indent/awk.vim -#usr/share/vim/vim74/indent/bib.vim -#usr/share/vim/vim74/indent/bst.vim -#usr/share/vim/vim74/indent/c.vim -#usr/share/vim/vim74/indent/cdl.vim -#usr/share/vim/vim74/indent/ch.vim -#usr/share/vim/vim74/indent/chaiscript.vim -#usr/share/vim/vim74/indent/changelog.vim -#usr/share/vim/vim74/indent/clojure.vim -#usr/share/vim/vim74/indent/cmake.vim -#usr/share/vim/vim74/indent/cobol.vim -#usr/share/vim/vim74/indent/config.vim -#usr/share/vim/vim74/indent/cpp.vim -#usr/share/vim/vim74/indent/cs.vim -#usr/share/vim/vim74/indent/css.vim -#usr/share/vim/vim74/indent/cucumber.vim -#usr/share/vim/vim74/indent/cuda.vim -#usr/share/vim/vim74/indent/d.vim -#usr/share/vim/vim74/indent/dictconf.vim -#usr/share/vim/vim74/indent/dictdconf.vim -#usr/share/vim/vim74/indent/docbk.vim -#usr/share/vim/vim74/indent/dtd.vim -#usr/share/vim/vim74/indent/dtrace.vim -#usr/share/vim/vim74/indent/dylan.vim -#usr/share/vim/vim74/indent/eiffel.vim -#usr/share/vim/vim74/indent/erlang.vim -#usr/share/vim/vim74/indent/eruby.vim -#usr/share/vim/vim74/indent/eterm.vim -#usr/share/vim/vim74/indent/falcon.vim -#usr/share/vim/vim74/indent/fortran.vim -#usr/share/vim/vim74/indent/framescript.vim -#usr/share/vim/vim74/indent/gitconfig.vim -#usr/share/vim/vim74/indent/gitolite.vim -#usr/share/vim/vim74/indent/haml.vim -#usr/share/vim/vim74/indent/hamster.vim -#usr/share/vim/vim74/indent/html.vim -#usr/share/vim/vim74/indent/htmldjango.vim -#usr/share/vim/vim74/indent/idlang.vim -#usr/share/vim/vim74/indent/ishd.vim -#usr/share/vim/vim74/indent/java.vim -#usr/share/vim/vim74/indent/javascript.vim -#usr/share/vim/vim74/indent/jsp.vim -#usr/share/vim/vim74/indent/ld.vim -#usr/share/vim/vim74/indent/lifelines.vim -#usr/share/vim/vim74/indent/liquid.vim -#usr/share/vim/vim74/indent/lisp.vim -#usr/share/vim/vim74/indent/logtalk.vim -#usr/share/vim/vim74/indent/lua.vim -#usr/share/vim/vim74/indent/mail.vim -#usr/share/vim/vim74/indent/make.vim -#usr/share/vim/vim74/indent/matlab.vim -#usr/share/vim/vim74/indent/mma.vim -#usr/share/vim/vim74/indent/mp.vim -#usr/share/vim/vim74/indent/objc.vim -#usr/share/vim/vim74/indent/ocaml.vim -#usr/share/vim/vim74/indent/occam.vim -#usr/share/vim/vim74/indent/pascal.vim -#usr/share/vim/vim74/indent/perl.vim -#usr/share/vim/vim74/indent/perl6.vim -#usr/share/vim/vim74/indent/php.vim -#usr/share/vim/vim74/indent/postscr.vim -#usr/share/vim/vim74/indent/pov.vim -#usr/share/vim/vim74/indent/prolog.vim -#usr/share/vim/vim74/indent/pyrex.vim -#usr/share/vim/vim74/indent/python.vim -#usr/share/vim/vim74/indent/r.vim -#usr/share/vim/vim74/indent/readline.vim -#usr/share/vim/vim74/indent/rpl.vim -#usr/share/vim/vim74/indent/rst.vim -#usr/share/vim/vim74/indent/ruby.vim -#usr/share/vim/vim74/indent/sass.vim -#usr/share/vim/vim74/indent/scheme.vim -#usr/share/vim/vim74/indent/scss.vim -#usr/share/vim/vim74/indent/sdl.vim -#usr/share/vim/vim74/indent/sh.vim -#usr/share/vim/vim74/indent/sml.vim -#usr/share/vim/vim74/indent/sql.vim -#usr/share/vim/vim74/indent/sqlanywhere.vim -#usr/share/vim/vim74/indent/tcl.vim -#usr/share/vim/vim74/indent/tcsh.vim -#usr/share/vim/vim74/indent/tex.vim -#usr/share/vim/vim74/indent/tf.vim -#usr/share/vim/vim74/indent/tilde.vim -#usr/share/vim/vim74/indent/treetop.vim -#usr/share/vim/vim74/indent/vb.vim -#usr/share/vim/vim74/indent/verilog.vim -#usr/share/vim/vim74/indent/vhdl.vim -#usr/share/vim/vim74/indent/vim.vim -#usr/share/vim/vim74/indent/xf86conf.vim -#usr/share/vim/vim74/indent/xhtml.vim -#usr/share/vim/vim74/indent/xinetd.vim -#usr/share/vim/vim74/indent/xml.vim -#usr/share/vim/vim74/indent/xsd.vim -#usr/share/vim/vim74/indent/xslt.vim -#usr/share/vim/vim74/indent/yacc.vim -#usr/share/vim/vim74/indent/yaml.vim -#usr/share/vim/vim74/indent/zimbu.vim -#usr/share/vim/vim74/indent/zsh.vim -#usr/share/vim/vim74/indoff.vim -#usr/share/vim/vim74/macros -#usr/share/vim/vim74/macros/README.txt -#usr/share/vim/vim74/macros/dvorak -#usr/share/vim/vim74/macros/editexisting.vim -#usr/share/vim/vim74/macros/hanoi -#usr/share/vim/vim74/macros/hanoi/click.me -#usr/share/vim/vim74/macros/hanoi/hanoi.vim -#usr/share/vim/vim74/macros/hanoi/poster -#usr/share/vim/vim74/macros/justify.vim -#usr/share/vim/vim74/macros/less.bat -#usr/share/vim/vim74/macros/less.sh -#usr/share/vim/vim74/macros/less.vim -#usr/share/vim/vim74/macros/life -#usr/share/vim/vim74/macros/life/click.me -#usr/share/vim/vim74/macros/life/life.vim -#usr/share/vim/vim74/macros/matchit.txt -#usr/share/vim/vim74/macros/matchit.vim -#usr/share/vim/vim74/macros/maze -#usr/share/vim/vim74/macros/maze/Makefile -#usr/share/vim/vim74/macros/maze/README.txt -#usr/share/vim/vim74/macros/maze/main.aap -#usr/share/vim/vim74/macros/maze/maze.c -#usr/share/vim/vim74/macros/maze/maze_5.78 -#usr/share/vim/vim74/macros/maze/maze_mac -#usr/share/vim/vim74/macros/maze/mazeansi.c -#usr/share/vim/vim74/macros/maze/mazeclean.c -#usr/share/vim/vim74/macros/maze/poster -#usr/share/vim/vim74/macros/shellmenu.vim -#usr/share/vim/vim74/macros/swapmous.vim -#usr/share/vim/vim74/macros/urm -#usr/share/vim/vim74/macros/urm/README.txt -#usr/share/vim/vim74/macros/urm/examples -#usr/share/vim/vim74/macros/urm/urm -#usr/share/vim/vim74/macros/urm/urm.vim -#usr/share/vim/vim74/menu.vim -#usr/share/vim/vim74/mswin.vim -#usr/share/vim/vim74/optwin.vim -#usr/share/vim/vim74/plugin -#usr/share/vim/vim74/plugin/README.txt -#usr/share/vim/vim74/plugin/getscriptPlugin.vim -#usr/share/vim/vim74/plugin/gzip.vim -#usr/share/vim/vim74/plugin/matchparen.vim -#usr/share/vim/vim74/plugin/netrwPlugin.vim -#usr/share/vim/vim74/plugin/rrhelper.vim -#usr/share/vim/vim74/plugin/spellfile.vim -#usr/share/vim/vim74/plugin/tarPlugin.vim -#usr/share/vim/vim74/plugin/tohtml.vim -#usr/share/vim/vim74/plugin/vimballPlugin.vim -#usr/share/vim/vim74/plugin/zipPlugin.vim -#usr/share/vim/vim74/print -#usr/share/vim/vim74/print/ascii.ps -#usr/share/vim/vim74/print/cidfont.ps -#usr/share/vim/vim74/print/cns_roman.ps -#usr/share/vim/vim74/print/cp1250.ps -#usr/share/vim/vim74/print/cp1251.ps -#usr/share/vim/vim74/print/cp1252.ps -#usr/share/vim/vim74/print/cp1253.ps -#usr/share/vim/vim74/print/cp1254.ps -#usr/share/vim/vim74/print/cp1255.ps -#usr/share/vim/vim74/print/cp1257.ps -#usr/share/vim/vim74/print/dec-mcs.ps -#usr/share/vim/vim74/print/ebcdic-uk.ps -#usr/share/vim/vim74/print/gb_roman.ps -#usr/share/vim/vim74/print/hp-roman8.ps -#usr/share/vim/vim74/print/iso-8859-10.ps -#usr/share/vim/vim74/print/iso-8859-11.ps -#usr/share/vim/vim74/print/iso-8859-13.ps -#usr/share/vim/vim74/print/iso-8859-14.ps -#usr/share/vim/vim74/print/iso-8859-15.ps -#usr/share/vim/vim74/print/iso-8859-2.ps -#usr/share/vim/vim74/print/iso-8859-3.ps -#usr/share/vim/vim74/print/iso-8859-4.ps -#usr/share/vim/vim74/print/iso-8859-5.ps -#usr/share/vim/vim74/print/iso-8859-7.ps -#usr/share/vim/vim74/print/iso-8859-8.ps -#usr/share/vim/vim74/print/iso-8859-9.ps -#usr/share/vim/vim74/print/jis_roman.ps -#usr/share/vim/vim74/print/koi8-r.ps -#usr/share/vim/vim74/print/koi8-u.ps -#usr/share/vim/vim74/print/ks_roman.ps -#usr/share/vim/vim74/print/latin1.ps -#usr/share/vim/vim74/print/mac-roman.ps -#usr/share/vim/vim74/print/prolog.ps -#usr/share/vim/vim74/scripts.vim -#usr/share/vim/vim74/spell -#usr/share/vim/vim74/spell/check_locales.vim -#usr/share/vim/vim74/spell/cleanadd.vim -#usr/share/vim/vim74/spell/en.ascii.spl -#usr/share/vim/vim74/spell/en.ascii.sug -#usr/share/vim/vim74/spell/en.latin1.spl -#usr/share/vim/vim74/spell/en.latin1.sug -#usr/share/vim/vim74/spell/en.utf-8.spl -#usr/share/vim/vim74/spell/en.utf-8.sug -#usr/share/vim/vim74/spell/fixdup.vim -#usr/share/vim/vim74/spell/he.vim -#usr/share/vim/vim74/spell/spell.vim -#usr/share/vim/vim74/spell/yi.vim -#usr/share/vim/vim74/synmenu.vim -#usr/share/vim/vim74/syntax -#usr/share/vim/vim74/syntax/2html.vim -#usr/share/vim/vim74/syntax/README.txt -#usr/share/vim/vim74/syntax/a2ps.vim -#usr/share/vim/vim74/syntax/a65.vim -#usr/share/vim/vim74/syntax/aap.vim -#usr/share/vim/vim74/syntax/abap.vim -#usr/share/vim/vim74/syntax/abaqus.vim -#usr/share/vim/vim74/syntax/abc.vim -#usr/share/vim/vim74/syntax/abel.vim -#usr/share/vim/vim74/syntax/acedb.vim -#usr/share/vim/vim74/syntax/ada.vim -#usr/share/vim/vim74/syntax/aflex.vim -#usr/share/vim/vim74/syntax/ahdl.vim -#usr/share/vim/vim74/syntax/alsaconf.vim -#usr/share/vim/vim74/syntax/amiga.vim -#usr/share/vim/vim74/syntax/aml.vim -#usr/share/vim/vim74/syntax/ampl.vim -#usr/share/vim/vim74/syntax/ant.vim -#usr/share/vim/vim74/syntax/antlr.vim -#usr/share/vim/vim74/syntax/apache.vim -#usr/share/vim/vim74/syntax/apachestyle.vim -#usr/share/vim/vim74/syntax/aptconf.vim -#usr/share/vim/vim74/syntax/arch.vim -#usr/share/vim/vim74/syntax/art.vim -#usr/share/vim/vim74/syntax/asciidoc.vim -#usr/share/vim/vim74/syntax/asm.vim -#usr/share/vim/vim74/syntax/asm68k.vim -#usr/share/vim/vim74/syntax/asmh8300.vim -#usr/share/vim/vim74/syntax/asn.vim -#usr/share/vim/vim74/syntax/aspperl.vim -#usr/share/vim/vim74/syntax/aspvbs.vim -#usr/share/vim/vim74/syntax/asterisk.vim -#usr/share/vim/vim74/syntax/asteriskvm.vim -#usr/share/vim/vim74/syntax/atlas.vim -#usr/share/vim/vim74/syntax/autohotkey.vim -#usr/share/vim/vim74/syntax/autoit.vim -#usr/share/vim/vim74/syntax/automake.vim -#usr/share/vim/vim74/syntax/ave.vim -#usr/share/vim/vim74/syntax/awk.vim -#usr/share/vim/vim74/syntax/ayacc.vim -#usr/share/vim/vim74/syntax/b.vim -#usr/share/vim/vim74/syntax/baan.vim -#usr/share/vim/vim74/syntax/basic.vim -#usr/share/vim/vim74/syntax/bc.vim -#usr/share/vim/vim74/syntax/bdf.vim -#usr/share/vim/vim74/syntax/bib.vim -#usr/share/vim/vim74/syntax/bindzone.vim -#usr/share/vim/vim74/syntax/blank.vim -#usr/share/vim/vim74/syntax/bst.vim -#usr/share/vim/vim74/syntax/btm.vim -#usr/share/vim/vim74/syntax/bzr.vim -#usr/share/vim/vim74/syntax/c.vim -#usr/share/vim/vim74/syntax/cabal.vim -#usr/share/vim/vim74/syntax/calendar.vim -#usr/share/vim/vim74/syntax/catalog.vim -#usr/share/vim/vim74/syntax/cdl.vim -#usr/share/vim/vim74/syntax/cdrdaoconf.vim -#usr/share/vim/vim74/syntax/cdrtoc.vim -#usr/share/vim/vim74/syntax/cf.vim -#usr/share/vim/vim74/syntax/cfg.vim -#usr/share/vim/vim74/syntax/ch.vim -#usr/share/vim/vim74/syntax/chaiscript.vim -#usr/share/vim/vim74/syntax/change.vim -#usr/share/vim/vim74/syntax/changelog.vim -#usr/share/vim/vim74/syntax/chaskell.vim -#usr/share/vim/vim74/syntax/cheetah.vim -#usr/share/vim/vim74/syntax/chill.vim -#usr/share/vim/vim74/syntax/chordpro.vim -#usr/share/vim/vim74/syntax/cl.vim -#usr/share/vim/vim74/syntax/clean.vim -#usr/share/vim/vim74/syntax/clipper.vim -#usr/share/vim/vim74/syntax/clojure.vim -#usr/share/vim/vim74/syntax/cmake.vim -#usr/share/vim/vim74/syntax/cmusrc.vim -#usr/share/vim/vim74/syntax/cobol.vim -#usr/share/vim/vim74/syntax/coco.vim -#usr/share/vim/vim74/syntax/colortest.vim -#usr/share/vim/vim74/syntax/conaryrecipe.vim -#usr/share/vim/vim74/syntax/conf.vim -#usr/share/vim/vim74/syntax/config.vim -#usr/share/vim/vim74/syntax/context.vim -#usr/share/vim/vim74/syntax/cpp.vim -#usr/share/vim/vim74/syntax/crm.vim -#usr/share/vim/vim74/syntax/crontab.vim -#usr/share/vim/vim74/syntax/cs.vim -#usr/share/vim/vim74/syntax/csc.vim -#usr/share/vim/vim74/syntax/csdl.vim -#usr/share/vim/vim74/syntax/csh.vim -#usr/share/vim/vim74/syntax/csp.vim -#usr/share/vim/vim74/syntax/css.vim -#usr/share/vim/vim74/syntax/cterm.vim -#usr/share/vim/vim74/syntax/ctrlh.vim -#usr/share/vim/vim74/syntax/cucumber.vim -#usr/share/vim/vim74/syntax/cuda.vim -#usr/share/vim/vim74/syntax/cupl.vim -#usr/share/vim/vim74/syntax/cuplsim.vim -#usr/share/vim/vim74/syntax/cvs.vim -#usr/share/vim/vim74/syntax/cvsrc.vim -#usr/share/vim/vim74/syntax/cweb.vim -#usr/share/vim/vim74/syntax/cynlib.vim -#usr/share/vim/vim74/syntax/cynpp.vim -#usr/share/vim/vim74/syntax/d.vim -#usr/share/vim/vim74/syntax/datascript.vim -#usr/share/vim/vim74/syntax/dcd.vim -#usr/share/vim/vim74/syntax/dcl.vim -#usr/share/vim/vim74/syntax/debchangelog.vim -#usr/share/vim/vim74/syntax/debcontrol.vim -#usr/share/vim/vim74/syntax/debsources.vim -#usr/share/vim/vim74/syntax/def.vim -#usr/share/vim/vim74/syntax/denyhosts.vim -#usr/share/vim/vim74/syntax/desc.vim -#usr/share/vim/vim74/syntax/desktop.vim -#usr/share/vim/vim74/syntax/dictconf.vim -#usr/share/vim/vim74/syntax/dictdconf.vim -#usr/share/vim/vim74/syntax/diff.vim -#usr/share/vim/vim74/syntax/dircolors.vim -#usr/share/vim/vim74/syntax/dirpager.vim -#usr/share/vim/vim74/syntax/diva.vim -#usr/share/vim/vim74/syntax/django.vim -#usr/share/vim/vim74/syntax/dns.vim -#usr/share/vim/vim74/syntax/dnsmasq.vim -#usr/share/vim/vim74/syntax/docbk.vim -#usr/share/vim/vim74/syntax/docbksgml.vim -#usr/share/vim/vim74/syntax/docbkxml.vim -#usr/share/vim/vim74/syntax/dosbatch.vim -#usr/share/vim/vim74/syntax/dosini.vim -#usr/share/vim/vim74/syntax/dot.vim -#usr/share/vim/vim74/syntax/doxygen.vim -#usr/share/vim/vim74/syntax/dracula.vim -#usr/share/vim/vim74/syntax/dsl.vim -#usr/share/vim/vim74/syntax/dtd.vim -#usr/share/vim/vim74/syntax/dtml.vim -#usr/share/vim/vim74/syntax/dtrace.vim -#usr/share/vim/vim74/syntax/dts.vim -#usr/share/vim/vim74/syntax/dylan.vim -#usr/share/vim/vim74/syntax/dylanintr.vim -#usr/share/vim/vim74/syntax/dylanlid.vim -#usr/share/vim/vim74/syntax/ecd.vim -#usr/share/vim/vim74/syntax/edif.vim -#usr/share/vim/vim74/syntax/eiffel.vim -#usr/share/vim/vim74/syntax/elf.vim -#usr/share/vim/vim74/syntax/elinks.vim -#usr/share/vim/vim74/syntax/elmfilt.vim -#usr/share/vim/vim74/syntax/erlang.vim -#usr/share/vim/vim74/syntax/eruby.vim -#usr/share/vim/vim74/syntax/esmtprc.vim -#usr/share/vim/vim74/syntax/esqlc.vim -#usr/share/vim/vim74/syntax/esterel.vim -#usr/share/vim/vim74/syntax/eterm.vim -#usr/share/vim/vim74/syntax/eviews.vim -#usr/share/vim/vim74/syntax/exim.vim -#usr/share/vim/vim74/syntax/expect.vim -#usr/share/vim/vim74/syntax/exports.vim -#usr/share/vim/vim74/syntax/falcon.vim -#usr/share/vim/vim74/syntax/fan.vim -#usr/share/vim/vim74/syntax/fasm.vim -#usr/share/vim/vim74/syntax/fdcc.vim -#usr/share/vim/vim74/syntax/fetchmail.vim -#usr/share/vim/vim74/syntax/fgl.vim -#usr/share/vim/vim74/syntax/flexwiki.vim -#usr/share/vim/vim74/syntax/focexec.vim -#usr/share/vim/vim74/syntax/form.vim -#usr/share/vim/vim74/syntax/forth.vim -#usr/share/vim/vim74/syntax/fortran.vim -#usr/share/vim/vim74/syntax/foxpro.vim -#usr/share/vim/vim74/syntax/framescript.vim -#usr/share/vim/vim74/syntax/freebasic.vim -#usr/share/vim/vim74/syntax/fstab.vim -#usr/share/vim/vim74/syntax/fvwm.vim -#usr/share/vim/vim74/syntax/fvwm2m4.vim -#usr/share/vim/vim74/syntax/gdb.vim -#usr/share/vim/vim74/syntax/gdmo.vim -#usr/share/vim/vim74/syntax/gedcom.vim -#usr/share/vim/vim74/syntax/git.vim -#usr/share/vim/vim74/syntax/gitcommit.vim -#usr/share/vim/vim74/syntax/gitconfig.vim -#usr/share/vim/vim74/syntax/gitolite.vim -#usr/share/vim/vim74/syntax/gitrebase.vim -#usr/share/vim/vim74/syntax/gitsendemail.vim -#usr/share/vim/vim74/syntax/gkrellmrc.vim -#usr/share/vim/vim74/syntax/gnash.vim -#usr/share/vim/vim74/syntax/gnuplot.vim -#usr/share/vim/vim74/syntax/gp.vim -#usr/share/vim/vim74/syntax/gpg.vim -#usr/share/vim/vim74/syntax/gprof.vim -#usr/share/vim/vim74/syntax/grads.vim -#usr/share/vim/vim74/syntax/gretl.vim -#usr/share/vim/vim74/syntax/groff.vim -#usr/share/vim/vim74/syntax/groovy.vim -#usr/share/vim/vim74/syntax/group.vim -#usr/share/vim/vim74/syntax/grub.vim -#usr/share/vim/vim74/syntax/gsp.vim -#usr/share/vim/vim74/syntax/gtkrc.vim -#usr/share/vim/vim74/syntax/haml.vim -#usr/share/vim/vim74/syntax/hamster.vim -#usr/share/vim/vim74/syntax/haskell.vim -#usr/share/vim/vim74/syntax/haste.vim -#usr/share/vim/vim74/syntax/hastepreproc.vim -#usr/share/vim/vim74/syntax/hb.vim -#usr/share/vim/vim74/syntax/help.vim -#usr/share/vim/vim74/syntax/hercules.vim -#usr/share/vim/vim74/syntax/hex.vim -#usr/share/vim/vim74/syntax/hgcommit.vim -#usr/share/vim/vim74/syntax/hitest.vim -#usr/share/vim/vim74/syntax/hog.vim -#usr/share/vim/vim74/syntax/hostconf.vim -#usr/share/vim/vim74/syntax/hostsaccess.vim -#usr/share/vim/vim74/syntax/html.vim -#usr/share/vim/vim74/syntax/htmlcheetah.vim -#usr/share/vim/vim74/syntax/htmldjango.vim -#usr/share/vim/vim74/syntax/htmlm4.vim -#usr/share/vim/vim74/syntax/htmlos.vim -#usr/share/vim/vim74/syntax/ia64.vim -#usr/share/vim/vim74/syntax/ibasic.vim -#usr/share/vim/vim74/syntax/icemenu.vim -#usr/share/vim/vim74/syntax/icon.vim -#usr/share/vim/vim74/syntax/idl.vim -#usr/share/vim/vim74/syntax/idlang.vim -#usr/share/vim/vim74/syntax/indent.vim -#usr/share/vim/vim74/syntax/inform.vim -#usr/share/vim/vim74/syntax/initex.vim -#usr/share/vim/vim74/syntax/initng.vim -#usr/share/vim/vim74/syntax/inittab.vim -#usr/share/vim/vim74/syntax/ipfilter.vim -#usr/share/vim/vim74/syntax/ishd.vim -#usr/share/vim/vim74/syntax/iss.vim -#usr/share/vim/vim74/syntax/ist.vim -#usr/share/vim/vim74/syntax/jal.vim -#usr/share/vim/vim74/syntax/jam.vim -#usr/share/vim/vim74/syntax/jargon.vim -#usr/share/vim/vim74/syntax/java.vim -#usr/share/vim/vim74/syntax/javacc.vim -#usr/share/vim/vim74/syntax/javascript.vim -#usr/share/vim/vim74/syntax/jess.vim -#usr/share/vim/vim74/syntax/jgraph.vim -#usr/share/vim/vim74/syntax/jovial.vim -#usr/share/vim/vim74/syntax/jproperties.vim -#usr/share/vim/vim74/syntax/jsp.vim -#usr/share/vim/vim74/syntax/kconfig.vim -#usr/share/vim/vim74/syntax/kix.vim -#usr/share/vim/vim74/syntax/kscript.vim -#usr/share/vim/vim74/syntax/kwt.vim -#usr/share/vim/vim74/syntax/lace.vim -#usr/share/vim/vim74/syntax/latte.vim -#usr/share/vim/vim74/syntax/ld.vim -#usr/share/vim/vim74/syntax/ldapconf.vim -#usr/share/vim/vim74/syntax/ldif.vim -#usr/share/vim/vim74/syntax/lex.vim -#usr/share/vim/vim74/syntax/lftp.vim -#usr/share/vim/vim74/syntax/lhaskell.vim -#usr/share/vim/vim74/syntax/libao.vim -#usr/share/vim/vim74/syntax/lifelines.vim -#usr/share/vim/vim74/syntax/lilo.vim -#usr/share/vim/vim74/syntax/limits.vim -#usr/share/vim/vim74/syntax/liquid.vim -#usr/share/vim/vim74/syntax/lisp.vim -#usr/share/vim/vim74/syntax/lite.vim -#usr/share/vim/vim74/syntax/litestep.vim -#usr/share/vim/vim74/syntax/loginaccess.vim -#usr/share/vim/vim74/syntax/logindefs.vim -#usr/share/vim/vim74/syntax/logtalk.vim -#usr/share/vim/vim74/syntax/lotos.vim -#usr/share/vim/vim74/syntax/lout.vim -#usr/share/vim/vim74/syntax/lpc.vim -#usr/share/vim/vim74/syntax/lprolog.vim -#usr/share/vim/vim74/syntax/lscript.vim -#usr/share/vim/vim74/syntax/lsl.vim -#usr/share/vim/vim74/syntax/lss.vim -#usr/share/vim/vim74/syntax/lua.vim -#usr/share/vim/vim74/syntax/lynx.vim -#usr/share/vim/vim74/syntax/m4.vim -#usr/share/vim/vim74/syntax/mail.vim -#usr/share/vim/vim74/syntax/mailaliases.vim -#usr/share/vim/vim74/syntax/mailcap.vim -#usr/share/vim/vim74/syntax/make.vim -#usr/share/vim/vim74/syntax/mallard.vim -#usr/share/vim/vim74/syntax/man.vim -#usr/share/vim/vim74/syntax/manconf.vim -#usr/share/vim/vim74/syntax/manual.vim -#usr/share/vim/vim74/syntax/maple.vim -#usr/share/vim/vim74/syntax/markdown.vim -#usr/share/vim/vim74/syntax/masm.vim -#usr/share/vim/vim74/syntax/mason.vim -#usr/share/vim/vim74/syntax/master.vim -#usr/share/vim/vim74/syntax/matlab.vim -#usr/share/vim/vim74/syntax/maxima.vim -#usr/share/vim/vim74/syntax/mel.vim -#usr/share/vim/vim74/syntax/messages.vim -#usr/share/vim/vim74/syntax/mf.vim -#usr/share/vim/vim74/syntax/mgl.vim -#usr/share/vim/vim74/syntax/mgp.vim -#usr/share/vim/vim74/syntax/mib.vim -#usr/share/vim/vim74/syntax/mma.vim -#usr/share/vim/vim74/syntax/mmix.vim -#usr/share/vim/vim74/syntax/mmp.vim -#usr/share/vim/vim74/syntax/modconf.vim -#usr/share/vim/vim74/syntax/model.vim -#usr/share/vim/vim74/syntax/modsim3.vim -#usr/share/vim/vim74/syntax/modula2.vim -#usr/share/vim/vim74/syntax/modula3.vim -#usr/share/vim/vim74/syntax/monk.vim -#usr/share/vim/vim74/syntax/moo.vim -#usr/share/vim/vim74/syntax/mp.vim -#usr/share/vim/vim74/syntax/mplayerconf.vim -#usr/share/vim/vim74/syntax/mrxvtrc.vim -#usr/share/vim/vim74/syntax/msidl.vim -#usr/share/vim/vim74/syntax/msmessages.vim -#usr/share/vim/vim74/syntax/msql.vim -#usr/share/vim/vim74/syntax/mupad.vim -#usr/share/vim/vim74/syntax/mush.vim -#usr/share/vim/vim74/syntax/muttrc.vim -#usr/share/vim/vim74/syntax/mysql.vim -#usr/share/vim/vim74/syntax/named.vim -#usr/share/vim/vim74/syntax/nanorc.vim -#usr/share/vim/vim74/syntax/nasm.vim -#usr/share/vim/vim74/syntax/nastran.vim -#usr/share/vim/vim74/syntax/natural.vim -#usr/share/vim/vim74/syntax/ncf.vim -#usr/share/vim/vim74/syntax/netrc.vim -#usr/share/vim/vim74/syntax/netrw.vim -#usr/share/vim/vim74/syntax/ninja.vim -#usr/share/vim/vim74/syntax/nosyntax.vim -#usr/share/vim/vim74/syntax/nqc.vim -#usr/share/vim/vim74/syntax/nroff.vim -#usr/share/vim/vim74/syntax/nsis.vim -#usr/share/vim/vim74/syntax/obj.vim -#usr/share/vim/vim74/syntax/objc.vim -#usr/share/vim/vim74/syntax/objcpp.vim -#usr/share/vim/vim74/syntax/ocaml.vim -#usr/share/vim/vim74/syntax/occam.vim -#usr/share/vim/vim74/syntax/omnimark.vim -#usr/share/vim/vim74/syntax/openroad.vim -#usr/share/vim/vim74/syntax/opl.vim -#usr/share/vim/vim74/syntax/ora.vim -#usr/share/vim/vim74/syntax/pamconf.vim -#usr/share/vim/vim74/syntax/papp.vim -#usr/share/vim/vim74/syntax/pascal.vim -#usr/share/vim/vim74/syntax/passwd.vim -#usr/share/vim/vim74/syntax/pcap.vim -#usr/share/vim/vim74/syntax/pccts.vim -#usr/share/vim/vim74/syntax/pdf.vim -#usr/share/vim/vim74/syntax/perl.vim -#usr/share/vim/vim74/syntax/perl6.vim -#usr/share/vim/vim74/syntax/pf.vim -#usr/share/vim/vim74/syntax/pfmain.vim -#usr/share/vim/vim74/syntax/php.vim -#usr/share/vim/vim74/syntax/phtml.vim -#usr/share/vim/vim74/syntax/pic.vim -#usr/share/vim/vim74/syntax/pike.vim -#usr/share/vim/vim74/syntax/pilrc.vim -#usr/share/vim/vim74/syntax/pine.vim -#usr/share/vim/vim74/syntax/pinfo.vim -#usr/share/vim/vim74/syntax/plaintex.vim -#usr/share/vim/vim74/syntax/pli.vim -#usr/share/vim/vim74/syntax/plm.vim -#usr/share/vim/vim74/syntax/plp.vim -#usr/share/vim/vim74/syntax/plsql.vim -#usr/share/vim/vim74/syntax/po.vim -#usr/share/vim/vim74/syntax/pod.vim -#usr/share/vim/vim74/syntax/postscr.vim -#usr/share/vim/vim74/syntax/pov.vim -#usr/share/vim/vim74/syntax/povini.vim -#usr/share/vim/vim74/syntax/ppd.vim -#usr/share/vim/vim74/syntax/ppwiz.vim -#usr/share/vim/vim74/syntax/prescribe.vim -#usr/share/vim/vim74/syntax/privoxy.vim -#usr/share/vim/vim74/syntax/procmail.vim -#usr/share/vim/vim74/syntax/progress.vim -#usr/share/vim/vim74/syntax/prolog.vim -#usr/share/vim/vim74/syntax/promela.vim -#usr/share/vim/vim74/syntax/proto.vim -#usr/share/vim/vim74/syntax/protocols.vim -#usr/share/vim/vim74/syntax/psf.vim -#usr/share/vim/vim74/syntax/ptcap.vim -#usr/share/vim/vim74/syntax/purifylog.vim -#usr/share/vim/vim74/syntax/pyrex.vim -#usr/share/vim/vim74/syntax/python.vim -#usr/share/vim/vim74/syntax/qf.vim -#usr/share/vim/vim74/syntax/quake.vim -#usr/share/vim/vim74/syntax/r.vim -#usr/share/vim/vim74/syntax/racc.vim -#usr/share/vim/vim74/syntax/radiance.vim -#usr/share/vim/vim74/syntax/ratpoison.vim -#usr/share/vim/vim74/syntax/rc.vim -#usr/share/vim/vim74/syntax/rcs.vim -#usr/share/vim/vim74/syntax/rcslog.vim -#usr/share/vim/vim74/syntax/readline.vim -#usr/share/vim/vim74/syntax/rebol.vim -#usr/share/vim/vim74/syntax/redif.vim -#usr/share/vim/vim74/syntax/registry.vim -#usr/share/vim/vim74/syntax/remind.vim -#usr/share/vim/vim74/syntax/resolv.vim -#usr/share/vim/vim74/syntax/reva.vim -#usr/share/vim/vim74/syntax/rexx.vim -#usr/share/vim/vim74/syntax/rhelp.vim -#usr/share/vim/vim74/syntax/rib.vim -#usr/share/vim/vim74/syntax/rnc.vim -#usr/share/vim/vim74/syntax/rng.vim -#usr/share/vim/vim74/syntax/rnoweb.vim -#usr/share/vim/vim74/syntax/robots.vim -#usr/share/vim/vim74/syntax/rpcgen.vim -#usr/share/vim/vim74/syntax/rpl.vim -#usr/share/vim/vim74/syntax/rst.vim -#usr/share/vim/vim74/syntax/rtf.vim -#usr/share/vim/vim74/syntax/ruby.vim -#usr/share/vim/vim74/syntax/samba.vim -#usr/share/vim/vim74/syntax/sas.vim -#usr/share/vim/vim74/syntax/sass.vim -#usr/share/vim/vim74/syntax/sather.vim -#usr/share/vim/vim74/syntax/scheme.vim -#usr/share/vim/vim74/syntax/scilab.vim -#usr/share/vim/vim74/syntax/screen.vim -#usr/share/vim/vim74/syntax/scss.vim -#usr/share/vim/vim74/syntax/sd.vim -#usr/share/vim/vim74/syntax/sdc.vim -#usr/share/vim/vim74/syntax/sdl.vim -#usr/share/vim/vim74/syntax/sed.vim -#usr/share/vim/vim74/syntax/sendpr.vim -#usr/share/vim/vim74/syntax/sensors.vim -#usr/share/vim/vim74/syntax/services.vim -#usr/share/vim/vim74/syntax/setserial.vim -#usr/share/vim/vim74/syntax/sgml.vim -#usr/share/vim/vim74/syntax/sgmldecl.vim -#usr/share/vim/vim74/syntax/sgmllnx.vim -#usr/share/vim/vim74/syntax/sh.vim -#usr/share/vim/vim74/syntax/sicad.vim -#usr/share/vim/vim74/syntax/sieve.vim -#usr/share/vim/vim74/syntax/simula.vim -#usr/share/vim/vim74/syntax/sinda.vim -#usr/share/vim/vim74/syntax/sindacmp.vim -#usr/share/vim/vim74/syntax/sindaout.vim -#usr/share/vim/vim74/syntax/sisu.vim -#usr/share/vim/vim74/syntax/skill.vim -#usr/share/vim/vim74/syntax/sl.vim -#usr/share/vim/vim74/syntax/slang.vim -#usr/share/vim/vim74/syntax/slice.vim -#usr/share/vim/vim74/syntax/slpconf.vim -#usr/share/vim/vim74/syntax/slpreg.vim -#usr/share/vim/vim74/syntax/slpspi.vim -#usr/share/vim/vim74/syntax/slrnrc.vim -#usr/share/vim/vim74/syntax/slrnsc.vim -#usr/share/vim/vim74/syntax/sm.vim -#usr/share/vim/vim74/syntax/smarty.vim -#usr/share/vim/vim74/syntax/smcl.vim -#usr/share/vim/vim74/syntax/smil.vim -#usr/share/vim/vim74/syntax/smith.vim -#usr/share/vim/vim74/syntax/sml.vim -#usr/share/vim/vim74/syntax/snnsnet.vim -#usr/share/vim/vim74/syntax/snnspat.vim -#usr/share/vim/vim74/syntax/snnsres.vim -#usr/share/vim/vim74/syntax/snobol4.vim -#usr/share/vim/vim74/syntax/spec.vim -#usr/share/vim/vim74/syntax/specman.vim -#usr/share/vim/vim74/syntax/spice.vim -#usr/share/vim/vim74/syntax/splint.vim -#usr/share/vim/vim74/syntax/spup.vim -#usr/share/vim/vim74/syntax/spyce.vim -#usr/share/vim/vim74/syntax/sql.vim -#usr/share/vim/vim74/syntax/sqlanywhere.vim -#usr/share/vim/vim74/syntax/sqlforms.vim -#usr/share/vim/vim74/syntax/sqlhana.vim -#usr/share/vim/vim74/syntax/sqlinformix.vim -#usr/share/vim/vim74/syntax/sqlj.vim -#usr/share/vim/vim74/syntax/sqloracle.vim -#usr/share/vim/vim74/syntax/sqr.vim -#usr/share/vim/vim74/syntax/squid.vim -#usr/share/vim/vim74/syntax/sshconfig.vim -#usr/share/vim/vim74/syntax/sshdconfig.vim -#usr/share/vim/vim74/syntax/st.vim -#usr/share/vim/vim74/syntax/stata.vim -#usr/share/vim/vim74/syntax/stp.vim -#usr/share/vim/vim74/syntax/strace.vim -#usr/share/vim/vim74/syntax/sudoers.vim -#usr/share/vim/vim74/syntax/svg.vim -#usr/share/vim/vim74/syntax/svn.vim -#usr/share/vim/vim74/syntax/syncolor.vim -#usr/share/vim/vim74/syntax/synload.vim -#usr/share/vim/vim74/syntax/syntax.vim -#usr/share/vim/vim74/syntax/sysctl.vim -#usr/share/vim/vim74/syntax/tads.vim -#usr/share/vim/vim74/syntax/tags.vim -#usr/share/vim/vim74/syntax/tak.vim -#usr/share/vim/vim74/syntax/takcmp.vim -#usr/share/vim/vim74/syntax/takout.vim -#usr/share/vim/vim74/syntax/tar.vim -#usr/share/vim/vim74/syntax/taskdata.vim -#usr/share/vim/vim74/syntax/taskedit.vim -#usr/share/vim/vim74/syntax/tasm.vim -#usr/share/vim/vim74/syntax/tcl.vim -#usr/share/vim/vim74/syntax/tcsh.vim -#usr/share/vim/vim74/syntax/terminfo.vim -#usr/share/vim/vim74/syntax/tex.vim -#usr/share/vim/vim74/syntax/texinfo.vim -#usr/share/vim/vim74/syntax/texmf.vim -#usr/share/vim/vim74/syntax/tf.vim -#usr/share/vim/vim74/syntax/tidy.vim -#usr/share/vim/vim74/syntax/tilde.vim -#usr/share/vim/vim74/syntax/tli.vim -#usr/share/vim/vim74/syntax/tpp.vim -#usr/share/vim/vim74/syntax/trasys.vim -#usr/share/vim/vim74/syntax/treetop.vim -#usr/share/vim/vim74/syntax/trustees.vim -#usr/share/vim/vim74/syntax/tsalt.vim -#usr/share/vim/vim74/syntax/tsscl.vim -#usr/share/vim/vim74/syntax/tssgm.vim -#usr/share/vim/vim74/syntax/tssop.vim -#usr/share/vim/vim74/syntax/tt2.vim -#usr/share/vim/vim74/syntax/tt2html.vim -#usr/share/vim/vim74/syntax/tt2js.vim -#usr/share/vim/vim74/syntax/uc.vim -#usr/share/vim/vim74/syntax/udevconf.vim -#usr/share/vim/vim74/syntax/udevperm.vim -#usr/share/vim/vim74/syntax/udevrules.vim -#usr/share/vim/vim74/syntax/uil.vim -#usr/share/vim/vim74/syntax/updatedb.vim -#usr/share/vim/vim74/syntax/upstart.vim -#usr/share/vim/vim74/syntax/upstreamdat.vim -#usr/share/vim/vim74/syntax/upstreaminstalllog.vim -#usr/share/vim/vim74/syntax/upstreamlog.vim -#usr/share/vim/vim74/syntax/usserverlog.vim -#usr/share/vim/vim74/syntax/usw2kagtlog.vim -#usr/share/vim/vim74/syntax/valgrind.vim -#usr/share/vim/vim74/syntax/vb.vim -#usr/share/vim/vim74/syntax/vera.vim -#usr/share/vim/vim74/syntax/verilog.vim -#usr/share/vim/vim74/syntax/verilogams.vim -#usr/share/vim/vim74/syntax/vgrindefs.vim -#usr/share/vim/vim74/syntax/vhdl.vim -#usr/share/vim/vim74/syntax/vim.vim -#usr/share/vim/vim74/syntax/viminfo.vim -#usr/share/vim/vim74/syntax/virata.vim -#usr/share/vim/vim74/syntax/vmasm.vim -#usr/share/vim/vim74/syntax/voscm.vim -#usr/share/vim/vim74/syntax/vrml.vim -#usr/share/vim/vim74/syntax/vsejcl.vim -#usr/share/vim/vim74/syntax/wdiff.vim -#usr/share/vim/vim74/syntax/web.vim -#usr/share/vim/vim74/syntax/webmacro.vim -#usr/share/vim/vim74/syntax/wget.vim -#usr/share/vim/vim74/syntax/whitespace.vim -#usr/share/vim/vim74/syntax/winbatch.vim -#usr/share/vim/vim74/syntax/wml.vim -#usr/share/vim/vim74/syntax/wsh.vim -#usr/share/vim/vim74/syntax/wsml.vim -#usr/share/vim/vim74/syntax/wvdial.vim -#usr/share/vim/vim74/syntax/xbl.vim -#usr/share/vim/vim74/syntax/xdefaults.vim -#usr/share/vim/vim74/syntax/xf86conf.vim -#usr/share/vim/vim74/syntax/xhtml.vim -#usr/share/vim/vim74/syntax/xinetd.vim -#usr/share/vim/vim74/syntax/xkb.vim -#usr/share/vim/vim74/syntax/xmath.vim -#usr/share/vim/vim74/syntax/xml.vim -#usr/share/vim/vim74/syntax/xmodmap.vim -#usr/share/vim/vim74/syntax/xpm.vim -#usr/share/vim/vim74/syntax/xpm2.vim -#usr/share/vim/vim74/syntax/xquery.vim -#usr/share/vim/vim74/syntax/xs.vim -#usr/share/vim/vim74/syntax/xsd.vim -#usr/share/vim/vim74/syntax/xslt.vim -#usr/share/vim/vim74/syntax/xxd.vim -#usr/share/vim/vim74/syntax/yacc.vim -#usr/share/vim/vim74/syntax/yaml.vim -#usr/share/vim/vim74/syntax/z8a.vim -#usr/share/vim/vim74/syntax/zimbu.vim -#usr/share/vim/vim74/syntax/zsh.vim -#usr/share/vim/vim74/tools -#usr/share/vim/vim74/tools/README.txt -#usr/share/vim/vim74/tools/blink.c -#usr/share/vim/vim74/tools/ccfilter.1 -#usr/share/vim/vim74/tools/ccfilter.c -#usr/share/vim/vim74/tools/ccfilter_README.txt -#usr/share/vim/vim74/tools/efm_filter.pl -#usr/share/vim/vim74/tools/efm_filter.txt -#usr/share/vim/vim74/tools/efm_perl.pl -#usr/share/vim/vim74/tools/mve.awk -#usr/share/vim/vim74/tools/mve.txt -#usr/share/vim/vim74/tools/pltags.pl -#usr/share/vim/vim74/tools/ref -#usr/share/vim/vim74/tools/shtags.1 -#usr/share/vim/vim74/tools/shtags.pl -#usr/share/vim/vim74/tools/unicode.vim -#usr/share/vim/vim74/tools/vim132 -#usr/share/vim/vim74/tools/vim_vs_net.cmd -#usr/share/vim/vim74/tools/vimm -#usr/share/vim/vim74/tools/vimspell.sh -#usr/share/vim/vim74/tools/vimspell.txt -#usr/share/vim/vim74/tools/xcmdsrv_client.c -#usr/share/vim/vim74/tutor -#usr/share/vim/vim74/tutor/README.el.cp737.txt -#usr/share/vim/vim74/tutor/README.el.txt -#usr/share/vim/vim74/tutor/README.txt -#usr/share/vim/vim74/tutor/tutor -#usr/share/vim/vim74/tutor/tutor.bar -#usr/share/vim/vim74/tutor/tutor.bar.utf-8 -#usr/share/vim/vim74/tutor/tutor.ca -#usr/share/vim/vim74/tutor/tutor.ca.utf-8 -#usr/share/vim/vim74/tutor/tutor.cs -#usr/share/vim/vim74/tutor/tutor.cs.cp1250 -#usr/share/vim/vim74/tutor/tutor.cs.utf-8 -#usr/share/vim/vim74/tutor/tutor.de -#usr/share/vim/vim74/tutor/tutor.de.utf-8 -#usr/share/vim/vim74/tutor/tutor.el -#usr/share/vim/vim74/tutor/tutor.el.cp737 -#usr/share/vim/vim74/tutor/tutor.el.utf-8 -#usr/share/vim/vim74/tutor/tutor.eo -#usr/share/vim/vim74/tutor/tutor.eo.utf-8 -#usr/share/vim/vim74/tutor/tutor.es -#usr/share/vim/vim74/tutor/tutor.es.utf-8 -#usr/share/vim/vim74/tutor/tutor.fr -#usr/share/vim/vim74/tutor/tutor.fr.utf-8 -#usr/share/vim/vim74/tutor/tutor.hr -#usr/share/vim/vim74/tutor/tutor.hr.cp1250 -#usr/share/vim/vim74/tutor/tutor.hr.utf-8 -#usr/share/vim/vim74/tutor/tutor.hu -#usr/share/vim/vim74/tutor/tutor.hu.cp1250 -#usr/share/vim/vim74/tutor/tutor.hu.utf-8 -#usr/share/vim/vim74/tutor/tutor.it -#usr/share/vim/vim74/tutor/tutor.it.utf-8 -#usr/share/vim/vim74/tutor/tutor.ja.euc -#usr/share/vim/vim74/tutor/tutor.ja.sjis -#usr/share/vim/vim74/tutor/tutor.ja.utf-8 -#usr/share/vim/vim74/tutor/tutor.ko.euc -#usr/share/vim/vim74/tutor/tutor.ko.utf-8 -#usr/share/vim/vim74/tutor/tutor.nb -#usr/share/vim/vim74/tutor/tutor.nb.utf-8 -#usr/share/vim/vim74/tutor/tutor.nl -#usr/share/vim/vim74/tutor/tutor.nl.utf-8 -#usr/share/vim/vim74/tutor/tutor.no -#usr/share/vim/vim74/tutor/tutor.no.utf-8 -#usr/share/vim/vim74/tutor/tutor.pl -#usr/share/vim/vim74/tutor/tutor.pl.cp1250 -#usr/share/vim/vim74/tutor/tutor.pl.utf-8 -#usr/share/vim/vim74/tutor/tutor.pt -#usr/share/vim/vim74/tutor/tutor.pt.utf-8 -#usr/share/vim/vim74/tutor/tutor.ru -#usr/share/vim/vim74/tutor/tutor.ru.cp1251 -#usr/share/vim/vim74/tutor/tutor.ru.utf-8 -#usr/share/vim/vim74/tutor/tutor.sk -#usr/share/vim/vim74/tutor/tutor.sk.cp1250 -#usr/share/vim/vim74/tutor/tutor.sk.utf-8 -#usr/share/vim/vim74/tutor/tutor.sv -#usr/share/vim/vim74/tutor/tutor.sv.utf-8 -#usr/share/vim/vim74/tutor/tutor.tr.iso9 -#usr/share/vim/vim74/tutor/tutor.tr.utf-8 -#usr/share/vim/vim74/tutor/tutor.utf-8 -#usr/share/vim/vim74/tutor/tutor.vi.utf-8 -#usr/share/vim/vim74/tutor/tutor.vim -#usr/share/vim/vim74/tutor/tutor.zh.big5 -#usr/share/vim/vim74/tutor/tutor.zh.euc -#usr/share/vim/vim74/tutor/tutor.zh.utf-8 -#usr/share/vim/vim74/tutor/tutor.zh_cn.utf-8 -#usr/share/vim/vim74/tutor/tutor.zh_tw.utf-8 -#usr/share/vim/vim74/vimrc_example.vim +#usr/share/vim/vim81 +#usr/share/vim/vim81/autoload +#usr/share/vim/vim81/autoload/README.txt +#usr/share/vim/vim81/autoload/ada.vim +#usr/share/vim/vim81/autoload/adacomplete.vim +#usr/share/vim/vim81/autoload/ccomplete.vim +#usr/share/vim/vim81/autoload/clojurecomplete.vim +#usr/share/vim/vim81/autoload/context.vim +#usr/share/vim/vim81/autoload/contextcomplete.vim +#usr/share/vim/vim81/autoload/csscomplete.vim +#usr/share/vim/vim81/autoload/decada.vim +#usr/share/vim/vim81/autoload/dist +#usr/share/vim/vim81/autoload/dist/ft.vim +#usr/share/vim/vim81/autoload/getscript.vim +#usr/share/vim/vim81/autoload/gnat.vim +#usr/share/vim/vim81/autoload/gzip.vim +#usr/share/vim/vim81/autoload/htmlcomplete.vim +#usr/share/vim/vim81/autoload/javascriptcomplete.vim +#usr/share/vim/vim81/autoload/netrw.vim +#usr/share/vim/vim81/autoload/netrwFileHandlers.vim +#usr/share/vim/vim81/autoload/netrwSettings.vim +#usr/share/vim/vim81/autoload/netrw_gitignore.vim +#usr/share/vim/vim81/autoload/paste.vim +#usr/share/vim/vim81/autoload/phpcomplete.vim +#usr/share/vim/vim81/autoload/python3complete.vim +#usr/share/vim/vim81/autoload/pythoncomplete.vim +#usr/share/vim/vim81/autoload/rubycomplete.vim +#usr/share/vim/vim81/autoload/rust.vim +#usr/share/vim/vim81/autoload/rustfmt.vim +#usr/share/vim/vim81/autoload/spellfile.vim +#usr/share/vim/vim81/autoload/sqlcomplete.vim +#usr/share/vim/vim81/autoload/syntaxcomplete.vim +#usr/share/vim/vim81/autoload/tar.vim +#usr/share/vim/vim81/autoload/tohtml.vim +#usr/share/vim/vim81/autoload/vimball.vim +#usr/share/vim/vim81/autoload/xml +#usr/share/vim/vim81/autoload/xml/html32.vim +#usr/share/vim/vim81/autoload/xml/html401f.vim +#usr/share/vim/vim81/autoload/xml/html401s.vim +#usr/share/vim/vim81/autoload/xml/html401t.vim +#usr/share/vim/vim81/autoload/xml/html40f.vim +#usr/share/vim/vim81/autoload/xml/html40s.vim +#usr/share/vim/vim81/autoload/xml/html40t.vim +#usr/share/vim/vim81/autoload/xml/xhtml10f.vim +#usr/share/vim/vim81/autoload/xml/xhtml10s.vim +#usr/share/vim/vim81/autoload/xml/xhtml10t.vim +#usr/share/vim/vim81/autoload/xml/xhtml11.vim +#usr/share/vim/vim81/autoload/xml/xsd.vim +#usr/share/vim/vim81/autoload/xml/xsl.vim +#usr/share/vim/vim81/autoload/xmlcomplete.vim +#usr/share/vim/vim81/autoload/xmlformat.vim +#usr/share/vim/vim81/autoload/zip.vim +#usr/share/vim/vim81/bugreport.vim +#usr/share/vim/vim81/colors +#usr/share/vim/vim81/colors/README.txt +#usr/share/vim/vim81/colors/blue.vim +#usr/share/vim/vim81/colors/darkblue.vim +#usr/share/vim/vim81/colors/default.vim +#usr/share/vim/vim81/colors/delek.vim +#usr/share/vim/vim81/colors/desert.vim +#usr/share/vim/vim81/colors/elflord.vim +#usr/share/vim/vim81/colors/evening.vim +#usr/share/vim/vim81/colors/industry.vim +#usr/share/vim/vim81/colors/koehler.vim +#usr/share/vim/vim81/colors/morning.vim +#usr/share/vim/vim81/colors/murphy.vim +#usr/share/vim/vim81/colors/pablo.vim +#usr/share/vim/vim81/colors/peachpuff.vim +#usr/share/vim/vim81/colors/ron.vim +#usr/share/vim/vim81/colors/shine.vim +#usr/share/vim/vim81/colors/slate.vim +#usr/share/vim/vim81/colors/tools +#usr/share/vim/vim81/colors/tools/check_colors.vim +#usr/share/vim/vim81/colors/torte.vim +#usr/share/vim/vim81/colors/zellner.vim +#usr/share/vim/vim81/compiler +#usr/share/vim/vim81/compiler/README.txt +#usr/share/vim/vim81/compiler/ant.vim +#usr/share/vim/vim81/compiler/bcc.vim +#usr/share/vim/vim81/compiler/bdf.vim +#usr/share/vim/vim81/compiler/cargo.vim +#usr/share/vim/vim81/compiler/checkstyle.vim +#usr/share/vim/vim81/compiler/context.vim +#usr/share/vim/vim81/compiler/cs.vim +#usr/share/vim/vim81/compiler/csslint.vim +#usr/share/vim/vim81/compiler/cucumber.vim +#usr/share/vim/vim81/compiler/decada.vim +#usr/share/vim/vim81/compiler/dot.vim +#usr/share/vim/vim81/compiler/erlang.vim +#usr/share/vim/vim81/compiler/eruby.vim +#usr/share/vim/vim81/compiler/fortran_F.vim +#usr/share/vim/vim81/compiler/fortran_cv.vim +#usr/share/vim/vim81/compiler/fortran_elf90.vim +#usr/share/vim/vim81/compiler/fortran_g77.vim +#usr/share/vim/vim81/compiler/fortran_lf95.vim +#usr/share/vim/vim81/compiler/fpc.vim +#usr/share/vim/vim81/compiler/g95.vim +#usr/share/vim/vim81/compiler/gcc.vim +#usr/share/vim/vim81/compiler/gfortran.vim +#usr/share/vim/vim81/compiler/ghc.vim +#usr/share/vim/vim81/compiler/gnat.vim +#usr/share/vim/vim81/compiler/go.vim +#usr/share/vim/vim81/compiler/haml.vim +#usr/share/vim/vim81/compiler/hp_acc.vim +#usr/share/vim/vim81/compiler/icc.vim +#usr/share/vim/vim81/compiler/ifort.vim +#usr/share/vim/vim81/compiler/intel.vim +#usr/share/vim/vim81/compiler/irix5_c.vim +#usr/share/vim/vim81/compiler/irix5_cpp.vim +#usr/share/vim/vim81/compiler/javac.vim +#usr/share/vim/vim81/compiler/jikes.vim +#usr/share/vim/vim81/compiler/mcs.vim +#usr/share/vim/vim81/compiler/mips_c.vim +#usr/share/vim/vim81/compiler/mipspro_c89.vim +#usr/share/vim/vim81/compiler/mipspro_cpp.vim +#usr/share/vim/vim81/compiler/modelsim_vcom.vim +#usr/share/vim/vim81/compiler/msbuild.vim +#usr/share/vim/vim81/compiler/msvc.vim +#usr/share/vim/vim81/compiler/neato.vim +#usr/share/vim/vim81/compiler/ocaml.vim +#usr/share/vim/vim81/compiler/onsgmls.vim +#usr/share/vim/vim81/compiler/pbx.vim +#usr/share/vim/vim81/compiler/perl.vim +#usr/share/vim/vim81/compiler/php.vim +#usr/share/vim/vim81/compiler/pylint.vim +#usr/share/vim/vim81/compiler/pyunit.vim +#usr/share/vim/vim81/compiler/rake.vim +#usr/share/vim/vim81/compiler/rspec.vim +#usr/share/vim/vim81/compiler/rst.vim +#usr/share/vim/vim81/compiler/ruby.vim +#usr/share/vim/vim81/compiler/rubyunit.vim +#usr/share/vim/vim81/compiler/rustc.vim +#usr/share/vim/vim81/compiler/sass.vim +#usr/share/vim/vim81/compiler/se.vim +#usr/share/vim/vim81/compiler/splint.vim +#usr/share/vim/vim81/compiler/tcl.vim +#usr/share/vim/vim81/compiler/tex.vim +#usr/share/vim/vim81/compiler/tidy.vim +#usr/share/vim/vim81/compiler/xbuild.vim +#usr/share/vim/vim81/compiler/xmllint.vim +#usr/share/vim/vim81/compiler/xmlwf.vim +#usr/share/vim/vim81/defaults.vim +#usr/share/vim/vim81/delmenu.vim +#usr/share/vim/vim81/doc +#usr/share/vim/vim81/doc/arabic.txt +#usr/share/vim/vim81/doc/autocmd.txt +#usr/share/vim/vim81/doc/change.txt +#usr/share/vim/vim81/doc/channel.txt +#usr/share/vim/vim81/doc/cmdline.txt +#usr/share/vim/vim81/doc/debug.txt +#usr/share/vim/vim81/doc/debugger.txt +#usr/share/vim/vim81/doc/develop.txt +#usr/share/vim/vim81/doc/diff.txt +#usr/share/vim/vim81/doc/digraph.txt +#usr/share/vim/vim81/doc/editing.txt +#usr/share/vim/vim81/doc/eval.txt +#usr/share/vim/vim81/doc/farsi.txt +#usr/share/vim/vim81/doc/filetype.txt +#usr/share/vim/vim81/doc/fold.txt +#usr/share/vim/vim81/doc/ft_ada.txt +#usr/share/vim/vim81/doc/ft_rust.txt +#usr/share/vim/vim81/doc/ft_sql.txt +#usr/share/vim/vim81/doc/gui.txt +#usr/share/vim/vim81/doc/gui_w32.txt +#usr/share/vim/vim81/doc/gui_x11.txt +#usr/share/vim/vim81/doc/hangulin.txt +#usr/share/vim/vim81/doc/hebrew.txt +#usr/share/vim/vim81/doc/help.txt +#usr/share/vim/vim81/doc/helphelp.txt +#usr/share/vim/vim81/doc/howto.txt +#usr/share/vim/vim81/doc/if_cscop.txt +#usr/share/vim/vim81/doc/if_lua.txt +#usr/share/vim/vim81/doc/if_mzsch.txt +#usr/share/vim/vim81/doc/if_ole.txt +#usr/share/vim/vim81/doc/if_perl.txt +#usr/share/vim/vim81/doc/if_pyth.txt +#usr/share/vim/vim81/doc/if_ruby.txt +#usr/share/vim/vim81/doc/if_sniff.txt +#usr/share/vim/vim81/doc/if_tcl.txt +#usr/share/vim/vim81/doc/indent.txt +#usr/share/vim/vim81/doc/index.txt +#usr/share/vim/vim81/doc/insert.txt +#usr/share/vim/vim81/doc/intro.txt +#usr/share/vim/vim81/doc/map.txt +#usr/share/vim/vim81/doc/mbyte.txt +#usr/share/vim/vim81/doc/message.txt +#usr/share/vim/vim81/doc/mlang.txt +#usr/share/vim/vim81/doc/motion.txt +#usr/share/vim/vim81/doc/netbeans.txt +#usr/share/vim/vim81/doc/options.txt +#usr/share/vim/vim81/doc/os_390.txt +#usr/share/vim/vim81/doc/os_amiga.txt +#usr/share/vim/vim81/doc/os_beos.txt +#usr/share/vim/vim81/doc/os_dos.txt +#usr/share/vim/vim81/doc/os_mac.txt +#usr/share/vim/vim81/doc/os_mint.txt +#usr/share/vim/vim81/doc/os_msdos.txt +#usr/share/vim/vim81/doc/os_os2.txt +#usr/share/vim/vim81/doc/os_qnx.txt +#usr/share/vim/vim81/doc/os_risc.txt +#usr/share/vim/vim81/doc/os_unix.txt +#usr/share/vim/vim81/doc/os_vms.txt +#usr/share/vim/vim81/doc/os_win32.txt +#usr/share/vim/vim81/doc/pattern.txt +#usr/share/vim/vim81/doc/pi_getscript.txt +#usr/share/vim/vim81/doc/pi_gzip.txt +#usr/share/vim/vim81/doc/pi_logipat.txt +#usr/share/vim/vim81/doc/pi_netrw.txt +#usr/share/vim/vim81/doc/pi_paren.txt +#usr/share/vim/vim81/doc/pi_spec.txt +#usr/share/vim/vim81/doc/pi_tar.txt +#usr/share/vim/vim81/doc/pi_vimball.txt +#usr/share/vim/vim81/doc/pi_zip.txt +#usr/share/vim/vim81/doc/print.txt +#usr/share/vim/vim81/doc/quickfix.txt +#usr/share/vim/vim81/doc/quickref.txt +#usr/share/vim/vim81/doc/quotes.txt +#usr/share/vim/vim81/doc/recover.txt +#usr/share/vim/vim81/doc/remote.txt +#usr/share/vim/vim81/doc/repeat.txt +#usr/share/vim/vim81/doc/rileft.txt +#usr/share/vim/vim81/doc/russian.txt +#usr/share/vim/vim81/doc/scroll.txt +#usr/share/vim/vim81/doc/sign.txt +#usr/share/vim/vim81/doc/spell.txt +#usr/share/vim/vim81/doc/sponsor.txt +#usr/share/vim/vim81/doc/starting.txt +#usr/share/vim/vim81/doc/syntax.txt +#usr/share/vim/vim81/doc/tabpage.txt +#usr/share/vim/vim81/doc/tags +#usr/share/vim/vim81/doc/tagsrch.txt +#usr/share/vim/vim81/doc/term.txt +#usr/share/vim/vim81/doc/terminal.txt +#usr/share/vim/vim81/doc/tips.txt +#usr/share/vim/vim81/doc/todo.txt +#usr/share/vim/vim81/doc/uganda.txt +#usr/share/vim/vim81/doc/undo.txt +#usr/share/vim/vim81/doc/usr_01.txt +#usr/share/vim/vim81/doc/usr_02.txt +#usr/share/vim/vim81/doc/usr_03.txt +#usr/share/vim/vim81/doc/usr_04.txt +#usr/share/vim/vim81/doc/usr_05.txt +#usr/share/vim/vim81/doc/usr_06.txt +#usr/share/vim/vim81/doc/usr_07.txt +#usr/share/vim/vim81/doc/usr_08.txt +#usr/share/vim/vim81/doc/usr_09.txt +#usr/share/vim/vim81/doc/usr_10.txt +#usr/share/vim/vim81/doc/usr_11.txt +#usr/share/vim/vim81/doc/usr_12.txt +#usr/share/vim/vim81/doc/usr_20.txt +#usr/share/vim/vim81/doc/usr_21.txt +#usr/share/vim/vim81/doc/usr_22.txt +#usr/share/vim/vim81/doc/usr_23.txt +#usr/share/vim/vim81/doc/usr_24.txt +#usr/share/vim/vim81/doc/usr_25.txt +#usr/share/vim/vim81/doc/usr_26.txt +#usr/share/vim/vim81/doc/usr_27.txt +#usr/share/vim/vim81/doc/usr_28.txt +#usr/share/vim/vim81/doc/usr_29.txt +#usr/share/vim/vim81/doc/usr_30.txt +#usr/share/vim/vim81/doc/usr_31.txt +#usr/share/vim/vim81/doc/usr_32.txt +#usr/share/vim/vim81/doc/usr_40.txt +#usr/share/vim/vim81/doc/usr_41.txt +#usr/share/vim/vim81/doc/usr_42.txt +#usr/share/vim/vim81/doc/usr_43.txt +#usr/share/vim/vim81/doc/usr_44.txt +#usr/share/vim/vim81/doc/usr_45.txt +#usr/share/vim/vim81/doc/usr_90.txt +#usr/share/vim/vim81/doc/usr_toc.txt +#usr/share/vim/vim81/doc/various.txt +#usr/share/vim/vim81/doc/version4.txt +#usr/share/vim/vim81/doc/version5.txt +#usr/share/vim/vim81/doc/version6.txt +#usr/share/vim/vim81/doc/version7.txt +#usr/share/vim/vim81/doc/version8.txt +#usr/share/vim/vim81/doc/vi_diff.txt +#usr/share/vim/vim81/doc/vim2html.pl +#usr/share/vim/vim81/doc/visual.txt +#usr/share/vim/vim81/doc/windows.txt +#usr/share/vim/vim81/doc/workshop.txt +#usr/share/vim/vim81/evim.vim +#usr/share/vim/vim81/filetype.vim +#usr/share/vim/vim81/ftoff.vim +#usr/share/vim/vim81/ftplugin +#usr/share/vim/vim81/ftplugin.vim +#usr/share/vim/vim81/ftplugin/README.txt +#usr/share/vim/vim81/ftplugin/a2ps.vim +#usr/share/vim/vim81/ftplugin/aap.vim +#usr/share/vim/vim81/ftplugin/abap.vim +#usr/share/vim/vim81/ftplugin/abaqus.vim +#usr/share/vim/vim81/ftplugin/ada.vim +#usr/share/vim/vim81/ftplugin/alsaconf.vim +#usr/share/vim/vim81/ftplugin/ant.vim +#usr/share/vim/vim81/ftplugin/arch.vim +#usr/share/vim/vim81/ftplugin/art.vim +#usr/share/vim/vim81/ftplugin/aspvbs.vim +#usr/share/vim/vim81/ftplugin/automake.vim +#usr/share/vim/vim81/ftplugin/awk.vim +#usr/share/vim/vim81/ftplugin/bdf.vim +#usr/share/vim/vim81/ftplugin/bst.vim +#usr/share/vim/vim81/ftplugin/btm.vim +#usr/share/vim/vim81/ftplugin/bzl.vim +#usr/share/vim/vim81/ftplugin/c.vim +#usr/share/vim/vim81/ftplugin/calendar.vim +#usr/share/vim/vim81/ftplugin/cdrdaoconf.vim +#usr/share/vim/vim81/ftplugin/ch.vim +#usr/share/vim/vim81/ftplugin/changelog.vim +#usr/share/vim/vim81/ftplugin/chicken.vim +#usr/share/vim/vim81/ftplugin/clojure.vim +#usr/share/vim/vim81/ftplugin/cmake.vim +#usr/share/vim/vim81/ftplugin/cobol.vim +#usr/share/vim/vim81/ftplugin/conf.vim +#usr/share/vim/vim81/ftplugin/config.vim +#usr/share/vim/vim81/ftplugin/context.vim +#usr/share/vim/vim81/ftplugin/cpp.vim +#usr/share/vim/vim81/ftplugin/crm.vim +#usr/share/vim/vim81/ftplugin/cs.vim +#usr/share/vim/vim81/ftplugin/csc.vim +#usr/share/vim/vim81/ftplugin/csh.vim +#usr/share/vim/vim81/ftplugin/css.vim +#usr/share/vim/vim81/ftplugin/cucumber.vim +#usr/share/vim/vim81/ftplugin/cvsrc.vim +#usr/share/vim/vim81/ftplugin/debchangelog.vim +#usr/share/vim/vim81/ftplugin/debcontrol.vim +#usr/share/vim/vim81/ftplugin/denyhosts.vim +#usr/share/vim/vim81/ftplugin/dictconf.vim +#usr/share/vim/vim81/ftplugin/dictdconf.vim +#usr/share/vim/vim81/ftplugin/diff.vim +#usr/share/vim/vim81/ftplugin/dircolors.vim +#usr/share/vim/vim81/ftplugin/docbk.vim +#usr/share/vim/vim81/ftplugin/dockerfile.vim +#usr/share/vim/vim81/ftplugin/dosbatch.vim +#usr/share/vim/vim81/ftplugin/dosini.vim +#usr/share/vim/vim81/ftplugin/dtd.vim +#usr/share/vim/vim81/ftplugin/dtrace.vim +#usr/share/vim/vim81/ftplugin/eiffel.vim +#usr/share/vim/vim81/ftplugin/elinks.vim +#usr/share/vim/vim81/ftplugin/erlang.vim +#usr/share/vim/vim81/ftplugin/eruby.vim +#usr/share/vim/vim81/ftplugin/eterm.vim +#usr/share/vim/vim81/ftplugin/falcon.vim +#usr/share/vim/vim81/ftplugin/fetchmail.vim +#usr/share/vim/vim81/ftplugin/flexwiki.vim +#usr/share/vim/vim81/ftplugin/fortran.vim +#usr/share/vim/vim81/ftplugin/framescript.vim +#usr/share/vim/vim81/ftplugin/fvwm.vim +#usr/share/vim/vim81/ftplugin/gdb.vim +#usr/share/vim/vim81/ftplugin/git.vim +#usr/share/vim/vim81/ftplugin/gitcommit.vim +#usr/share/vim/vim81/ftplugin/gitconfig.vim +#usr/share/vim/vim81/ftplugin/gitrebase.vim +#usr/share/vim/vim81/ftplugin/gitsendemail.vim +#usr/share/vim/vim81/ftplugin/go.vim +#usr/share/vim/vim81/ftplugin/gpg.vim +#usr/share/vim/vim81/ftplugin/gprof.vim +#usr/share/vim/vim81/ftplugin/groovy.vim +#usr/share/vim/vim81/ftplugin/group.vim +#usr/share/vim/vim81/ftplugin/grub.vim +#usr/share/vim/vim81/ftplugin/haml.vim +#usr/share/vim/vim81/ftplugin/hamster.vim +#usr/share/vim/vim81/ftplugin/haskell.vim +#usr/share/vim/vim81/ftplugin/help.vim +#usr/share/vim/vim81/ftplugin/hgcommit.vim +#usr/share/vim/vim81/ftplugin/hog.vim +#usr/share/vim/vim81/ftplugin/hostconf.vim +#usr/share/vim/vim81/ftplugin/hostsaccess.vim +#usr/share/vim/vim81/ftplugin/html.vim +#usr/share/vim/vim81/ftplugin/htmldjango.vim +#usr/share/vim/vim81/ftplugin/indent.vim +#usr/share/vim/vim81/ftplugin/initex.vim +#usr/share/vim/vim81/ftplugin/ishd.vim +#usr/share/vim/vim81/ftplugin/j.vim +#usr/share/vim/vim81/ftplugin/java.vim +#usr/share/vim/vim81/ftplugin/javascript.vim +#usr/share/vim/vim81/ftplugin/jproperties.vim +#usr/share/vim/vim81/ftplugin/json.vim +#usr/share/vim/vim81/ftplugin/jsp.vim +#usr/share/vim/vim81/ftplugin/kconfig.vim +#usr/share/vim/vim81/ftplugin/kwt.vim +#usr/share/vim/vim81/ftplugin/ld.vim +#usr/share/vim/vim81/ftplugin/less.vim +#usr/share/vim/vim81/ftplugin/lftp.vim +#usr/share/vim/vim81/ftplugin/libao.vim +#usr/share/vim/vim81/ftplugin/limits.vim +#usr/share/vim/vim81/ftplugin/liquid.vim +#usr/share/vim/vim81/ftplugin/lisp.vim +#usr/share/vim/vim81/ftplugin/logcheck.vim +#usr/share/vim/vim81/ftplugin/loginaccess.vim +#usr/share/vim/vim81/ftplugin/logindefs.vim +#usr/share/vim/vim81/ftplugin/logtalk.dict +#usr/share/vim/vim81/ftplugin/logtalk.vim +#usr/share/vim/vim81/ftplugin/lprolog.vim +#usr/share/vim/vim81/ftplugin/lua.vim +#usr/share/vim/vim81/ftplugin/m4.vim +#usr/share/vim/vim81/ftplugin/mail.vim +#usr/share/vim/vim81/ftplugin/mailaliases.vim +#usr/share/vim/vim81/ftplugin/mailcap.vim +#usr/share/vim/vim81/ftplugin/make.vim +#usr/share/vim/vim81/ftplugin/man.vim +#usr/share/vim/vim81/ftplugin/manconf.vim +#usr/share/vim/vim81/ftplugin/markdown.vim +#usr/share/vim/vim81/ftplugin/matlab.vim +#usr/share/vim/vim81/ftplugin/mf.vim +#usr/share/vim/vim81/ftplugin/modconf.vim +#usr/share/vim/vim81/ftplugin/mp.vim +#usr/share/vim/vim81/ftplugin/mplayerconf.vim +#usr/share/vim/vim81/ftplugin/mrxvtrc.vim +#usr/share/vim/vim81/ftplugin/msmessages.vim +#usr/share/vim/vim81/ftplugin/muttrc.vim +#usr/share/vim/vim81/ftplugin/nanorc.vim +#usr/share/vim/vim81/ftplugin/neomuttrc.vim +#usr/share/vim/vim81/ftplugin/netrc.vim +#usr/share/vim/vim81/ftplugin/nsis.vim +#usr/share/vim/vim81/ftplugin/objc.vim +#usr/share/vim/vim81/ftplugin/ocaml.vim +#usr/share/vim/vim81/ftplugin/occam.vim +#usr/share/vim/vim81/ftplugin/pamconf.vim +#usr/share/vim/vim81/ftplugin/pascal.vim +#usr/share/vim/vim81/ftplugin/passwd.vim +#usr/share/vim/vim81/ftplugin/pdf.vim +#usr/share/vim/vim81/ftplugin/perl.vim +#usr/share/vim/vim81/ftplugin/perl6.vim +#usr/share/vim/vim81/ftplugin/php.vim +#usr/share/vim/vim81/ftplugin/pinfo.vim +#usr/share/vim/vim81/ftplugin/plaintex.vim +#usr/share/vim/vim81/ftplugin/postscr.vim +#usr/share/vim/vim81/ftplugin/procmail.vim +#usr/share/vim/vim81/ftplugin/prolog.vim +#usr/share/vim/vim81/ftplugin/protocols.vim +#usr/share/vim/vim81/ftplugin/pyrex.vim +#usr/share/vim/vim81/ftplugin/python.vim +#usr/share/vim/vim81/ftplugin/qf.vim +#usr/share/vim/vim81/ftplugin/quake.vim +#usr/share/vim/vim81/ftplugin/r.vim +#usr/share/vim/vim81/ftplugin/racc.vim +#usr/share/vim/vim81/ftplugin/readline.vim +#usr/share/vim/vim81/ftplugin/registry.vim +#usr/share/vim/vim81/ftplugin/reva.vim +#usr/share/vim/vim81/ftplugin/rhelp.vim +#usr/share/vim/vim81/ftplugin/rmd.vim +#usr/share/vim/vim81/ftplugin/rnc.vim +#usr/share/vim/vim81/ftplugin/rnoweb.vim +#usr/share/vim/vim81/ftplugin/rpl.vim +#usr/share/vim/vim81/ftplugin/rrst.vim +#usr/share/vim/vim81/ftplugin/rst.vim +#usr/share/vim/vim81/ftplugin/ruby.vim +#usr/share/vim/vim81/ftplugin/rust.vim +#usr/share/vim/vim81/ftplugin/sass.vim +#usr/share/vim/vim81/ftplugin/sbt.vim +#usr/share/vim/vim81/ftplugin/scala.vim +#usr/share/vim/vim81/ftplugin/scheme.vim +#usr/share/vim/vim81/ftplugin/screen.vim +#usr/share/vim/vim81/ftplugin/scss.vim +#usr/share/vim/vim81/ftplugin/sensors.vim +#usr/share/vim/vim81/ftplugin/services.vim +#usr/share/vim/vim81/ftplugin/setserial.vim +#usr/share/vim/vim81/ftplugin/sgml.vim +#usr/share/vim/vim81/ftplugin/sh.vim +#usr/share/vim/vim81/ftplugin/sieve.vim +#usr/share/vim/vim81/ftplugin/slpconf.vim +#usr/share/vim/vim81/ftplugin/slpreg.vim +#usr/share/vim/vim81/ftplugin/slpspi.vim +#usr/share/vim/vim81/ftplugin/spec.vim +#usr/share/vim/vim81/ftplugin/sql.vim +#usr/share/vim/vim81/ftplugin/sshconfig.vim +#usr/share/vim/vim81/ftplugin/sudoers.vim +#usr/share/vim/vim81/ftplugin/svg.vim +#usr/share/vim/vim81/ftplugin/sysctl.vim +#usr/share/vim/vim81/ftplugin/systemd.vim +#usr/share/vim/vim81/ftplugin/systemverilog.vim +#usr/share/vim/vim81/ftplugin/tcl.vim +#usr/share/vim/vim81/ftplugin/tcsh.vim +#usr/share/vim/vim81/ftplugin/terminfo.vim +#usr/share/vim/vim81/ftplugin/tex.vim +#usr/share/vim/vim81/ftplugin/text.vim +#usr/share/vim/vim81/ftplugin/tmux.vim +#usr/share/vim/vim81/ftplugin/treetop.vim +#usr/share/vim/vim81/ftplugin/tt2html.vim +#usr/share/vim/vim81/ftplugin/udevconf.vim +#usr/share/vim/vim81/ftplugin/udevperm.vim +#usr/share/vim/vim81/ftplugin/udevrules.vim +#usr/share/vim/vim81/ftplugin/updatedb.vim +#usr/share/vim/vim81/ftplugin/vb.vim +#usr/share/vim/vim81/ftplugin/verilog.vim +#usr/share/vim/vim81/ftplugin/vhdl.vim +#usr/share/vim/vim81/ftplugin/vim.vim +#usr/share/vim/vim81/ftplugin/vroom.vim +#usr/share/vim/vim81/ftplugin/xdefaults.vim +#usr/share/vim/vim81/ftplugin/xf86conf.vim +#usr/share/vim/vim81/ftplugin/xhtml.vim +#usr/share/vim/vim81/ftplugin/xinetd.vim +#usr/share/vim/vim81/ftplugin/xml.vim +#usr/share/vim/vim81/ftplugin/xmodmap.vim +#usr/share/vim/vim81/ftplugin/xs.vim +#usr/share/vim/vim81/ftplugin/xsd.vim +#usr/share/vim/vim81/ftplugin/xslt.vim +#usr/share/vim/vim81/ftplugin/yaml.vim +#usr/share/vim/vim81/ftplugin/zimbu.vim +#usr/share/vim/vim81/ftplugin/zsh.vim +#usr/share/vim/vim81/ftplugof.vim +#usr/share/vim/vim81/gvimrc_example.vim +#usr/share/vim/vim81/indent +#usr/share/vim/vim81/indent.vim +#usr/share/vim/vim81/indent/README.txt +#usr/share/vim/vim81/indent/aap.vim +#usr/share/vim/vim81/indent/ada.vim +#usr/share/vim/vim81/indent/ant.vim +#usr/share/vim/vim81/indent/automake.vim +#usr/share/vim/vim81/indent/awk.vim +#usr/share/vim/vim81/indent/bib.vim +#usr/share/vim/vim81/indent/bst.vim +#usr/share/vim/vim81/indent/bzl.vim +#usr/share/vim/vim81/indent/c.vim +#usr/share/vim/vim81/indent/cdl.vim +#usr/share/vim/vim81/indent/ch.vim +#usr/share/vim/vim81/indent/chaiscript.vim +#usr/share/vim/vim81/indent/changelog.vim +#usr/share/vim/vim81/indent/clojure.vim +#usr/share/vim/vim81/indent/cmake.vim +#usr/share/vim/vim81/indent/cobol.vim +#usr/share/vim/vim81/indent/config.vim +#usr/share/vim/vim81/indent/context.vim +#usr/share/vim/vim81/indent/cpp.vim +#usr/share/vim/vim81/indent/cs.vim +#usr/share/vim/vim81/indent/css.vim +#usr/share/vim/vim81/indent/cucumber.vim +#usr/share/vim/vim81/indent/cuda.vim +#usr/share/vim/vim81/indent/d.vim +#usr/share/vim/vim81/indent/dictconf.vim +#usr/share/vim/vim81/indent/dictdconf.vim +#usr/share/vim/vim81/indent/docbk.vim +#usr/share/vim/vim81/indent/dtd.vim +#usr/share/vim/vim81/indent/dtrace.vim +#usr/share/vim/vim81/indent/dylan.vim +#usr/share/vim/vim81/indent/eiffel.vim +#usr/share/vim/vim81/indent/erlang.vim +#usr/share/vim/vim81/indent/eruby.vim +#usr/share/vim/vim81/indent/eterm.vim +#usr/share/vim/vim81/indent/falcon.vim +#usr/share/vim/vim81/indent/fortran.vim +#usr/share/vim/vim81/indent/framescript.vim +#usr/share/vim/vim81/indent/gitconfig.vim +#usr/share/vim/vim81/indent/gitolite.vim +#usr/share/vim/vim81/indent/go.vim +#usr/share/vim/vim81/indent/haml.vim +#usr/share/vim/vim81/indent/hamster.vim +#usr/share/vim/vim81/indent/hog.vim +#usr/share/vim/vim81/indent/html.vim +#usr/share/vim/vim81/indent/htmldjango.vim +#usr/share/vim/vim81/indent/idlang.vim +#usr/share/vim/vim81/indent/ishd.vim +#usr/share/vim/vim81/indent/j.vim +#usr/share/vim/vim81/indent/java.vim +#usr/share/vim/vim81/indent/javascript.vim +#usr/share/vim/vim81/indent/json.vim +#usr/share/vim/vim81/indent/jsp.vim +#usr/share/vim/vim81/indent/ld.vim +#usr/share/vim/vim81/indent/less.vim +#usr/share/vim/vim81/indent/lifelines.vim +#usr/share/vim/vim81/indent/liquid.vim +#usr/share/vim/vim81/indent/lisp.vim +#usr/share/vim/vim81/indent/logtalk.vim +#usr/share/vim/vim81/indent/lua.vim +#usr/share/vim/vim81/indent/mail.vim +#usr/share/vim/vim81/indent/make.vim +#usr/share/vim/vim81/indent/matlab.vim +#usr/share/vim/vim81/indent/mf.vim +#usr/share/vim/vim81/indent/mma.vim +#usr/share/vim/vim81/indent/mp.vim +#usr/share/vim/vim81/indent/nsis.vim +#usr/share/vim/vim81/indent/objc.vim +#usr/share/vim/vim81/indent/ocaml.vim +#usr/share/vim/vim81/indent/occam.vim +#usr/share/vim/vim81/indent/pascal.vim +#usr/share/vim/vim81/indent/perl.vim +#usr/share/vim/vim81/indent/perl6.vim +#usr/share/vim/vim81/indent/php.vim +#usr/share/vim/vim81/indent/postscr.vim +#usr/share/vim/vim81/indent/pov.vim +#usr/share/vim/vim81/indent/prolog.vim +#usr/share/vim/vim81/indent/pyrex.vim +#usr/share/vim/vim81/indent/python.vim +#usr/share/vim/vim81/indent/r.vim +#usr/share/vim/vim81/indent/readline.vim +#usr/share/vim/vim81/indent/rhelp.vim +#usr/share/vim/vim81/indent/rmd.vim +#usr/share/vim/vim81/indent/rnoweb.vim +#usr/share/vim/vim81/indent/rpl.vim +#usr/share/vim/vim81/indent/rrst.vim +#usr/share/vim/vim81/indent/rst.vim +#usr/share/vim/vim81/indent/ruby.vim +#usr/share/vim/vim81/indent/rust.vim +#usr/share/vim/vim81/indent/sas.vim +#usr/share/vim/vim81/indent/sass.vim +#usr/share/vim/vim81/indent/scala.vim +#usr/share/vim/vim81/indent/scheme.vim +#usr/share/vim/vim81/indent/scss.vim +#usr/share/vim/vim81/indent/sdl.vim +#usr/share/vim/vim81/indent/sh.vim +#usr/share/vim/vim81/indent/sml.vim +#usr/share/vim/vim81/indent/sql.vim +#usr/share/vim/vim81/indent/sqlanywhere.vim +#usr/share/vim/vim81/indent/systemd.vim +#usr/share/vim/vim81/indent/systemverilog.vim +#usr/share/vim/vim81/indent/tcl.vim +#usr/share/vim/vim81/indent/tcsh.vim +#usr/share/vim/vim81/indent/teraterm.vim +#usr/share/vim/vim81/indent/tex.vim +#usr/share/vim/vim81/indent/tf.vim +#usr/share/vim/vim81/indent/tilde.vim +#usr/share/vim/vim81/indent/treetop.vim +#usr/share/vim/vim81/indent/vb.vim +#usr/share/vim/vim81/indent/verilog.vim +#usr/share/vim/vim81/indent/vhdl.vim +#usr/share/vim/vim81/indent/vim.vim +#usr/share/vim/vim81/indent/vroom.vim +#usr/share/vim/vim81/indent/xf86conf.vim +#usr/share/vim/vim81/indent/xhtml.vim +#usr/share/vim/vim81/indent/xinetd.vim +#usr/share/vim/vim81/indent/xml.vim +#usr/share/vim/vim81/indent/xsd.vim +#usr/share/vim/vim81/indent/xslt.vim +#usr/share/vim/vim81/indent/yacc.vim +#usr/share/vim/vim81/indent/yaml.vim +#usr/share/vim/vim81/indent/zimbu.vim +#usr/share/vim/vim81/indent/zsh.vim +#usr/share/vim/vim81/indoff.vim +#usr/share/vim/vim81/macros +#usr/share/vim/vim81/macros/README.txt +#usr/share/vim/vim81/macros/editexisting.vim +#usr/share/vim/vim81/macros/hanoi +#usr/share/vim/vim81/macros/hanoi/click.me +#usr/share/vim/vim81/macros/hanoi/hanoi.vim +#usr/share/vim/vim81/macros/hanoi/poster +#usr/share/vim/vim81/macros/justify.vim +#usr/share/vim/vim81/macros/less.bat +#usr/share/vim/vim81/macros/less.sh +#usr/share/vim/vim81/macros/less.vim +#usr/share/vim/vim81/macros/life +#usr/share/vim/vim81/macros/life/click.me +#usr/share/vim/vim81/macros/life/life.vim +#usr/share/vim/vim81/macros/matchit.vim +#usr/share/vim/vim81/macros/maze +#usr/share/vim/vim81/macros/maze/Makefile +#usr/share/vim/vim81/macros/maze/README.txt +#usr/share/vim/vim81/macros/maze/main.aap +#usr/share/vim/vim81/macros/maze/maze.c +#usr/share/vim/vim81/macros/maze/maze_5.78 +#usr/share/vim/vim81/macros/maze/maze_mac +#usr/share/vim/vim81/macros/maze/mazeansi.c +#usr/share/vim/vim81/macros/maze/mazeclean.c +#usr/share/vim/vim81/macros/maze/poster +#usr/share/vim/vim81/macros/shellmenu.vim +#usr/share/vim/vim81/macros/swapmous.vim +#usr/share/vim/vim81/macros/urm +#usr/share/vim/vim81/macros/urm/README.txt +#usr/share/vim/vim81/macros/urm/examples +#usr/share/vim/vim81/macros/urm/urm +#usr/share/vim/vim81/macros/urm/urm.vim +#usr/share/vim/vim81/menu.vim +#usr/share/vim/vim81/mswin.vim +#usr/share/vim/vim81/optwin.vim +#usr/share/vim/vim81/pack +#usr/share/vim/vim81/pack/dist +#usr/share/vim/vim81/pack/dist/opt +#usr/share/vim/vim81/pack/dist/opt/dvorak +#usr/share/vim/vim81/pack/dist/opt/dvorak/dvorak +#usr/share/vim/vim81/pack/dist/opt/dvorak/dvorak/disable.vim +#usr/share/vim/vim81/pack/dist/opt/dvorak/dvorak/enable.vim +#usr/share/vim/vim81/pack/dist/opt/dvorak/plugin +#usr/share/vim/vim81/pack/dist/opt/dvorak/plugin/dvorak.vim +#usr/share/vim/vim81/pack/dist/opt/editexisting +#usr/share/vim/vim81/pack/dist/opt/editexisting/plugin +#usr/share/vim/vim81/pack/dist/opt/editexisting/plugin/editexisting.vim +#usr/share/vim/vim81/pack/dist/opt/justify +#usr/share/vim/vim81/pack/dist/opt/justify/plugin +#usr/share/vim/vim81/pack/dist/opt/justify/plugin/justify.vim +#usr/share/vim/vim81/pack/dist/opt/matchit +#usr/share/vim/vim81/pack/dist/opt/matchit/doc +#usr/share/vim/vim81/pack/dist/opt/matchit/doc/matchit.txt +#usr/share/vim/vim81/pack/dist/opt/matchit/doc/tags +#usr/share/vim/vim81/pack/dist/opt/matchit/plugin +#usr/share/vim/vim81/pack/dist/opt/matchit/plugin/matchit.vim +#usr/share/vim/vim81/pack/dist/opt/shellmenu +#usr/share/vim/vim81/pack/dist/opt/shellmenu/plugin +#usr/share/vim/vim81/pack/dist/opt/shellmenu/plugin/shellmenu.vim +#usr/share/vim/vim81/pack/dist/opt/swapmouse +#usr/share/vim/vim81/pack/dist/opt/swapmouse/plugin +#usr/share/vim/vim81/pack/dist/opt/swapmouse/plugin/swapmouse.vim +#usr/share/vim/vim81/pack/dist/opt/termdebug +#usr/share/vim/vim81/pack/dist/opt/termdebug/plugin +#usr/share/vim/vim81/pack/dist/opt/termdebug/plugin/termdebug.vim +#usr/share/vim/vim81/plugin +#usr/share/vim/vim81/plugin/README.txt +#usr/share/vim/vim81/plugin/getscriptPlugin.vim +#usr/share/vim/vim81/plugin/gzip.vim +#usr/share/vim/vim81/plugin/logiPat.vim +#usr/share/vim/vim81/plugin/manpager.vim +#usr/share/vim/vim81/plugin/matchparen.vim +#usr/share/vim/vim81/plugin/netrwPlugin.vim +#usr/share/vim/vim81/plugin/rrhelper.vim +#usr/share/vim/vim81/plugin/spellfile.vim +#usr/share/vim/vim81/plugin/tarPlugin.vim +#usr/share/vim/vim81/plugin/tohtml.vim +#usr/share/vim/vim81/plugin/vimballPlugin.vim +#usr/share/vim/vim81/plugin/zipPlugin.vim +#usr/share/vim/vim81/print +#usr/share/vim/vim81/print/ascii.ps +#usr/share/vim/vim81/print/cidfont.ps +#usr/share/vim/vim81/print/cns_roman.ps +#usr/share/vim/vim81/print/cp1250.ps +#usr/share/vim/vim81/print/cp1251.ps +#usr/share/vim/vim81/print/cp1252.ps +#usr/share/vim/vim81/print/cp1253.ps +#usr/share/vim/vim81/print/cp1254.ps +#usr/share/vim/vim81/print/cp1255.ps +#usr/share/vim/vim81/print/cp1257.ps +#usr/share/vim/vim81/print/dec-mcs.ps +#usr/share/vim/vim81/print/ebcdic-uk.ps +#usr/share/vim/vim81/print/gb_roman.ps +#usr/share/vim/vim81/print/hp-roman8.ps +#usr/share/vim/vim81/print/iso-8859-10.ps +#usr/share/vim/vim81/print/iso-8859-11.ps +#usr/share/vim/vim81/print/iso-8859-13.ps +#usr/share/vim/vim81/print/iso-8859-14.ps +#usr/share/vim/vim81/print/iso-8859-15.ps +#usr/share/vim/vim81/print/iso-8859-2.ps +#usr/share/vim/vim81/print/iso-8859-3.ps +#usr/share/vim/vim81/print/iso-8859-4.ps +#usr/share/vim/vim81/print/iso-8859-5.ps +#usr/share/vim/vim81/print/iso-8859-7.ps +#usr/share/vim/vim81/print/iso-8859-8.ps +#usr/share/vim/vim81/print/iso-8859-9.ps +#usr/share/vim/vim81/print/jis_roman.ps +#usr/share/vim/vim81/print/koi8-r.ps +#usr/share/vim/vim81/print/koi8-u.ps +#usr/share/vim/vim81/print/ks_roman.ps +#usr/share/vim/vim81/print/latin1.ps +#usr/share/vim/vim81/print/mac-roman.ps +#usr/share/vim/vim81/print/prolog.ps +#usr/share/vim/vim81/rgb.txt +#usr/share/vim/vim81/scripts.vim +#usr/share/vim/vim81/spell +#usr/share/vim/vim81/spell/check_locales.vim +#usr/share/vim/vim81/spell/cleanadd.vim +#usr/share/vim/vim81/spell/en.ascii.spl +#usr/share/vim/vim81/spell/en.ascii.sug +#usr/share/vim/vim81/spell/en.latin1.spl +#usr/share/vim/vim81/spell/en.latin1.sug +#usr/share/vim/vim81/spell/en.utf-8.spl +#usr/share/vim/vim81/spell/en.utf-8.sug +#usr/share/vim/vim81/spell/fixdup.vim +#usr/share/vim/vim81/spell/he.vim +#usr/share/vim/vim81/spell/spell.vim +#usr/share/vim/vim81/spell/yi.vim +#usr/share/vim/vim81/synmenu.vim +#usr/share/vim/vim81/syntax +#usr/share/vim/vim81/syntax/2html.vim +#usr/share/vim/vim81/syntax/README.txt +#usr/share/vim/vim81/syntax/a2ps.vim +#usr/share/vim/vim81/syntax/a65.vim +#usr/share/vim/vim81/syntax/aap.vim +#usr/share/vim/vim81/syntax/abap.vim +#usr/share/vim/vim81/syntax/abaqus.vim +#usr/share/vim/vim81/syntax/abc.vim +#usr/share/vim/vim81/syntax/abel.vim +#usr/share/vim/vim81/syntax/acedb.vim +#usr/share/vim/vim81/syntax/ada.vim +#usr/share/vim/vim81/syntax/aflex.vim +#usr/share/vim/vim81/syntax/ahdl.vim +#usr/share/vim/vim81/syntax/alsaconf.vim +#usr/share/vim/vim81/syntax/amiga.vim +#usr/share/vim/vim81/syntax/aml.vim +#usr/share/vim/vim81/syntax/ampl.vim +#usr/share/vim/vim81/syntax/ant.vim +#usr/share/vim/vim81/syntax/antlr.vim +#usr/share/vim/vim81/syntax/apache.vim +#usr/share/vim/vim81/syntax/apachestyle.vim +#usr/share/vim/vim81/syntax/aptconf.vim +#usr/share/vim/vim81/syntax/arch.vim +#usr/share/vim/vim81/syntax/arduino.vim +#usr/share/vim/vim81/syntax/art.vim +#usr/share/vim/vim81/syntax/asciidoc.vim +#usr/share/vim/vim81/syntax/asm.vim +#usr/share/vim/vim81/syntax/asm68k.vim +#usr/share/vim/vim81/syntax/asmh8300.vim +#usr/share/vim/vim81/syntax/asn.vim +#usr/share/vim/vim81/syntax/aspperl.vim +#usr/share/vim/vim81/syntax/aspvbs.vim +#usr/share/vim/vim81/syntax/asterisk.vim +#usr/share/vim/vim81/syntax/asteriskvm.vim +#usr/share/vim/vim81/syntax/atlas.vim +#usr/share/vim/vim81/syntax/autodoc.vim +#usr/share/vim/vim81/syntax/autohotkey.vim +#usr/share/vim/vim81/syntax/autoit.vim +#usr/share/vim/vim81/syntax/automake.vim +#usr/share/vim/vim81/syntax/ave.vim +#usr/share/vim/vim81/syntax/avra.vim +#usr/share/vim/vim81/syntax/awk.vim +#usr/share/vim/vim81/syntax/ayacc.vim +#usr/share/vim/vim81/syntax/b.vim +#usr/share/vim/vim81/syntax/baan.vim +#usr/share/vim/vim81/syntax/basic.vim +#usr/share/vim/vim81/syntax/bc.vim +#usr/share/vim/vim81/syntax/bdf.vim +#usr/share/vim/vim81/syntax/bib.vim +#usr/share/vim/vim81/syntax/bindzone.vim +#usr/share/vim/vim81/syntax/blank.vim +#usr/share/vim/vim81/syntax/bst.vim +#usr/share/vim/vim81/syntax/btm.vim +#usr/share/vim/vim81/syntax/bzl.vim +#usr/share/vim/vim81/syntax/bzr.vim +#usr/share/vim/vim81/syntax/c.vim +#usr/share/vim/vim81/syntax/cabal.vim +#usr/share/vim/vim81/syntax/calendar.vim +#usr/share/vim/vim81/syntax/catalog.vim +#usr/share/vim/vim81/syntax/cdl.vim +#usr/share/vim/vim81/syntax/cdrdaoconf.vim +#usr/share/vim/vim81/syntax/cdrtoc.vim +#usr/share/vim/vim81/syntax/cf.vim +#usr/share/vim/vim81/syntax/cfg.vim +#usr/share/vim/vim81/syntax/ch.vim +#usr/share/vim/vim81/syntax/chaiscript.vim +#usr/share/vim/vim81/syntax/change.vim +#usr/share/vim/vim81/syntax/changelog.vim +#usr/share/vim/vim81/syntax/chaskell.vim +#usr/share/vim/vim81/syntax/cheetah.vim +#usr/share/vim/vim81/syntax/chicken.vim +#usr/share/vim/vim81/syntax/chill.vim +#usr/share/vim/vim81/syntax/chordpro.vim +#usr/share/vim/vim81/syntax/cl.vim +#usr/share/vim/vim81/syntax/clean.vim +#usr/share/vim/vim81/syntax/clipper.vim +#usr/share/vim/vim81/syntax/clojure.vim +#usr/share/vim/vim81/syntax/cmake.vim +#usr/share/vim/vim81/syntax/cmod.vim +#usr/share/vim/vim81/syntax/cmusrc.vim +#usr/share/vim/vim81/syntax/cobol.vim +#usr/share/vim/vim81/syntax/coco.vim +#usr/share/vim/vim81/syntax/colortest.vim +#usr/share/vim/vim81/syntax/conaryrecipe.vim +#usr/share/vim/vim81/syntax/conf.vim +#usr/share/vim/vim81/syntax/config.vim +#usr/share/vim/vim81/syntax/context.vim +#usr/share/vim/vim81/syntax/cpp.vim +#usr/share/vim/vim81/syntax/crm.vim +#usr/share/vim/vim81/syntax/crontab.vim +#usr/share/vim/vim81/syntax/cs.vim +#usr/share/vim/vim81/syntax/csc.vim +#usr/share/vim/vim81/syntax/csdl.vim +#usr/share/vim/vim81/syntax/csh.vim +#usr/share/vim/vim81/syntax/csp.vim +#usr/share/vim/vim81/syntax/css.vim +#usr/share/vim/vim81/syntax/cterm.vim +#usr/share/vim/vim81/syntax/ctrlh.vim +#usr/share/vim/vim81/syntax/cucumber.vim +#usr/share/vim/vim81/syntax/cuda.vim +#usr/share/vim/vim81/syntax/cupl.vim +#usr/share/vim/vim81/syntax/cuplsim.vim +#usr/share/vim/vim81/syntax/cvs.vim +#usr/share/vim/vim81/syntax/cvsrc.vim +#usr/share/vim/vim81/syntax/cweb.vim +#usr/share/vim/vim81/syntax/cynlib.vim +#usr/share/vim/vim81/syntax/cynpp.vim +#usr/share/vim/vim81/syntax/d.vim +#usr/share/vim/vim81/syntax/datascript.vim +#usr/share/vim/vim81/syntax/dcd.vim +#usr/share/vim/vim81/syntax/dcl.vim +#usr/share/vim/vim81/syntax/debchangelog.vim +#usr/share/vim/vim81/syntax/debcontrol.vim +#usr/share/vim/vim81/syntax/debcopyright.vim +#usr/share/vim/vim81/syntax/debsources.vim +#usr/share/vim/vim81/syntax/def.vim +#usr/share/vim/vim81/syntax/denyhosts.vim +#usr/share/vim/vim81/syntax/desc.vim +#usr/share/vim/vim81/syntax/desktop.vim +#usr/share/vim/vim81/syntax/dictconf.vim +#usr/share/vim/vim81/syntax/dictdconf.vim +#usr/share/vim/vim81/syntax/diff.vim +#usr/share/vim/vim81/syntax/dircolors.vim +#usr/share/vim/vim81/syntax/dirpager.vim +#usr/share/vim/vim81/syntax/diva.vim +#usr/share/vim/vim81/syntax/django.vim +#usr/share/vim/vim81/syntax/dns.vim +#usr/share/vim/vim81/syntax/dnsmasq.vim +#usr/share/vim/vim81/syntax/docbk.vim +#usr/share/vim/vim81/syntax/docbksgml.vim +#usr/share/vim/vim81/syntax/docbkxml.vim +#usr/share/vim/vim81/syntax/dockerfile.vim +#usr/share/vim/vim81/syntax/dosbatch.vim +#usr/share/vim/vim81/syntax/dosini.vim +#usr/share/vim/vim81/syntax/dot.vim +#usr/share/vim/vim81/syntax/doxygen.vim +#usr/share/vim/vim81/syntax/dracula.vim +#usr/share/vim/vim81/syntax/dsl.vim +#usr/share/vim/vim81/syntax/dtd.vim +#usr/share/vim/vim81/syntax/dtml.vim +#usr/share/vim/vim81/syntax/dtrace.vim +#usr/share/vim/vim81/syntax/dts.vim +#usr/share/vim/vim81/syntax/dylan.vim +#usr/share/vim/vim81/syntax/dylanintr.vim +#usr/share/vim/vim81/syntax/dylanlid.vim +#usr/share/vim/vim81/syntax/ecd.vim +#usr/share/vim/vim81/syntax/edif.vim +#usr/share/vim/vim81/syntax/eiffel.vim +#usr/share/vim/vim81/syntax/elf.vim +#usr/share/vim/vim81/syntax/elinks.vim +#usr/share/vim/vim81/syntax/elmfilt.vim +#usr/share/vim/vim81/syntax/erlang.vim +#usr/share/vim/vim81/syntax/eruby.vim +#usr/share/vim/vim81/syntax/esmtprc.vim +#usr/share/vim/vim81/syntax/esqlc.vim +#usr/share/vim/vim81/syntax/esterel.vim +#usr/share/vim/vim81/syntax/eterm.vim +#usr/share/vim/vim81/syntax/euphoria3.vim +#usr/share/vim/vim81/syntax/euphoria4.vim +#usr/share/vim/vim81/syntax/eviews.vim +#usr/share/vim/vim81/syntax/exim.vim +#usr/share/vim/vim81/syntax/expect.vim +#usr/share/vim/vim81/syntax/exports.vim +#usr/share/vim/vim81/syntax/falcon.vim +#usr/share/vim/vim81/syntax/fan.vim +#usr/share/vim/vim81/syntax/fasm.vim +#usr/share/vim/vim81/syntax/fdcc.vim +#usr/share/vim/vim81/syntax/fetchmail.vim +#usr/share/vim/vim81/syntax/fgl.vim +#usr/share/vim/vim81/syntax/flexwiki.vim +#usr/share/vim/vim81/syntax/focexec.vim +#usr/share/vim/vim81/syntax/form.vim +#usr/share/vim/vim81/syntax/forth.vim +#usr/share/vim/vim81/syntax/fortran.vim +#usr/share/vim/vim81/syntax/foxpro.vim +#usr/share/vim/vim81/syntax/framescript.vim +#usr/share/vim/vim81/syntax/freebasic.vim +#usr/share/vim/vim81/syntax/fstab.vim +#usr/share/vim/vim81/syntax/fvwm.vim +#usr/share/vim/vim81/syntax/fvwm2m4.vim +#usr/share/vim/vim81/syntax/gdb.vim +#usr/share/vim/vim81/syntax/gdmo.vim +#usr/share/vim/vim81/syntax/gedcom.vim +#usr/share/vim/vim81/syntax/git.vim +#usr/share/vim/vim81/syntax/gitcommit.vim +#usr/share/vim/vim81/syntax/gitconfig.vim +#usr/share/vim/vim81/syntax/gitolite.vim +#usr/share/vim/vim81/syntax/gitrebase.vim +#usr/share/vim/vim81/syntax/gitsendemail.vim +#usr/share/vim/vim81/syntax/gkrellmrc.vim +#usr/share/vim/vim81/syntax/gnash.vim +#usr/share/vim/vim81/syntax/gnuplot.vim +#usr/share/vim/vim81/syntax/go.vim +#usr/share/vim/vim81/syntax/godoc.vim +#usr/share/vim/vim81/syntax/gp.vim +#usr/share/vim/vim81/syntax/gpg.vim +#usr/share/vim/vim81/syntax/gprof.vim +#usr/share/vim/vim81/syntax/grads.vim +#usr/share/vim/vim81/syntax/gretl.vim +#usr/share/vim/vim81/syntax/groff.vim +#usr/share/vim/vim81/syntax/groovy.vim +#usr/share/vim/vim81/syntax/group.vim +#usr/share/vim/vim81/syntax/grub.vim +#usr/share/vim/vim81/syntax/gsp.vim +#usr/share/vim/vim81/syntax/gtkrc.vim +#usr/share/vim/vim81/syntax/haml.vim +#usr/share/vim/vim81/syntax/hamster.vim +#usr/share/vim/vim81/syntax/haskell.vim +#usr/share/vim/vim81/syntax/haste.vim +#usr/share/vim/vim81/syntax/hastepreproc.vim +#usr/share/vim/vim81/syntax/hb.vim +#usr/share/vim/vim81/syntax/help.vim +#usr/share/vim/vim81/syntax/hercules.vim +#usr/share/vim/vim81/syntax/hex.vim +#usr/share/vim/vim81/syntax/hgcommit.vim +#usr/share/vim/vim81/syntax/hitest.vim +#usr/share/vim/vim81/syntax/hog.vim +#usr/share/vim/vim81/syntax/hostconf.vim +#usr/share/vim/vim81/syntax/hostsaccess.vim +#usr/share/vim/vim81/syntax/html.vim +#usr/share/vim/vim81/syntax/htmlcheetah.vim +#usr/share/vim/vim81/syntax/htmldjango.vim +#usr/share/vim/vim81/syntax/htmlm4.vim +#usr/share/vim/vim81/syntax/htmlos.vim +#usr/share/vim/vim81/syntax/ia64.vim +#usr/share/vim/vim81/syntax/ibasic.vim +#usr/share/vim/vim81/syntax/icemenu.vim +#usr/share/vim/vim81/syntax/icon.vim +#usr/share/vim/vim81/syntax/idl.vim +#usr/share/vim/vim81/syntax/idlang.vim +#usr/share/vim/vim81/syntax/indent.vim +#usr/share/vim/vim81/syntax/inform.vim +#usr/share/vim/vim81/syntax/initex.vim +#usr/share/vim/vim81/syntax/initng.vim +#usr/share/vim/vim81/syntax/inittab.vim +#usr/share/vim/vim81/syntax/ipfilter.vim +#usr/share/vim/vim81/syntax/ishd.vim +#usr/share/vim/vim81/syntax/iss.vim +#usr/share/vim/vim81/syntax/ist.vim +#usr/share/vim/vim81/syntax/j.vim +#usr/share/vim/vim81/syntax/jal.vim +#usr/share/vim/vim81/syntax/jam.vim +#usr/share/vim/vim81/syntax/jargon.vim +#usr/share/vim/vim81/syntax/java.vim +#usr/share/vim/vim81/syntax/javacc.vim +#usr/share/vim/vim81/syntax/javascript.vim +#usr/share/vim/vim81/syntax/jess.vim +#usr/share/vim/vim81/syntax/jgraph.vim +#usr/share/vim/vim81/syntax/jovial.vim +#usr/share/vim/vim81/syntax/jproperties.vim +#usr/share/vim/vim81/syntax/json.vim +#usr/share/vim/vim81/syntax/jsp.vim +#usr/share/vim/vim81/syntax/kconfig.vim +#usr/share/vim/vim81/syntax/kivy.vim +#usr/share/vim/vim81/syntax/kix.vim +#usr/share/vim/vim81/syntax/kscript.vim +#usr/share/vim/vim81/syntax/kwt.vim +#usr/share/vim/vim81/syntax/lace.vim +#usr/share/vim/vim81/syntax/latte.vim +#usr/share/vim/vim81/syntax/ld.vim +#usr/share/vim/vim81/syntax/ldapconf.vim +#usr/share/vim/vim81/syntax/ldif.vim +#usr/share/vim/vim81/syntax/less.vim +#usr/share/vim/vim81/syntax/lex.vim +#usr/share/vim/vim81/syntax/lftp.vim +#usr/share/vim/vim81/syntax/lhaskell.vim +#usr/share/vim/vim81/syntax/libao.vim +#usr/share/vim/vim81/syntax/lifelines.vim +#usr/share/vim/vim81/syntax/lilo.vim +#usr/share/vim/vim81/syntax/limits.vim +#usr/share/vim/vim81/syntax/liquid.vim +#usr/share/vim/vim81/syntax/lisp.vim +#usr/share/vim/vim81/syntax/lite.vim +#usr/share/vim/vim81/syntax/litestep.vim +#usr/share/vim/vim81/syntax/loginaccess.vim +#usr/share/vim/vim81/syntax/logindefs.vim +#usr/share/vim/vim81/syntax/logtalk.vim +#usr/share/vim/vim81/syntax/lotos.vim +#usr/share/vim/vim81/syntax/lout.vim +#usr/share/vim/vim81/syntax/lpc.vim +#usr/share/vim/vim81/syntax/lprolog.vim +#usr/share/vim/vim81/syntax/lscript.vim +#usr/share/vim/vim81/syntax/lsl.vim +#usr/share/vim/vim81/syntax/lss.vim +#usr/share/vim/vim81/syntax/lua.vim +#usr/share/vim/vim81/syntax/lynx.vim +#usr/share/vim/vim81/syntax/m4.vim +#usr/share/vim/vim81/syntax/mail.vim +#usr/share/vim/vim81/syntax/mailaliases.vim +#usr/share/vim/vim81/syntax/mailcap.vim +#usr/share/vim/vim81/syntax/make.vim +#usr/share/vim/vim81/syntax/mallard.vim +#usr/share/vim/vim81/syntax/man.vim +#usr/share/vim/vim81/syntax/manconf.vim +#usr/share/vim/vim81/syntax/manual.vim +#usr/share/vim/vim81/syntax/maple.vim +#usr/share/vim/vim81/syntax/markdown.vim +#usr/share/vim/vim81/syntax/masm.vim +#usr/share/vim/vim81/syntax/mason.vim +#usr/share/vim/vim81/syntax/master.vim +#usr/share/vim/vim81/syntax/matlab.vim +#usr/share/vim/vim81/syntax/maxima.vim +#usr/share/vim/vim81/syntax/mel.vim +#usr/share/vim/vim81/syntax/messages.vim +#usr/share/vim/vim81/syntax/mf.vim +#usr/share/vim/vim81/syntax/mgl.vim +#usr/share/vim/vim81/syntax/mgp.vim +#usr/share/vim/vim81/syntax/mib.vim +#usr/share/vim/vim81/syntax/mix.vim +#usr/share/vim/vim81/syntax/mma.vim +#usr/share/vim/vim81/syntax/mmix.vim +#usr/share/vim/vim81/syntax/mmp.vim +#usr/share/vim/vim81/syntax/modconf.vim +#usr/share/vim/vim81/syntax/model.vim +#usr/share/vim/vim81/syntax/modsim3.vim +#usr/share/vim/vim81/syntax/modula2.vim +#usr/share/vim/vim81/syntax/modula3.vim +#usr/share/vim/vim81/syntax/monk.vim +#usr/share/vim/vim81/syntax/moo.vim +#usr/share/vim/vim81/syntax/mp.vim +#usr/share/vim/vim81/syntax/mplayerconf.vim +#usr/share/vim/vim81/syntax/mrxvtrc.vim +#usr/share/vim/vim81/syntax/msidl.vim +#usr/share/vim/vim81/syntax/msmessages.vim +#usr/share/vim/vim81/syntax/msql.vim +#usr/share/vim/vim81/syntax/mupad.vim +#usr/share/vim/vim81/syntax/murphi.vim +#usr/share/vim/vim81/syntax/mush.vim +#usr/share/vim/vim81/syntax/muttrc.vim +#usr/share/vim/vim81/syntax/mysql.vim +#usr/share/vim/vim81/syntax/n1ql.vim +#usr/share/vim/vim81/syntax/named.vim +#usr/share/vim/vim81/syntax/nanorc.vim +#usr/share/vim/vim81/syntax/nasm.vim +#usr/share/vim/vim81/syntax/nastran.vim +#usr/share/vim/vim81/syntax/natural.vim +#usr/share/vim/vim81/syntax/ncf.vim +#usr/share/vim/vim81/syntax/neomuttrc.vim +#usr/share/vim/vim81/syntax/netrc.vim +#usr/share/vim/vim81/syntax/netrw.vim +#usr/share/vim/vim81/syntax/ninja.vim +#usr/share/vim/vim81/syntax/nosyntax.vim +#usr/share/vim/vim81/syntax/nqc.vim +#usr/share/vim/vim81/syntax/nroff.vim +#usr/share/vim/vim81/syntax/nsis.vim +#usr/share/vim/vim81/syntax/obj.vim +#usr/share/vim/vim81/syntax/objc.vim +#usr/share/vim/vim81/syntax/objcpp.vim +#usr/share/vim/vim81/syntax/ocaml.vim +#usr/share/vim/vim81/syntax/occam.vim +#usr/share/vim/vim81/syntax/omnimark.vim +#usr/share/vim/vim81/syntax/openroad.vim +#usr/share/vim/vim81/syntax/opl.vim +#usr/share/vim/vim81/syntax/ora.vim +#usr/share/vim/vim81/syntax/pamconf.vim +#usr/share/vim/vim81/syntax/papp.vim +#usr/share/vim/vim81/syntax/pascal.vim +#usr/share/vim/vim81/syntax/passwd.vim +#usr/share/vim/vim81/syntax/pcap.vim +#usr/share/vim/vim81/syntax/pccts.vim +#usr/share/vim/vim81/syntax/pdf.vim +#usr/share/vim/vim81/syntax/perl.vim +#usr/share/vim/vim81/syntax/perl6.vim +#usr/share/vim/vim81/syntax/pf.vim +#usr/share/vim/vim81/syntax/pfmain.vim +#usr/share/vim/vim81/syntax/php.vim +#usr/share/vim/vim81/syntax/phtml.vim +#usr/share/vim/vim81/syntax/pic.vim +#usr/share/vim/vim81/syntax/pike.vim +#usr/share/vim/vim81/syntax/pilrc.vim +#usr/share/vim/vim81/syntax/pine.vim +#usr/share/vim/vim81/syntax/pinfo.vim +#usr/share/vim/vim81/syntax/plaintex.vim +#usr/share/vim/vim81/syntax/pli.vim +#usr/share/vim/vim81/syntax/plm.vim +#usr/share/vim/vim81/syntax/plp.vim +#usr/share/vim/vim81/syntax/plsql.vim +#usr/share/vim/vim81/syntax/po.vim +#usr/share/vim/vim81/syntax/pod.vim +#usr/share/vim/vim81/syntax/postscr.vim +#usr/share/vim/vim81/syntax/pov.vim +#usr/share/vim/vim81/syntax/povini.vim +#usr/share/vim/vim81/syntax/ppd.vim +#usr/share/vim/vim81/syntax/ppwiz.vim +#usr/share/vim/vim81/syntax/prescribe.vim +#usr/share/vim/vim81/syntax/privoxy.vim +#usr/share/vim/vim81/syntax/procmail.vim +#usr/share/vim/vim81/syntax/progress.vim +#usr/share/vim/vim81/syntax/prolog.vim +#usr/share/vim/vim81/syntax/promela.vim +#usr/share/vim/vim81/syntax/proto.vim +#usr/share/vim/vim81/syntax/protocols.vim +#usr/share/vim/vim81/syntax/psf.vim +#usr/share/vim/vim81/syntax/ptcap.vim +#usr/share/vim/vim81/syntax/purifylog.vim +#usr/share/vim/vim81/syntax/pyrex.vim +#usr/share/vim/vim81/syntax/python.vim +#usr/share/vim/vim81/syntax/qf.vim +#usr/share/vim/vim81/syntax/quake.vim +#usr/share/vim/vim81/syntax/r.vim +#usr/share/vim/vim81/syntax/racc.vim +#usr/share/vim/vim81/syntax/radiance.vim +#usr/share/vim/vim81/syntax/ratpoison.vim +#usr/share/vim/vim81/syntax/rc.vim +#usr/share/vim/vim81/syntax/rcs.vim +#usr/share/vim/vim81/syntax/rcslog.vim +#usr/share/vim/vim81/syntax/readline.vim +#usr/share/vim/vim81/syntax/rebol.vim +#usr/share/vim/vim81/syntax/redif.vim +#usr/share/vim/vim81/syntax/registry.vim +#usr/share/vim/vim81/syntax/remind.vim +#usr/share/vim/vim81/syntax/resolv.vim +#usr/share/vim/vim81/syntax/reva.vim +#usr/share/vim/vim81/syntax/rexx.vim +#usr/share/vim/vim81/syntax/rhelp.vim +#usr/share/vim/vim81/syntax/rib.vim +#usr/share/vim/vim81/syntax/rmd.vim +#usr/share/vim/vim81/syntax/rnc.vim +#usr/share/vim/vim81/syntax/rng.vim +#usr/share/vim/vim81/syntax/rnoweb.vim +#usr/share/vim/vim81/syntax/robots.vim +#usr/share/vim/vim81/syntax/rpcgen.vim +#usr/share/vim/vim81/syntax/rpl.vim +#usr/share/vim/vim81/syntax/rrst.vim +#usr/share/vim/vim81/syntax/rst.vim +#usr/share/vim/vim81/syntax/rtf.vim +#usr/share/vim/vim81/syntax/ruby.vim +#usr/share/vim/vim81/syntax/rust.vim +#usr/share/vim/vim81/syntax/samba.vim +#usr/share/vim/vim81/syntax/sas.vim +#usr/share/vim/vim81/syntax/sass.vim +#usr/share/vim/vim81/syntax/sather.vim +#usr/share/vim/vim81/syntax/sbt.vim +#usr/share/vim/vim81/syntax/scala.vim +#usr/share/vim/vim81/syntax/scheme.vim +#usr/share/vim/vim81/syntax/scilab.vim +#usr/share/vim/vim81/syntax/screen.vim +#usr/share/vim/vim81/syntax/scss.vim +#usr/share/vim/vim81/syntax/sd.vim +#usr/share/vim/vim81/syntax/sdc.vim +#usr/share/vim/vim81/syntax/sdl.vim +#usr/share/vim/vim81/syntax/sed.vim +#usr/share/vim/vim81/syntax/sendpr.vim +#usr/share/vim/vim81/syntax/sensors.vim +#usr/share/vim/vim81/syntax/services.vim +#usr/share/vim/vim81/syntax/setserial.vim +#usr/share/vim/vim81/syntax/sgml.vim +#usr/share/vim/vim81/syntax/sgmldecl.vim +#usr/share/vim/vim81/syntax/sgmllnx.vim +#usr/share/vim/vim81/syntax/sh.vim +#usr/share/vim/vim81/syntax/sicad.vim +#usr/share/vim/vim81/syntax/sieve.vim +#usr/share/vim/vim81/syntax/simula.vim +#usr/share/vim/vim81/syntax/sinda.vim +#usr/share/vim/vim81/syntax/sindacmp.vim +#usr/share/vim/vim81/syntax/sindaout.vim +#usr/share/vim/vim81/syntax/sisu.vim +#usr/share/vim/vim81/syntax/skill.vim +#usr/share/vim/vim81/syntax/sl.vim +#usr/share/vim/vim81/syntax/slang.vim +#usr/share/vim/vim81/syntax/slice.vim +#usr/share/vim/vim81/syntax/slpconf.vim +#usr/share/vim/vim81/syntax/slpreg.vim +#usr/share/vim/vim81/syntax/slpspi.vim +#usr/share/vim/vim81/syntax/slrnrc.vim +#usr/share/vim/vim81/syntax/slrnsc.vim +#usr/share/vim/vim81/syntax/sm.vim +#usr/share/vim/vim81/syntax/smarty.vim +#usr/share/vim/vim81/syntax/smcl.vim +#usr/share/vim/vim81/syntax/smil.vim +#usr/share/vim/vim81/syntax/smith.vim +#usr/share/vim/vim81/syntax/sml.vim +#usr/share/vim/vim81/syntax/snnsnet.vim +#usr/share/vim/vim81/syntax/snnspat.vim +#usr/share/vim/vim81/syntax/snnsres.vim +#usr/share/vim/vim81/syntax/snobol4.vim +#usr/share/vim/vim81/syntax/spec.vim +#usr/share/vim/vim81/syntax/specman.vim +#usr/share/vim/vim81/syntax/spice.vim +#usr/share/vim/vim81/syntax/splint.vim +#usr/share/vim/vim81/syntax/spup.vim +#usr/share/vim/vim81/syntax/spyce.vim +#usr/share/vim/vim81/syntax/sql.vim +#usr/share/vim/vim81/syntax/sqlanywhere.vim +#usr/share/vim/vim81/syntax/sqlforms.vim +#usr/share/vim/vim81/syntax/sqlhana.vim +#usr/share/vim/vim81/syntax/sqlinformix.vim +#usr/share/vim/vim81/syntax/sqlj.vim +#usr/share/vim/vim81/syntax/sqloracle.vim +#usr/share/vim/vim81/syntax/sqr.vim +#usr/share/vim/vim81/syntax/squid.vim +#usr/share/vim/vim81/syntax/srec.vim +#usr/share/vim/vim81/syntax/sshconfig.vim +#usr/share/vim/vim81/syntax/sshdconfig.vim +#usr/share/vim/vim81/syntax/st.vim +#usr/share/vim/vim81/syntax/stata.vim +#usr/share/vim/vim81/syntax/stp.vim +#usr/share/vim/vim81/syntax/strace.vim +#usr/share/vim/vim81/syntax/sudoers.vim +#usr/share/vim/vim81/syntax/svg.vim +#usr/share/vim/vim81/syntax/svn.vim +#usr/share/vim/vim81/syntax/syncolor.vim +#usr/share/vim/vim81/syntax/synload.vim +#usr/share/vim/vim81/syntax/syntax.vim +#usr/share/vim/vim81/syntax/sysctl.vim +#usr/share/vim/vim81/syntax/systemd.vim +#usr/share/vim/vim81/syntax/systemverilog.vim +#usr/share/vim/vim81/syntax/tads.vim +#usr/share/vim/vim81/syntax/tags.vim +#usr/share/vim/vim81/syntax/tak.vim +#usr/share/vim/vim81/syntax/takcmp.vim +#usr/share/vim/vim81/syntax/takout.vim +#usr/share/vim/vim81/syntax/tap.vim +#usr/share/vim/vim81/syntax/tar.vim +#usr/share/vim/vim81/syntax/taskdata.vim +#usr/share/vim/vim81/syntax/taskedit.vim +#usr/share/vim/vim81/syntax/tasm.vim +#usr/share/vim/vim81/syntax/tcl.vim +#usr/share/vim/vim81/syntax/tcsh.vim +#usr/share/vim/vim81/syntax/teraterm.vim +#usr/share/vim/vim81/syntax/terminfo.vim +#usr/share/vim/vim81/syntax/tex.vim +#usr/share/vim/vim81/syntax/texinfo.vim +#usr/share/vim/vim81/syntax/texmf.vim +#usr/share/vim/vim81/syntax/tf.vim +#usr/share/vim/vim81/syntax/tidy.vim +#usr/share/vim/vim81/syntax/tilde.vim +#usr/share/vim/vim81/syntax/tli.vim +#usr/share/vim/vim81/syntax/tmux.vim +#usr/share/vim/vim81/syntax/tpp.vim +#usr/share/vim/vim81/syntax/trasys.vim +#usr/share/vim/vim81/syntax/treetop.vim +#usr/share/vim/vim81/syntax/trustees.vim +#usr/share/vim/vim81/syntax/tsalt.vim +#usr/share/vim/vim81/syntax/tsscl.vim +#usr/share/vim/vim81/syntax/tssgm.vim +#usr/share/vim/vim81/syntax/tssop.vim +#usr/share/vim/vim81/syntax/tt2.vim +#usr/share/vim/vim81/syntax/tt2html.vim +#usr/share/vim/vim81/syntax/tt2js.vim +#usr/share/vim/vim81/syntax/uc.vim +#usr/share/vim/vim81/syntax/udevconf.vim +#usr/share/vim/vim81/syntax/udevperm.vim +#usr/share/vim/vim81/syntax/udevrules.vim +#usr/share/vim/vim81/syntax/uil.vim +#usr/share/vim/vim81/syntax/updatedb.vim +#usr/share/vim/vim81/syntax/upstart.vim +#usr/share/vim/vim81/syntax/upstreamdat.vim +#usr/share/vim/vim81/syntax/upstreaminstalllog.vim +#usr/share/vim/vim81/syntax/upstreamlog.vim +#usr/share/vim/vim81/syntax/upstreamrpt.vim +#usr/share/vim/vim81/syntax/usserverlog.vim +#usr/share/vim/vim81/syntax/usw2kagtlog.vim +#usr/share/vim/vim81/syntax/valgrind.vim +#usr/share/vim/vim81/syntax/vb.vim +#usr/share/vim/vim81/syntax/vera.vim +#usr/share/vim/vim81/syntax/verilog.vim +#usr/share/vim/vim81/syntax/verilogams.vim +#usr/share/vim/vim81/syntax/vgrindefs.vim +#usr/share/vim/vim81/syntax/vhdl.vim +#usr/share/vim/vim81/syntax/vim.vim +#usr/share/vim/vim81/syntax/viminfo.vim +#usr/share/vim/vim81/syntax/virata.vim +#usr/share/vim/vim81/syntax/vmasm.vim +#usr/share/vim/vim81/syntax/voscm.vim +#usr/share/vim/vim81/syntax/vrml.vim +#usr/share/vim/vim81/syntax/vroom.vim +#usr/share/vim/vim81/syntax/vsejcl.vim +#usr/share/vim/vim81/syntax/wdiff.vim +#usr/share/vim/vim81/syntax/web.vim +#usr/share/vim/vim81/syntax/webmacro.vim +#usr/share/vim/vim81/syntax/wget.vim +#usr/share/vim/vim81/syntax/whitespace.vim +#usr/share/vim/vim81/syntax/winbatch.vim +#usr/share/vim/vim81/syntax/wml.vim +#usr/share/vim/vim81/syntax/wsh.vim +#usr/share/vim/vim81/syntax/wsml.vim +#usr/share/vim/vim81/syntax/wvdial.vim +#usr/share/vim/vim81/syntax/xbl.vim +#usr/share/vim/vim81/syntax/xdefaults.vim +#usr/share/vim/vim81/syntax/xf86conf.vim +#usr/share/vim/vim81/syntax/xhtml.vim +#usr/share/vim/vim81/syntax/xinetd.vim +#usr/share/vim/vim81/syntax/xkb.vim +#usr/share/vim/vim81/syntax/xmath.vim +#usr/share/vim/vim81/syntax/xml.vim +#usr/share/vim/vim81/syntax/xmodmap.vim +#usr/share/vim/vim81/syntax/xpm.vim +#usr/share/vim/vim81/syntax/xpm2.vim +#usr/share/vim/vim81/syntax/xquery.vim +#usr/share/vim/vim81/syntax/xs.vim +#usr/share/vim/vim81/syntax/xsd.vim +#usr/share/vim/vim81/syntax/xslt.vim +#usr/share/vim/vim81/syntax/xxd.vim +#usr/share/vim/vim81/syntax/yacc.vim +#usr/share/vim/vim81/syntax/yaml.vim +#usr/share/vim/vim81/syntax/z8a.vim +#usr/share/vim/vim81/syntax/zimbu.vim +#usr/share/vim/vim81/syntax/zsh.vim +#usr/share/vim/vim81/tools +#usr/share/vim/vim81/tools/README.txt +#usr/share/vim/vim81/tools/blink.c +#usr/share/vim/vim81/tools/ccfilter.1 +#usr/share/vim/vim81/tools/ccfilter.c +#usr/share/vim/vim81/tools/ccfilter_README.txt +#usr/share/vim/vim81/tools/demoserver.py +#usr/share/vim/vim81/tools/efm_filter.pl +#usr/share/vim/vim81/tools/efm_filter.txt +#usr/share/vim/vim81/tools/efm_perl.pl +#usr/share/vim/vim81/tools/mve.awk +#usr/share/vim/vim81/tools/mve.txt +#usr/share/vim/vim81/tools/pltags.pl +#usr/share/vim/vim81/tools/ref +#usr/share/vim/vim81/tools/shtags.1 +#usr/share/vim/vim81/tools/shtags.pl +#usr/share/vim/vim81/tools/unicode.vim +#usr/share/vim/vim81/tools/vim132 +#usr/share/vim/vim81/tools/vim_vs_net.cmd +#usr/share/vim/vim81/tools/vimm +#usr/share/vim/vim81/tools/vimspell.sh +#usr/share/vim/vim81/tools/vimspell.txt +#usr/share/vim/vim81/tools/xcmdsrv_client.c +#usr/share/vim/vim81/tutor +#usr/share/vim/vim81/tutor/README.el.cp737.txt +#usr/share/vim/vim81/tutor/README.el.txt +#usr/share/vim/vim81/tutor/README.txt +#usr/share/vim/vim81/tutor/tutor +#usr/share/vim/vim81/tutor/tutor.bar +#usr/share/vim/vim81/tutor/tutor.bar.utf-8 +#usr/share/vim/vim81/tutor/tutor.bg.utf-8 +#usr/share/vim/vim81/tutor/tutor.ca +#usr/share/vim/vim81/tutor/tutor.ca.utf-8 +#usr/share/vim/vim81/tutor/tutor.cs +#usr/share/vim/vim81/tutor/tutor.cs.cp1250 +#usr/share/vim/vim81/tutor/tutor.cs.utf-8 +#usr/share/vim/vim81/tutor/tutor.de +#usr/share/vim/vim81/tutor/tutor.de.utf-8 +#usr/share/vim/vim81/tutor/tutor.el +#usr/share/vim/vim81/tutor/tutor.el.cp737 +#usr/share/vim/vim81/tutor/tutor.el.utf-8 +#usr/share/vim/vim81/tutor/tutor.eo +#usr/share/vim/vim81/tutor/tutor.eo.utf-8 +#usr/share/vim/vim81/tutor/tutor.es +#usr/share/vim/vim81/tutor/tutor.es.utf-8 +#usr/share/vim/vim81/tutor/tutor.fr +#usr/share/vim/vim81/tutor/tutor.fr.utf-8 +#usr/share/vim/vim81/tutor/tutor.hr +#usr/share/vim/vim81/tutor/tutor.hr.cp1250 +#usr/share/vim/vim81/tutor/tutor.hr.utf-8 +#usr/share/vim/vim81/tutor/tutor.hu +#usr/share/vim/vim81/tutor/tutor.hu.cp1250 +#usr/share/vim/vim81/tutor/tutor.hu.utf-8 +#usr/share/vim/vim81/tutor/tutor.it +#usr/share/vim/vim81/tutor/tutor.it.utf-8 +#usr/share/vim/vim81/tutor/tutor.ja.euc +#usr/share/vim/vim81/tutor/tutor.ja.sjis +#usr/share/vim/vim81/tutor/tutor.ja.utf-8 +#usr/share/vim/vim81/tutor/tutor.ko.euc +#usr/share/vim/vim81/tutor/tutor.ko.utf-8 +#usr/share/vim/vim81/tutor/tutor.lv +#usr/share/vim/vim81/tutor/tutor.nb +#usr/share/vim/vim81/tutor/tutor.nb.utf-8 +#usr/share/vim/vim81/tutor/tutor.nl +#usr/share/vim/vim81/tutor/tutor.nl.utf-8 +#usr/share/vim/vim81/tutor/tutor.no +#usr/share/vim/vim81/tutor/tutor.no.utf-8 +#usr/share/vim/vim81/tutor/tutor.pl +#usr/share/vim/vim81/tutor/tutor.pl.cp1250 +#usr/share/vim/vim81/tutor/tutor.pl.utf-8 +#usr/share/vim/vim81/tutor/tutor.pt +#usr/share/vim/vim81/tutor/tutor.pt.utf-8 +#usr/share/vim/vim81/tutor/tutor.ru +#usr/share/vim/vim81/tutor/tutor.ru.cp1251 +#usr/share/vim/vim81/tutor/tutor.ru.utf-8 +#usr/share/vim/vim81/tutor/tutor.sk +#usr/share/vim/vim81/tutor/tutor.sk.cp1250 +#usr/share/vim/vim81/tutor/tutor.sk.utf-8 +#usr/share/vim/vim81/tutor/tutor.sr.cp1250 +#usr/share/vim/vim81/tutor/tutor.sr.utf-8 +#usr/share/vim/vim81/tutor/tutor.sv +#usr/share/vim/vim81/tutor/tutor.sv.utf-8 +#usr/share/vim/vim81/tutor/tutor.tr.iso9 +#usr/share/vim/vim81/tutor/tutor.tr.utf-8 +#usr/share/vim/vim81/tutor/tutor.uk.utf-8 +#usr/share/vim/vim81/tutor/tutor.utf-8 +#usr/share/vim/vim81/tutor/tutor.vi.utf-8 +#usr/share/vim/vim81/tutor/tutor.vim +#usr/share/vim/vim81/tutor/tutor.zh.big5 +#usr/share/vim/vim81/tutor/tutor.zh.euc +#usr/share/vim/vim81/tutor/tutor.zh.utf-8 +#usr/share/vim/vim81/tutor/tutor.zh_cn.utf-8 +#usr/share/vim/vim81/tutor/tutor.zh_tw.utf-8 +#usr/share/vim/vim81/vimrc_example.vim diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 49937b655..238134dd3 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -9815,6 +9815,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/nouveau/debug #lib/modules/KVER-ipfire/build/include/config/nouveau/debug.h #lib/modules/KVER-ipfire/build/include/config/nouveau/debug/default.h +#lib/modules/KVER-ipfire/build/include/config/nouveau/legacy +#lib/modules/KVER-ipfire/build/include/config/nouveau/legacy/ctx +#lib/modules/KVER-ipfire/build/include/config/nouveau/legacy/ctx/support.h #lib/modules/KVER-ipfire/build/include/config/nozomi.h #lib/modules/KVER-ipfire/build/include/config/nr #lib/modules/KVER-ipfire/build/include/config/nr/cpus.h @@ -17484,6 +17487,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/free #lib/modules/KVER-ipfire/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/core/133/filelists/jansson b/config/rootfiles/core/133/filelists/jansson deleted file mode 120000 index 21f73bd0c..000000000 --- a/config/rootfiles/core/133/filelists/jansson +++ /dev/null @@ -1 +0,0 @@ -../../../common/jansson \ No newline at end of file diff --git a/config/rootfiles/core/133/exclude b/config/rootfiles/core/134/exclude similarity index 100% rename from config/rootfiles/core/133/exclude rename to config/rootfiles/core/134/exclude diff --git a/config/rootfiles/core/134/filelists/aarch64/linux b/config/rootfiles/core/134/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/134/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/aarch64/linux-initrd b/config/rootfiles/core/134/filelists/aarch64/linux-initrd new file mode 120000 index 000000000..8acdb0f31 --- /dev/null +++ b/config/rootfiles/core/134/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-kirkwood new file mode 120000 index 000000000..39c5591b7 --- /dev/null +++ b/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 000000000..0b1b4530a --- /dev/null +++ b/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/134/filelists/armv5tel/linux-kirkwood new file mode 120000 index 000000000..72171071e --- /dev/null +++ b/config/rootfiles/core/134/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/armv5tel/linux-multi b/config/rootfiles/core/134/filelists/armv5tel/linux-multi new file mode 120000 index 000000000..204eb4c43 --- /dev/null +++ b/config/rootfiles/core/134/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/133/filelists/bind b/config/rootfiles/core/134/filelists/bind similarity index 100% rename from config/rootfiles/core/133/filelists/bind rename to config/rootfiles/core/134/filelists/bind diff --git a/config/rootfiles/core/134/filelists/files b/config/rootfiles/core/134/filelists/files new file mode 100644 index 000000000..31f9cbcc4 --- /dev/null +++ b/config/rootfiles/core/134/filelists/files @@ -0,0 +1,8 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +etc/rc.d/init.d/unbound +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/general-functions.pl +var/ipfire/langs diff --git a/config/rootfiles/core/134/filelists/i586/linux b/config/rootfiles/core/134/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/i586/linux-initrd b/config/rootfiles/core/134/filelists/i586/linux-initrd new file mode 120000 index 000000000..32a03e6a9 --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/i586/openssl-sse2 b/config/rootfiles/core/134/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/133/filelists/openssl b/config/rootfiles/core/134/filelists/openssl similarity index 100% rename from config/rootfiles/core/133/filelists/openssl rename to config/rootfiles/core/134/filelists/openssl diff --git a/config/rootfiles/core/134/filelists/unbound b/config/rootfiles/core/134/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/134/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/vim b/config/rootfiles/core/134/filelists/vim new file mode 120000 index 000000000..98613172e --- /dev/null +++ b/config/rootfiles/core/134/filelists/vim @@ -0,0 +1 @@ +../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/x86_64/linux b/config/rootfiles/core/134/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/134/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/x86_64/linux-initrd b/config/rootfiles/core/134/filelists/x86_64/linux-initrd new file mode 120000 index 000000000..1b9fff70f --- /dev/null +++ b/config/rootfiles/core/134/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/134/update.sh b/config/rootfiles/core/134/update.sh new file mode 100644 index 000000000..297fdfb9c --- /dev/null +++ b/config/rootfiles/core/134/update.sh @@ -0,0 +1,151 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2019 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=134 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks. +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 80000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules +rm -f /etc/sysconfig/lm_sensors + +# Remove old vim 7.4 files +rm -rf /usr/share/vim74 + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound restart + +# Search sensors again after reboot into the new kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + rm -rf /opt/pakfire/db/rootfiles/linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + touch /var/run/need_reboot + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + else + touch /var/run/need_reboot + fi + ;; + *) + # This update needs a reboot... + touch /var/run/need_reboot + ;; +esac + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/133/exclude b/config/rootfiles/oldcore/133/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/133/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/133/filelists/aarch64/binutils b/config/rootfiles/oldcore/133/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/133/filelists/aarch64/binutils rename to config/rootfiles/oldcore/133/filelists/aarch64/binutils diff --git a/config/rootfiles/core/133/filelists/aarch64/gcc b/config/rootfiles/oldcore/133/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/133/filelists/aarch64/gcc rename to config/rootfiles/oldcore/133/filelists/aarch64/gcc diff --git a/config/rootfiles/core/133/filelists/aarch64/glibc b/config/rootfiles/oldcore/133/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/133/filelists/aarch64/glibc rename to config/rootfiles/oldcore/133/filelists/aarch64/glibc diff --git a/config/rootfiles/core/133/filelists/armv5tel/binutils b/config/rootfiles/oldcore/133/filelists/armv5tel/binutils similarity index 100% rename from config/rootfiles/core/133/filelists/armv5tel/binutils rename to config/rootfiles/oldcore/133/filelists/armv5tel/binutils diff --git a/config/rootfiles/core/133/filelists/armv5tel/gcc b/config/rootfiles/oldcore/133/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/133/filelists/armv5tel/gcc rename to config/rootfiles/oldcore/133/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/133/filelists/armv5tel/glibc b/config/rootfiles/oldcore/133/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/133/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/133/filelists/armv5tel/glibc diff --git a/config/rootfiles/oldcore/133/filelists/bind b/config/rootfiles/oldcore/133/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/oldcore/133/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/133/filelists/files b/config/rootfiles/oldcore/133/filelists/files similarity index 100% rename from config/rootfiles/core/133/filelists/files rename to config/rootfiles/oldcore/133/filelists/files diff --git a/config/rootfiles/core/133/filelists/i586/binutils b/config/rootfiles/oldcore/133/filelists/i586/binutils similarity index 100% rename from config/rootfiles/core/133/filelists/i586/binutils rename to config/rootfiles/oldcore/133/filelists/i586/binutils diff --git a/config/rootfiles/core/133/filelists/i586/gcc b/config/rootfiles/oldcore/133/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/133/filelists/i586/gcc rename to config/rootfiles/oldcore/133/filelists/i586/gcc diff --git a/config/rootfiles/core/133/filelists/i586/glibc b/config/rootfiles/oldcore/133/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/133/filelists/i586/glibc rename to config/rootfiles/oldcore/133/filelists/i586/glibc diff --git a/config/rootfiles/core/133/filelists/i586/hyperscan b/config/rootfiles/oldcore/133/filelists/i586/hyperscan similarity index 100% rename from config/rootfiles/core/133/filelists/i586/hyperscan rename to config/rootfiles/oldcore/133/filelists/i586/hyperscan diff --git a/config/rootfiles/core/133/filelists/ids-ruleset-sources b/config/rootfiles/oldcore/133/filelists/ids-ruleset-sources similarity index 100% rename from config/rootfiles/core/133/filelists/ids-ruleset-sources rename to config/rootfiles/oldcore/133/filelists/ids-ruleset-sources diff --git a/config/rootfiles/core/133/filelists/knot b/config/rootfiles/oldcore/133/filelists/knot similarity index 100% rename from config/rootfiles/core/133/filelists/knot rename to config/rootfiles/oldcore/133/filelists/knot diff --git a/config/rootfiles/oldcore/133/filelists/openssl b/config/rootfiles/oldcore/133/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/oldcore/133/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/133/filelists/pam b/config/rootfiles/oldcore/133/filelists/pam similarity index 100% rename from config/rootfiles/core/133/filelists/pam rename to config/rootfiles/oldcore/133/filelists/pam diff --git a/config/rootfiles/core/133/filelists/rrdtool b/config/rootfiles/oldcore/133/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/133/filelists/rrdtool rename to config/rootfiles/oldcore/133/filelists/rrdtool diff --git a/config/rootfiles/core/133/filelists/squid b/config/rootfiles/oldcore/133/filelists/squid similarity index 100% rename from config/rootfiles/core/133/filelists/squid rename to config/rootfiles/oldcore/133/filelists/squid diff --git a/config/rootfiles/core/133/filelists/strongswan b/config/rootfiles/oldcore/133/filelists/strongswan similarity index 100% rename from config/rootfiles/core/133/filelists/strongswan rename to config/rootfiles/oldcore/133/filelists/strongswan diff --git a/config/rootfiles/core/133/filelists/suricata b/config/rootfiles/oldcore/133/filelists/suricata similarity index 100% rename from config/rootfiles/core/133/filelists/suricata rename to config/rootfiles/oldcore/133/filelists/suricata diff --git a/config/rootfiles/core/133/filelists/wpa_supplicant b/config/rootfiles/oldcore/133/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/133/filelists/wpa_supplicant rename to config/rootfiles/oldcore/133/filelists/wpa_supplicant diff --git a/config/rootfiles/core/133/filelists/x86_64/binutils b/config/rootfiles/oldcore/133/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/133/filelists/x86_64/binutils rename to config/rootfiles/oldcore/133/filelists/x86_64/binutils diff --git a/config/rootfiles/core/133/filelists/x86_64/gcc b/config/rootfiles/oldcore/133/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/133/filelists/x86_64/gcc rename to config/rootfiles/oldcore/133/filelists/x86_64/gcc diff --git a/config/rootfiles/core/133/filelists/x86_64/glibc b/config/rootfiles/oldcore/133/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/133/filelists/x86_64/glibc rename to config/rootfiles/oldcore/133/filelists/x86_64/glibc diff --git a/config/rootfiles/core/133/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/133/filelists/x86_64/hyperscan similarity index 100% rename from config/rootfiles/core/133/filelists/x86_64/hyperscan rename to config/rootfiles/oldcore/133/filelists/x86_64/hyperscan diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/oldcore/133/update.sh similarity index 100% rename from config/rootfiles/core/133/update.sh rename to config/rootfiles/oldcore/133/update.sh diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index 02212f52b..590595828 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -9765,6 +9765,9 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/nouveau/debug #lib/modules/KVER-ipfire-pae/build/include/config/nouveau/debug.h #lib/modules/KVER-ipfire-pae/build/include/config/nouveau/debug/default.h +#lib/modules/KVER-ipfire-pae/build/include/config/nouveau/legacy +#lib/modules/KVER-ipfire-pae/build/include/config/nouveau/legacy/ctx +#lib/modules/KVER-ipfire-pae/build/include/config/nouveau/legacy/ctx/support.h #lib/modules/KVER-ipfire-pae/build/include/config/nozomi.h #lib/modules/KVER-ipfire-pae/build/include/config/nr #lib/modules/KVER-ipfire-pae/build/include/config/nr/cpus.h @@ -17539,6 +17542,7 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/free #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/free/clk_put.cocci diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 545136dc9..f48d65a80 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -262,6 +262,7 @@ WARNING: translation string unused: err rs 1 WARNING: translation string unused: err rs 6 decrypt WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar +WARNING: translation string unused: error WARNING: translation string unused: error config WARNING: translation string unused: error external access WARNING: translation string unused: esp encryption @@ -363,11 +364,6 @@ WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id -WARNING: translation string unused: ids preprocessor -WARNING: translation string unused: ids rules license -WARNING: translation string unused: ids rules license1 -WARNING: translation string unused: ids rules license2 -WARNING: translation string unused: ids rules license3 WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity @@ -385,6 +381,7 @@ WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 +WARNING: translation string unused: intrusion prevention system WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -603,6 +600,7 @@ WARNING: translation string unused: router ip WARNING: translation string unused: rsvd dst port overlap WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date +WARNING: translation string unused: runmode WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error WARNING: translation string unused: select dest net @@ -629,8 +627,6 @@ WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport -WARNING: translation string unused: snort hits -WARNING: translation string unused: snort working WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -779,31 +775,24 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: translation string unused: zoneconf access native +WARNING: translation string unused: zoneconf access none +WARNING: translation string unused: zoneconf access vlan +WARNING: translation string unused: zoneconf nic assignment +WARNING: translation string unused: zoneconf nicmode bridge +WARNING: translation string unused: zoneconf nicmode default +WARNING: translation string unused: zoneconf nicmode macvtap +WARNING: translation string unused: zoneconf val native assignment error +WARNING: translation string unused: zoneconf val ppp assignment error +WARNING: translation string unused: zoneconf val vlan amount assignment error +WARNING: translation string unused: zoneconf val vlan tag assignment error +WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: Captive ACTIVATE = unknown string WARNING: untranslated string: Captive clients = unknown string -WARNING: untranslated string: Captive delete logo = Delete Logo -WARNING: untranslated string: Daily = Daily -WARNING: untranslated string: Disabled = Disabled WARNING: untranslated string: Scan for Songs = unknown string -WARNING: untranslated string: Weekly = Weekly -WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet -WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0 -WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* -WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) -WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. -WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) -WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: bytes = unknown string -WARNING: untranslated string: dangerous = Dangerous -WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled -WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules -WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) -WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL -WARNING: untranslated string: force enable = Forced -WARNING: untranslated string: foreshadow = Foreshadow WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string -WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: guardian block a host = unknown string WARNING: untranslated string: guardian block httpd brute-force = unknown string WARNING: untranslated string: guardian block ssh brute-force = unknown string @@ -833,55 +822,12 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities -WARNING: untranslated string: ids apply = Apply -WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully... -WARNING: untranslated string: ids automatic rules update = Automatic Rule Update -WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully... -WARNING: untranslated string: ids enable = Enable Intrusion Prevention System -WARNING: untranslated string: ids hide = Hide -WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts -WARNING: untranslated string: ids log hits = Total of number of activated rules for -WARNING: untranslated string: ids monitor traffic only = Monitor traffic only -WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces -WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored -WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first -WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode -WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully... -WARNING: untranslated string: ids ruleset settings = Ruleset Settings -WARNING: untranslated string: ids show = Show -WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string -WARNING: untranslated string: meltdown = Meltdown -WARNING: untranslated string: mitigated = Mitigated WARNING: untranslated string: no data = unknown string -WARNING: untranslated string: not affected = Not Affected -WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: pakfire ago = ago. -WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes -WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations -WARNING: untranslated string: ptr = PTR WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string -WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled -WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled -WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported -WARNING: untranslated string: spectre variant 1 = Spectre Variant 1 -WARNING: untranslated string: spectre variant 2 = Spectre Variant 2 -WARNING: untranslated string: spectre variant 4 = Spectre Variant 4 -WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding -WARNING: untranslated string: system is offline = The system is offline. -WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: vpn statistics n2n = unknown string -WARNING: untranslated string: vulnerability = Vulnerability -WARNING: untranslated string: vulnerable = Vulnerable -WARNING: untranslated string: wlanap auto = Automatic Channel Selection -WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID -WARNING: untranslated string: wlanap client isolation = Client Isolation -WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) -WARNING: untranslated string: wlanap ssid = SSID -WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. -WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_missings b/doc/language_missings index 453557189..4c744bfb5 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -884,84 +884,6 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ -< advproxy errmsg wpad invalid ip or mask -< advproxy wpad example dst_noproxy_ip -< advproxy wpad example dst_noproxy_url -< advproxy wpad label dst_noproxy_ip -< advproxy wpad label dst_noproxy_url -< advproxy wpad notice -< advproxy wpad title -< advproxy wpad view pac -< Captive delete logo -< Daily -< dangerous -< Disabled -< dnsforward dnssec disabled -< emerging pro rules -< enable smt -< error -< fallout zombieload ridl -< force enable -< foreshadow -< generate ptr -< hardware vulnerabilities -< ids apply -< ids apply ruleset changes -< ids automatic rules update -< ids download new ruleset -< ids enable -< ids hide -< ids ignored hosts -< ids log hits -< ids monitored interfaces -< ids monitor traffic only -< ids no network zone -< ids no ruleset available -< ids oinkcode required -< ids ruleset autoupdate in progress -< ids ruleset settings -< ids show -< ids working -< intrusion prevention system -< meltdown -< mitigated -< not affected -< ovpn tls auth -< please reboot to apply your changes -< processor vulnerability mitigations -< ptr -< runmode -< smt disabled -< smt enabled -< smt not supported -< spectre variant 1 -< spectre variant 2 -< spectre variant 4 -< ssh agent forwarding -< system is offline -< update ruleset -< vulnerability -< vulnerable -< Weekly -< wlanap auto -< wlanap broadcast ssid -< wlanap client isolation -< wlanap management frame protection -< wlanap ssid -< zoneconf access native -< zoneconf access none -< zoneconf access vlan -< zoneconf nic assignment -< zoneconf nicmode bridge -< zoneconf nicmode default -< zoneconf nicmode macvtap -< zoneconf notice reboot -< zoneconf title -< zoneconf val native assignment error -< zoneconf val ppp assignment error -< zoneconf val vlan amount assignment error -< zoneconf val vlan tag assignment error -< zoneconf val zoneslave amount error ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 6ce9542b2..5031e4088 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -89,9 +89,9 @@ Alfred Haas, Lars Schuhmacher, Rene Zingel, Sascha Kilian, +Stéphane Pautrel, Ronald Wiesinger, Stephan Feddersen, -Stéphane Pautrel, Florian Bührle, Bernhard Bitsch, Justin Luth, diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index deb0a1f8f..28af41cfb 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -12,7 +12,6 @@ 'Captive 1day' => '1 jour', 'Captive 1month' => '1 mois', 'Captive 1week' => '1 semaine', -'Captive ACTIVATE' => 'ACTIVER', 'Captive GAIN ACCESS' => 'ACCEDER', 'Captive WiFi coupon' => 'Coupon wifi', 'Captive activate' => 'Activation', @@ -27,6 +26,7 @@ 'Captive client session expiry time' => 'Délai d\'expiration de la session', 'Captive config' => 'Paramètres', 'Captive coupon' => 'Coupon', +'Captive delete logo' => 'Supprimer le logo', 'Captive err doublevoucher' => 'Un coupon avec ce code existe déjà', 'Captive expire' => 'Expire', 'Captive expiry time' => 'Heure d\'expiration', @@ -45,7 +45,7 @@ 'Captive mac' => 'Adresse MAC', 'Captive noexpiretime' => 'Aucune plage de temps de connexion valide donnée', 'Captive nolimit' => 'illimité', -'Captive nr' => 'Number', +'Captive nr' => 'Numéro', 'Captive please accept the terms and conditions' => 'Veuillez accepter les termes et conditions', 'Captive please enter a coupon code' => 'Veuillez saisir un code de coupon', 'Captive portal' => 'Portail captif IPFire', @@ -83,6 +83,8 @@ 'ConnSched time' => 'Temps :', 'ConnSched up' => 'Actif', 'ConnSched weekdays' => 'Jours de la semaine :', +'Daily' => 'Quotidienne', +'Disabled' => 'Désactivée', 'Edit an existing route' => 'Modifier une route existante', 'Enter TOS' => 'Activer ou désactiver TOS-Bits puis appuyez sur Enregistrer .', 'Existing Files' => 'Fichiers dans la base de données', @@ -119,8 +121,9 @@ 'The destination IP address is invalid.' => 'L\'adresse IP de destination n\'est pas valide.', 'The source IP address is invalid.' => 'L\'adresse IP source n\'est pas valide.', 'Utilization on' => 'Utilisation active', -'Verbose' => 'Bavard :', +'Verbose' => 'Verbeux :', 'WakeOnLan' => 'Réveil via le réseau', +'Weekly' => 'Hebdomadaire', 'a ca certificate with this name already exists' => 'Un certificat de CA avec ce nom existe déjà.', 'a connection with this common name already exists' => 'Une connexion avec ce nom commun existe déjà.', 'a connection with this name already exists' => 'Une connexion avec ce nom existe déjà.', @@ -168,7 +171,7 @@ 'advproxy AUTH method ident' => 'identd', 'advproxy AUTH method ldap' => 'LDAP', 'advproxy AUTH method ncsa' => 'Local', -'advproxy AUTH method none' => 'Rien', +'advproxy AUTH method none' => 'Aucune', 'advproxy AUTH method ntlm' => 'Domaine Windows NT4', 'advproxy AUTH method ntlm auth' => 'Active Directory Windows', 'advproxy AUTH method radius' => 'RADIUS', @@ -316,6 +319,7 @@ 'advproxy errmsg radius secret' => 'Pass-phrase RADIUS requise', 'advproxy errmsg radius server' => 'Adresse IP du serveur RADIUS non valide', 'advproxy errmsg time restriction' => 'Restriction horaire non valide', +'advproxy errmsg wpad invalid ip or mask' => 'WPAD : IP ou sous-réseau invalide pour le sous-réseau IP exclu', 'advproxy error design' => 'Construction des messages erronées ', 'advproxy error language' => 'Langage des messages erronés ', 'advproxy fake referer' => 'Fausses références soumises aux sites externes ', @@ -340,7 +344,7 @@ 'advproxy monday' => 'Lun', 'advproxy network based access' => 'Contrôle d\'accès réseau', 'advproxy no cache sites' => 'Ne pas mettre en cache ces domaines (un par ligne) ', -'advproxy no clients defined' => 'Aucun clients défini', +'advproxy no clients defined' => 'Aucun client défini', 'advproxy no connection auth' => 'Aucune connexion d\'authentification axée sur la transmission ', 'advproxy no cre groups' => 'Il n\'y a aucun groupe d\'accès disponible', 'advproxy no internal proxy on blue' => 'Désactiver l\'accès du proxy interne BLEU vers d\'autres sous-réseaux ', @@ -394,6 +398,13 @@ 'advproxy visible hostname' => 'Nom d\'hôte visible ', 'advproxy web browser' => 'Navigateur web', 'advproxy wednesday' => 'Mer', +'advproxy wpad example dst_noproxy_ip' => 'Ex. : 192.168.2.0/255.255.255.0', +'advproxy wpad example dst_noproxy_url' => 'Ex. : *.ipfire.org*', +'advproxy wpad label dst_noproxy_ip' => 'Sous-réseaux IP exclus (un par ligne) ', +'advproxy wpad label dst_noproxy_url' => 'URL exclus (une par ligne) ', +'advproxy wpad notice' => 'Note : Pour le fonctionnement correct de WPAD/PAC, d\'autres modifications doivent être apportées. Veuillez consulter le <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.', +'advproxy wpad title' => 'Protocole de détection automatique du proxy web (WPAD) / config automatique du proxy (PAC)', +'advproxy wpad view pac' => 'Ouvrir fichier PAC ', 'again' => 'De nouveau :', 'age second' => 'seconde', 'age seconds' => 'secondes', @@ -484,7 +495,7 @@ 'bandwitherror' => 'Vous ne pouvez pas changer les réglages de la bande passante tant que la Qos est activée. Désactivez d\'abord la Qos.', 'bandwithsettings' => 'Réglages de la bande passante', 'basic options' => 'Options de base', -'beep when ppp connects or disconnects' => 'Emettre des beep quand IPFire se connecte ou se déconnecte', +'beep when ppp connects or disconnects' => 'Emettre un son quand IPFire se connecte ou se déconnecte', 'behind a proxy' => 'Derrière un proxy :', 'bewan adsl pci st' => 'A SUPPRIMER', 'bewan adsl usb' => 'A SUPPRIMER', @@ -493,7 +504,7 @@ 'bleeding rules' => 'Bleeding Edge règles de Snort', 'block' => 'Bloquer', 'blue' => 'BLEU', -'blue access' => 'Accès BLEU', +'blue access' => 'Accès réseau BLEU', 'blue access use hint' => 'Vous devez saisir l\'adresse IP ou MAC de votre périphérique. Vous pouvez également saisir les deux', 'blue interface' => 'Interface BLEUE', 'broadcast' => 'Diffusion', @@ -701,6 +712,7 @@ 'custom networks' => 'Réseaux personnalisés', 'custom services' => 'Services personnalisés', 'daily firewallhits' => 'Contacts journaliers du pare-feu', +'dangerous' => 'dangereux', 'dat without key' => 'Une archive chiffrée ne pouvant être restaurée sans la clef.', 'date' => 'Date', 'date not in logs' => 'Aucun rapport n\'existe pour le jour demandé (ou incomplet) ', @@ -848,6 +860,7 @@ 'dnsforward' => 'Transfert DNS', 'dnsforward add a new entry' => 'Ajouter une nouvelle entrée', 'dnsforward configuration' => 'Configuration de transfert DNS', +'dnsforward dnssec disabled' => 'La validation DNSSEC est désactivée', 'dnsforward edit an entry' => 'Modifier une entrée existante', 'dnsforward entries' => 'Entrées actuelles', 'dnsforward forward_servers' => 'Nom des serveurs ', @@ -868,7 +881,7 @@ 'domain name suffix' => 'Suffixe du nom de domaine :', 'domain not set' => 'Domaine non établi.', 'donation' => 'Faire un don', -'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif', +'donation-link' => 'https://www.paypal.com/fr_fr/fr/i/btn/btn_donateCC_LG.gif', 'donation-text' => 'IPFire est développé et maintenu par des volontaires durant leur temps libre. Afin d\'assurer les coûts du projet et nous encourager, vous pouvez effectuer un don.', 'done' => 'Faites le', 'dos charset' => 'DOS Charset', @@ -951,11 +964,13 @@ 'email tls' => 'Utiliser une connexion chiffrée TLS', 'email usemail' => 'Activation du service', 'emailreportlevel' => 'Niveau de rapport des mails', +'emerging pro rules' => 'Règles Pro de la communauté Emergingthreats.net', 'emerging rules' => 'Règles de la communauté Emergingthreats.net', 'empty' => 'Ce champ peut être laissé vide', 'empty profile' => 'vide', 'enable ignore filter' => 'Activer le filtre d\'exclusion ', 'enable javascript' => 'Activer Javascript', +'enable smt' => 'Activer multithreading simultané (SMT)', 'enable wildcards' => 'Activer les cartes d\'invitations :', 'enabled' => 'Activé :', 'enabled on' => 'Activé sur', @@ -978,6 +993,7 @@ 'err rs 6 decrypt' => 'Erreur lors du déchiffrement de l\'archive', 'err rs 7 untartst' => 'Archive déchiffrée non valide', 'err rs 8 untar' => 'Erreur lors de l\'extraction de l\'archive tar', +'error' => 'Erreur', 'error config' => 'Impossible d\'ouvrir /var/ipcop/ovpn/config/ZERINA.ovpn !', 'error external access' => 'Impossible d\'ouvrir /var/ipcop/xtaccess/config (l\'accès externe ne peut pas être garanti) !', 'error messages' => 'Messages d\'erreurs :', @@ -1012,6 +1028,7 @@ 'extrahd unable to read' => 'Impossible de lire', 'extrahd unable to write' => 'Impossible d\'écrire', 'extrahd you cant mount' => 'Vous ne pouvez pas monter', +'fallout zombieload ridl' => 'Fallout/ZombieLoad/RIDL', 'false classnumber' => 'Le numéro de classe ne correspond pas à l\'interface.', 'false max bandwith' => 'La bande passante maximum est fausse.', 'false min bandwith' => 'La bande passante minimum est fausse.', @@ -1061,8 +1078,10 @@ 'fixed ip lease modified' => 'Bail adresse IP fixe modifie', 'fixed ip lease removed' => 'Bail adresse IP fixe supprime', 'flag' => 'Drap.', +'force enable' => 'Forcé', 'force update' => 'Forcer la mise à jour', 'force user' => 'Obliger tous les nouveaux fichiers à l\'utilisateur', +'foreshadow' => 'Foreshadow', 'forward firewall' => 'Pare-feu', 'forwarding rule added' => 'Règle de transfert ajoutée ; Redémarrage du transitaire', 'forwarding rule removed' => 'Règle de transfert supprimée ; Redémarrage du transitaire', @@ -1288,6 +1307,7 @@ 'generate a certificate' => 'Générer un certificat :', 'generate dh key' => 'Générer paramètres Diffie-Hellman', 'generate iso' => 'Générer ISO', +'generate ptr' => 'Générer PTR', 'generate root/host certificates' => 'Générer des certificats root / hôte ', 'generate tripwire keys and init' => 'Générer des clef Tripwire et init', 'generatekeys' => 'Générer des clefs', @@ -1327,6 +1347,7 @@ 'harddisk temperature graphs' => 'Graphiques température disque dur', 'hardware graphs' => 'Graphiques matériel', 'hardware support' => 'Support matériel', +'hardware vulnerabilities' => 'Vulnérabilités matérielles', 'hdd temperature in' => 'Température interne disque dur', 'help' => 'Aide', 'high' => 'Haut', @@ -1357,14 +1378,26 @@ 'idle' => 'Inactif', 'idle timeout' => 'Délai d\'inactivité (minutes ; 0 pour désactiver) :', 'idle timeout not set' => 'Délai d\'inactivité non défini.', +'ids apply' => 'Appliquer', +'ids apply ruleset changes' => 'Les modifications du jeu de règles sont appliquées. Veuillez patienter jusqu\'à ce que toutes les opérations soient terminées avec succès...', +'ids automatic rules update' => 'Mise à jour automatique des règles', +'ids download new ruleset' => 'Téléchargement et décompression d\'un nouveau jeu de règles. Veuillez patienter jusqu\'à ce que toutes les opérations soient terminées avec succès...', +'ids enable' => 'Activer le système de prévention d\'intrusion', +'ids hide' => 'Cacher', +'ids ignored hosts' => 'Hôtes de liste blanche', +'ids log hits' => 'Total du nombre de règles activées pour', 'ids log viewer' => 'Rapport IDs', 'ids logs' => 'Rapports IDs', -'ids preprocessor' => 'Préprocesseur IDS', -'ids rules license' => 'Pour utiliser les règles certifiées par Sourcefire VRT, vous devez vous inscrire sur', -'ids rules license1' => '.', -'ids rules license2' => 'Après avoir pris connaissance de la licence, activez votre compte en utilisant l\'URL que vous avez reçu par mail. Ensuite allez à', -'ids rules license3' => 'appuyez sur le bouton "Generate code" et copiez les 40 caractères Oinkcode dans le champ ci-dessous.', -'ids rules update' => 'Mise à jour des règles Snort', +'ids monitor traffic only' => 'Surveiller seulement le trafic', +'ids monitored interfaces' => 'Interfaces surveillées', +'ids no network zone' => 'Veuillez choisir au moins une zone de réseau à surveiller.', +'ids no ruleset available' => 'Aucun jeu de règles n\'est disponible. Veuillez d\'abord en télécharger un', +'ids oinkcode required' => 'Le jeu de règles choisi nécessite un abonnement ou un Oinkcode', +'ids rules update' => 'Jeux de règles', +'ids ruleset autoupdate in progress' => 'Mise à jour du jeu de règles en cours. Veuillez patienter jusqu\'à ce que toutes les opérations soient terminées avec succès...', +'ids ruleset settings' => 'Paramètres du jeu de règles', +'ids show' => 'Afficher', +'ids working' => 'Les modifications sont en cours d\'application. Veuillez patienter jusqu\'à ce que toutes les opérations soient terminées avec succès...', 'iface' => 'Iface', 'ignore filter' => 'Filtre d\'exclusion ', 'ike encryption' => 'Chiffrement IKE :', @@ -1404,6 +1437,7 @@ 'intrusion detection system log viewer' => 'Visualisateur de rapport du système de détection d\'intrusion', 'intrusion detection system rules' => 'Règles du système de détection d\'intrusion', 'intrusion detection system2' => 'Système de détection d\'intrusion :', +'intrusion prevention system' => 'Système de prévention d\intrusion', 'invalid broadcast ip' => 'Diffusion d\'IP non valide', 'invalid cache size' => 'Taille de cache non valide.', 'invalid characters found in pre-shared key' => 'La clef partagée contient des caractères invalides.', @@ -1546,7 +1580,7 @@ 'log' => 'Rapport :', 'log enabled' => 'Journal activé', 'log level' => 'Niveau de rapport', -'log lines per page' => 'Lignes par page ', +'log lines per page' => 'Nb de lignes par page ', 'log server address' => 'Serveur Syslog', 'log server protocol' => 'Protocole :', 'log settings' => 'Réglages rapports de synthèse', @@ -1639,6 +1673,7 @@ 'media' => 'Stockage', 'media information' => 'Informations du stockage', 'medium' => 'Moyen', +'meltdown' => 'Effondrement', 'memory' => 'Mémoire', 'memory information' => 'Informations mémoire', 'memory usage per' => 'Utilisation de la mémoire par', @@ -1655,6 +1690,7 @@ 'misc-options' => 'Options supplémentaires', 'missing dat' => 'Archive chiffrée introuvable', 'missing gz' => 'Archive déchiffrée introuvable', +'mitigated' => 'Mitigé', 'mode' => 'Mode', 'model' => 'Modèle', 'modem' => 'Modem', @@ -1692,7 +1728,7 @@ 'monthly volume start day short' => 'Premier jour', 'months' => 'mois', 'more' => 'plus', -'most preferred' => 'le plus préféré', +'most preferred' => 'le davantage préféré', 'mount' => 'Monter', 'mounted on' => 'Monté en tant que', 'mpfire' => 'Lecteur de médias pour IPFire', @@ -1732,7 +1768,7 @@ 'network removed' => 'Réseau personnalisé supprimé', 'network status information' => 'Informations sur l\'état du réseau', 'network time' => 'Utiliser un serveur de temps automatique :', -'network time from' => 'Obtenir l\'heure depuis un serveur de temps automatique', +'network time from' => 'Obtenir automatiquement l\'heure depuis un serveur de temps', 'network traffic graphs' => 'Graphiques de l\'activité réseau', 'network traffic graphs external' => 'Graphique du trafic réseau (externe)', 'network traffic graphs internal' => 'Graphique du trafic réseau (interne)', @@ -1763,6 +1799,7 @@ 'noservicename' => 'Aucun nom de service saisi', 'not a valid ca certificate' => 'Le certificat CA n\'est pas valide.', 'not a valid dh key' => 'Ce n\'est pas un fichier de paramètres Diffie-Hellman valide. Veuillez choisir une longueur de 1024, 2048, 3072 ou 4096 bits et le format PKCS#3.', +'not affected' => 'Non affecté', 'not enough disk space' => 'Pas assez d\'espace sur le disque', 'not present' => 'Absent', 'not running' => 'ne fonctionne pas', @@ -1775,8 +1812,8 @@ 'ntp must be enabled to have clients' => 'NTP doit être activé pour avoir des clients.', 'ntp server' => 'Serveur NTP', 'ntp sync' => 'Synchronisation', -'ntp syncro disabled' => 'Synchronisation NTP désactivée', -'ntp syncro enabled' => 'Synchronisation NTP activée', +'ntp syncro disabled' => 'Synchronisation NTP désactivee', +'ntp syncro enabled' => 'Synchronisation NTP activee', 'ntpd restarted' => 'ntpd redémarré', 'number' => 'Nombre :', 'o-no' => 'Inactif', @@ -1832,7 +1869,7 @@ 'our donors' => 'Nos donateurs', 'out' => 'sortie', 'outgoing' => 'sortant', -'outgoing compression in bytes per second' => 'Outgoing compression', +'outgoing compression in bytes per second' => 'Compression sortante', 'outgoing firewall' => 'Pare-feu sortant', 'outgoing firewall access' => 'Accès sortant au pare-feu', 'outgoing firewall add ip group' => 'Ajouter un groupe d\'adresses IP', @@ -1879,7 +1916,7 @@ 'ovpn hmac' => 'Options HMAC', 'ovpn log' => 'OVPN-Log', 'ovpn mgmt in root range' => 'Un numéro de port de 1024 ou plus est requis.', -'ovpn mtu-disc' => 'Path MTU Discovery', +'ovpn mtu-disc' => 'Découverte du chemin MTU', 'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery nécessite un MTU de 1500.', 'ovpn mtu-disc maybe' => 'En option', 'ovpn mtu-disc no' => 'Jamais', @@ -1898,6 +1935,7 @@ 'ovpn subnet' => 'Sous-réseau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Sous-réseau OpenVPN non valide.', 'ovpn subnet overlap' => 'Le sous-réseau OpenVPN se chevauche avec : ', +'ovpn tls auth' => 'Protection du canal TLS :', 'ovpn warning rfc3280' => 'Votre certificat d\'hôte n\'est pas conforme avec la RFC3280. Veuillez mettre à jour la dernière version d\'IPFire et générer dès que possible un nouveau certificat racine et hôte. Tous les clients OpenVPN doivent ensuite être renouvelés !', 'ovpn_fastio' => 'Fast-IO', 'ovpn_mssfix' => 'Taille MSSFIX', @@ -1917,7 +1955,7 @@ 'p2p block' => 'Réseaux P2P', 'p2p block save notice' => 'Veuillez recharger le jeu de règles de pare-feu afin d\'appliquer vos modifications.', 'package failed to install' => 'L\'installation du paquet a échoué.', -'pagerefresh' => 'La page est en train d\'être rafraichie, veuillez attendre.', +'pagerefresh' => 'La page est en cours de rafraichissement, veuillez attendre.', 'pakfire accept all' => 'Voulez-vous installer tous les paquets ?', 'pakfire ago' => '', 'pakfire available addons' => 'Modules disponibles :', @@ -1957,11 +1995,12 @@ 'percentage' => 'Pourcentage', 'persistent' => 'Persistant', 'pfs yes no' => 'Perfect Forward Secrecy (PFS)', -'phase1 group' => 'Groupe phase1', +'phase1 group' => 'Groupe phase 1', 'phonebook entry' => 'Entrée du répertoire :', 'ping disabled' => 'Désactiver la réponse au ping', 'pkcs12 file password' => 'Mot de passe PKCS12 ', 'play' => 'Jouer', +'please reboot to apply your changes' => 'Veuillez redémarrer pour appliquer vos modifications.', 'polfile' => 'Fichier des politiques', 'policy' => 'Politique', 'port' => 'Port', @@ -1990,6 +2029,7 @@ 'printing options' => 'Options d\'impression', 'priority' => 'Priorité', 'processes' => 'Processus', +'processor vulnerability mitigations' => 'Atténuations de la vulnérabilité du processeur', 'profile' => 'Profil', 'profile deleted' => 'Profil supprimé : ', 'profile has errors' => 'Le profil contient des erreurs', @@ -2018,6 +2058,7 @@ 'proxy reports today' => 'Rapport d\'aujourd\'hui', 'proxy reports weekly' => 'Rapports hebdomadaires', 'psk' => 'PSK', +'ptr' => 'PTR', 'pulse' => 'Impulsion', 'pulse dial' => 'Numérotation par impulsions :', 'qos add subclass' => 'Ajouter une sous-classe', @@ -2094,6 +2135,7 @@ 'rsvd dst port overlap' => 'La plage des ports de destination comprend un port réservé à IPFire :', 'rsvd src port overlap' => 'La plage des ports source comprend un port réservé à IPFire :', 'rules already up to date' => 'Les règles sont déjà à jour', +'runmode' => 'Mode d\'exécution', 'running' => 'EN FONCTION', 'safe removal of umounted device' => 'Vous pouvez enlever le périphérique démonté en toute sécurité', 'samba' => 'Samba', @@ -2177,11 +2219,12 @@ 'smbrestart' => 'Redémarrer Samba', 'smbstart' => 'Démarrer Samba', 'smbstop' => 'Arrêter Samba', +'smt disabled' => 'Le multithreading simultané (SMT) est désactivé', +'smt enabled' => 'Le multithreading simultané(SMT) est activé', +'smt not supported' => 'Le multithreading simultané (SMT) n\'est pas supporté', 'smtphost' => 'Hôte SMTP', 'smtpport' => 'Port SMTP', 'snat new source ip address' => 'Nouvelle adresse IP source', -'snort hits' => 'Total du nombre de règles d\'intrusion activées pour', -'snort working' => 'Snort travaille ... Veuillez attendre que toutes les opérations se soient terminées avec succès.', 'socket options' => 'Options socket', 'software version' => 'Version logicielle', 'sort ascending' => 'Tri croissant', @@ -2202,6 +2245,9 @@ 'source port overlaps' => 'La plage de port source chevauche une plage de port existante.', 'speaker off' => 'Haut-parleur éteint :', 'speaker on' => 'Haut-parleur allumé :', +'spectre variant 1' => 'Spectre Variant 1', +'spectre variant 2' => 'Spectre Variant 2', +'spectre variant 4' => 'Spectre Variant 4', 'squid extension methods' => 'Votre liste de <tt>méthodes d\'extension</tt>', 'squid extension methods invalid' => 'Votre liste de méthodes d\'extension peut seulement contenir des mots composés de majuscules ou de chiffres, séparés par un espace. ', 'squid fix cache' => 'Cache de réparation', @@ -2211,8 +2257,9 @@ 'ssdmz pinholes' => 'DMZ Pinholes', 'ssh' => 'SSH', 'ssh access' => 'Accès SSH', -'ssh access tip' => 'IPFire n\'utilise par le port par défaut 22 pour le SSH !', +'ssh access tip' => 'IPFire n\'utilise pas le port par défaut 22 pour le SSH !', 'ssh active sessions' => 'Connexions actives', +'ssh agent forwarding' => 'Autoriser le transfert d\'agent SSH', 'ssh fingerprint' => 'Empreinte digitale', 'ssh host keys' => 'Clef SSH de l\'hôte', 'ssh is disabled' => 'SSH est desactive. Arret.', @@ -2271,6 +2318,7 @@ 'system has hwrng' => 'Ce système a un générateur de nombre aléatoire de matériel.', 'system has rdrand' => 'Ce système prend en charge Intel (R) RDRAND.', 'system information' => 'Informations système', +'system is offline' => 'Le système est hors ligne.', 'system log viewer' => 'Visualisateur de journaux système', 'system logs' => 'Rapports système', 'system status information' => 'Informations sur le statut du système', @@ -2329,7 +2377,7 @@ 'tor bandwidth rate' => 'Max. rate', 'tor bandwidth settings' => 'Paramètres de bande passante', 'tor bandwidth unlimited' => 'illimité', -'tor bridge enabled' => 'Enable Tor bridge', +'tor bridge enabled' => 'Activer le pont Tor', 'tor common settings' => 'Paramètres communs', 'tor configuration' => 'Configuration Tor', 'tor connected relays' => 'Relais connectés', @@ -2354,9 +2402,9 @@ 'tor relay external address' => 'Adresse externe relais', 'tor relay fingerprint' => 'Relay fingerprint', 'tor relay mode' => 'Mode relais', -'tor relay mode bridge' => 'Bridge', +'tor relay mode bridge' => 'Pont', 'tor relay mode exit' => 'Exit-Node', -'tor relay mode private bridge' => 'Private bridge', +'tor relay mode private bridge' => 'Pont privé', 'tor relay mode relay' => 'Relais seul', 'tor relay nickname' => 'Surnom relais', 'tor relay port' => 'Port relais', @@ -2414,7 +2462,7 @@ 'uncheck all' => 'Tout décocher', 'unencrypted' => 'Non chiffré', 'uninstall' => 'Désinstaller', -'unix charset' => 'UNIX Charset', +'unix charset' => 'Jeu de car. UNIX', 'unix group' => 'Groupe d\'utilisateurs UNIX', 'unix password sync' => 'Mot de passe Sync Unix', 'unix shell' => 'Shell UNIX', @@ -2423,6 +2471,7 @@ 'unnamed' => 'Sans nom', 'update' => 'Mettre à jour', 'update accelerator' => 'Accélérateur (cache)', +'update ruleset' => 'Mettre à jour le jeu de règles', 'update time' => 'Mise à jour de l\'heure :', 'update transcript' => 'Mettre à jour transcript', 'updatedatabase' => 'Mettre à jour la base de données avec le dernier rapport', @@ -2529,7 +2578,7 @@ 'url filter' => 'Filtre de contenu', 'urlfilter access' => 'Accès', 'urlfilter activity detection' => 'Détection d\'activité ', -'urlfilter add new time constraint rule' => 'Ajouter une nouvelle règle de contrainte de temps ', +'urlfilter add new time constraint rule' => 'Ajouter une nouvelle règle de contrainte horaires ', 'urlfilter add new user quota rule' => 'Ajouter une nouvelle règle sur le quota de l\'utilisateur ', 'urlfilter add rule' => 'Ajouter', 'urlfilter advanced settings' => 'Paramètres avancés', @@ -2603,7 +2652,7 @@ 'urlfilter enable full backup' => 'Inclure liste noire complète ', 'urlfilter enable jpeg' => 'Activer image d\'arrière plan', 'urlfilter enable log' => 'Activer le journal ', -'urlfilter enable rewrite rules' => 'Activer fichier local de redirection ', +'urlfilter enable rewrite rules' => 'Activer le fichier local de redirection ', 'urlfilter enabled' => 'Activé :', 'urlfilter example' => 'Exemple : www.domain.com', 'urlfilter example ads' => 'Exemple : www.domain.com/ads/', @@ -2634,8 +2683,8 @@ 'urlfilter log viewer' => 'Rapport de filtre URL', 'urlfilter logs' => 'Rapports de filtre URL', 'urlfilter maintenance' => 'Maintenance filtre URL', -'urlfilter manage local file repository' => 'Gérer fichier de dépôt local ', -'urlfilter manage repository' => 'Gérer dépôt', +'urlfilter manage local file repository' => 'Gérer le fichier de dépôt local ', +'urlfilter manage repository' => 'Gérer le dépôt', 'urlfilter minutes' => 'minutes', 'urlfilter mode allow' => 'autoriser', 'urlfilter mode block' => 'bloquer', @@ -2674,8 +2723,8 @@ 'urlfilter select blacklist' => 'Choisir une liste noire existante ', 'urlfilter select multi' => 'Presser \'Ctrl\' pour sélectionner plusieurs catégories', 'urlfilter select source' => 'Choisir une source de téléchargement ', -'urlfilter set time constraints' => 'Fixer les contraintes de temps', -'urlfilter set user quota' => 'Fixer quotas utilisateur', +'urlfilter set time constraints' => 'Fixer les contraintes horaires', +'urlfilter set user quota' => 'Fixer les quotas utilisateur', 'urlfilter show category' => 'Montrer la catégorie de page bloquée ', 'urlfilter show dnserror' => 'Utiliser "Erreur DNS" pour les url bloquées ', 'urlfilter show ip' => 'Montrer adresse IP page bloquée ', @@ -2691,7 +2740,7 @@ 'urlfilter time' => 'Temps', 'urlfilter time quota' => 'Quota de temps', 'urlfilter time space' => 'Espace temps', -'urlfilter timebased access control' => 'Contrôle d\'accès basé sur le temps', +'urlfilter timebased access control' => 'Contrôle d\'accès basé sur les horaires', 'urlfilter timespace error' => 'Erreur dans la déclaration d\'espace/temps', 'urlfilter to' => 'A', 'urlfilter tue' => 'Mar', @@ -2789,6 +2838,8 @@ 'vpn wait' => 'ATTENTE', 'vpn watch' => 'Redémarrer le VPN site-à-site si l\'IP hôte distant change (dyndns).', 'vpn weak' => 'Faible', +'vulnerability' => 'Vulnérabilité', +'vulnerable' => 'Vulnérable', 'waiting to synchronize clock' => 'Attendre la synchronisation de l\'horloge', 'warn when traffic reaches' => 'Avertir lorsque le trafic atteint x %', 'warning messages' => 'Messages d\'alerte', @@ -2858,7 +2909,10 @@ 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlan clients' => 'Clients sans fil', 'wlanap' => 'Point d\'accès', +'wlanap auto' => 'Sélection automatique du canal', +'wlanap broadcast ssid' => 'Broadcast SSID', 'wlanap channel' => 'Canal', +'wlanap client isolation' => 'Isolation du client', 'wlanap configuration' => 'Configuration du point d\'accès', 'wlanap country' => 'Code pays', 'wlanap debugging' => 'Débogage', @@ -2869,13 +2923,15 @@ 'wlanap invalid wpa' => 'Longueur non valide dans la Passphrase WPA. Doit comporter entre 8 et 63 caractères.', 'wlanap link dhcp' => 'Configuration DHCP du réseau local sans fil', 'wlanap link wireless' => 'Activer les clients LAN sans fil', +'wlanap management frame protection' => 'Management Frame Protection (802.11w)', 'wlanap neighbor scan' => 'Balayage des réseaux proches', 'wlanap neighbor scan warning' => 'Attention ! La désactivation peut enfreindre les règles réglementaires !', 'wlanap no interface' => 'L\'interface choisie n\'est pas une carte LAN sans fil !', 'wlanap none' => 'aucun', 'wlanap notifications' => 'Notifications', 'wlanap select interface' => 'Veuillez choisir l\'interface réseau sans fil.', -'wlanap verbose' => 'Verbose', +'wlanap ssid' => 'SSID', +'wlanap verbose' => 'Verbeux', 'wlanap warnings' => 'Alertes', 'wlanap wlan card' => 'Carte WLan', 'wlanap wlan services' => 'Services WLan', @@ -2893,6 +2949,20 @@ 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Vous ne pouvez définir qu\'une connexion client nomade lors de l\'utilisation avec pré-authentification par clé partagée. Soit vous avez déjà une connexion client nomade avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.', 'your department' => 'Votre département', 'your e-mail' => 'Votre adresse de courriel ', +'zoneconf access native' => 'Native', +'zoneconf access none' => 'Aucun', +'zoneconf access vlan' => 'VLAN', +'zoneconf nic assignment' => 'Affectation de carte réseau', +'zoneconf nicmode bridge' => 'Pont', +'zoneconf nicmode default' => 'Défaut', +'zoneconf nicmode macvtap' => 'MacVTtap', +'zoneconf notice reboot' => 'Veuillez redémarrer pour appliquer vos changements.', +'zoneconf title' => 'Configuration de zones', +'zoneconf val native assignment error' => 'Une carte réseau ne peut pas être atteinte nativement par davantage qu\'une zone.', +'zoneconf val ppp assignment error' => 'La carte réseau utilisée pour ROUGE en mode PPP ne peut être atteinte par une autre zone.', +'zoneconf val vlan amount assignment error' => 'Une zone ne peut pas avoir plus d\'un VLAN attribué.', +'zoneconf val vlan tag assignment error' => 'Vous ne pouvez pas utiliser le même label VLAN plus d\'une fois par carte réseau.', +'zoneconf val zoneslave amount error' => 'Une zone qui n\'est pas en mode pont ne peut pas avoir plus d\'une carte réseau assignée', ); #EOF diff --git a/lfs/bind b/lfs/bind index c26487dc9..2f7e83ac1 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.7 +VER = 9.11.8 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5c16cdab2ee066ed43a623febfd29244 +$(DL_FILE)_MD5 = 67b856b6e5cbe4ff4b4456259ec37336 install : $(TARGET) diff --git a/lfs/hyperscan b/lfs/hyperscan index 79547b3bc..45e57bc08 100644 --- a/lfs/hyperscan +++ b/lfs/hyperscan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -36,7 +36,7 @@ SUP_ARCH = x86_64 i586 # The compiler uses a lot of memory to compile hyperscan, hence we reduce # the total number of processes a little bit to be able to build on # smaller machines -MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 512))) +MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024))) ############################################################################### # Top-level Rules diff --git a/lfs/linux b/lfs/linux index c7a475553..6669cf220 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.121 -ARM_PATCHES = 4.14.121-ipfire0 +VER = 4.14.128 +ARM_PATCHES = 4.14.128-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 83 +PAK_VER = 84 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 619cfc35e376eaa1f05d835624bbb432 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = ac64bdb78fbecba032b92df61c928d3f +$(DL_FILE)_MD5 = 6c51d852170552a503b497766cfb632f +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 5c5f6da89606e63701cdcd84a500aca1 install : $(TARGET) @@ -153,13 +153,10 @@ endif ifeq "$(KCFG)" "-multi" # Apply Arm-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch - endif ifeq "$(BUILD_ARCH)" "aarch64" # Apply Arm-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch diff --git a/lfs/openssl b/lfs/openssl index 9f9e7a684..47bd4aff0 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -117,7 +117,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.1a-default-cipherlist.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.1c-default-cipherlist.patch # Apply our CFLAGS cd $(DIR_APP) && sed -i Configure \ diff --git a/lfs/unbound b/lfs/unbound index 87666dfce..e017dcd78 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.9.1 +VER = 1.9.2 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5d954920d192b33f7c88f015dd969940 +$(DL_FILE)_MD5 = 244e10977d1453dff669caa3c0efba18 install : $(TARGET) diff --git a/lfs/vim b/lfs/vim index 81d1516d7..0fa4bf858 100644 --- a/lfs/vim +++ b/lfs/vim @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,12 +24,12 @@ include Config -VER = 7.4 +VER = 8.1 THISAPP = vim-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/vim74 +DIR_APP = $(DIR_SRC)/vim81 TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 607e135c559be642f210094ad023dc65 +$(DL_FILE)_MD5 = 1739a1df312305155285f0cfa6118294 install : $(TARGET) diff --git a/make.sh b/make.sh index cdf5bbed7..aca75fc71 100755 --- a/make.sh +++ b/make.sh @@ -26,8 +26,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.23" # Version number -CORE="133" # Core Level (Filename) -PAKFIRE_CORE="133" # Core Level (PAKFIRE) +CORE="134" # Core Level (Filename) +PAKFIRE_CORE="134" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index da89857d8..b3483a744 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -379,6 +379,9 @@ iptables_init() { # run wirelessctrl /usr/local/bin/wirelessctrl + # run captivectrl + /usr/local/bin/captivectrl + # POLICY CHAIN iptables -N POLICYIN iptables -A INPUT -j POLICYIN diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index 520525ea1..34b3e06fd 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -482,6 +482,27 @@ fix_time_if_dns_fail() { fi } +resolve() { + local hostname="${1}" + + local found=0 + local ns + for ns in $(read_name_servers); do + local answer + for answer in $(dig +short "@${ns}" A "${hostname}"); do + found=1 + + # Filter out non-IP addresses + if [[ ! "${answer}" =~ \.$ ]]; then + echo "${answer}" + fi + done + + # End loop when we have got something + [ ${found} -eq 1 ] && break + done +} + # Sets up Safe Search for various search engines write_safe_search_conf() { local google_tlds=( @@ -691,26 +712,39 @@ write_safe_search_conf() { # Bing echo " local-zone: bing.com transparent" - echo " local-data: \"www.bing.com CNAME strict.bing.com.\"" + for address in $(resolve "strict.bing.com"); do + echo " local-data: \"www.bing.com ${LOCAL_TTL} IN A ${address}\"" + done # DuckDuckGo - echo " local-zone: duckduckgo.com transparent" - echo " local-data: \"duckduckgo.com CNAME safe.duckduckgo.com.\"" + echo " local-zone: duckduckgo.com typetransparent" + for address in $(resolve "safe.duckduckgo.com"); do + echo " local-data: \"duckduckgo.com ${LOCAL_TTL} IN A ${address}\"" + done # Google + addresses="$(resolve "forcesafesearch.google.com")" local domain for domain in ${google_tlds[@]}; do echo " local-zone: ${domain} transparent" - echo " local-data: \"www.${domain} CNAME forcesafesearch.google.com.\"" + for address in ${addresses}; do + echo " local-data: \"www.${domain} ${LOCAL_TTL} IN A ${address}\"" + done done # Yandex - echo " local-zone: yandex.ru transparent" - echo " local-data: \"yandex.ru A 213.180.193.56\"" + for domain in yandex.com yandex.ru; do + echo " local-zone: ${domain} typetransparent" + for address in $(resolve "familysearch.${domain}"); do + echo " local-data: \"${domain} ${LOCAL_TTL} IN A ${address}\"" + done + done # YouTube echo " local-zone: youtube.com transparent" - echo " local-data: \"www.youtube.com CNAME restrictmoderate.youtube.com.\"" + for address in $(resolve "restrictmoderate.youtube.com"); do + echo " local-data: \"www.youtube.com ${LOCAL_TTL} IN A ${address}\"" + done ) > /etc/unbound/safe-search.conf } @@ -809,8 +843,12 @@ case "$1" in exit ${ret} ;; + resolve) + resolve "${2}" + ;; + *) - echo "Usage: $0 {start|stop|restart|status|update-forwarders|test-name-server}" + echo "Usage: $0 {start|stop|restart|status|update-forwarders|test-name-server|resolve}" exit 1 ;; esac diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index fd71621d5..fa84c801c 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -67,7 +67,9 @@ if [ -e /boot/grub/grub.cfg ]; then # Update grub2 config # grub-mkconfig > /boot/grub/grub.cfg -else +fi + +if [ -e /boot/grub/grub.conf ]; then # # xen pv with pygrub need grub.conf / menu.lst # diff --git a/src/patches/openssl-1.1.1a-default-cipherlist.patch b/src/patches/openssl-1.1.1c-default-cipherlist.patch similarity index 66% rename from src/patches/openssl-1.1.1a-default-cipherlist.patch rename to src/patches/openssl-1.1.1c-default-cipherlist.patch index dfe156bf5..72f6ce3b1 100644 --- a/src/patches/openssl-1.1.1a-default-cipherlist.patch +++ b/src/patches/openssl-1.1.1c-default-cipherlist.patch @@ -1,11 +1,12 @@ ---- openssl-1.1.1.orig/include/openssl/ssl.h 2018-09-11 14:48:23.000000000 +0200 -+++ openssl-1.1.1/include/openssl/ssl.h 2018-11-05 16:55:03.935513159 +0100 +diff -Naur openssl-1.1.1c.orig/include/openssl/ssl.h openssl-1.1.1c/include/openssl/ssl.h +--- openssl-1.1.1c.orig/include/openssl/ssl.h 2019-06-10 20:41:21.209140012 +0200 ++++ openssl-1.1.1c/include/openssl/ssl.h 2019-06-10 20:42:26.733973129 +0200 @@ -170,11 +170,11 @@ * an application-defined cipher list string starts with 'DEFAULT'. * This applies to ciphersuites for TLSv1.2 and below. */ -# define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL" -+# define SSL_DEFAULT_CIPHER_LIST "TLSv1.3:CHACHA20:HIGH:+DH:+aRSA:+SHA:+kRSA:!aNULL:!eNULL:!SRP:!PSK:!DSS:!AESCCM" ++# define SSL_DEFAULT_CIPHER_LIST "CHACHA20:HIGH:+aRSA:+SHA384:+SHA256:+DH:+SHA:+kRSA:!eNULL:!aNULL:!PSK:!SRP:!AESCCM:!DSS" /* This is the default set of TLSv1.3 ciphersuites */ # if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) -# define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:" \ @@ -15,4 +16,3 @@ "TLS_AES_128_GCM_SHA256" # else # define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:" \ - hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2019