summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Barker <paul@betafive.co.uk>2019-11-15 13:00:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-21 23:08:19 +0000
commitbd00c8d85a3543ce20fb2f90c0776dabf3e2d9dd (patch)
treef9aae85521a3b80b22008667d3fc6029273fad88 /meta/recipes-devtools
parent56c530c291da0f3344f8a68a5ca38d8d82e132f7 (diff)
downloadpoky-bd00c8d85a3543ce20fb2f90c0776dabf3e2d9dd.tar.gz
cdrtools-native: Don't set uid/gid during install
This is a native recipe so won't be installed as root. If the string 'root' is part of the username then the install script can get tricked into thinking we are root (regardless of the actual uid or permissions) resulting in attempts to run chown/chgrp inappropriately. (From OE-Core rev: 5db7b80140410cd3c164e4522dc87df92fac93b0) Signed-off-by: Paul Barker <paul@betafive.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb5
-rw-r--r--meta/recipes-devtools/cdrtools/cdrtools/0001-Don-t-set-uid-gid-during-install.patch27
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
index 78e1565e47..1c602e7ce7 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
@@ -7,7 +7,10 @@ SECTION = "console/utils"
7LICENSE = "GPLv2 & CDDL-1.0 & LGPLv2.1+" 7LICENSE = "GPLv2 & CDDL-1.0 & LGPLv2.1+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=32f68170be424c2cd64804337726b312" 8LIC_FILES_CHKSUM = "file://COPYING;md5=32f68170be424c2cd64804337726b312"
9 9
10SRC_URI = "${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${REALPV}.tar.bz2" 10SRC_URI = " \
11 ${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${REALPV}.tar.bz2 \
12 file://0001-Don-t-set-uid-gid-during-install.patch \
13 "
11UPSTREAM_VERSION_UNKNOWN = "1" 14UPSTREAM_VERSION_UNKNOWN = "1"
12 15
13SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" 16SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b"
diff --git a/meta/recipes-devtools/cdrtools/cdrtools/0001-Don-t-set-uid-gid-during-install.patch b/meta/recipes-devtools/cdrtools/cdrtools/0001-Don-t-set-uid-gid-during-install.patch
new file mode 100644
index 0000000000..9d38294b41
--- /dev/null
+++ b/meta/recipes-devtools/cdrtools/cdrtools/0001-Don-t-set-uid-gid-during-install.patch
@@ -0,0 +1,27 @@
1From 529cd5b007aa681c3ca14e5ab1e30469dd51646b Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@betafive.co.uk>
3Date: Tue, 12 Nov 2019 22:17:19 +0000
4Subject: [PATCH] Don't set uid/gid during install
5
6Signed-off-by: Paul Barker <paul@betafive.co.uk>
7Upstream-Status: Inappropriate [native]
8---
9 RULES/rules.prg | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/RULES/rules.prg b/RULES/rules.prg
13index 023555c..f70f1a7 100644
14--- a/RULES/rules.prg
15+++ b/RULES/rules.prg
16@@ -94,7 +94,7 @@ INSGRP= $(__DEFINSGRP:$(_UNIQ)%=%)
17
18 LD= @echo " ==> LINKING \"$@\""; ld
19 LOCALIZE= @echo " ==> LOCALIZING \"$@\""; $(RM_F) $@; cp
20-INSTALL= @echo " ==> INSTALLING \"$@\""; sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS) -o $(INSUSR) -g $(INSGRP)
21+INSTALL= @echo " ==> INSTALLING \"$@\""; sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS)
22 CHMOD= @echo " ==> SETTING PERMISSIONS ON \"$@\""; chmod
23 CHOWN= @echo " ==> SETTING OWNER ON \"$@\""; chown
24 CHGRP= @echo " ==> SETTING GROUP ON \"$@\""; chgrp
25--
262.24.0
27