Compare commits

...

34 Commits

Author SHA1 Message Date
Peter Korsgaard
fc1c7e5961 Update for 2019.11-rc3
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-24 11:15:16 +01:00
Fabrice Fontaine
964d31a99e package/tftpd: add license
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-24 09:26:02 +01:00
Thomas Petazzoni
14c3e876d3 package/faifa: fix incorrect library symlink
As spotted in
http://autobuild.buildroot.net/results/a61/a612cb7a85927d8cfe55c95c34d2901e7694fab0//diffoscope-results.txt,
faifa installs a library symlink with an incorrect target, which was
detected by the reproducible build logic, but is in fact wrong in any
case:

-lrwxrwxrwx   0        0        0        0 2019-11-07 19:38:04.000000 ./usr/lib/libfaifa.so -> /home/naourr/work/instance-3/output-1/target/usr/lib/libfaifa.so.0
+lrwxrwxrwx   0        0        0        0 2019-11-07 19:38:04.000000 ./usr/lib/libfaifa.so -> /home/naourr/work/instance-3/output-2/target/usr/lib/libfaifa.so.0

In practice, this is not a problem at runtime, as the .so symlink is
not used: the library soname is libfaifa.so.0. However, it still makes
sense to fix.

It is fixed by backporting an upstream commit. We considered bumping
to a newer version, but the latest version requires a new dependency
(libevent), so we preferred the backporting approach.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-23 22:29:10 +01:00
Jérémy Rosen
d3af5d7040 package/systemd: bump to v243.4
Upstream systemd-stable has started tagging point releses.

The commit we currently used has now been tagged as v243.3, and this
brings us to v243.4.

Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
[yann.morin.1998@free.fr:
  - expand commit log to explain previous version
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-23 22:23:12 +01:00
Titouan Christophe
dfcb5fc9c9 package/redis: bump to version 5.0.7
Changes announced upstream:

Upgrade urgency HIGH: many issues fixed, some may have an impact.
Redis 5.0.7 fixes a number of bugs, none is very critical, however
there are a few that may have an impact. It's a good idea to upgrade.
There are fixes in the area of replication from modules commands and
callbacks, AOF fsync (non critical issue), memory leaks (very rare and small),
streams beahvior (non critical), and a potential crash in commands
processing multiple keys at the same time that is there for years, and happens
very rarely, but is not impossible to trigger.

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-23 21:35:42 +01:00
Peter Korsgaard
b3aaa725f1 package/asterisk: security bump to version 16.6.2
Fixes the following security vulnerabilities:

AST-2019-006: SIP request can change address of a SIP peer.
A SIP request can be sent to Asterisk that can change a SIP peer’s IP
address.  A REGISTER does not need to occur, and calls can be hijacked as a
result.  The only thing that needs to be known is the peer’s name;
authentication details such as passwords do not need to be known.  This
vulnerability is only exploitable when the “nat” option is set to the
default, or “auto_force_rport”.

https://downloads.asterisk.org/pub/security/AST-2019-006.pdf

AST-2019-007: AMI user could execute system commands.
A remote authenticated Asterisk Manager Interface (AMI) user without
“system” authorization could use a specially crafted “Originate” AMI request
to execute arbitrary system commands.

https://downloads.asterisk.org/pub/security/AST-2019-007.pdf

AST-2019-008: Re-invite with T.38 and malformed SDP causes crash.
If Asterisk receives a re-invite initiating T.38 faxing and has a port of 0
and no c line in the SDP, a crash will occur.

https://downloads.asterisk.org/pub/security/AST-2019-008.pdf

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-23 19:27:39 +01:00
Adam Duskett
d6d3d66d93 package/zip: add license hash
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-23 19:23:37 +01:00
Adam Duskett
9465182eb8 package/perl: add license hash
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-23 19:23:35 +01:00
Fabrice Fontaine
808a54aa3b package/spice: security bump to version 0.14.2
- Fix CVE-2019-3813: fix off-by-one error in group/slot boundary check
- Add license hash

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-23 14:27:09 +01:00
Fabrice Fontaine
371e6adc15 package/spice-protocol: bump to version 0.14.0
- This bump is needed for spice 0.14.2
- Add license hash

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-23 14:26:41 +01:00
Bernd Kuhls
a7ba9c54b4 package/php: bump version to 7.3.12
Release notes of this bugfix release:
https://www.php.net/ChangeLog-7.php#7.3.12

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-23 11:58:22 +01:00
Adrian Perez de Castro
3b8c95a08d package/webkitgtk: security bump to version 2.26.2
This is a minor release which includes fixes for CVE-2019-8812 and
CVE-2019-8814.

This release also fixes the build with WebDriver disabled and without
X11, so "0001-GTK-ANGLE-s-eglplatform.h-is-build-broken-with-DENAB.patch"
and "0002-WPE-GTK-Build-fails-with-ENABLE_WEBDRIVER-OFF.patch" are not
needed anymore (and therefore removed). There is also a performance
improvement for a regression related to fallback font selection, and a
couple of small fixes. The full release notes are available at:

  https://webkitgtk.org/2019/11/06/webkitgtk2.26.2-released.html

The detailed security advisory can be found at:

  https://webkitgtk.org/security/WSA-2019-0006.html

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-23 11:56:41 +01:00
Yegor Yefremov
01d8b65dc7 package/linux-serial-test: bump version
This update fixes both the below mentioned build error when handling
undefined baud rates, and makes the patch for MIPS obsolete.

No other changes will be introduced with this update.

Fixes:
http://autobuild.buildroot.net/results/ef77cbe220619050eb9d46c78ae79a94eea8aa8b

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-23 11:44:51 +01:00
Fabrice Fontaine
40eccec533 package/waylandpp: fix build with cmake < 3.13
Fixes:
 - http://autobuild.buildroot.org/results/587fb44ea2272bd134262716870f5ad36a18661d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2019-11-23 10:43:30 +01:00
Bernd Kuhls
c870ce5478 package/postgresql: bump version to 12.1
Release notes of the bugfix release:
https://www.postgresql.org/about/news/1994/
https://www.postgresql.org/docs/current/release-12-1.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 7a709f77c8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-23 09:41:15 +01:00
Arnout Vandecappelle (Essensium/Mind)
b8b7bd18ed package/kvm-unit-tests: really fix build on Arch Linux x86_64
On x86_64, we use the host compiler instead of the target compiler to
build kvm-unit-tests, because it is built with -m32 and our target
compiler doesn't support that.

However, the compiler on Arch Linux is broken: it *always* builds with
-fstack-protector, even when -ffreestanding is passed. However, when
-fnostdlib is passed at link time (which is normally the case when
building with -ffreestanding), it is not linked with the stack-protector
library. This leads to a link time error:

/usr/bin/ld: x86/realmode.o: in function `print_serial_u32':
.../x86/realmode.c:104: undefined reference to `__stack_chk_fail'

Since the entire package is built with -ffreestanding, it doesn't
support stack-protector at all. Therefore, simply pass
-fno-stack-protector explicitly on x86_64 to work around the bug in Arch
Linux.

Commit c0ffd16e4 tried to do this, but got the condition wrong:
-fno-stack-protector was passed in all cases *except* for x86_64. This
commit fixes that, by inverting the condition and moving the
--cross-prefix part to the else branch.

Fixes:
http://autobuild.buildroot.net/results/ca9576721214ecdce5622f2b7ec4fd4fc3699ac0/

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Matthew Weber <matthew.weber@rockwellcollins.com>
Reviewed-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Tested-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-22 23:30:52 +01:00
Bernd Kuhls
2e5d631f8f {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.3.x series
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-22 23:28:03 +01:00
Bernd Kuhls
2ee02eaaee package/{mesa3d, mesa3d-headers}: bump version to 19.2.6
Release notes of this bugfix release:
https://lists.freedesktop.org/archives/mesa-announce/2019-November/000559.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-11-22 23:24:36 +01:00
Jörg Krause
dbfd6d8194 package/libupnp18: bump to version 1.8.6
This version fixes a runtime issue which crashes gerbera:
https://github.com/gerbera/gerbera/issues/522

The issue has been reported upstream:
https://github.com/mrjimenez/pupnp/pull/122

The fix for this issue is the only "useful" commit between 1.8.5 and
1.8.6:

$ git --no-pager log --format=oneline release-1.8.5..release-1.8.6
71a47673795e9228775959ea23a984ff6c4d0a43 (tag: release-1.8.6) Adjust the library numbers for release
436aae7b617a4cd7bc1e1411d6882780699eb2ee Put the 1.8.6 release on README.md
90069231d83d2f365b76e2b15d918dfb06209970 Update README.md
7d6158d2c88245f2da4354a8bd0bc359eb15fac6 Update Changelog and THANKS
463f1cc025b27af35b0b73a05ba379d0051bcedf Fix format string for ExtraHeaders
8516da470bf32fa1f5c6f59aac3508378d5a85be Homekeeping for the next release

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-21 22:20:39 +01:00
Matt Weber
33da50f014 package/rpcbind: add systemd as a build-time dependency
When systemd support is enabled, systemd should be built before,
otherwise the build fails with:

checking for SYSTEMD... no
configure: error: libsystemd support requested but found
package/pkg-generic.mk:228: recipe for target

Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-20 22:33:07 +01:00
Petr Vorel
f749282fe6 package/ltp-testsuite: Rename older patches
* add upstream commit hash
* renumber patches

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-20 22:00:38 +01:00
Petr Vorel
eee5e432ed package/ltp-testsuite: backport 3 more musl related patches
0009-nfsv4-acl-Remove-unneeded-malloc-sizeof-FILE.patch is fixing
following reports (other 2 has not been reported due previous)

Fixes:
http://autobuild.buildroot.net/results/a38a5d8deaa365f73db427911df68dd10c6930a6
http://autobuild.buildroot.net/results/dfa173caea08876ab69dd959da146b75750cdd28
http://autobuild.buildroot.net/results/1e602f1574e9134a44d5d66838e7851b38e8069a
http://autobuild.buildroot.net/results/f1b4b129ec94795b2144b4501b4301fb20892e71

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-20 22:00:24 +01:00
Bernd Kuhls
ccca4f0954 package/clamav: security bump version to 0.102.1
Release notes:
https://lists.clamav.net/pipermail/clamav-announce/2019/000043.html

Fixes CVE-2019-15961.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-20 21:50:55 +01:00
Bernd Kuhls
386e5f0baf package/{mesa3d, mesa3d-headers}: bump version to 19.2.5
Release notes of this bugfix release:
https://lists.freedesktop.org/archives/mesa-announce/2019-November/000557.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-20 21:47:30 +01:00
Fabrice Fontaine
f581525812 package/spice: disable tests
By disabling tests, we'll remove the optional gdk-pixbuf dependency

Fixes:
 - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-19 17:27:21 +01:00
Fabrice Fontaine
502d55fc2d package/lxc: fix build without SSP
Fixes:
 - http://autobuild.buildroot.org/results/57945f54ffbc5c8764b6891a4516c4907e56ab97

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 23:23:44 +01:00
Avi Shukron
051266c0f5 package/qemu: add host-python3 as an explicit dependency
qemu requires python in its configre script. Yet host-python was
not listed as one of the package's dependencies. If no other package
requested host-python, then configuring this package will fail since
it won't find any executable named python in the host dir.

In order to reproduce this issue you must not have python2 installed
on your host machine.

Signed-off-by: Avi Shukron <avraham.shukron@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 23:22:06 +01:00
Bartosz Bilas
61d35fb727 package/rauc: add systemd service file hook
Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 22:50:51 +01:00
Fabrice Fontaine
9ae86ebece package/kmod: fix build with python 3.8
Add a patch to filter -Wl,--no-undefined as -Wl,-z,undefs was only
added in binutils 2.30, and therefore is not available in some older
toolchains, causing build failures such as:

/home/naourr/work/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-linux-gnu/7.3.1/../../../../aarch64_be-linux-gnu/bin/ld: warning: -z undefs ignored.

Fixes:
 - http://autobuild.buildroot.org/results/06a6d865b6b7d8ebd793bde214f4a4c40e0962e1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Thomas: improve commit log]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 22:24:38 +01:00
Fabrice Fontaine
ee7acf2af3 package/domoticz: fix build with jsoncpp
domoticz embeds its own version of jsoncpp that can clash with upstream
jsoncpp so retrieve upstream commit that fix this issue

Build failures started after jsoncpp bumps from 1.8.4 to 1.9.1

Fixes:
 - http://autobuild.buildroot.org/results/a73406eb780a454369ea997654b6b4c6b3757a41

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 22:16:12 +01:00
Fabrice Fontaine
ed8bfed70f package/lsof: fix static build
TARGET_LDFLAGS which contains -static is not passed so build fails on:

/home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o lsof dfile.o dmnt.o dnode.o dproc.o dsock.o dstore.o arg.o main.o misc.o node.o print.o proc.o store.o usage.o util.o -L./lib -llsof  -ltirpc
/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/8.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/8.3.0/libgcc.a(unwind-dw2-fde-dip.o): in function `_Unwind_Find_registered_FDE':
/home/buildroot/autobuild/instance-1/output-1/build/host-gcc-final-8.3.0/build/xtensa-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde.c:1040: undefined reference to `dl_iterate_phdr'
collect2: error: ld returned 1 exit status

Pass TARGET_LDFLAGS thanks to LSOF_CFGL

Fixes:
 - http://autobuild.buildroot.org/results/0c228e0d3ea1ff2d728ddc906e242d40ed973222

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 22:12:21 +01:00
Fabrice Fontaine
2618429d88 package/gerbera: bump to version 1.3.4
Fix build with libupnp18 1.8.5 through
1476d7a906

Fixes:
 - http://autobuild.buildroot.org/results/e77839fad16caa5798cacb36a5a48b3dbb822ea6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 21:26:47 +01:00
Titouan Christophe
43683d2d9b package/redis: bump to 5.0.6
The release notes at
https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES
say:

==
Upgrade urgency CRITICAL: Only in case of exposed instances to untrusted users.

This Redis release, 5.0.6, is a bugfix and enhancement release. The most
important bugfix is a corruption related to the HyperLogLog. A malformed
HyperLogLog string could cause an invalid access to the memory. At a first
glance the vulnerability appears to be not exploitable but just a DoS. The
way to trigger the issue is complex, we'll not provide any information about
how to do that for the users safety.
==

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 21:20:28 +01:00
Michael Drake
728d6800bb docs/manual/quickstart: update output directory contents documentation
Update the documentation for the output/host/ directory to mention
that it contains the sysroot for the target toolchain, as well as the
host tools required for running buildroot.

Update the staging/ documentation to reflect that it is a link to the
target toolchain sysroot in the host/ directory.

Signed-off-by: Michael Drake <michael.drake@codethink.co.uk>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-18 21:16:26 +01:00
60 changed files with 917 additions and 260 deletions

10
CHANGES
View File

@@ -1,3 +1,13 @@
2019.11-rc3, released November 24th, 2019
Fixes all over the tree.
Updated/fixed packages: asterisk, clamav, domoticz, faifa,
gerbera, kmod, kvm-unit-tests, libupnp18, linux-serial-test,
lsof, ltp-testsuite, lxc, mesa3d, mesa3d-headers, perl, php,
postgresql, qemu, rauc, redis, rpcbind, spice, spice-protocol,
systemd, tftpd, waylandpp, webkitgtk, zip
2019.11-rc2, released November 16th, 2019
Fixes all over the tree.

View File

@@ -92,9 +92,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2019.11-rc2
export BR2_VERSION := 2019.11-rc3
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1573941000
BR2_VERSION_EPOCH = 1574590000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)

View File

@@ -87,15 +87,21 @@ This directory contains several subdirectories:
target). This directory contains one subdirectory for each of these
components.
* +staging/+ which contains a hierarchy similar to a root filesystem
hierarchy. This directory contains the headers and libraries of the
cross-compilation toolchain and all the userspace packages selected
for the target. However, this directory is 'not' intended to be
the root filesystem for the target: it contains a lot of development
files, unstripped binaries and libraries that make it far too big
for an embedded system. These development files are used to compile
libraries and applications for the target that depend on other
libraries.
* +host/+ contains both the tools built for the host, and the sysroot
of the target toolchain. The former is an installation of tools
compiled for the host that are needed for the proper execution of
Buildroot, including the cross-compilation toolchain. The latter
is a hierarchy similar to a root filesystem hierarchy. It contains
the headers and libraries of all user-space packages that provide
and install libraries used by other packages. However, this
directory is 'not' intended to be the root filesystem for the target:
it contains a lot of development files, unstripped binaries and
libraries that make it far too big for an embedded system. These
development files are used to compile libraries and applications for
the target that depend on other libraries.
* +staging/+ is a symlink to the target toolchain sysroot inside
+host/+, which exists for backwards compatibility.
* +target/+ which contains 'almost' the complete root filesystem for
the target: everything needed is present except the device files in
@@ -111,10 +117,6 @@ This directory contains several subdirectories:
development files (headers, etc.) are not present, the binaries are
stripped.
* +host/+ contains the installation of tools compiled for the host
that are needed for the proper execution of Buildroot, including the
cross-compilation toolchain.
These commands, +make menuconfig|nconfig|gconfig|xconfig+ and +make+, are the
basic ones that allow to easily and quickly generate images fitting
your needs, with all the features and applications you enabled.

View File

@@ -76,37 +76,37 @@
</div>
</div>
<h3 style="text-align: center;">Latest release candidate: <b>2019.11-rc2</b></h3>
<h3 style="text-align: center;">Latest release candidate: <b>2019.11-rc3</b></h3>
<div class="row mt centered">
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2019.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2019.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2019.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2019.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2019.11-rc2.tar.gz">buildroot-2019.11-rc2.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2019.11-rc2.tar.gz.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2019.11-rc3.tar.gz">buildroot-2019.11-rc3.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2019.11-rc3.tar.gz.sign">PGP signature</a></p>
</div>
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2019.11-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2019.11-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2019.11-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2019.11-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2019.11-rc2.tar.bz2">buildroot-2019.11-rc2.tar.bz2</a></h3>
<p><a href="/downloads/buildroot-2019.11-rc2.tar.bz2.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2019.11-rc3.tar.bz2">buildroot-2019.11-rc3.tar.bz2</a></h3>
<p><a href="/downloads/buildroot-2019.11-rc3.tar.bz2.sign">PGP signature</a></p>
</div>
</div>

View File

@@ -10,6 +10,28 @@
<ul class="timeline">
<li class="timeline-inverted">
<li>
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
<div class="timeline-heading">
<h4 class="timeline-title">2019.11-rc3 released</h4>
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>24 November 2019</small></p>
</div>
<div class="timeline-body">
<p>Another week, another release candidate with more cleanups and build fixes. See the
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.11-rc3">CHANGES</a>
file for details.</p>
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2019.11-rc3.tar.bz2">2019.11-rc3
release candidate</a>, and report any problems found to the
<a href="support.html">mailing list</a> or
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
</div>
</div>
</li>
<li>
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
<div class="timeline-heading">

View File

@@ -122,7 +122,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "5.3.11" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.3.12" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.19.75-cip11" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION

View File

@@ -1,7 +1,7 @@
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 6e7156946d1d72e24786d09a47511e44c3abe5d4da757f4f68f2da482880aeb7 linux-5.3.11.tar.xz
sha256 53bff6f89dca19f928043fb0d3434bfb4b6abbb1bf18b907cb731188bdac97a0 linux-5.3.12.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 868b4a92619cb00ab142a20a67f000525b9605820d1b66faa4a183133eac0660 linux-4.19.84.tar.xz
sha256 86de4a24379a78d67fc08b2e249ccf7b689eb6c37fbe329fc3dfbe8ab4300603 linux-4.14.154.tar.xz
sha256 383fd43bd35251636232912ad52fbc844e3c8ab792cadb62b4aefe000bacbd88 linux-4.9.201.tar.xz
sha256 a78a85c4fb0c0835b01933765c984ab5ab190eac1d521338fb88b03a49641388 linux-4.4.201.tar.xz
sha256 fdacceeae22d1a0467cae50c15e6e754bfb8bb8e8010623df0d8fd78f4adb929 linux-4.4.202.tar.xz
sha256 8108ec1cd10fc40821c84e9f087dba10b1767aad66596f4a36925faef55e4ebf linux-4.9.202.tar.xz
sha256 77d61979556b81c95b81452fa10e1fe9368cbe2f9f80a13e4669b0464722e481 linux-4.14.155.tar.xz
sha256 7bf435970aeeafd46263f49730087a61c4858d8b8fc5a4002ceac971b45f4fb7 linux-4.19.85.tar.xz

View File

@@ -1,5 +1,5 @@
# Locally computed
sha256 9323f1fd41416d2d997015b2199d5507847e54da64c2e24923d75f5c283c5e83 asterisk-16.6.1.tar.gz
sha256 474cbc6f9dddee94616f8af8e097bc4d340dc9698c4165dc45be6e0be80ff725 asterisk-16.6.2.tar.gz
# sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
# sha256 locally computed

View File

@@ -4,7 +4,7 @@
#
################################################################################
ASTERISK_VERSION = 16.6.1
ASTERISK_VERSION = 16.6.2
# Use the github mirror: it's an official mirror maintained by Digium, and
# provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))

View File

@@ -1,5 +1,5 @@
# Locally calculated
sha256 48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1 clamav-0.102.0.tar.gz
sha256 0dbda8d0d990d068732966f13049d112a26dce62145d234383467c1d877dedd6 clamav-0.102.1.tar.gz
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file

View File

@@ -4,7 +4,7 @@
#
################################################################################
CLAMAV_VERSION = 0.102.0
CLAMAV_VERSION = 0.102.1
CLAMAV_SITE = https://www.clamav.net/downloads/production
CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \

View File

@@ -0,0 +1,76 @@
From 23f69284cb1ce1a98885b29a6126ebdbee735e7d Mon Sep 17 00:00:00 2001
From: Daniel Wallner <14888585+danielwallner@users.noreply.github.com>
Date: Thu, 17 Oct 2019 07:31:43 +0200
Subject: [PATCH] Fix include paths to not confuse local files with system
files (json/json.h) (#3669)
[Retrieved from:
https://github.com/domoticz/domoticz/commit/23f69284cb1ce1a98885b29a6126ebdbee735e7d]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
hardware/1Wire/1WireForWindows.cpp | 2 +-
hardware/plugins/PluginManager.cpp | 16 ++++++++--------
hardware/plugins/PluginProtocols.cpp | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hardware/1Wire/1WireForWindows.cpp b/hardware/1Wire/1WireForWindows.cpp
index cf0b42795d..2044882fb9 100644
--- a/hardware/1Wire/1WireForWindows.cpp
+++ b/hardware/1Wire/1WireForWindows.cpp
@@ -4,7 +4,7 @@
#include "1WireForWindows.h"
#include "../../main/Logger.h"
#include <boost/optional.hpp>
-#include "../json/json.h"
+#include "../../json/json.h"
#include <WS2tcpip.h>
#define _1WIRE_SERVICE_PORT "1664"
diff --git a/hardware/plugins/PluginManager.cpp b/hardware/plugins/PluginManager.cpp
index 793934121e..4276fe2fbc 100644
--- a/hardware/plugins/PluginManager.cpp
+++ b/hardware/plugins/PluginManager.cpp
@@ -14,14 +14,14 @@
#include "PluginMessages.h"
#include "PluginTransports.h"
-#include "../main/Helper.h"
-#include "../main/Logger.h"
-#include "../main/SQLHelper.h"
-#include "../main/WebServer.h"
-#include "../main/mainworker.h"
-#include "../main/EventSystem.h"
-#include "../json/json.h"
-#include "../main/localtime_r.h"
+#include "../../main/Helper.h"
+#include "../../main/Logger.h"
+#include "../../main/SQLHelper.h"
+#include "../../main/WebServer.h"
+#include "../../main/mainworker.h"
+#include "../../main/EventSystem.h"
+#include "../../json/json.h"
+#include "../../main/localtime_r.h"
#ifdef WIN32
# include <direct.h>
#else
diff --git a/hardware/plugins/PluginProtocols.cpp b/hardware/plugins/PluginProtocols.cpp
index f19731e1a4..8b1ae4c3e7 100644
--- a/hardware/plugins/PluginProtocols.cpp
+++ b/hardware/plugins/PluginProtocols.cpp
@@ -7,12 +7,12 @@
#include "PluginMessages.h"
#include "PluginProtocols.h"
-#include "../main/Helper.h"
-#include "../main/Logger.h"
-#include "../webserver/Base64.h"
+#include "../../main/Helper.h"
+#include "../../main/Logger.h"
+#include "../../webserver/Base64.h"
#include "icmp_header.hpp"
#include "ipv4_header.hpp"
-#include "../json/json.h"
+#include "../../json/json.h"
namespace Plugins {

View File

@@ -0,0 +1,32 @@
From d16abf61049947c451a6411a13fc15dda32feb47 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Sat, 6 Sep 2014 11:23:02 -0700
Subject: [PATCH] Makefile.in: fix asbolute symlink of libfaifa.so
Fixes #7
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
[Upstream: da2e279fd736d05bcd0ee6e4609c44fece017ba8]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index ba65bee..9dec7ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -98,9 +98,9 @@ install: installman strip
$(INSTALL) -m0755 hpav_cfg $(DESTDIR)$(sbindir)
$(INSTALL) -d $(DESTDIR)$(libdir)
$(INSTALL) -m0644 $(LIB_SONAME) $(DESTDIR)$(libdir)
- ln -sf $(DESTDIR)$(libdir)/$(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SHARED_SO)
$(INSTALL) -d $(DESTDIR)$(includedir)/faifa
cp $(HEADERS) $(DESTDIR)$(includedir)/faifa
+ cd $(DESTDIR)$(libdir) && ln -sf $(LIB_SONAME) $(LIB_SHARED_SO)
strip:
$(STRIP) $(APP)
--
2.23.0

View File

@@ -1,3 +1,3 @@
# Locally computed:
sha256 47515d5d9b640c31d114c74aa5532c3d6f40d6a8a60b00f1cb1cef7629d8d9db gerbera-1.3.2.tar.gz
sha256 c7fbb6104dd03ed22d114c7b1fbe95eb7f90893148630e16b0a4c23f1f631341 gerbera-1.3.4.tar.gz
sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md

View File

@@ -4,7 +4,7 @@
#
################################################################################
GERBERA_VERSION = 1.3.2
GERBERA_VERSION = 1.3.4
GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION))
GERBERA_LICENSE = GPL-2.0
GERBERA_LICENSE_FILES = LICENSE.md

View File

@@ -0,0 +1,43 @@
From 7a55f18e14f606500fdeab6bc116ec74f3e5b1c3 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 16 Nov 2019 17:40:32 +0100
Subject: [PATCH] Makefile.am: filter -Wl,--no-undefined
Commit 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 does not completely fix
the build with python 3.8 as we still get link failure due to
'-z undefs' being ignored by some versions of ld:
/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/../../../../mips-linux-gnu/bin/ld: warning: -z undefs ignored.
/home/naourr/work/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-linux-gnu/7.3.1/../../../../aarch64_be-linux-gnu/bin/ld: warning: -z undefs ignored.
So filter -Wl,--no-undefined to fix the issue
Fixes:
- http://autobuild.buildroot.org/results/e9645d9969481b09f507f6e0d0b35faaa283eb60
- http://autobuild.buildroot.org/results/06a6d865b6b7d8ebd793bde214f4a4c40e0962e1
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 8e9c90d..47505c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,7 +173,10 @@ CPYTHON_MODULE_CFLAGS = \
$(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \
$(PYTHON_NOWARN) $(PYTHON_CFLAGS) \
-fvisibility=default
-CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs
+# Filter -Wl,--no-undefined to fix build with python 3.8
+comma = ,
+CPYTHON_MODULE_LDFLAGS = $(subst -Wl$(comma)--no-undefined,,$(AM_LDFLAGS))
+CPYTHON_MODULE_LDFLAGS += -module -avoid-version -shared
if BUILD_PYTHON
pkgpyexec_LTLIBRARIES = \
--
2.24.0

View File

@@ -35,13 +35,14 @@ KVM_UNIT_TESTS_CONF_OPTS =\
# compiler. However, for x86-64, we use the host compiler, as
# kvm-unit-tests builds 32 bit code, which Buildroot toolchains for
# x86-64 cannot do.
ifneq ($(BR2_x86_64),y)
KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)"
ifeq ($(BR2_x86_64),y)
# Arch Linux adds -fstack-protector even when building with -ffreestanding, but
# it doesn't link with the stack-protector library when -nostdlib is passed,
# which leads to a link error. Therefore, disable it explicitly to work around
# this bug in Arch Linux. https://bugs.archlinux.org/task/64270
KVM_UNIT_TESTS_MAKE_OPTS += EXTRA_CFLAGS=-fno-stack-protector
else
KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)"
endif
define KVM_UNIT_TESTS_CONFIGURE_CMDS

View File

@@ -1,5 +1,5 @@
# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.5/libupnp-1.8.5.tar.bz2.sha1
sha1 4d687f8f7d6279fddc4c6faff7f5e3513e765d8a libupnp-1.8.5.tar.bz2
# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.6/libupnp-1.8.6.tar.bz2.sha1
sha1 6132a949d7536dac835172609d1def1e7f2bd232 libupnp-1.8.6.tar.bz2
# Locally computed:
sha256 55c4c30543b4cdaff3ed3a1c72bf118173369e9009eeed0bbd6e2ae62c6f0e93 libupnp-1.8.5.tar.bz2
sha256 65faf240f8ccee50cc0e7fe7fb21dcd79f743fc227a9b652b091f50f6956c2c7 libupnp-1.8.6.tar.bz2
sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING

View File

@@ -4,7 +4,7 @@
#
################################################################################
LIBUPNP18_VERSION = 1.8.5
LIBUPNP18_VERSION = 1.8.6
LIBUPNP18_SOURCE = libupnp-$(LIBUPNP18_VERSION).tar.bz2
LIBUPNP18_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libupnp-$(LIBUPNP18_VERSION)
LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no

View File

@@ -305,11 +305,11 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.4.201" if BR2_KERNEL_HEADERS_4_4
default "4.9.201" if BR2_KERNEL_HEADERS_4_9
default "4.14.154" if BR2_KERNEL_HEADERS_4_14
default "4.19.84" if BR2_KERNEL_HEADERS_4_19
default "5.3.11" if BR2_KERNEL_HEADERS_5_3
default "4.4.202" if BR2_KERNEL_HEADERS_4_4
default "4.9.202" if BR2_KERNEL_HEADERS_4_9
default "4.14.155" if BR2_KERNEL_HEADERS_4_14
default "4.19.85" if BR2_KERNEL_HEADERS_4_19
default "5.3.12" if BR2_KERNEL_HEADERS_5_3
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \

View File

@@ -1,54 +0,0 @@
From c34767aa22623a21369f1464c52fc4635895223c Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 8 Nov 2019 18:25:35 +0100
Subject: [PATCH] linux-serial-test.c: fix missing CMSPAR define on MIPS
This patch is an adaptation of
https://git.busybox.net/buildroot/diff/package/freerdp/0003-add-missing-define.patch?id=78cd32631e959e04b1a2f18be7b0757e21482438
linux-serial-test.c uses CMSPAR, which is defined by glibc in
bits/termios.h.
glibc has two flavours of bits/termios.h: a generic one and an
architecture-specific one. When installing, glibc will install the
architecture-specific file if it exists, otherwise it installs the
generic file. Only Alpha, MIPS, PPC and Sparc have their own
bits/termios.h.
The generic bits/termios.h, as well as the Alpha, PPC and Sparc flavours
do define CMSPAR. However, the MIPS flavour does not define it.
Define CMSPAR to the value from the generic value, which is also the
value known to the Linux kernel for MIPS.
Fixes:
- http://autobuild.buildroot.org/results/1350cc46dcb285772b1a4c90aec6ba38fdb11e3c
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/cbrake/linux-serial-test/pull/20]
---
linux-serial-test.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/linux-serial-test.c b/linux-serial-test.c
index 5e7504e..0d4a919 100644
--- a/linux-serial-test.c
+++ b/linux-serial-test.c
@@ -17,6 +17,14 @@
#include <linux/serial.h>
#include <errno.h>
+/*
+ * glibc for MIPS has its own bits/termios.h which does not define
+ * CMSPAR, so we vampirise the value from the generic bits/termios.h
+ */
+#ifndef CMSPAR
+#define CMSPAR 010000000000
+#endif
+
// command line args
int _cl_baud = 0;
char *_cl_port = NULL;
--
2.23.0

View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 edbb3ec1f287ec0fb96bac4e6a580a024af1d16b767a15f3c1b0163ff518fb71 linux-serial-test-5d11b31d9c9807cd58e53a8628bc6402b6fe7fac.tar.gz
sha256 bfc25088e960c18e151f978b13d893dbee9a3e377e062bd56caab1bd409e4dcb linux-serial-test-13bea838f2a7573d2a68a6d95fc9d1f153b580be.tar.gz
sha256 a2a6760c2c6fa779a635e4a7ad00f668862ebcadb2a8a57d16662543e103e08c LICENSES/MIT

View File

@@ -4,7 +4,7 @@
#
################################################################################
LINUX_SERIAL_TEST_VERSION = 5d11b31d9c9807cd58e53a8628bc6402b6fe7fac
LINUX_SERIAL_TEST_VERSION = 13bea838f2a7573d2a68a6d95fc9d1f153b580be
LINUX_SERIAL_TEST_SITE = $(call github,cbrake,linux-serial-test,$(LINUX_SERIAL_TEST_VERSION))
LINUX_SERIAL_TEST_LICENSE = MIT
LINUX_SERIAL_TEST_LICENSE_FILES = LICENSES/MIT

View File

@@ -33,7 +33,8 @@ define LSOF_CONFIGURE_CMDS
(cd $(@D) ; \
echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" \
LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \
LINUX_CLIB=-DGLIBCV=2 ./Configure linux)
LINUX_CLIB=-DGLIBCV=2 LSOF_CFGL="$(TARGET_LDFLAGS)" \
./Configure linux)
$(LSOF_CONFIGURE_WCHAR_FIXUPS)
$(LSOF_CONFIGURE_LOCALE_FIXUPS)
endef

View File

@@ -0,0 +1,55 @@
From f37704d6cf69c9616dfd2aee5647b7941aa2bbaa Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Sat, 16 Nov 2019 00:14:42 +0100
Subject: [PATCH] fanotify: Fix FSID_VAL_MEMBER() usage
This basically reverts part of 0498fc0a8.
FSID_VAL_MEMBER() wrapper was meant to be only for struct
fanotify_event_info_fid, it was used also for struct event_t
(which has also __kernel_fsid_t fsid, but shouldn't be redefined).
This caused error on recent musl v1.1.23 (with f67b3c17),
which has struct fanotify_event_info_fid.
Fixes: 0498fc0a8 ("fanotify: Detect val vs. __val
fanotify_event_info_fid.fsid member")
Acked-by: Jan Stancek <jstancek@redhat.com>
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[Upstream status: f37704d6cf69c9616dfd2aee5647b7941aa2bbaa]
---
testcases/kernel/syscalls/fanotify/fanotify.h | 1 +
testcases/kernel/syscalls/fanotify/fanotify13.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index 5370e30bb..9c98aaa1d 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h
@@ -143,6 +143,7 @@ struct fanotify_event_info_fid {
};
#endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID */
+/* NOTE: only for struct fanotify_event_info_fid */
#ifdef HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID_FSID___VAL
# define FSID_VAL_MEMBER(fsid, i) (fsid.__val[i])
#else
diff --git a/testcases/kernel/syscalls/fanotify/fanotify13.c b/testcases/kernel/syscalls/fanotify/fanotify13.c
index 26212ab62..3d8de6009 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify13.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify13.c
@@ -130,8 +130,8 @@ static int setup_marks(unsigned int fd, struct test_case_t *tc)
"kernel");
return 1;
} else if (errno == ENODEV &&
- !FSID_VAL_MEMBER(event_set[i].fsid, 0) &&
- !FSID_VAL_MEMBER(event_set[i].fsid, 1)) {
+ !event_set[i].fsid.val[0] &&
+ !event_set[i].fsid.val[1]) {
tst_res(TCONF,
"FAN_REPORT_FID not supported on "
"filesystem type %s",
--
2.23.0

View File

@@ -1,31 +0,0 @@
From 087e13ecb9eea6cbd920708e64eab18e7ab8a90c Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Sat, 16 Nov 2019 00:14:42 +0100
Subject: [PATCH] fanotify: Fix for musl
Fixes: 0498fc0a8 ("fanotify: Detect val vs. __val fanotify_event_info_fid.fsid member")
[upstream status: https://patchwork.ozlabs.org/patch/1195915/]
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
testcases/kernel/syscalls/fanotify/fanotify13.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testcases/kernel/syscalls/fanotify/fanotify13.c b/testcases/kernel/syscalls/fanotify/fanotify13.c
index 26212ab62..3d8de6009 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify13.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify13.c
@@ -130,8 +130,8 @@ static int setup_marks(unsigned int fd, struct test_case_t *tc)
"kernel");
return 1;
} else if (errno == ENODEV &&
- !FSID_VAL_MEMBER(event_set[i].fsid, 0) &&
- !FSID_VAL_MEMBER(event_set[i].fsid, 1)) {
+ !event_set[i].fsid.val[0] &&
+ !event_set[i].fsid.val[1]) {
tst_res(TCONF,
"FAN_REPORT_FID not supported on "
"filesystem type %s",
--
2.24.0

View File

@@ -0,0 +1,52 @@
From 7b614a0c352fdaae883b0409a94c68bf06bfe914 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Sun, 17 Nov 2019 11:40:26 +0100
Subject: [PATCH] utils/compat_16: Always include <sys/fsuid.h>
All major implementations have setfsuid() declaration in <sys/fsuid.h>.
This fixes build on musl and (probably) on uclibc).
NOTE: maybe we should guard presence of <sys/fsuid.h> with autotools,
but we're not doing that for other it's uses.
Fixes: 0e7a99b53 ("setfsgid, setfsuid: clean up and 16-bit version
fixes")
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[Upstream status: 7b614a0c352fdaae883b0409a94c68bf06bfe914]
---
testcases/kernel/syscalls/utils/compat_16.h | 2 --
testcases/kernel/syscalls/utils/compat_tst_16.h | 2 --
2 files changed, 4 deletions(-)
diff --git a/testcases/kernel/syscalls/utils/compat_16.h b/testcases/kernel/syscalls/utils/compat_16.h
index 5b0338d38..75d5d2d28 100644
--- a/testcases/kernel/syscalls/utils/compat_16.h
+++ b/testcases/kernel/syscalls/utils/compat_16.h
@@ -24,9 +24,7 @@
#include <errno.h>
#include <grp.h>
-#if defined(__GLIBC__) || defined(__ANDROID__)
#include <sys/fsuid.h>
-#endif
#include <sys/types.h>
#include <unistd.h>
diff --git a/testcases/kernel/syscalls/utils/compat_tst_16.h b/testcases/kernel/syscalls/utils/compat_tst_16.h
index 3b86ef3e3..09fa8b0d8 100644
--- a/testcases/kernel/syscalls/utils/compat_tst_16.h
+++ b/testcases/kernel/syscalls/utils/compat_tst_16.h
@@ -21,9 +21,7 @@
#include <errno.h>
#include <grp.h>
-#if defined(__GLIBC__) || defined(__ANDROID__)
#include <sys/fsuid.h>
-#endif
#include <sys/types.h>
#include <unistd.h>
--
2.23.0

View File

@@ -0,0 +1,37 @@
From 7eae073fda17a94a36893337b5a5d639024d571c Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Sun, 17 Nov 2019 12:53:22 +0100
Subject: [PATCH] nfsv4/acl: Remove unneeded malloc(sizeof(FILE))
FILE incomplete type under musl (comply C11 [1]).
malloc(sizeof(FILE)) is not needed anyway, thus remove.
This fixes build on musl (at least):
acl1.c:51:23: error: invalid application of 'sizeof' to incomplete type 'FILE' {aka 'struct _IO_FILE'}
fptr = malloc(sizeof(FILE));
Fixes: 618fd23eb ("Initial add of acl testsuite from Bull")
[1] https://www.openwall.com/lists/musl/2019/01/16/1
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[Upstream status: 7eae073fda17a94a36893337b5a5d639024d571c]
---
testcases/network/nfsv4/acl/acl1.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c
index bdf0180da..aae9484e5 100644
--- a/testcases/network/nfsv4/acl/acl1.c
+++ b/testcases/network/nfsv4/acl/acl1.c
@@ -48,7 +48,6 @@ int do_file_op(char *filename)
result = 0;
FILE *fptr;
char str[256] = "./";
- fptr = malloc(sizeof(FILE));
uid = geteuid();
strcat(str, filename);
--
2.23.0

View File

@@ -0,0 +1,351 @@
From cceadfb997513fa71c2ae35fb5e09073175c077f Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Sun, 17 Nov 2019 13:52:30 +0100
Subject: [PATCH] Replace bzero() with memset()
bzero() is deprecated.
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[Upstream status: cceadfb997513fa71c2ae35fb5e09073175c077f]
---
lib/tlibio.c | 2 +-
testcases/kernel/fs/read_all/read_all.c | 3 ++-
.../kernel/hotplug/memory_hotplug/memtoy.c | 2 +-
.../kernel/syscalls/epoll_ctl/epoll_ctl01.c | 4 ++--
.../kernel/syscalls/epoll_wait/epoll_wait01.c | 3 +--
.../tirpc_simple_rpc_call/tirpc_rpc_call.c | 1 +
.../tirpc_rpc_call_performance.c | 1 +
.../tirpc_rpc_call_stress.c | 1 +
.../rpc-tirpc/tests_pack/rpc_svc_2/rpc_svc_2.c | 1 +
.../tests_pack/tirpc_svc_11/tirpc_svc_11.c | 1 +
.../tests_pack/tirpc_svc_3/tirpc_svc_3.c | 1 +
.../tests_pack/tirpc_svc_4/tirpc_svc_4.c | 1 +
.../tests_pack/tirpc_svc_5/tirpc_svc_5.c | 1 +
.../tests_pack/tirpc_svc_6/tirpc_svc_6.c | 1 +
.../tests_pack/tirpc_svc_7/tirpc_svc_7.c | 1 +
.../tests_pack/tirpc_svc_8/tirpc_svc_8.c | 1 +
.../tests_pack/tirpc_svc_9/tirpc_svc_9.c | 1 +
utils/sctp/func_tests/test_getname.c | 17 ++++++++---------
18 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/lib/tlibio.c b/lib/tlibio.c
index 8b30d591d..cc110d1c9 100644
--- a/lib/tlibio.c
+++ b/lib/tlibio.c
@@ -105,7 +105,7 @@
#else
/* for linux or sgi */
#include <sys/uio.h> /* readv(2)/writev(2) */
-#include <string.h> /* bzero */
+#include <string.h>
#endif
#if defined(__linux__) || defined(__sun) || defined(__hpux) || defined(_AIX)
#if !defined(UCLINUX) && !defined(__UCLIBC__)
diff --git a/testcases/kernel/fs/read_all/read_all.c b/testcases/kernel/fs/read_all/read_all.c
index 68fc7d031..47f853223 100644
--- a/testcases/kernel/fs/read_all/read_all.c
+++ b/testcases/kernel/fs/read_all/read_all.c
@@ -31,6 +31,7 @@
#include <lapi/fnmatch.h>
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <dirent.h>
#include <errno.h>
#include <unistd.h>
@@ -287,7 +288,7 @@ static void spawn_workers(void)
int i;
struct worker *wa = workers;
- bzero(workers, worker_count * sizeof(*workers));
+ memset(workers, 0, worker_count * sizeof(*workers));
for (i = 0; i < worker_count; i++) {
wa[i].q = queue_init();
diff --git a/testcases/kernel/hotplug/memory_hotplug/memtoy.c b/testcases/kernel/hotplug/memory_hotplug/memtoy.c
index 0707a9c8c..8ac9600de 100644
--- a/testcases/kernel/hotplug/memory_hotplug/memtoy.c
+++ b/testcases/kernel/hotplug/memory_hotplug/memtoy.c
@@ -367,7 +367,7 @@ void touch_memory(bool rw, unsigned long *memp, size_t memlen)
void init_glctx(glctx_t * gcp)
{
- bzero(gcp, sizeof(glctx_t));
+ memset(gcp, 0, sizeof(glctx_t));
gcp->pagesize = (size_t) sysconf(_SC_PAGESIZE);
diff --git a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl01.c b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl01.c
index 1f81c3a26..e199ac6ac 100644
--- a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl01.c
+++ b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl01.c
@@ -21,7 +21,7 @@
#include <sys/epoll.h>
#include <poll.h>
-#include <strings.h>
+#include <string.h>
#include <errno.h>
#include "tst_test.h"
@@ -88,7 +88,7 @@ static void check_epoll_ctl(int opt, int exp_num)
while (events) {
int events_matched = 0;
- bzero(res_evs, sizeof(res_evs));
+ memset(res_evs, 0, sizeof(res_evs));
res = epoll_wait(epfd, res_evs, 2, -1);
if (res <= 0) {
diff --git a/testcases/kernel/syscalls/epoll_wait/epoll_wait01.c b/testcases/kernel/syscalls/epoll_wait/epoll_wait01.c
index 9c13e2e5c..ad9126aaf 100644
--- a/testcases/kernel/syscalls/epoll_wait/epoll_wait01.c
+++ b/testcases/kernel/syscalls/epoll_wait/epoll_wait01.c
@@ -14,7 +14,6 @@
#include <sys/epoll.h>
#include <poll.h>
#include <string.h>
-#include <strings.h>
#include <errno.h>
#include "tst_test.h"
@@ -181,7 +180,7 @@ static void verify_epollio(void)
while (events) {
int events_matched = 0;
- bzero(ret_evs, sizeof(ret_evs));
+ memset(ret_evs, 0, sizeof(ret_evs));
TEST(epoll_wait(epfd, ret_evs, 2, -1));
if (TST_RET <= 0) {
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call.c
index 257b108cc..1dc533d0c 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <time.h>
#include <errno.h>
#include "lapi/rpc.h"
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_performance.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_performance.c
index 357d9d18d..1a609751a 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_performance.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_performance.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/time.h>
#include "lapi/rpc.h"
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_stress.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_stress.c
index 56b5ddb57..264e24c45 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_stress.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_stress.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <time.h>
#include <errno.h>
#include "lapi/rpc.h"
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/rpc_svc_2.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/rpc_svc_2.c
index 877db2af9..a2d18cc43 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/rpc_svc_2.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/rpc_svc_2.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <rpc/rpc.h>
#include <utmp.h>
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/tirpc_svc_11.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/tirpc_svc_11.c
index a93e831d0..121ae97e8 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/tirpc_svc_11.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/tirpc_svc_11.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <sys/socket.h>
#include <errno.h>
#include <netinet/in.h>
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/tirpc_svc_3.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/tirpc_svc_3.c
index e20b9b4bb..c28f412fc 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/tirpc_svc_3.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/tirpc_svc_3.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <sys/socket.h>
#include <errno.h>
#include "lapi/rpc.h"
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/tirpc_svc_4.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/tirpc_svc_4.c
index 02d745c6a..566b6fcf6 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/tirpc_svc_4.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/tirpc_svc_4.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <sys/socket.h>
#include <errno.h>
#include "lapi/rpc.h"
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/tirpc_svc_5.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/tirpc_svc_5.c
index 36003cb4f..ebf577717 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/tirpc_svc_5.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/tirpc_svc_5.c
@@ -27,6 +27,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <sys/socket.h>
#include <errno.h>
#include <netinet/in.h>
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/tirpc_svc_6.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/tirpc_svc_6.c
index 71a475373..1dd421e1c 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/tirpc_svc_6.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/tirpc_svc_6.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <sys/socket.h>
#include <errno.h>
#include <pthread.h>
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/tirpc_svc_7.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/tirpc_svc_7.c
index ea141f4ef..559ef7f97 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/tirpc_svc_7.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/tirpc_svc_7.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <sys/socket.h>
#include <errno.h>
#include <netinet/in.h>
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/tirpc_svc_8.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/tirpc_svc_8.c
index 6c1c37bac..fd516e4dd 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/tirpc_svc_8.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/tirpc_svc_8.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <pthread.h>
#include <sys/socket.h>
#include <errno.h>
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/tirpc_svc_9.c b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/tirpc_svc_9.c
index a000ba265..2fd9b4fc9 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/tirpc_svc_9.c
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/tirpc_svc_9.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <pthread.h>
#include <sys/socket.h>
#include <errno.h>
diff --git a/utils/sctp/func_tests/test_getname.c b/utils/sctp/func_tests/test_getname.c
index ffc47357c..f7070a34a 100644
--- a/utils/sctp/func_tests/test_getname.c
+++ b/utils/sctp/func_tests/test_getname.c
@@ -41,7 +41,6 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <strings.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -92,7 +91,7 @@ main(int argc, char *argv[])
svr_sk = test_socket(pf_class, SOCK_STREAM, IPPROTO_SCTP);
test_bind(svr_sk, &svr_loop.sa, sizeof(svr_loop));
- bzero(&svr_local_addr, sizeof(svr_local_addr));
+ memset(&svr_local_addr, 0, sizeof(svr_local_addr));
len = sizeof(svr_local_addr);
/* Verify that getsockname() on an unconnected socket works fine. */
error = getsockname(svr_sk, (struct sockaddr *)&svr_local_addr, &len);
@@ -101,7 +100,7 @@ main(int argc, char *argv[])
tst_resm(TPASS, "getsockname on an unconnected socket");
- bzero(&svr_peer_addr, sizeof(svr_peer_addr));
+ memset(&svr_peer_addr, 0, sizeof(svr_peer_addr));
len = sizeof(svr_peer_addr);
/* Verify that getpeername() on an unconnected socket fails. */
error = getpeername(svr_sk, (struct sockaddr *)&svr_peer_addr, &len);
@@ -125,7 +124,7 @@ main(int argc, char *argv[])
#endif
test_connect(clt_sk, &svr_loop.sa, sizeof(svr_loop));
- bzero(&clt_local_addr, sizeof(clt_local_addr));
+ memset(&clt_local_addr, 0, sizeof(clt_local_addr));
len = sizeof(clt_local_addr);
/* Get the client's local address. */
error = getsockname(clt_sk, (struct sockaddr *)&clt_local_addr, &len);
@@ -135,7 +134,7 @@ main(int argc, char *argv[])
tst_resm(TPASS, "getsockname on a connected client socket");
- bzero(&clt_peer_addr, sizeof(clt_peer_addr));
+ memset(&clt_peer_addr, 0, sizeof(clt_peer_addr));
len = sizeof(clt_peer_addr);
/* Get the client's peer address. */
error = getpeername(clt_sk, (struct sockaddr *)&clt_peer_addr, &len);
@@ -149,7 +148,7 @@ main(int argc, char *argv[])
len = sizeof(accept_loop);
accept_sk = test_accept(svr_sk, &accept_loop.sa, &len);
- bzero(&svr_local_addr, sizeof(svr_local_addr));
+ memset(&svr_local_addr, 0, sizeof(svr_local_addr));
len = sizeof(svr_local_addr);
/* Get the server's local address. */
error = getsockname(accept_sk, (struct sockaddr *)&svr_local_addr,
@@ -160,7 +159,7 @@ main(int argc, char *argv[])
tst_resm(TPASS, "getsockname on a connected server socket");
- bzero(&svr_peer_addr, sizeof(svr_peer_addr));
+ memset(&svr_peer_addr, 0, sizeof(svr_peer_addr));
len = sizeof(svr_peer_addr);
/* Get the server's peer address. */
error = getpeername(accept_sk, (struct sockaddr *)&svr_peer_addr,
@@ -200,7 +199,7 @@ main(int argc, char *argv[])
#endif
tst_resm(TPASS, "getsockname/getpeername server/client match");
- bzero(&clt_local_addr, sizeof(clt_local_addr));
+ memset(&clt_local_addr, 0, sizeof(clt_local_addr));
len = sizeof(clt_local_addr);
/*getsockname(): Bad socket descriptor, EBADF expected error*/
error = getsockname(-1, (struct sockaddr *)&clt_local_addr, &len);
@@ -235,7 +234,7 @@ main(int argc, char *argv[])
tst_resm(TPASS, "getsockname with invalid buffer - EFAULT");
- bzero(&clt_peer_addr, sizeof(clt_peer_addr));
+ memset(&clt_peer_addr, 0, sizeof(clt_peer_addr));
len = sizeof(clt_peer_addr);
/*getpeername(): Bad socket descriptor, EBADF expected error*/
error = getpeername(-1, (struct sockaddr *)&clt_local_addr, &len);
--
2.23.0

View File

@@ -13,7 +13,7 @@ Fixes:
- http://autobuild.buildroot.org/results/9155326e1ff7c2bb2218122c453872c2fc76f65e
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/linux-test-project/ltp/pull/616]
[Upstream status: 22f510de8072c5cacce5b2a4ca2ff97d1a6fa3ca]
---
testcases/kernel/controllers/cpuset/Makefile.inc | 2 +-
testcases/kernel/controllers/cpuset/cpuset_lib/Makefile | 2 +-

View File

@@ -0,0 +1,36 @@
From 226205f0c5e3ef6f5757ffdfddd5b815b217e4ff Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 11 Nov 2019 22:55:36 +0100
Subject: [PATCH] configure.ac: fix build on toolchain without SSP
Commit 3b5a0eebd4d2efdaa03c6fb11950abfcf081fab8 reverted
3aa7271157d3c815a4426c1f8eaea2f3b6dafa6a resulting in lxc being unable
to be built on toolchain without SSP support
Fixes:
- http://autobuild.buildroot.org/results/57945f54ffbc5c8764b6891a4516c4907e56ab97
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/lxc/lxc/pull/3184]
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 645a2166d..4c1a10b3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -713,8 +713,8 @@ AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"],,[-Werror]
AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"],,[-Werror])
AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"],,[-Werror])
AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [CFLAGS="$CFLAGS -fstack-clash-protection"],,[-Werror])
-AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
-AX_CHECK_COMPILE_FLAG([--param=ssp-buffer-size=4], [CFLAGS="$CFLAGS --param=ssp-buffer-size=4"],,[-Werror])
+AX_CHECK_LINK_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
+AX_CHECK_LINK_FLAG([--param=ssp-buffer-size=4], [CFLAGS="$CFLAGS --param=ssp-buffer-size=4"],,[-Werror])
AX_CHECK_COMPILE_FLAG([-g], [CFLAGS="$CFLAGS -g"],,[-Werror])
AX_CHECK_COMPILE_FLAG([--mcet -fcf-protection], [CFLAGS="$CFLAGS --mcet -fcf-protection"],,[-Werror])
AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"],,[-Werror])
--
2.23.0

View File

@@ -10,6 +10,8 @@ LXC_LICENSE = LGPL-2.1+
LXC_LICENSE_FILES = COPYING
LXC_DEPENDENCIES = host-pkgconf
LXC_INSTALL_STAGING = YES
# We're patching configure.ac
LXC_AUTORECONF = YES
LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
--disable-werror \

View File

@@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
MESA3D_HEADERS_VERSION = 19.2.4
MESA3D_HEADERS_VERSION = 19.2.6
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
MESA3D_HEADERS_DL_SUBDIR = mesa3d

View File

@@ -1,6 +1,6 @@
# From https://lists.freedesktop.org/archives/mesa-announce/2019-November/000555.html
sha256 09000a0f7dbbd82e193b81a8f1bf0c118eab7ca975c0329181968596e548e30f mesa-19.2.4.tar.xz
sha512 e8a0e90460f3153d730f8fb13f2c912a9826c05d2af9e22dc575bcd8885bf6a33c0af1c6659e81701ff097a132df88eead208e89dceb552b9da809ab543fa479 mesa-19.2.4.tar.xz
# From https://lists.freedesktop.org/archives/mesa-announce/2019-November/000559.html
sha256 9d7b24fa60c82db34788196450042a55ce6cb2d70c7a8d5c31401619b6907797 mesa-19.2.6.tar.xz
sha512 2e961631ae8ea1cb64d87bede51432445a17d153244d8c76f5eb70cbdc8c069d3f08cac11928d85ce2730d772aff9b3aff089e5e552eb021fdcb65364bb685b6 mesa-19.2.6.tar.xz
# License
sha256 d8d662974fc86e2e640362015e42de3fcc161d435a9f2111ecd8561412feca73 docs/license.html

View File

@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
MESA3D_VERSION = 19.2.4
MESA3D_VERSION = 19.2.6
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://mesa.freedesktop.org/archive
MESA3D_LICENSE = MIT, SGI, Khronos

View File

@@ -5,3 +5,8 @@ sha256 0b0189bfa4b2da20e899b4bdd746ac402e8f746a58e4fcf5516484157f2aab07 perl-5.2
# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.hash
sha256 84583a1bb5f3a2c64d13d031386c114382e5c62955c6f84a27cec8318536627c perl-cross-1.2.3.tar.gz
# Locally calculated
sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic
sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying
sha256 4a39adc445d79e213df5c2028c5432806dfcdfe69a5bc31ba5c83071a0097877 README

View File

@@ -1,5 +1,5 @@
# From http://php.net/downloads.php
sha256 657cf6464bac28e9490c59c07a2cf7bb76c200f09cfadf6e44ea64e95fa01021 php-7.3.11.tar.xz
sha256 aafe5e9861ad828860c6af8c88cdc1488314785962328eb1783607c1fdd855df php-7.3.12.tar.xz
# License file
sha256 f689b8fa63bea7950ce6a21bf52ed88ea0d77673ee76e6de12f51191174d91b8 LICENSE

View File

@@ -4,7 +4,7 @@
#
################################################################################
PHP_VERSION = 7.3.11
PHP_VERSION = 7.3.12
PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES

View File

@@ -1,7 +1,7 @@
# From https://ftp.postgresql.org/pub/source/v12.0/postgresql-12.0.tar.bz2.md5
md5 87545416ef021eee8621d31a93fcc899 postgresql-12.0.tar.bz2
# From https://ftp.postgresql.org/pub/source/v12.0/postgresql-12.0.tar.bz2.sha256
sha256 cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6 postgresql-12.0.tar.bz2
# From https://ftp.postgresql.org/pub/source/v12.1/postgresql-12.1.tar.bz2.md5
md5 2ee1bd4ec5f49363a3f456f07e599b41 postgresql-12.1.tar.bz2
# From https://ftp.postgresql.org/pub/source/v12.1/postgresql-12.1.tar.bz2.sha256
sha256 a09bf3abbaf6763980d0f8acbb943b7629a8b20073de18d867aecdb7988483ed postgresql-12.1.tar.bz2
# License file, Locally calculated
sha256 c4c86d683970b22b9fab53320ee1b3a30ef4e8223122b4fb6be53ea62ecee8b3 COPYRIGHT

View File

@@ -4,7 +4,7 @@
#
################################################################################
POSTGRESQL_VERSION = 12.0
POSTGRESQL_VERSION = 12.1
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
POSTGRESQL_LICENSE = PostgreSQL

View File

@@ -20,8 +20,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
#-------------------------------------------------------------
# Target-qemu
QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman
QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman host-python3
# Need the LIBS variable because librt and libm are
# not automatically pulled. :-(
@@ -132,6 +131,7 @@ define QEMU_CONFIGURE_CMDS
--prefix=/usr \
--cross-prefix=$(TARGET_CROSS) \
--audio-drv-list= \
--python=$(HOST_DIR)/bin/python3 \
--enable-kvm \
--enable-attr \
--enable-vhost-net \
@@ -182,7 +182,7 @@ $(eval $(generic-package))
#-------------------------------------------------------------
# Host-qemu
HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman
HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman host-python3
# BR ARCH qemu
# ------- ----
@@ -299,6 +299,7 @@ define HOST_QEMU_CONFIGURE_CMDS
--host-cc="$(HOSTCC)" \
--extra-cflags="$(HOST_CFLAGS)" \
--extra-ldflags="$(HOST_LDFLAGS)" \
--python=$(HOST_DIR)/bin/python3 \
$(HOST_QEMU_OPTS)
endef

View File

@@ -30,6 +30,12 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y)
RAUC_DEPENDENCIES += systemd
endif
define RAUC_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../lib/systemd/system/rauc.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rauc.service
endef
HOST_RAUC_DEPENDENCIES = \
host-pkgconf \
host-openssl \

View File

@@ -1,5 +1,5 @@
# From https://github.com/antirez/redis-hashes/blob/master/README
sha256 2139009799d21d8ff94fc40b7f36ac46699b9e1254086299f8d3b223ca54a375 redis-5.0.5.tar.gz
sha256 61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b redis-5.0.7.tar.gz
# Locally calculated
sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING

View File

@@ -4,7 +4,7 @@
#
################################################################################
REDIS_VERSION = 5.0.5
REDIS_VERSION = 5.0.7
REDIS_SITE = http://download.redis.io/releases
REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components)
REDIS_LICENSE_FILES = COPYING

View File

@@ -17,6 +17,7 @@ RPCBIND_CONF_OPTS += --with-rpcuser=root
ifeq ($(BR2_INIT_SYSTEMD),y)
RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
RPCBIND_DEPENDENCIES += systemd
else
RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
endif

View File

@@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature
sha256 20350bc4309039fdf0d29ee4fd0033cde27bccf33501e13b3c1befafde9d0c9c spice-protocol-0.12.14.tar.bz2
sha256 b6a4aa1ca32668790b45a494bbd000e9d05797b391d5a5d4b91adf1118216eac spice-protocol-0.14.0.tar.bz2
# Hash for license file
sha256 eb55ea746be694c449224c7ddce6340648b075fd377281712a19094e7fb7ef92 COPYING

View File

@@ -4,7 +4,7 @@
#
################################################################################
SPICE_PROTOCOL_VERSION = 0.12.14
SPICE_PROTOCOL_VERSION = 0.14.0
SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
SPICE_PROTOCOL_LICENSE = BSD-3-Clause

View File

@@ -0,0 +1,54 @@
From 1b6eaf5589a14763452cbe53382cc699cdeca141 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 15 Nov 2019 11:36:14 +0100
Subject: [PATCH] configure.ac: add --enable-tests
Allow the user to disable tests through --disable-tests, this is
especially useful for example to disable gdk-pixbuf dependency
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status:
https://gitlab.freedesktop.org/spice/spice-common/merge_requests/6]
---
Makefile.am | 6 +++++-
configure.ac | 7 +++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/subprojects/spice-common/Makefile.am b/subprojects/spice-common/Makefile.am
index 5402499..00623a1 100644
--- a/subprojects/spice-common/Makefile.am
+++ b/subprojects/spice-common/Makefile.am
@@ -1,7 +1,11 @@
NULL =
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = python_modules common tests docs
+SUBDIRS = python_modules common docs
+
+if ENABLE_TESTS
+SUBDIRS += tests
+endif
EXTRA_DIST = \
meson.build \
diff --git a/subprojects/spice-common/configure.ac b/subprojects/spice-common/configure.ac
index 9d10287..2dba7c8 100644
--- a/subprojects/spice-common/configure.ac
+++ b/subprojects/spice-common/configure.ac
@@ -33,6 +33,13 @@ AC_SEARCH_LIBS(regcomp, [regex rx])
SPICE_CHECK_SYSDEPS
SPICE_EXTRA_CHECKS
+AC_ARG_ENABLE([tests],
+ AS_HELP_STRING([--enable-tests],
+ [Enable tests @<:@default=yes@:>@]),
+ [],
+ enable_tests="yes")
+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes")
+
AC_ARG_ENABLE([alignment-checks],
AS_HELP_STRING([--enable-alignment-checks],
[Enable runtime checks for cast alignment @<:@default=no@:>@]),
--
2.23.0

View File

@@ -1,2 +1,3 @@
# Locally calculated
sha256 1ead5de63d06eededed4017db37240f07bef0abffbaf621899647e7e685a1519 spice-0.14.1.tar.bz2
sha256 b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7 spice-0.14.2.tar.bz2
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING

View File

@@ -4,7 +4,7 @@
#
################################################################################
SPICE_VERSION = 0.14.1
SPICE_VERSION = 0.14.2
SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
SPICE_SITE = http://www.spice-space.org/download/releases/spice-server
SPICE_LICENSE = LGPL-2.1+
@@ -17,6 +17,8 @@ SPICE_DEPENDENCIES = \
openssl \
pixman \
spice-protocol
# We're patching subprojects/spice-common/configure.ac
SPICE_AUTORECONF = YES
# We disable everything for now, because the dependency tree can become
# quite deep if we try to enable some features, and I have not tested that.
@@ -25,7 +27,8 @@ SPICE_CONF_OPTS = \
--disable-opengl \
--disable-smartcard \
--without-sasl \
--disable-manual
--disable-manual \
--disable-tests
SPICE_DEPENDENCIES += host-pkgconf

View File

@@ -1,5 +1,5 @@
# sha256 locally computed
sha256 d9cb11fab907292c61f66ef8ad2d9a68054c0e8856bd47cd2b0a12b2255da771 systemd-243-78-gef677436aa.tar.gz
sha256 281bc47aa6b173c3c6fa1bbc88aea84ecb014313aeb679c54f8885dd09e434be systemd-243.4.tar.gz
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
sha256 3a3b3cbd0ef03c7045bfda9b61062bdc33ad4913b44a6b6147043f26d00b51bf README

View File

@@ -4,7 +4,7 @@
#
################################################################################
SYSTEMD_VERSION = 243-78-gef677436aa
SYSTEMD_VERSION = 243.4
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README

View File

@@ -1,2 +1,5 @@
# From https://www.kernel.org/pub/software/network/tftp/tftp-hpa/sha256sums.asc
sha256 afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b tftp-hpa-5.2.tar.xz
# Hash for license file
sha256 5efef82650b8ece733e37790fc70f05e426c9e1ef9640d4ebcb04867bd3f5e28 tftpd/tftpd.c

View File

@@ -8,6 +8,8 @@ TFTPD_VERSION = 5.2
TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
TFTPD_CONF_OPTS = --without-tcpwrappers
TFTPD_LICENSE = BSD-4-Clause
TFTPD_LICENSE_FILES = tftpd/tftpd.c
define TFTPD_INSTALL_TARGET_CMDS
$(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp

View File

@@ -0,0 +1,37 @@
From a39c0c115e19150551c01b04a5e903376633e771 Mon Sep 17 00:00:00 2001
From: Nils Christopher Brause <nilschrbrause@googlemail.com>
Date: Fri, 22 Nov 2019 17:39:20 +0100
Subject: [PATCH] [cmake] Make target_link_options optional, lowering the
required cmake version to 3.4.
[Retrieved from:
https://github.com/NilsBrause/waylandpp/commit/a39c0c115e19150551c01b04a5e903376633e771]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 386f8d8..47a412c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.4)
project(waylandpp VERSION 0.2.7 LANGUAGES CXX)
# packages
@@ -160,7 +160,9 @@ if(BUILD_LIBRARIES)
"include/wayland-client.hpp;include/wayland-util.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-version.hpp"
src/wayland-client.cpp src/wayland-util.cpp wayland-client-protocol.cpp wayland-client-protocol.hpp)
# Report undefined references only for the base library.
- target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined")
+ if(${CMAKE_VERSION} VERSION_GREATER "3.14.0")
+ target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined")
+ endif()
define_library(wayland-client-extra++ "${WAYLAND_CLIENT_CFLAGS}" "${WAYLAND_CLIENT_LIBRARIES}"
"${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol-extra.hpp"
wayland-client-protocol-extra.cpp wayland-client-protocol-extra.hpp wayland-client-protocol.hpp)

View File

@@ -1,40 +0,0 @@
From d1697f868e047f1355fed7b44dbcd6dda897c234 Mon Sep 17 00:00:00 2001
From: Adrian Perez de Castro <aperez@igalia.com>
Date: Thu, 19 Sep 2019 17:13:19 +0300
Subject: [PATCH xserver 1/1] [GTK] ANGLE's eglplatform.h is build broken with
-DENABLE_X11_PLATFORM=OFF https://bugs.webkit.org/show_bug.cgi?id=198621
Reviewed by NOBODY (OOPS!).
* PlatformGTK.cmake: Use WL_EGL_PLATFORM to prefer Wayland type
definitions with ENABLE_WAYLAND_TARGET, and USE_SYSTEM_EGL otherwise
when ENABLE_X11_TARGET is not enabled.
Fetch from: https://bugs.webkit.org/show_bug.cgi?id=198621
Upstream-Status: Pending
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Source/ThirdParty/ANGLE/ChangeLog | 11 +++++++++++
Source/ThirdParty/ANGLE/PlatformGTK.cmake | 9 +++++++++
2 files changed, 20 insertions(+)
diff --git a/Source/ThirdParty/ANGLE/PlatformGTK.cmake b/Source/ThirdParty/ANGLE/PlatformGTK.cmake
index 74f35e29234..7229b0e09cc 100644
--- a/Source/ThirdParty/ANGLE/PlatformGTK.cmake
+++ b/Source/ThirdParty/ANGLE/PlatformGTK.cmake
@@ -1,2 +1,11 @@
# Enable GLSL compiler output.
list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL)
+
+if (ENABLE_WAYLAND_TARGET)
+ # Explicitly prefer the Wayland platform, otherwise if we are building
+ # in a system without X11 ANGLE will still try to use the X11 headers.
+ list(APPEND ANGLE_DEFINITIONS WL_EGL_PLATFORM)
+elseif (NOT ENABLE_X11_TARGET)
+ # Allow building ANGLE on platforms which may not provide X11 headers.
+ list(APPEND ANGLE_DEFINITIONS USE_SYSTEM_EGL)
+endif ()
--
2.23.0

View File

@@ -1,55 +0,0 @@
From fb0f978af0dd3923a1d3bcb6dccf610861e284d3 Mon Sep 17 00:00:00 2001
From: Adrian Perez de Castro <aperez@igalia.com>
Date: Tue, 8 Oct 2019 11:06:56 +0300
Subject: [PATCH xserver 2/2] [WPE][GTK] Build fails with ENABLE_WEBDRIVER=OFF
https://bugs.webkit.org/show_bug.cgi?id=202658
Reviewed by NOBODY (OOPS!).
* UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp: Add missing
ENABLE(WEBDRIVER_MOUSE_INTERACTIONS) and ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
preprocessor guards.
* UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp: Ditto.
Fetch (and adapted) from: https://bugs.webkit.org/show_bug.cgi?id=202658
Upstream-Status: Pending
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Source/WebKit/ChangeLog | 12 ++++++++++++
.../Automation/gtk/WebAutomationSessionGtk.cpp | 4 ++++
.../Automation/wpe/WebAutomationSessionWPE.cpp | 4 ++++
3 files changed, 20 insertions(+)
diff --git a/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp b/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp
index dd81d1d55ea..ee665c2e346 100644
--- a/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp
+++ b/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp
@@ -34,6 +34,7 @@
namespace WebKit {
using namespace WebCore;
+#if ENABLE(WEBDRIVER_MOUSE_INTERACTIONS)
static unsigned modifiersToEventState(OptionSet<WebEvent::Modifier> modifiers)
{
unsigned state = 0;
@@ -131,7 +132,9 @@ void WebAutomationSession::platformSimulateMouseInteraction(WebPageProxy& page,
break;
}
}
+#endif // ENABLE(WEBDRIVER_MOUSE_INTERACTIONS)
+#if ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
static void doKeyStrokeEvent(GdkEventType type, GtkWidget* widget, unsigned keyVal, unsigned state, bool doReleaseAfterPress = false)
{
ASSERT(type == GDK_KEY_PRESS || type == GDK_KEY_RELEASE);
@@ -331,5 +334,6 @@ void WebAutomationSession::platformSimulateKeySequence(WebPageProxy& page, const
p = g_utf8_next_char(p);
} while (*p);
}
+#endif // ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
} // namespace WebKit
--
2.23.0

View File

@@ -1,7 +1,7 @@
# From https://webkitgtk.org/releases/webkitgtk-2.26.0.tar.xz.sums
md5 08145bd6c1587230f135921c142bc150 webkitgtk-2.26.1.tar.xz
sha1 bd0432281c0463147ec06587c25f226a67acbb2d webkitgtk-2.26.1.tar.xz
sha256 6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155 webkitgtk-2.26.1.tar.xz
# From https://webkitgtk.org/releases/webkitgtk-2.26.2.tar.xz.sums
md5 65e06fe73ee166447894aaea95038e3b webkitgtk-2.26.2.tar.xz
sha1 5bd1ccb436c76fd1edb83afd5bec377de5655d45 webkitgtk-2.26.2.tar.xz
sha256 6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 webkitgtk-2.26.2.tar.xz
# Hashes for license files:
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE

View File

@@ -4,7 +4,7 @@
#
################################################################################
WEBKITGTK_VERSION = 2.26.1
WEBKITGTK_VERSION = 2.26.2
WEBKITGTK_SITE = https://www.webkitgtk.org/releases
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
WEBKITGTK_INSTALL_STAGING = YES

View File

@@ -1,2 +1,3 @@
# Locally calculated from download (no sig, hash)
sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tgz
sha256 8ecd6c1bab449127eb665cef1561e73a8bce52e217375f6f466939e137b1e110 LICENSE