diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-06-16 10:06:29 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-06-16 10:06:29 (EDT) |
| commit | 1d9bfde29afeec187d5e4faecde4f8f1bf18c1ea (patch) | |
| tree | 4f17bc32b0fae207d311c382a1339b18968834bc | |
| parent | 56c87a3fd5d427eaab0903349af4d2a897ff18ba (diff) | |
Drop patches applied upstream.
| -rw-r--r-- | patches/01_better-handle-unrecognized-options.patch | 17 | ||||
| -rw-r--r-- | patches/02_dont-generate-mksysconf.patch | 17 | ||||
| -rw-r--r-- | patches/03_separate-opt_uid0_cmd-non-option-args.patch | 52 |
3 files changed, 0 insertions, 86 deletions
diff --git a/patches/01_better-handle-unrecognized-options.patch b/patches/01_better-handle-unrecognized-options.patch deleted file mode 100644 index 87f4f1a..0000000 --- a/patches/01_better-handle-unrecognized-options.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: "P. J. McDermott" <pjm@nac.net> -Description: Better handle unecognized options - optind needs to be incremented for every option. - ---- src.orig/configure 2012-11-16 15:41:08.000000000 -0500 -+++ src/configure 2013-06-02 17:19:30.619119593 -0400 -@@ -256,9 +256,7 @@ - if [ ${?} -ne 0 ]; then - printf 'warning: unrecognized %s name: %s\n' \ - "${_type}" "${_opt}" >&2 -- continue -- fi -- if ${_optarg_set}; then -+ elif ${_optarg_set}; then - _opt="$(printf '%s' "${_opt}" | tr -c '[a-z0-9]' '_')" - eval "${_opt}"=\"\$\{_optarg\}\" - else diff --git a/patches/02_dont-generate-mksysconf.patch b/patches/02_dont-generate-mksysconf.patch deleted file mode 100644 index 27ece1d..0000000 --- a/patches/02_dont-generate-mksysconf.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: "P. J. McDermott" <pjm@nac.net> -Description: Don't generate mksysconf - ---- src.orig/configure 2013-06-02 17:19:30.619119593 -0400 -+++ src/configure 2013-06-02 17:28:09.749967301 -0400 -@@ -329,11 +329,6 @@ - mkdir -p "${_dir}" - sed "${_sed_script}" "${srcdir}/${_dir}/Makefile.in" >"${_dir}/Makefile" - done -- -- # New and improved kludge to generate system configuration for testing. -- # TODO: Remove when no longer used. -- sed "${_sed_script}" "${srcdir}/mksysconf.in" >'mksysconf' -- chmod 755 'mksysconf' - } - - main "${@}" diff --git a/patches/03_separate-opt_uid0_cmd-non-option-args.patch b/patches/03_separate-opt_uid0_cmd-non-option-args.patch deleted file mode 100644 index b3f847d..0000000 --- a/patches/03_separate-opt_uid0_cmd-non-option-args.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: "P. J. McDermott" <pjm@nac.net> -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 21:15:47.625478555 -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}" -@@ -263,7 +263,7 @@ - src_pkg_data_base="src-${src}.data$(ob_get_system_path 'package-source' \ - "${src}" "${ver}")" - -- "${opt_uid0_cmd}" mkdir -p \ -+ "${opt_uid0_cmd}" -- mkdir -p \ - "${src_pkg_data_base}" || \ - ob_error "$(ob_get_msg 'cant_make_src_pkg_dir')" - -@@ -272,7 +272,7 @@ - ../tmp) - ;; - ../*) -- "${opt_uid0_cmd}" cp -R "${file}" "${src_pkg_data_base}" || \ -+ "${opt_uid0_cmd}" -- cp -R "${file}" "${src_pkg_data_base}" || \ - ob_error "$(ob_get_msg 'cant_install_src_pkg_file')" - ;; - esac -@@ -328,7 +328,7 @@ - case "${opt_target}" in - '') - ../build build -- ${opt_uid0_cmd} sh -s <<-EOF -+ ${opt_uid0_cmd} -- sh -s <<-EOF - ../build install && \ - '@@BINDIR@@/ob-installdocs' && \ - '@@BINDIR@@/ob-gencontrol' && \ -@@ -339,7 +339,7 @@ - fi - ;; - 'install'|'install-'*) -- if ! ${opt_uid0_cmd} ../build "${opt_target}"; then -+ if ! ${opt_uid0_cmd} -- ../build "${opt_target}"; then - exit 1 - fi - ;; |