summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-navigation
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-29 16:48:15 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-29 16:48:21 +0300
commit93c3acf56fcecefef579497263e98c15b6b0e34a (patch)
treeb2b86526293298bb30af7587d17d62405832b930 /meta-openembedded/meta-oe/recipes-navigation
parentb350a87270ee007fb1da2c564c050184abd5ba1e (diff)
downloadopenbmc-93c3acf56fcecefef579497263e98c15b6b0e34a.tar.xz
meta-openembedded: subtree update:18506b797b..c986cbed93
Adrian Bunk (7): gpsd: Backport a memory leak fix gpsd: Stop depending on chrpath-native klibc: Upgrade 2.0.6 -> 2.0.7 gerbera: Upgrade 1.3.0 -> 1.3.2 gstd: Fix the version number webrtc-audio-processing: Upgrade 0.3 -> 0.3.1 vlc: Upgrade 3.0.6 -> 3.0.8 Andreas Müller (15): itstool: rework native shebang and add class to make native itstool work yelp-tools: use itstools.bbclass yelp-xsl: use itstool.bbclass yelp: use itstool.bbclass gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles' zenity: rework recipe dconf: extend to native build for upcoming gdm dconf-editor: upgrade 3.32.0 -> 3.34.0 gtksourceview4: upgrade 4.2.0 -> 4.4.0 gnome-menus3: upgrade 3.10.1 -> 3.32.0 gnome-desktop3: upgrade 3.34.0 -> 3.34.1 gnome-bluetooth: upgrade 3.32.1 -> 3.34.0 gspell: upgrade 1.8.1 -> 1.8.2 gnome-system-monitor: upgrade 3.32.0 -> 3.32.1 network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup Luca Boccassi (4): dbus-broker: 19 -> 21 dbus-broker: backport patches from master dbus-broker: build with SELinux if it's enabled via DISTRO_FEATURES dbus-broker: add patch to fix build with musl libc Trevor Gamblin (1): rsyslog: upgrade from v8.1908.0 to v8.1910.0 Zang Ruochen (4): python-bitarray: upgrade 0.8.3 -> 1.0.1 python-can: upgrade 2.2.1 -> 3.3.2 python-daemonize: upgrade 2.4.7 -> 2.5.0 xmlsec1: upgrade 1.2.28 -> 1.2.29 Zheng Ruoqin (2): keepalived: upgrade 2.0.16 -> 2.0.19 postfix: upgrade 3.4.5 -> 3.4.7 Change-Id: Ibff272f163bb42473022825cfb17a284a0019e83 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-navigation')
-rw-r--r--meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch37
-rw-r--r--meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb6
2 files changed, 39 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
new file mode 100644
index 0000000000..9b38015800
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
@@ -0,0 +1,37 @@
+From 2a4b3bcde0d73a3a4a6644d5f944ac9d16023ba9 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@stusta.de>
+Date: Mon, 21 Oct 2019 13:53:25 +0300
+Subject: gps_shm_close: Free privdata
+
+Previously every open/close cycle leaked privdata.
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Gary E. Miller <gem@rellim.com>
+
+Upstream-Status: Backport
+---
+ libgps_shm.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libgps_shm.c b/libgps_shm.c
+index d93972bba..12bb3760b 100644
+--- a/libgps_shm.c
++++ b/libgps_shm.c
+@@ -163,8 +163,12 @@ int gps_shm_read(struct gps_data_t *gpsdata)
+
+ void gps_shm_close(struct gps_data_t *gpsdata)
+ {
+- if (PRIVATE(gpsdata) && PRIVATE(gpsdata)->shmseg != NULL)
+- (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg);
++ if (PRIVATE(gpsdata)) {
++ if (PRIVATE(gpsdata)->shmseg != NULL)
++ (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg);
++ free(PRIVATE(gpsdata));
++ gpsdata->privdata = NULL;
++ }
+ }
+
+ int gps_shm_mainloop(struct gps_data_t *gpsdata, int timeout,
+--
+2.20.1
+
diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb
index a28d59dce1..6834bd45a7 100644
--- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb
+++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb
@@ -2,13 +2,12 @@ SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices"
SECTION = "console/network"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53"
-DEPENDS = "dbus ncurses python python3 libusb1 chrpath-replacement-native pps-tools"
+DEPENDS = "dbus ncurses python python3 libusb1 pps-tools"
PROVIDES = "virtual/gpsd"
-EXTRANATIVEPATH += "chrpath-native"
-
SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
+ file://0001-gps_shm_close-Free-privdata.patch \
"
SRC_URI[md5sum] = "b3bf88706794eb8e5f2c2543bf7ba87b"
SRC_URI[sha256sum] = "27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39"
@@ -32,7 +31,6 @@ EXTRA_OESCONS = " \
libQgpsmm='false' \
debug='false' \
nostrip='true' \
- chrpath='yes' \
systemd='${SYSTEMD_OESCONS}' \
libdir='${libdir}' \
manbuild='false' \