From a11ee7117201ad8993671f33a2e2c990b15965ea Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Mon, 03 Jun 2013 21:00:31 -0400 Subject: Add patch to separate opt_uid0_cmd operands. --- diff --git a/patches/03_separate-opt_uid0_cmd-non-option-args.patch b/patches/03_separate-opt_uid0_cmd-non-option-args.patch new file mode 100644 index 0000000..f491acb --- /dev/null +++ b/patches/03_separate-opt_uid0_cmd-non-option-args.patch @@ -0,0 +1,16 @@ +From: "P. J. McDermott" +Description: Separate opt_uid0_cmd non-option arguments + Otherwise, the -u option might be collected by the opt_uid0_cmd. + +diff -Naur src.orig/src/opkbuild.sh src/src/opkbuild.sh +--- src.orig/src/opkbuild.sh 2012-11-15 14:55:57.000000000 -0500 ++++ src/src/opkbuild.sh 2013-06-03 20:46:14.235239682 -0400 +@@ -193,7 +193,7 @@ + test_uid0_cmd() + { + # Verify that the UID 0 command works. +- test_uid=$("${opt_uid0_cmd}" id -u) ++ test_uid=$("${opt_uid0_cmd}" -- id -u) + + if [ ${?} -ne 0 ]; then + ob_error "$(ob_get_msg 'uid0_cmd_not_found')" "${opt_uid0_cmd}" -- cgit v0.9.1