From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5194fdec46da8b264d9e8b68cdab7ce4c131c956 Date: Mon, 24 Jun 2019 14:40:22 +0100 Message-ID: <20190624134023.C31AC80F6A4@people01.i.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6301828277058961357==" List-Id: --===============6301828277058961357== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 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 Date: Mon Jun 24 14:03:24 2019 +0100 boost: Update to 1.70.0 =20 Signed-off-by: Michael Tremer commit 10c7dfd8b18a9bcd883d4c6574f22bdc892d9236 Merge: 48052e143 e30ce079e Author: Michael Tremer Date: Mon Jun 24 13:30:24 2019 +0100 Merge remote-tracking branch 'stevee/master' commit e30ce079e1971ea1c323d2c9a799bee06b1ed48f Author: Stefan Schantl Date: Sun Jun 23 17:21:57 2019 +0200 libyaml: Update to 0.2.2 =20 Signed-off-by: Stefan Schantl commit 9e6dd6dc6b32bd7325fefae39a8f08ef37d42e42 Author: Stefan Schantl Date: Sun Jun 23 17:18:11 2019 +0200 python-yaml: New package =20 Signed-off-by: Stefan Schantl commit e54bb56dc6fe5bea4d991ef934e725de80aa09f9 Author: Stefan Schantl Date: Sun Jun 23 12:57:50 2019 +0200 less: Update to 551 =20 Signed-off-by: Stefan Schantl commit fb27129df3533154c749487d1d180f4460e686bb Author: Stefan Schantl Date: Sun Jun 23 11:15:22 2019 +0200 suricata-update: New package =20 Signed-off-by: Stefan Schantl commit d58493c8cb02e88ace4bc62f7ecaddc792df1a65 Author: Stefan Schantl Date: Sun Jun 23 11:13:03 2019 +0200 ncurses: Update to 6.1 =20 Signed-off-by: Stefan Schantl commit 3647687dcd76bd594c5852d4cd277d81c0b7a777 Author: Stefan Schantl Date: Sun Jun 23 11:10:25 2019 +0200 compat-ncurses: New package =20 This package is used to keep compatibility for binaries which are linked to the series 5 of ncurses. =20 Signed-off-by: Stefan Schantl commit 6a8e687e51afcdb21faad6b6f870f546114e4ff6 Author: Stefan Schantl Date: Sat Jun 22 15:32:19 2019 +0200 nftables: Update to latest snaphot (20190622). =20 Signed-off-by: Stefan Schantl commit 1a1f3921bb12587637adf3dd66f6eb3dcc9ad12c Author: Stefan Schantl Date: Sat Jun 22 15:30:49 2019 +0200 gawk: Update to 5.0.1 =20 Signed-off-by: Stefan Schantl commit 530cba5e04576de7f97df0df0948d23dffbc4ea9 Author: Stefan Schantl Date: Sat Jun 22 12:18:07 2019 +0200 dhcp: Update to 4.4.1 =20 Signed-off-by: Stefan Schantl commit 3c91321ff78247cca618ebd294e4dca624127140 Author: Stefan Schantl Date: Thu Jun 20 23:44:24 2019 +0200 xfsprogs: Update to 5.0.0 =20 Signed-off-by: Stefan Schantl commit 48052e14340122aefc1235cb2ffb876bd4e187ad Author: Michael Tremer Date: Fri Jun 21 15:24:00 2019 +0100 strongswan: Update to 5.8.0 =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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 =3D> compat-ncurses/compat-ncurses.nm | 96 +---- dhcp/dhcp.nm | 9 +- ...arn-message.patch =3D> 0001-change-bug-url.patch} | 33 +- dhcp/patches/0001-dhcp-remove-bind.patch | 261 ------------- ...atch =3D> 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 ++++++ ...=3D> 0005-Change-default-requested-options.patch} | 39 +- ...atch =3D> 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 =3D> 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 =3D> 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 =3D> 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_AppendIni= ttab.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 =3D> compat-ncurses/compat-ncurses.nm (50%) rename dhcp/patches/{0003-dhcp-errwarn-message.patch =3D> 0001-change-bug-ur= l.patch} (76%) delete mode 100644 dhcp/patches/0001-dhcp-remove-bind.patch rename dhcp/patches/{0004-dhcp-dhclient-options.patch =3D> 0002-additional-d= hclient-options.patch} (59%) delete mode 100644 dhcp/patches/0002-dhcp-sharedlib.patch rename dhcp/patches/{0005-dhcp-release-by-ifup.patch =3D> 0003-Handle-releas= ing-interfaces-requested-by-sbin-ifup.patch} (75%) create mode 100644 dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-s= ystems-and-ma.patch rename dhcp/patches/{0008-dhcp-default-requested-options.patch =3D> 0005-Cha= nge-default-requested-options.patch} (55%) rename dhcp/patches/{0009-dhcp-manpages.patch =3D> 0006-Various-man-page-onl= y-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-standard= s.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 =3D> 0011-Drop-unnecessary-c= apabilities.patch} (52%) delete mode 100644 dhcp/patches/0011-dhcp-CLOEXEC.patch rename dhcp/patches/{0017-dhcp-rfc3442-classless-static-routes.patch =3D> 00= 12-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 =3D> 0014-IPoIB-support-660681.p= atch} (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.pat= ch 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-correc= t-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-statele= ss-mode-11563.patch delete mode 100644 dhcp/patches/0019-dhcp-PPP.patch create mode 100644 dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniquene= ss.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 =3D> 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 =3D> python-yaml/python-yaml.nm (61%) copy pyxattr/pyxattr.nm =3D> 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 @@ =20 name =3D boost ver_major =3D 1 -ver_minor =3D 60 +ver_minor =3D 70 ver_plevel =3D 0 version =3D %{ver_major}.%{ver_minor}.%{ver_plevel} -release =3D 2 +release =3D 1 =20 groups =3D System/Libraries url =3D http://www.boost.org/ @@ -43,23 +43,27 @@ build # Obtain python3 abiflags. python3_abiflags =3D %(python3-config --abiflags) =20 + CFLAGS +=3D -I/usr/include/python%{python3_version}%{python3_abiflags} + CXXFLAGS +=3D -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 =3D -j2 =20 configure_options =3D \ - --layout=3Dtagged \ - --without-mpi \ - --without-graph_parallel \ + --layout=3Dsystem \ --build-dir=3Dserial \ \ cflags=3D"%{CFLAGS}" \ cxxflags=3D"%{CXXFLAGS}" \ + linkflags=3D"%{LDFLAGS}" \ variant=3Drelease \ - threading=3Dsingle,multi \ + threading=3Dmulti \ + runtime-link=3Dshared \ + link=3Dshared,static \ debug-symbols=3Don \ - python=3D%{python_version} \ + python=3D%{python3_version} \ pch=3Doff =20 # Get python3 abi flags. @@ -70,13 +74,11 @@ build mkdir -pv %{DIR_APP}/serial =20 # Bootstrap build environment. - ./bootstrap.sh --with-toolset=3Dgcc --with-icu + ./bootstrap.sh --with-toolset=3Dgcc --with-icu \ + --with-python=3D%{python3} =20 - # Enable boost lib for python3. - cat >> ./tools/build/src/user-config.jam << EOF - using python : %{python_version} : %{python2} : %{includedir}/python%{pyth= on_version} : : : : ; - using python : %{python3_version} : %{python3} : %{includedir}/python%{pyt= hon3_version}%{python3_abiflags} : : : : %{python3_abiflags} ; - EOF + # Support for OpenMPI + echo "using mpi ;" >> project-config.jam end =20 build diff --git a/boost/patches/boost-1.48.0-add-bjam-man-page.patch b/boost/patch= es/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=3Dy] = [-tx] [-v] [--x]\fP -+.PP -+\fIbjam\fP accepts the following options: -+.PP -+\fB-a\fP=20 -+.br -+ Build all targets, even if they are current -+.PP -+\fB-dx\fP=20 -+.br -+ Set the debug level to x (0-9) -+.PP -+\fB-fx\fP=20 -+.br -+ Read x instead of Jambase -+.PP -+\fB-jx\fP=20 -+.br -+ Run up to x shell commands concurrently -+.PP -+\fB-lx\fP=20 -+.br -+ Limit actions to x number of seconds after which they are stopped -+.PP -+\fB-n\fP=20 -+.br -+ Don't actually execute the updating actions -+.PP -+\fB-ox\fP=20 -+.br -+ Write the updating actions to file x -+.PP -+\fB-px\fP=20 -+.br -+ x=3D0, pipes action stdout and stderr merged into action output -+.PP -+\fB-q\fP=20 -+.br -+ Quit quickly as soon as a target fails -+.PP -+\fB-sx=3Dy\fP=20 -+.br -+ Set variable x=3Dy, overriding environment -+.PP -+\fB-tx\fP=20 -+.br -+ Rebuild x, even if it is up-to-date -+.PP -+\fB-v\fP=20 -+.br -+ Print the version of jam and exit -+.PP -+\fB--x\fP=20 -+.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-l= evel, and Chapter 6, Reference as well as the on-line help system must be use= d to obtain low-level documentation (see --help) -+.PP -+\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a b= uild 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 =C3=A2=C2=80= =C2=9CInitialization=C3=A2=C2=80=C2=9D -+.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, w= ith 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 s= cheduled build action commands -+.PP -+.PP -+So, to be able to successfully use \fIBoost\&.Build\fP, you need to know on= ly 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/h= tml/bbv2/overview/targets.html) -+.IP "\(bu" 2 -+How the build process works (http://www.boost.org/boost-build2/doc/html/bbv= 2/overview/build_process.html) -+.PP -+.PP -+Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called = =C3=A2=C2=80=C2=9CBoost\&.Jam Language=C3=A2=C2=80=C2=9D (http://www.boost.or= g/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 s= ection\&. The best way to explain the concepts is by comparison with more cla= ssical build tools -+.PP -+When using any flavour of make, you directly specify targets and commands t= hat 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 com= mands, options, and sets of created targets depending on the used compiler an= d operating system\&. -+.PP -+To improve portability, most modern build system provide a set of higher-le= vel functions that can be used in build description files\&. Consider this ex= ample: -+.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\&. Ofte= n, change in any build property requires complete reconfiguration of the buil= d tree -+.PP -+In order to support true multivariant builds, Boost\&.Build introduces the = concept of metatarget=C3=A2=C2=80=C2=94object that is created when build desc= ription is parsed and can be later called with specific build properties to g= enerate 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=3Dgcc toolset=3Dmsvc -+.br -+.PP -+In that case, the metatarget will be called twice, once with toolset=3Dgcc = and once with toolset=3Dmsvc\&. Both invocations will produce concrete target= s, that will have different extensions and use different command lines\&. Ano= ther key concept is build property\&. Build property is a variable that affec= ts the build process\&. It can be specified on the command line, and is passe= d 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 providin= g 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 'to= p-level' metatargets are called with the properties specified on the command = line Each metatarget can elect to augment or override some properties (in par= ticular, using the requirements mechanism, see the section called =C3=A2=C2= =80=C2=9CRequirements=C3=A2=C2=80=C2=9D: http://www.boost.org/boost-build2/do= c/html/bbv2/overview/targets.html#bbv2.overview.targets.requirements) Then, t= he dependency metatargets are called with modified properties and produce con= crete targets that are then used in build process Of course, dependency metat= argets maybe in turn modify build properties and have dependencies of their o= wn\&. -+.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/0= 4_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 dir= ectly on Internet: -+.br -+ http://www.boost.org/LICENSE_1_0.txt=20 diff --git a/boost/patches/boost-1.50.0-fix-non-utf8-files.patch b/boost/patc= hes/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/autopr= efixes.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 - { - static const char* name() { return("EUR"); } -- static const char* symbol() { return("=C2=80"); } -+ static const char* symbol() { return("=C3=A2=C2=82=C2=AC"); } - }; -=20 - int main() -@@ -140,7 +140,7 @@ int main() -=20 - quantity ce =3D 2048. * euro_base_unit::unit_t= ype(); - cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR -- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k=C2= =80 -+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k=C3= =A2=C2=82=C2=AC -=20 -=20 - return 0; diff --git a/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.pa= tch 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/t= est/exec.cpp ---- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0= 200 -+++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +01= 00 -@@ -56,6 +56,20 @@ void eval_test() - BOOST_TEST(value =3D=3D "ABCDEFG"); - } -=20 -+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() - ) =3D=3D -1)=20 - throw std::runtime_error("Failed to add embedded_hello to the interpret= er's " - "builtin modules"); -+ -+ PyCtx ctx; - // Retrieve the main module - python::object main =3D python::import("__main__"); - =20 -@@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=3Dfal - } - } -=20 -+template -+bool -+run_and_handle_exception(Cb cb, bool pyerr_expected =3D 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 =3D=3D 2 || argc =3D=3D 3); - std::string script =3D argv[1]; -- // Initialize the interpreter -- Py_Initialize(); -=20 -- 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(); -- } -- =20 -- 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."); -- } -=20 - 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(); - } -=20 -- // Boost.Python doesn't support Py_Finalize yet. -- // Py_Finalize(); - return boost::report_errors(); - } -=20 - -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 on : ; -=20 - # Declare flags and action for compilation. --toolset.flags gcc.compile OPTIONS off : -O0 ; --toolset.flags gcc.compile OPTIONS speed : -O3 ; --toolset.flags gcc.compile OPTIONS space : -Os ; -+toolset.flags gcc.compile OPTIONS off : ; -+toolset.flags gcc.compile OPTIONS speed : ; -+toolset.flags gcc.compile OPTIONS space : ; -=20 --toolset.flags gcc.compile OPTIONS off : -fno-inline ; --toolset.flags gcc.compile OPTIONS on : -Wno-inline ; --toolset.flags gcc.compile OPTIONS full : -finline-functions -Wno-= inline ; -+toolset.flags gcc.compile OPTIONS off : ; -+toolset.flags gcc.compile OPTIONS on : ; -+toolset.flags gcc.compile OPTIONS full : ; -=20 --toolset.flags gcc.compile OPTIONS off : -w ; --toolset.flags gcc.compile OPTIONS on : -Wall ; --toolset.flags gcc.compile OPTIONS all : -Wall -pedantic ; -+toolset.flags gcc.compile OPTIONS off : ; -+toolset.flags gcc.compile OPTIONS on : ; -+toolset.flags gcc.compile OPTIONS all : ; - toolset.flags gcc.compile OPTIONS on : -Werror ; -=20 - toolset.flags gcc.compile OPTIONS on : -g ; -@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc -=20 - actions compile.c++ bind PCH_FILE - { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTION= S) $(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)" - } -=20 - actions compile.c bind PCH_FILE -@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE -=20 - actions compile.c++.preprocess bind PCH_FILE - { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTION= S) $(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)" - } -=20 - 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 =3D sizeof(T) + -1 }; - #elif defined(__MWERKS__) - void f(int); --#else=20 -- enum { -- n =3D --# if defined(__EDG_VERSION__) -- aux::dependent_unsigned::value > -1 --# else=20 -- sizeof(T) > -1 --# endif=20 -- }; --#endif=20 -+#elif defined(__EDG_VERSION__) -+ enum { n =3D aux::dependent_unsigned::value > -1 }; -+#elif defined(BOOST_GCC) -+ enum { n1 }; -+ enum { n2 }; -+ enum { n =3D n1 !=3D n2 }; -+#else -+ enum { n =3D sizeof(T) > -1 }; -+#endif - }; -=20 - #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/patc= hes/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.000000= 000 +0200 -+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413= 877 +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) ; -=20 -@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?=20 - } - } -=20 -- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : = $(condition) : $(extension-suffix) ; -+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : = $(condition) : $(extension-suffix) : $(abi-letters) ; -=20 - project.pop-current ; - } -@@ -653,7 +653,7 @@ local rule system-library-dependencies ( -=20 - # Declare a target to represent Python's library. - # --local rule declare-libpython-target ( version ? : requirements * ) -+local rule declare-libpython-target ( version ? : requirements * : abi-lett= ers ? ) - { - # Compute the representation of Python version in the name of Python's - # library file. -@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve - } -=20 - # Declare it. -- lib python.lib : : python$(lib-version) $(requirements) ; -+ lib python.lib : : python$(lib-version)$(abi-letters) $(requireme= nts) ; - } -=20 -=20 - # 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 ?=3D _d ; - } - extension-suffix ?=3D "" ; -+ abi-letters ?=3D "" ; -=20 - # 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) : $(ab= i-letters) ; -=20 - # This is an evil hack. On, Windows, when Python is embedded, noth= ing - # 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/pa= tches/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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- 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/p= atches/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/gramm= ar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/gramma= r.ipp ---- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ip= p~ 2014-10-13 12:21:40.000000000 +0200 -+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ip= p 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 helper_base_t; - typedef grammar_helper_list helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator= _t; -=20 - helper_list_t& helpers =3D - grammartract_helper_list::do_(self); -=20 - # if defined(BOOST_INTEL_CXX_VERSION) -+ typedef typename helper_list_t::vector_t::reverse_iterator iterator= _t; - for (iterator_t i =3D helpers.rbegin(); i !=3D 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/patch= es/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/tes= t/Jamfile.v2 ---- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0= 100 -+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +01= 00 -@@ -28,17 +28,17 @@ - local Werr =3D gcc:on msvc:on ; -=20 - test-suite pool : -- [ run test_simple_seg_storage.cpp : : : $(Werr) msvc:-wd4267 ] -- [ run test_pool_alloc.cpp : : : $(Werr) ] -- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) msvc:-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) msvc:-wd4267 /boost/system//boost_system ] -+ [ run test_pool_alloc.cpp : : : $(Werr) /boost/system//boost_s= ystem ] -+ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) msvc:-wd4512 /boost/system//boost_system ] -+ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) /boost/syste= m//boost_system ] -+ [ run test_bug_3349.cpp : : : $(Werr) /boost/system//boost_sys= tem ] -+ [ run test_bug_4960.cpp : : : $(Werr) /boost/system//boost_sys= tem ] -+ [ run test_bug_1252.cpp : : : $(Werr) /boost/system//boost_sys= tem ] -+ [ run test_bug_2696.cpp : : : $(Werr) /boost/system//boost_sys= tem ] -+ [ run test_bug_5526.cpp : : : $(Werr) /boost/system//boost_sys= tem ] - [ run test_threading.cpp : : : multi /boost/thread/= /boost_thread ] -- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ] -+ [ run ../example/time_pool_alloc.cpp : : : $(Werr) /boost/sys= tem//boost_system ] - [ compile test_poisoned_macros.cpp : $(Werr) ] -=20 - # diff --git a/boost/patches/boost-1.58.0-pool.patch0 b/boost/patches/boost-1.5= 8.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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- boost/pool/pool.hpp (revision 78317) -+++ boost/pool/pool.hpp (revision 78326) -@@ -27,4 +27,6 @@ - #include -=20 -+// std::numeric_limits -+#include - // boost::integer::static_lcm - #include -@@ -358,4 +360,11 @@ - } -=20 -+ 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 =3D alloc_size(); -+ size_type POD_size =3D integer::static_lcm::value + sizeof(size_type); -+ return (std::numeric_limits::max() - POD_size) / alloc_siz= e(); -+ } -+ - 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 o= ne block. -+ //! \param nmax_size is the maximum number of chunks to allocate in o= ne block. =09 -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } -=20 -@@ -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 tha= t object needs to allocate system memory. This value should never be set to 0. -- //! \returns nnext_size. -- next_size =3D start_size =3D nnext_size; -+ { //! Set number of chunks to request from the system the next time tha= t object needs to allocate system memory. This value should never be set to 0= . =20 -+ BOOST_USING_STD_MIN(); -+ next_size =3D start_size =3D min BOOST_PREVENT_MACRO_SUBSTITUTION(nne= xt_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 =3D nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size =3D min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chun= ks()); - } - size_type get_requested_size() const -@@ -713,7 +727,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<=3D 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size =3D 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)); -=20 - // initialize it, -@@ -753,7 +767,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<=3D 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size =3D 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)); -=20 - // 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; -=20 - const size_type partition_size =3D alloc_size(); -@@ -845,7 +861,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<=3D 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size =3D 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)); -=20 - // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- 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 =C3=83=C2=89tienne Dupuis -+*=20 -+* Use, modification and distribution is subject to the=20 -+* 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 -+#include -+ -+int main() -+{ -+ boost::pool<> p(1024, std::numeric_limits::max() / 768); -+ -+ void *x =3D p.malloc(); -+ BOOST_ASSERT(!x); -+ =20 -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >=3D p.get_next_si= ze()); -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >=3D p.get_max_siz= e()); -+ -+ void *y =3D p.ordered_malloc(std::numeric_limits::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 -Date: Mon Sep 14 15:05:24 2015 +0100 - - Do not qualify names that might be macros. - -diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/t= est/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 ) -=20 - 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 =3D ::feenableexcept( mask ); -+ feclearexcept(BOOST_FPE_ALL); -+ int res =3D feenableexcept( mask ); - return res =3D=3D -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; - #else - /* Not Implemented */ -@@ -1417,8 +1417,8 @@ disable( unsigned mask ) -=20 - 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 =3D ::fedisableexcept( mask ); -+ feclearexcept(BOOST_FPE_ALL); -+ int res =3D fedisableexcept( mask ); - return res =3D=3D -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 -=20 - actions link bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=3D-R)$(SPACE)-= Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROU= P) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PF= X) -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$(FINDLI= BS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } -=20 -=20 -@@ -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=3D-R)$(SPACE)-= Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SON= AME_OPTION)$(SPACE)-Wl,$(<[-1]:D=3D) -shared $(START-GROUP) "$(>)" "$(LIBRARI= ES)" $(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=3D) -shared $(= START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FIND= LIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } -=20 - 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 = # +############################################################################= ### + +name =3D compat-ncurses +version =3D 5.9 +revision =3D 20150117 +release =3D 12.%{revision} +thisapp =3D ncurses-%{version}-%{revision} + +groups =3D System/Base +url =3D http://invisible-island.net/ncurses/ncurses.html +license =3D MIT +summary =3D 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 =3D ftp://invisible-island.net/ncurses/current/ +sources =3D %{thisapp}.tgz + +build + requires + gcc-c++ + end + + configure_options +=3D \ + --with-shared \ + --without-debug \ + --without-ada \ + --with-ospeed=3Dunsigned \ + --with-chtype=3Dlong \ + --enable-hard-tabs \ + --enable-xmc-glitch \ + --enable-colorfgbg \ + --with-terminfo-dirs=3D%{sysconfdir}/terminfo:%{datadir}/terminfo \ + --enable-overwrite \ + --enable-pc-files \ + --with-termlib=3Dtinfo + + export PKG_CONFIG_LIBDIR=3D%{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=3D%{BUILDROOT} install.libs + rm -rvf %{BUILDROOT}%{libdir}/libtinfo.* + make -C widec DESTDIR=3D%{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=3D$(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 =3D %{thisver} + end + + obsoletes + ncurses-libs <=3D %{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 @@ ############################################################################= ### =20 name =3D dhcp -version =3D 4.3.5b1 +version =3D 4.4.1 release =3D 1 =20 groups =3D Networking/Daemons @@ -37,6 +37,8 @@ build =20 CFLAGS +=3D -fno-strict-aliasing =20 + PARALLELISMFLAGS =3D # No parallel build. + configure_options +=3D \ --sysconfdir=3D%{sysconfdir}/dhcp \ --with-srv-lease-file=3D/var/lib/dhcpd/dhcpd.leases \ @@ -50,8 +52,6 @@ build --with-relay-pid-file=3D/run/dhcrelay.pid \ --with-ldap \ --with-ldapcrypto \ - --with-libbind=3D/usr/include/ \ - --with-libbind-libs=3D/usr/lib/ \ --disable-static \ --enable-paranoia \ --enable-early-chroot \ @@ -59,9 +59,6 @@ build --with-systemd =20 prepare_cmds - # Remove bundled BIND source - rm -rvf %{DIR_APP}/bind/bind.tar.gz - # Regenerate build environment autoreconf --verbose --force --install =20 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 +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]; -=20 + +// get BUG_REPORT_URL from /etc/os-release +char * bug_report_url(void) { + FILE * file =3D fopen("/etc/os-release", "r"); @@ -41,17 +52,17 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/o= mapip/errwarn.c + + /* Log an error message, then exit... */ -=20 + 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, ... ) } -=20 + log_error ("%s", ""); - log_error ("If you think you have received this message due to a bug rath= er"); - log_error ("than a configuration issue please read the section on submitt= ing"); - log_error ("bugs on either our web page at www.isc.org or in the README f= ile"); - 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/oma= pip/errwarn.c + log_error ("%s", bug_report_url()); log_error ("%s", ""); log_error ("exiting."); -=20 + +-- +2.14.5 diff --git a/dhcp/patches/0001-dhcp-remove-bind.patch b/dhcp/patches/0001-dhc= p-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/Mak= efile.am ---- dhcp-4.3.5b1/client/Makefile.am.remove-bind 2016-08-26 20:19:53.00000000= 0 +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 =3D . tests -=20 --BINDLIBDIR =3D @BINDDIR@/lib -- - AM_CPPFLAGS =3D -DCLIENT_PATH=3D'"PATH=3D$(sbindir):/sbin:/bin:/usr/sbin:/u= sr/bin"' \ - -DLOCALSTATEDIR=3D'"$(localstatedir)"' -=20 -@@ -15,7 +13,7 @@ dhclient_SOURCES =3D clparse.c dhclient.c - scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt --dhclient_LDADD =3D ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/l= ibirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+dhclient_LDADD =3D ../common/libdhcp.a ../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS =3D dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST =3D $(man_MANS) -diff -up dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind dhcp-4.3.5b1/comm= on/tests/Makefile.am ---- dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.00= 0000000 +0200 -+++ dhcp-4.3.5b1/common/tests/Makefile.am 2016-09-12 17:07:42.168232452 +0200 -@@ -1,7 +1,5 @@ - SUBDIRS =3D . -=20 --BINDLIBDIR =3D @BINDDIR@/lib -- - AM_CPPFLAGS =3D $(ATF_CFLAGS) -I$(top_srcdir)/includes -=20 - EXTRA_DIST =3D Atffile -@@ -15,26 +13,26 @@ ATF_TESTS +=3D alloc_unittest dns_unittest - alloc_unittest_SOURCES =3D test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c - alloc_unittest_LDADD =3D $(ATF_LDFLAGS) - alloc_unittest_LDADD +=3D ../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 -=20 - dns_unittest_SOURCES =3D dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - dns_unittest_LDADD =3D $(ATF_LDFLAGS) - dns_unittest_LDADD +=3D ../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 -=20 - misc_unittest_SOURCES =3D misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - misc_unittest_LDADD =3D $(ATF_LDFLAGS) - misc_unittest_LDADD +=3D ../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 -=20 - ns_name_unittest_SOURCES =3D ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c - ns_name_unittest_LDADD =3D $(ATF_LDFLAGS) - ns_name_unittest_LDADD +=3D ../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 -=20 - check: $(ATF_TESTS) - @if test $(top_srcdir) !=3D ${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=3D - BINDSRCDIR=3D - AC_ARG_WITH(libbind, -- AS_HELP_STRING([--with-libbind=3DPATH],[bind includes and libraries are in= PATH -- (default is ./bind)]), -+ AS_HELP_STRING([--with-libbind=3DPATH],[bind includes are in PATH -+ (default is ./bind/includes)]), - use_libbind=3D"$withval", use_libbind=3D"no") - case "$use_libbind" in -+yes|no) -+ libbind=3D"\${top_srcdir}/bind/include" -+ ;; -+*) -+ libbind=3D"$use_libbind" -+ ;; -+esac -+ -+BIND9_LIBDIR=3D'-L$(top_builddir)/bind/lib' -+AC_ARG_WITH(libbind-libs, -+ AC_HELP_STRING([--with-libbind-libs=3DPATH], -+ [bind9 export libraries are in PATH]), -+ [libbind_libs=3D"$withval"], [libbind_libs=3D'no']) -+case "$libbind_libs" in - yes) -- BINDDIR=3D"\${top_srcdir}/bind" -- BINDSRCDIR=3D"\${top_srcdir}/bind" -+ AC_MSG_ERROR([Specify path to bind9 libraries]) - ;; - no) -- BINDDIR=3D"\${top_srcdir}/bind" -- BINDSRCDIR=3D"\${top_srcdir}/bind" -+ BUNDLED_BIND=3Dyes - ;; - *) -- BINDDIR=3D"$use_libbind" -+ BIND9_LIBDIR=3D"-L$libbind_libs" -+ BUNDLED_BIND=3Dno - 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" =3D yes]) -+AC_SUBST([BIND9_LIBDIR]) -=20 - # OpenLDAP support. - AC_ARG_WITH(ldap, -@@ -788,7 +801,7 @@ fi - CFLAGS=3D"$CFLAGS $STD_CWARNINGS" -=20 - # Try to add the bind and dhcp include directories --CFLAGS=3D"$CFLAGS -I\$(top_srcdir)/includes -I$BINDDIR/include" -+CFLAGS=3D"$CFLAGS -I$libbind" -=20 - case "$host" in - *-darwin*) -diff -up dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.3.5b1/dhcpctl/M= akefile.am ---- dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind 2016-08-26 20:19:53.0000000= 00 +0200 -+++ dhcp-4.3.5b1/dhcpctl/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,5 +1,3 @@ --BINDLIBDIR =3D @BINDDIR@/lib -- - bin_PROGRAMS =3D omshell - lib_LIBRARIES =3D libdhcpctl.a - noinst_PROGRAMS =3D cltest -@@ -8,12 +6,10 @@ EXTRA_DIST =3D $(man_MANS) -=20 - omshell_SOURCES =3D omshell.c - omshell_LDADD =3D 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-ex= port -=20 - libdhcpctl_a_SOURCES =3D dhcpctl.c callback.c remote.c -=20 - cltest_SOURCES =3D cltest.c - cltest_LDADD =3D 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-exp= ort -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 =3D RELNOTES LICENSE \ - bind/Makefile.in bind/bind.tar.gz bind/version.tmp \ - common/tests/Atffile server/tests/Atffile -=20 --SUBDIRS =3D @BINDSRCDIR@ includes tests common omapip client dhcpctl relay = server -+if BUNDLED_BIND -+SUBDIRS =3D bind -+else -+SUBDIRS =3D=20 -+endif -+ -+SUBDIRS +=3D includes tests common omapip client dhcpctl relay server -=20 - nobase_include_HEADERS =3D dhcpctl/dhcpctl.h -=20 -diff -up dhcp-4.3.5b1/omapip/Makefile.am.remove-bind dhcp-4.3.5b1/omapip/Mak= efile.am ---- dhcp-4.3.5b1/omapip/Makefile.am.remove-bind 2016-08-26 20:19:53.00000000= 0 +0200 -+++ dhcp-4.3.5b1/omapip/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,5 +1,3 @@ --BINDLIBDIR =3D @BINDDIR@/lib -- - lib_LIBRARIES =3D libomapi.a - noinst_PROGRAMS =3D svtest -=20 -@@ -12,6 +10,6 @@ man_MANS =3D omapi.3 - EXTRA_DIST =3D $(man_MANS) -=20 - svtest_SOURCES =3D test.c --svtest_LDADD =3D libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+svtest_LDADD =3D libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-exp= ort -=20 -diff -up dhcp-4.3.5b1/relay/Makefile.am.remove-bind dhcp-4.3.5b1/relay/Makef= ile.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 =3D @BINDDIR@/lib -- - AM_CPPFLAGS =3D -DLOCALSTATEDIR=3D'"@localstatedir@"' -=20 - sbin_PROGRAMS =3D dhcrelay - dhcrelay_SOURCES =3D dhcrelay.c - dhcrelay_LDADD =3D ../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 =3D dhcrelay.8 - EXTRA_DIST =3D $(man_MANS) -=20 -diff -up dhcp-4.3.5b1/server/Makefile.am.remove-bind dhcp-4.3.5b1/server/Mak= efile.am ---- dhcp-4.3.5b1/server/Makefile.am.remove-bind 2016-08-26 20:19:53.00000000= 0 +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 =3D . tests -=20 --BINDLIBDIR =3D @BINDDIR@/lib -- - AM_CPPFLAGS =3D -I.. -DLOCALSTATEDIR=3D'"@localstatedir@"' -=20 - dist_sysconf_DATA =3D dhcpd.conf.example -@@ -15,10 +13,9 @@ dhcpd_SOURCES =3D dhcpd.c dhcp.c bootp.c c - dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c -=20 - dhcpd_CFLAGS =3D $(LDAP_CFLAGS) --dhcpd_LDADD =3D ../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 =3D ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcp= ctl.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-expo= rt \ -+ $(LDAP_LIBS) -=20 - man_MANS =3D dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - EXTRA_DIST =3D $(man_MANS) -diff -up dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind dhcp-4.3.5b1/serv= er/tests/Makefile.am ---- dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.00= 0000000 +0200 -+++ dhcp-4.3.5b1/server/tests/Makefile.am 2016-09-12 17:00:22.799902249 +0200 -@@ -1,9 +1,7 @@ - SUBDIRS =3D . -=20 --BINDLIBDIR =3D @BINDDIR@/lib -- - AM_CPPFLAGS =3D $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes --AM_CPPFLAGS +=3D -I(a)BINDDIR@/include -I$(top_srcdir) -+AM_CPPFLAGS +=3D -I$(top_srcdir) - AM_CPPFLAGS +=3D -DLOCALSTATEDIR=3D'"."' -=20 - EXTRA_DIST =3D Atffile -@@ -20,9 +18,8 @@ DHCPSRC =3D ../dhcp.c ../bootp.c ../confpa - ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c -=20 - DHCPLIBS =3D $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/liboma= pi.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 -=20 - ATF_TESTS =3D - if HAVE_ATF diff --git a/dhcp/patches/0004-dhcp-dhclient-options.patch b/dhcp/patches/000= 2-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 +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 =3D 7200; + /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache) + */ + top_level_config.requested_lease =3D 7200; + top_level_config.bootp_broadcast_always =3D 0; -=20 - 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 */ -=20 + 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; -=20 + 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 =3D next_token(&val, (unsigned*)0, cfile); + config -> bootp_broadcast_always =3D 1; + parse_semi (cfile); + return; + -=20 - default: - lose =3D 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 =3D 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\ -+Specify the dhcp-client-identifier option to send to the DHCP server. -+ -+.TP -+.BI \-H\ -+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\ -+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\ -+Specify the vendor-class-identifier option to send to the DHCP server. -+ -+.TP -+.BI \--request-options\