helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 22:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdrkit: Fix build with hardening flags

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2017-06-27 23:14:15 -07:00 committed by Martin Jansa
parent f3ac89d24e
commit 8012181e4f
2 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
View File

@ -5,10 +5,10 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8" LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
# While writing download from cdrkit.org was broken so get sources from debian # While writing download from cdrkit.org was broken so get sources from debian
SRC_URI = " \ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \
file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \ file://0001-genisoimage-Fix-fprintf-format-errors.patch \
" "
SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9"
SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da"

49
meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch Normal file
View File

@ -0,0 +1,49 @@
From 8547f23c4416ed98f585c53c62e7d8afd8edab36 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 27 Jun 2017 21:05:31 -0700
Subject: [PATCH] genisoimage: Fix fprintf format errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
genisoimage/genisoimage.c | 4 ++--
genisoimage/tree.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c
index 46f0cb7..9089081 100644
--- a/genisoimage/genisoimage.c
+++ b/genisoimage/genisoimage.c
@@ -3406,7 +3406,7 @@ if (check_session == 0)
if (goof) {
fprintf(stderr, "ISO9660/Rock Ridge tree sort failed.\n");
if(merge_warn_msg)
- fprintf(stderr, merge_warn_msg);
+ fprintf(stderr, "%s", merge_warn_msg);
exit(1);
}
#ifdef UDF
@@ -3419,7 +3419,7 @@ if (check_session == 0)
if (goof) {
fprintf(stderr, "Joliet tree sort failed. The -joliet-long switch may help you.\n");
if(merge_warn_msg)
- fprintf(stderr, merge_warn_msg);
+ fprintf(stderr, "%s", merge_warn_msg);
exit(1);
}
/*
diff --git a/genisoimage/tree.c b/genisoimage/tree.c
index 7805888..8412cc3 100644
--- a/genisoimage/tree.c
+++ b/genisoimage/tree.c
@@ -647,7 +647,7 @@ got_valid_name:
fprintf(stderr, "Unable to sort directory %s\n",
this_dir->whole_name);
if(merge_warn_msg)
- fprintf(stderr, merge_warn_msg);
+ fprintf(stderr, "%s", merge_warn_msg);
exit(1);
}
/*
--
2.13.2