Skip to content

Merged latest dunfell branch from upstream #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
amstewart merged 52 commits into from
Aug 13, 2020
Merged

Merged latest dunfell branch from upstream #2

amstewart merged 52 commits into from
Aug 13, 2020

Conversation

@chaitu236
Copy link

@chaitu236 chaitu236 commented Aug 10, 2020 •
edited
Loading

Merged HEAD of upstream dunfell branch (654ad8b).

texierp and others added 30 commits July 1, 2020 07:59
@texierp @akuster
zchunk: upgrade 1.1.5 -> 1.1.6
47326ba 
- Remove patches already in version

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit d3e33a7)
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
uriparser: upgrade 0.9.3 -> 0.9.4
b3839e1 
License-Update: copyright years updated

Changelog:

2020-05-31 -- 0.9.4

  * Fixed: testrunner: No longer crashes when compiled with NDEBUG (GitHub ni#67)
  * Fixed: CMake: Support GTest 1.8.0 (GitHub ni#68)
      Thanks to Ryan Schmidt for the related report!
  * Fixed: CMake: Use variable GTEST_INCLUDE_DIRS (with plural "S") rather than
      GTEST_INCLUDE_DIR (GitHub ni#79, ni#81)
      Thanks to Wouter Beek for the related report!
  * Improved: CMake: Send config summary to stdout, not stderr (GitHub ni#72)
      Thanks to Scott Donelan for the patch!
  * Improved: Make -DURIPARSER_BUILD_TESTS=OFF unlock compilation without
      a C++ compiler; thanks to Fabrice Fontaine for the patch! (GitHub ni#69)
  * Added: Functions to make UriUri[AW] instances independent of the original
      URI string (GitHub ni#77 and ni#78)
      New functions:
        uriMakeOwner[AW]
        uriMakeOwnerMm[AW]
  * Added: CMake option URIPARSER_ENABLE_INSTALL to toggle installation of
      files, defaults to "ON" (GitHub ni#74, ni#75)
      Thanks to Scott Donelan for the patch!
  * Soname: 1:26:0

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 27adb93)
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
jsoncpp: upgrade 1.9.2 -> 1.9.3
2b384c5 
See full changelog https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 65e124e)
Signed-off-by: Armin Kuster <[email protected]>
@zangrc-fnst @akuster
proj: upgrade 7.0.0 -> 7.0.1
e05b11b 
-Added md5 verification.

Signed-off-by: Zang Ruochen <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit adedd56)
Signed-off-by: Armin Kuster <[email protected]>
@priv-kweihmann @akuster
netkit-rsh: properly append PACKAGECONFIG
ee6dace 
As ??= assignment will be overwritten by += in any case,
one can't define a default of PACKAGECONFIG in this recipe.
Using _append instead mitigates chances of accidental overwriting
the default

Signed-off-by: Konrad Weihmann <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 4cca3ef)
Signed-off-by: Armin Kuster <[email protected]>
@priv-kweihmann @akuster
zile: properly append PACKAGECONFIG
5fe3def 
As ??= assignment will be overwritten by += in any case,
one can't define a default of PACKAGECONFIG in this recipe.
Using _append instead mitigates chances of accidental overwriting
the default

Signed-off-by: Konrad Weihmann <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 1a1194a)
Signed-off-by: Armin Kuster <[email protected]>
@wangmingyu84 @akuster
postgresql: 12.2 -> 12.3
666cc4c 
0001-Use-pkg-config-for-libxml2-detection.patch
removed since it is not available in 12.3

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 04dc1ff)
[Bug fix only update]
Signed-off-by: Armin Kuster <[email protected]>
@schnitzeltony @akuster
libblockdev: upgrade 2.23 -> 2.24
d2b6c35 
Change SRC_URI: all udisks related sources moved to
https://github.com/storaged-project

Signed-off-by: Andreas Müller <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit dc25abf)
Signed-off-by: Armin Kuster <[email protected]>
@zangrc-fnst @akuster
libvpx: upgrade 1.8.1 -> 1.8.2
af2aa33 
Signed-off-by: Zang Ruochen <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 91b3056)
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
jpnevulator: upgrade 2.3.4 -> 2.3.5
2535e2b 
See changelog https://github.com/snarlistic/jpnevulator/blob/master/Changelog

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 28bf55b)
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
libnftnl: upgrade 1.1.6 -> 1.1.7
efa2118 
See https://lwn.net/Articles/822353/

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 9e7912b)
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
nftables: upgrade 0.9.4 -> 0.9.5
1bdcdb3 
Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit bf1ac50)
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
haveged: upgrade 1.9.8 -> 1.9.9
7a0afbe 
Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 339b7c6)
Signed-off-by: Armin Kuster <[email protected]>
@zangrc-fnst @akuster
mm-common: upgrade 1.0..0 -> 1.0.1
c82fa13 
Signed-off-by: Zang Ruochen <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 15e5721)
Signed-off-by: Armin Kuster <[email protected]>
@sandy-lcq @akuster
python-django: add RDEPENDS
6c2d606 
fix error:
ModuleNotFoundError: No module named 'distutils'

Signed-off-by: Changqing Li <[email protected]>
Acked-by: Trevor Gamblin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 1407d43)
Signed-off-by: Armin Kuster <[email protected]>
@sandy-lcq @akuster
python-m2crypto: Add RDEPENDS
f0cfde7 
fix errors:
ModuleNotFoundError: No module named 'distutils'
ModuleNotFoundError: No module named 'asyncore'
ModuleNotFoundError: No module named 'xmlrpc'

Signed-off-by: Changqing Li <[email protected]>
Acked-by: Trevor Gamblin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 1d6071e)
Signed-off-by: Armin Kuster <[email protected]>
@ChenQi1989 @akuster
python-django: set CVE_PRODUCT to be django
9621a82 
Signed-off-by: Chen Qi <[email protected]>
Acked-by: Trevor Gamblin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 639eae8)
Signed-off-by: Armin Kuster <[email protected]>
@akuster
python3-m2crypto: add the missing rdepends
2591786 
Add the missing rdepends to fix the error such as below:
 # python3
 [snip]
 >>> import M2Crypto
 ModuleNotFoundError: No module named 'decimal'

Signed-off-by: Mingli Yu <[email protected]>
Acked-by: Trevor Gamblin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit fe77eaa)
Signed-off-by: Armin Kuster <[email protected]>
@akiernan @akuster
zstd: Upgrade 1.4.4 -> 1.4.5
e4fa609 
Signed-off-by: Alex Kiernan <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit f6aa84f)
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
rsnapshot: upgrade 1.4.2 -> 1.4.3
554b2ad 
VERSION 1.4.3
------------------------------------------------------------------------------
- Fixes and minor updates to Pod / man page.
- Adds more tests.
- Restore rsync error code 23 as an important warning.
- Fixes shortargs appending.
- Non-LVM backup source breaks after LVM backup source.
- Update rsnapreport.pl utility script to work with rsync >= 3.1.0 stats and bytes changes.

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>

(cherry picked from commit 4ea3135)

Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
fuse3: upgrade 3.9.1 -> 3.9.2
c02460f 
See changelog https://github.com/libfuse/libfuse/releases/tag/fuse-3.9.2

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit b697946)
Signed-off-by: Armin Kuster <[email protected]>
@bluelightning @akuster
protobuf-c: disable parallelism to avoid race condition
28941dd 
Unfortunately 489d3b4 did not completely
fix the problem - if you try cleaning and rebuilding protobuf-c-native it
doesn't take long to reproduce the issue on a 32-core machine. I spent
some time trying to debug this but failed, there is still a race between
generating t.test-full.pb.h and compiling cxx_generate_packed_data.c
despite BUILT_SOURCES and explicit dependencies. I even tried converting
the multiple target rules to use grouped targets (&:), that didn't fix it
either. Disabling parallelism as a workaround only costs ~20s and it
turns out that upstream is switching to Meson soon anyway:

  protobuf-c/protobuf-c#340

Signed-off-by: Paul Eggleton <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 3251fe2)
Signed-off-by: Armin Kuster <[email protected]>
@wangmingyu84 @akuster
openipmi: upgrade 2.0.28 -> 2.0.29
6ab0a2d 
???Signed-off-by: Wang Mingyu <[email protected]>

Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 0b0c102)
Signed-off-by: Armin Kuster <[email protected]>
@wangmingyu84 @akuster
twm: upgrade 1.0.10 -> 1.0.11
2bf8068 
??Signed-off-by: Wang Mingyu <[email protected]>

Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 8f6facb)
Signed-off-by: Armin Kuster <[email protected]>
@priv-kweihmann @akuster
libtalloc: fix upstream url
1f14508 
https://samba.org seems to be gone, switch to https://www.samba.org
Signed-off-by: Konrad Weihmann <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 9a85b92)
Signed-off-by: Armin Kuster <[email protected]>
@ceggers-arri @akuster
linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t
6384427 
Back ported upstream patch:
richardcochran/linuxptp@7de73fe

Signed-off-by: Christian Eggers <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 924bd4d)
Signed-off-by: Armin Kuster <[email protected]>
@schnitzeltony @akuster
openh264: upgrade 2.1.0 -> 2.1.1
c5e0758 
>From [1]
* release x86 and x64 libraries for android platform
* Bug fixes

[1] https://github.com/cisco/openh264/releases

Signed-off-by: Andreas Müller <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 69716e9)
Signed-off-by: Armin Kuster <[email protected]>
@schnitzeltony @akuster
tcpreplay: upgrade 4.3.2 -> 4.3.3
c5f9605 
>From [1]

* Increase cache buffers size to accomodate VLAN edits (openembedded#594)
* Correct L2 header length to correct IP header offset (openembedded#583)
* Fix warnings from gcc version 10 (openembedded#580)
* Heap Buffer Overflow in randomize_iparp (openembedded#579)
* Use after free in get_ipv6_next (openembedded#578)
* Heap Buffer Overflow in git_ipv6_next (openembedded#576)
* Call pcap_freecode() on pcap_compile() (openembedded#572)
* Increase max snaplen to 262144 (openembedded#571)
* Fix divide by zero in fuzzing (openembedded#570)
* Unique IP repeats at very high iteration counts (openembedded#566)
* Fails to compile on FreeBSD amd64 13.0 (openembedded#558)
* Heap Buffer Overflow in do_checksum (openembedded#556) (openembedded#577)
* Attempt to correct corrupt pcap files, if possible (openembedded#557)
* Fix GCC v10 warnings (openembedded#555)
* Remove some duplicated SOURCES entries (openembedded#551)
* Expand /dev/bpfX hard limit to fix macOS Mojave (openembedded#550)
* Implement --loopdelay-ms when using --loop=0 (openembedded#546)
* Heap overflow packet2tree and get_l2len (openembedded#530)

[1] https://github.com/appneta/tcpreplay/releases

Signed-off-by: Andreas Müller <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 822963c)
Signed-off-by: Armin Kuster <[email protected]>
@leon-anavi @akuster
python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17
41f84f6 
Upgrade to release 1.3.17:

- orm Bug fixes
- orm Added an accessor ColumnProperty.Comparator.expressions
  which provides access to the group of columns mapped under a
  multi-column ColumnProperty attribute.
- orm Introduce _orm.relationship.sync_backref flag in a
  relationship to control if the synchronization events that
  mutate the in-Python attributes are added. This supersedes the
  previous change #5149, which warned that viewonly=True
  relationship target of a back_populates or backref configuration
  would be disallowed.
- engine Bug fixes
- schema Bug fixes
- schema Add comment attribute to _schema.Column __repr__ method.

The year in LICENSE has been updated so LIC_FILES_CHKSUM was
changed.

Signed-off-by: Leon Anavi <[email protected]>
Acked-by: Trevor Gamblin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 5fef53b)
Signed-off-by: Armin Kuster <[email protected]>
@mvakuster @akuster
ntp: update 4.2.8p15
cc6fc6b 
Source: ntp.org
MR: 104487
Type: Security Fix
Disposition: Backport from http://archive.ntp.org/ntp4/ntp-4.2/
ChangeID: 65b220646dc29168c45b051a6ea2a651b9e669d1
Description:

Bugfix only update including a security fix: CVE-2020-15025

changelog: https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ChangeLog-stable

Signed-off-by: Armin Kuster <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit c9384d7)
Signed-off-by: Armin Kuster <[email protected]>
schnitzeltony and others added 15 commits July 12, 2020 19:20
@schnitzeltony @akuster
modemmanager: upgrade 1.12.10 -> 1.12.12
f032374 
Signed-off-by: Andreas Müller <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit f0a9b8b)
[ak: 1.12.x is a stable release]
Signed-off-by: Armin Kuster <[email protected]>
@schnitzeltony @akuster
ibus: upgrade 1.5.21 -> 1.5.22
66a4579 
1.5.22

* GDBusAuthObserver security fix 3d442db
* Use XDG_CACHE_HOME for Unix socket directory a141a14 982c40f 5742e1b d53401e a1705ad
* Hangul button press handling 25d11f5 c662a02 ecc3465
* Fix deprecated APIs 48a8d7e 35863d8
* Bug fixes 773420f 745ffb8 26a8105 bccf94d d50627f 7486385 cd4fef5

Signed-off-by: Andreas Müller <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 43e3c0d)
Signed-off-by: Armin Kuster <[email protected]>
@zhengrq-fnst @akuster
Fix build error when enable multilib.
b1b6f97 
ERROR: tracker-miners-2.3.3-r0 do_package: QA Issue: tracker-miners:
Files/directories were installed but not shipped in any package:
  /usr/lib64/systemd
  /usr/lib64/systemd/user
  /usr/lib64/systemd/user/tracker-extract.service
  /usr/lib64/systemd/user/tracker-writeback.service
  /usr/lib64/systemd/user/tracker-miner-fs.service

Signed-off-by: Zheng Ruoqin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 02afb13)
Signed-off-by: Armin Kuster <[email protected]>
@zangrc-fnst @akuster
nftables: upgrade 0.9.5 -> 0.9.6
7ed1adb 
Signed-off-by: Zang Ruochen <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit b0d884a)
[AK: This release fixes vmap support which broke in the previous 0.9.5 release.]
Signed-off-by: Armin Kuster <[email protected]>
@texierp @akuster
minicoredumper: update SRC_URI to use github instead
b86aae0 
Change SRC_URI:

 - all minicoredumper related sources moved to https://github.com/diamon/minicoredumper

>From the NEWS:

The Linux Foundation will be shutting down their git service for workgroups.
The minicoredumper repository and bug tracking has been moved to the DiaMon
Workgroup account on github.com. We thank the Linux Foundation for providing
us the git service over the last 5 years.

Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 110fa89)
Signed-off-by: Armin Kuster <[email protected]>
@zhengrq-fnst @akuster
mraa: Disable python2, otherwise, there is a build error when enable …
aa6371f 
…multilib.

ERROR: mraa-2.1.0+gitAUTOINC+e15ce6fbc7-r0 do_package: QA Issue: mraa:
Files/directories were installed but not shipped in any package:
  /usr/lib/python3.8/site-packages/_mraa.so
  /usr/lib/python3.8/site-packages/mraa.py

Signed-off-by: Zheng Ruoqin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit fadaf48)
Signed-off-by: Armin Kuster <[email protected]>
@zhengrq-fnst @akuster
paho-mqtt-c: Fix build error when enable multilib.
1f77d18 
The error is as the following:
ERROR: paho-mqtt-c-1.3.2-r0 do_package: QA Issue: paho-mqtt-c:
Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/cmake
  /usr/lib/cmake/eclipse-paho-mqtt-c
  /usr/lib/cmake/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake
  /usr/lib/cmake/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfigVersion.cmake
  /usr/lib/cmake/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig-noconfig.cmake

Signed-off-by: Zheng Ruoqin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 93aa8de)
Signed-off-by: Armin Kuster <[email protected]>
@zhengrq-fnst @akuster
upm:Fix build error when enable multilib.
ead5cb4 
ERROR: upm-2.0.0+gitAUTOINC+5cf20df96c-r0 do_package: QA Issue: upm:
Files/directories were installed but not shipped in any package:
  /usr/lib/python3.8/site-packages/upm/pyupm_adc121c021.py
  /usr/lib/python3.8/site-packages/upm/pyupm_hmc5883l.py
  /usr/lib/python3.8/site-packages/upm/_pyupm_mma8x5x.so
  /usr/lib/python3.8/site-packages/upm/_pyupm_m24lr64e.so
  /usr/lib/python3.8/site-packages/upm/pyupm_tca9548a.py
  /usr/lib/python3.8/site-packages/upm/pyupm_mb704x.py
  /usr/lib/python3.8/site-packages/upm/_pyupm_ehr.so
  ......

Signed-off-by: Zheng Ruoqin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit efe14bb)
Signed-off-by: Armin Kuster <[email protected]>
@priv-kweihmann @akuster
openldap: packaging fixes
a6bf385 
in FILES_${PN}-slurpd:
- ${localstatedir}/volatile/run is already covered by FILES_${PN}-slapd
- ${localstatedir}/run is already covered by FILES_${PN}-slapd
in FILES_${PN}-dev:
- ${libdir}/*.a is already covered by FILES_${PN}-staticdev

remove the settings as they were without effect anyway

Signed-off-by: Konrad Weihmann <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 6898858)
Signed-off-by: Armin Kuster <[email protected]>
@ChenQi1989 @akuster
multipath-tools: disable parallel build as a workaround
2103ef7 
With parallel build enabled, we got the following error:

  ld: error in libsg.o(.eh_frame); no .eh_frame_hdr table will be created
  ....
  ld: BFD (GNU Binutils) 2.34.0.20200220 internal error, aborting at ../../bfd/merge.c:933 in _bfd_merged_section_offset
  ....
  | make[1]: *** [Makefile:24: libcheckcciss_tur.so] Error 1
  | make[1]: *** Waiting for unfinished jobs....

However, looking at the Makefile, it does not seem to have problem.

So disable the parallel build as a workaround.

Signed-off-by: Chen Qi <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 45d6317)
Signed-off-by: Armin Kuster <[email protected]>
@robertlinux @akuster
drbd-utils: Add CLEANBROKEN to fix rebuild errors
c0d869c 
Fixed when rebuild:
DEBUG: Executing shell function autotools_preconfigure
NOTE: make clean
aclocal
autoheader
autoconf

You need to call ./configure with appropriate arguments (again).

make: *** [Makefile:287: config.status] Error 1

Signed-off-by: Robert Yang <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 922e061)
Signed-off-by: Armin Kuster <[email protected]>
@mvakuster @akuster
wireshark: Update to 3.2.5
3add820 
Source: wireshark.org
MR: 104620
Type: Security Fix
Disposition: Backport from wireshark.org
ChangeID: 64e3701e4d6bd53972c22c49d655556e6f37e461
Description:

Affects: 3.2.0 to 3.2.4

Includes:
CVE-2020-15466

For more info see: https://www.wireshark.org/docs/relnotes/wireshark-3.2.5.html

Signed-off-by: Armin Kuster <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 9019ceb)
Signed-off-by: Armin Kuster <[email protected]>
@akuster
Revert "jsoncpp: upgrade 1.9.2 -> 1.9.3"
0e0b489 
This reverts commit 2b384c5.

It appears that there was a change in soname not noted in the changelog.

open-source-parsers/jsoncpp@8b7ea09

ABI change appears to have occured.
https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp

Signed-off-by: Armin Kuster <[email protected]>
@opanait-wr @akuster
nss: Fix CVE-2020-12399
5d40238 
Master (nss version 3.54) is not affected by this issue. This is a backport
from nss version 3.54.

NSS has shown timing differences when performing DSA signatures, which was
exploitable and could eventually leak private keys. This vulnerability affects
Thunderbird < 68.9.0, Firefox < 77, and Firefox ESR < 68.9.

Upstream patch:
https://hg.mozilla.org/projects/nss/rev/daa823a4a29bcef0fec33a379ec83857429aea2e

Signed-off-by: Ovidiu Panait <[email protected]>
Signed-off-by: Armin Kuster <[email protected]>
@akuster
jsoncpp: add PE do to revert to older PV
654ad8b 
Signed-off-by: Armin Kuster <[email protected]>
@chaitu236
Copy link
Author

chaitu236 commented Aug 10, 2020

@ni/rtos

@chaitu236 chaitu236 changed the title Cherry latest commits from upstream Cherrypick latest commits from upstream Aug 10, 2020
amstewart
amstewart approved these changes Aug 10, 2020
View reviewed changes
Copy link

@amstewart amstewart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK; these all seem fine to me. Maybe we'll try out a merge commit - instead of a rebase - for this large patchset.

@chaitu236
Copy link
Author

chaitu236 commented Aug 10, 2020 •
edited
Loading

Merge commit would destroy commit history - but we do want it right?
Edit: Nvm was thinking of squash merge.

@amstewart
Copy link

amstewart commented Aug 10, 2020

Not a squash-and-merge, but a regular merge. I've never done that on github before; but I assume it will create a new merge commit with dual-parents to the previous HEAD of dunfell and to the HEAD of dev/dunfell_backports. Then we we rebase, it should automatically drop the merge commit, I think.

@chaitu236
Copy link
Author

chaitu236 commented Aug 10, 2020

Makes sense. In that case, I need to force push the merge commit to this PR?

@chaitu236
Copy link
Author

chaitu236 commented Aug 10, 2020

I think we need merge-commit between our HEAD and upstrem's HEAD not our HEAD and dev/dunfell_backports (which has cherry-picked commits so their commit ids would be different from upstream) - so in this case I need to raise the PR with merge commit?

@amstewart
Copy link

amstewart commented Aug 10, 2020

Makes sense. In that case, I need to force push the merge commit to this PR?

Nope; I think github should make a merge commit automatically from the PR.

I think we need merge-commit between our HEAD and upstrem's HEAD not our HEAD and dev/dunfell_backports (which has cherry-picked commits so their commit ids would be different from upstream) - so in this case I need to raise the PR with merge commit?

I think; if you were to try and merge upstream:dunfell and ni:nilrt/master/dunfell that they would conflict, because we have already cherry-picked some commits from upstream.... I think... I'm not sure; maybe give it a try and tell me if it works.

@chaitu236
Copy link
Author

chaitu236 commented Aug 10, 2020

git merge worked without issues. I'll do a force-push to this PR

@chaitu236 chaitu236 force-pushed the dev/dunfell_backports branch from 270dda7 to bb5c566 Compare August 10, 2020 23:17
@chaitu236 chaitu236 changed the title Cherrypick latest commits from upstream Merged latest dunfell branch from upstream Aug 10, 2020
@amstewart amstewart merged commit ca29f53 into ni:nilrt/master/dunfell Aug 13, 2020
amstewart pushed a commit that referenced this pull request Sep 27, 2022
@amstewart
fio: disable compiler optimizations
8ca0a57 
Pass parameter "--disable-optimizations" to
configure script to disable compiler optimizations
to fix below issue:
$ gdb /usr/bin/fio
(gdb) r -h
Starting program: /usr/bin/fio -h
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1".

Program received signal SIGILL, Illegal instruction.
0x0000000000407220 in prio_tree_init () at lib/prio_tree.c:61
 61	index_bits_to_maxindex[i] = (1UL << (i + 1)) - 1;
(gdb) bt
 #0 0x0000000000407220 in prio_tree_init () at lib/prio_tree.c:61
 #1 0x0000000000482208 in __libc_csu_init (argc=argc@entry=2,
    argv=argv@entry=0x7fffffffecc8, envp=0x7fffffffece0)
    at /usr/src/debug/glibc/2.26-r0/git/csu/elf-init.c:88
 #2 0x00000031c742095e in __libc_start_main (main=0x407700 <main>, argc=2,
    argv=0x7fffffffecc8, init=0x4821b6 <__libc_csu_init>,
    fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7fffffffecb8)
    at /usr/src/debug/glibc/2.26-r0/git/csu/libc-start.c:264
 #3 0x00000000004077ea in _start () at ../sysdeps/x86_64/start.S:120

Signed-off-by: Mingli Yu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
rtollert pushed a commit to rtollert/meta-openembedded that referenced this pull request Sep 13, 2024
@threexc @kraj
xkbutils: upgrade 1.0.5 -> 1.0.6
5fe3c7a 
In particular, make it build with gcc 14.

License-Update: Remove "All rights reserved" from copyright line

Changelog:

2939632 xkbutils 1.0.6
e2ee9c2 Change sprintf calls to use snprintf instead
aa03a3b Remove uSetErrorFile()
5f875c8 xkbwatch: Fix -Wincompatible-pointer-types warning (Issue ni#2)
6dbcbb5 Remove "All rights reserved" from Oracle copyright notices
56c99e3 gitlab CI: stop requiring Signed-off-by in commits

Signed-off-by: Trevor Gamblin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@amstewart amstewart amstewart approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.