From 43cd3d58a651fcf3d4754e344aead611a09349b3 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 24 Feb 2018 09:36:50 -0800 Subject: dash: move dash to recipes-shell Signed-off-by: Armin Kuster --- .../0001-Fix-printf-format-errors-with-clang.patch | 28 --------------------- meta-oe/recipes-extended/dash/dash_0.5.9.1.bb | 29 ---------------------- .../0001-Fix-printf-format-errors-with-clang.patch | 28 +++++++++++++++++++++ meta-oe/recipes-shells/dash/dash_0.5.9.1.bb | 29 ++++++++++++++++++++++ 4 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch delete mode 100644 meta-oe/recipes-extended/dash/dash_0.5.9.1.bb create mode 100644 meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch create mode 100644 meta-oe/recipes-shells/dash/dash_0.5.9.1.bb diff --git a/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch b/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch deleted file mode 100644 index b3991faa88..0000000000 --- a/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3ddf397febf47f8de9ca2805e92355ecb3ba0e9f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Apr 2017 12:37:54 -0700 -Subject: [PATCH] Fix printf format errors with clang - -error: format string is not a string literal (potentially insecure) - -Signed-off-by: Khem Raj ---- - src/jobs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jobs.c b/src/jobs.c -index c2c2332..dcb81c1 100644 ---- a/src/jobs.c -+++ b/src/jobs.c -@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly) - goto out; - #endif - } -- col = fmtstr(s, 32, strsignal(st)); -+ col = fmtstr(s, 32, "%s", strsignal(st)); - #ifdef WCOREDUMP - if (WCOREDUMP(status)) { - col += fmtstr(s + col, 16, " (core dumped)"); --- -2.12.2 - diff --git a/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb b/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb deleted file mode 100644 index 6dee66f691..0000000000 --- a/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Small and fast POSIX-compliant shell" -HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" -SECTION = "System Environment/Shells" - -LICENSE = "BSD & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" - -inherit autotools update-alternatives - -SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz \ - file://0001-Fix-printf-format-errors-with-clang.patch \ - " -SRC_URI[md5sum] = "6472702a8d9760d166ef8333dcb527a6" -SRC_URI[sha256sum] = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659" - -EXTRA_OECONF += "--bindir=${base_bindir}" - -ALTERNATIVE_${PN} = "sh" -ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" -ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" -ALTERNATIVE_PRIORITY = "10" - -pkg_postinst_${PN} () { - grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells -} - -pkg_postrm_${PN} () { - printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells -} diff --git a/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch b/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch new file mode 100644 index 0000000000..b3991faa88 --- /dev/null +++ b/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch @@ -0,0 +1,28 @@ +From 3ddf397febf47f8de9ca2805e92355ecb3ba0e9f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 8 Apr 2017 12:37:54 -0700 +Subject: [PATCH] Fix printf format errors with clang + +error: format string is not a string literal (potentially insecure) + +Signed-off-by: Khem Raj +--- + src/jobs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jobs.c b/src/jobs.c +index c2c2332..dcb81c1 100644 +--- a/src/jobs.c ++++ b/src/jobs.c +@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly) + goto out; + #endif + } +- col = fmtstr(s, 32, strsignal(st)); ++ col = fmtstr(s, 32, "%s", strsignal(st)); + #ifdef WCOREDUMP + if (WCOREDUMP(status)) { + col += fmtstr(s + col, 16, " (core dumped)"); +-- +2.12.2 + diff --git a/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb b/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb new file mode 100644 index 0000000000..6dee66f691 --- /dev/null +++ b/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Small and fast POSIX-compliant shell" +HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" +SECTION = "System Environment/Shells" + +LICENSE = "BSD & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" + +inherit autotools update-alternatives + +SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz \ + file://0001-Fix-printf-format-errors-with-clang.patch \ + " +SRC_URI[md5sum] = "6472702a8d9760d166ef8333dcb527a6" +SRC_URI[sha256sum] = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659" + +EXTRA_OECONF += "--bindir=${base_bindir}" + +ALTERNATIVE_${PN} = "sh" +ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" +ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" +ALTERNATIVE_PRIORITY = "10" + +pkg_postinst_${PN} () { + grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells +} + +pkg_postrm_${PN} () { + printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells +} -- cgit 1.2.3-korg