* [PR PATCH] xbps-src: cleaned up usage of mktemp(1).
@ 2019-06-17 13:14 voidlinux-github
2019-06-17 13:23 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-06-17 13:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 bytes --]
There is a new pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages mktemp-cleanup
https://github.com/void-linux/void-packages/pull/12511
xbps-src: cleaned up usage of mktemp(1).
This one was on my TODO for a long while... fixes unportable
arguments (checked with the NetBSD's manual page).
A patch file from https://github.com/void-linux/void-packages/pull/12511.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mktemp-cleanup-12511.patch --]
[-- Type: application/text/x-diff, Size: 6690 bytes --]
From faeaf206b0a884781c2c4795a0f42e01b462f923 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 17 Jun 2019 15:10:16 +0200
Subject: [PATCH] xbps-src: cleaned up usage of mktemp(1).
This one was on my TODO for a long while... fixes unportable
arguments (checked with the NetBSD's manual page).
---
common/chroot-style/proot.sh | 2 +-
.../hooks/post-install/04-create-xbps-metadata-scripts.sh | 2 +-
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 2 +-
common/hooks/pre-pkg/06-shlib-provides.sh | 2 +-
common/xbps-src/libexec/build.sh | 2 +-
common/xbps-src/shutils/bulk.sh | 2 +-
common/xbps-src/shutils/common.sh | 2 +-
common/xbps-src/shutils/cross.sh | 6 +++---
common/xbps-src/shutils/pkgtarget.sh | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/chroot-style/proot.sh b/common/chroot-style/proot.sh
index 58e7cde01bd..9bcc3f9520f 100755
--- a/common/chroot-style/proot.sh
+++ b/common/chroot-style/proot.sh
@@ -18,7 +18,7 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
fi
# proot does not properly return the resultcode. Workaround this
-RESULT=$(mktemp /tmp/proot_result.XXXXXXXXXX)
+RESULT=$(mktemp || exit 1)
PROOT_NO_SECCOMP=1 proot -r $MASTERDIR -w / -b "$RESULT:/.result" -b $DISTDIR:/void-packages \
${HOSTDIR:+-b $HOSTDIR:/host} -b /proc:/proc -b /dev:/dev \
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index 13d555bde21..8d3c74dd528 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -12,7 +12,7 @@ _add_trigger() {
process_metadata_scripts() {
local action="$1"
local action_file="$2"
- local tmpf=$(mktemp)
+ local tmpf=$(mktemp || exit 1)
local fpattern="s|${PKGDESTDIR}||g;s|^\./$||g;/^$/d"
local targets= f= _f= info_files= home= shell= descr= groups=
local found= triggers_found= _icondirs= _schemas= _mods= _tmpfiles=
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 5ca384a520b..9edb85ad59b 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -61,7 +61,7 @@ hook() {
return 0
fi
- depsftmp=$(mktemp -t xbps_src_depstmp.XXXXXXXXXX) || return 1
+ depsftmp=$(mktemp || exit 1)
find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null
exec 3<&0 # save stdin
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index 738760d0729..44c452a5d9a 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -5,7 +5,7 @@ collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$"
- local _tmpfile="$(mktemp)"
+ local _tmpfile="$(mktemp || exit 1)"
if [ ! -d ${_destdir} ]; then
rm -f ${_tmpfile}
diff --git a/common/xbps-src/libexec/build.sh b/common/xbps-src/libexec/build.sh
index fa81fc32718..3c6f4d7d1dd 100755
--- a/common/xbps-src/libexec/build.sh
+++ b/common/xbps-src/libexec/build.sh
@@ -131,7 +131,7 @@ fi
# the bootstrap pkgs from scratch.
if [ -z "$CHROOT_READY" -a "$PKGNAME" = "base-files" ]; then
msg_normal "Installing $PKGNAME into masterdir...\n"
- _log=$(mktemp --tmpdir || exit 1)
+ _log=$(mktemp || exit 1)
XBPS_ARCH=$XBPS_MACHINE $XBPS_INSTALL_CMD -yf $PKGNAME >${_log} 2>&1
if [ $? -ne 0 ]; then
msg_red "Failed to install $PKGNAME into masterdir, see below for errors:\n"
diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 252de7e9444..ebcd92214c6 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -30,7 +30,7 @@ bulk_sortdeps() {
fi
done
- tmpf=$(mktemp)
+ tmpf=$(mktemp || exit 1)
# Now make the real dependency graph of all pkgs to build.
# Perform a topological sort of all pkgs but only with build dependencies
# that are found in previous step.
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 5cc68599056..ff823538a08 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -5,7 +5,7 @@ run_func() {
: ${funcname:=$func}
- logpipe=$(mktemp -u --tmpdir=${XBPS_STATEDIR} ${pkgname}_${XBPS_CROSS_BUILD}_XXXXXXXX.logpipe)
+ logpipe=$(mktemp -u -p ${XBPS_STATEDIR} ${pkgname}_${XBPS_CROSS_BUILD}_XXXXXXXX.logpipe || exit 1)
logfile=${XBPS_STATEDIR}/${pkgname}_${XBPS_CROSS_BUILD}_${funcname}.log
msg_normal "${pkgver:-xbps-src}: running ${desc:-${func}} ...\n"
diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index 83b7b66fa39..4aab8b81ded 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -6,7 +6,7 @@ remove_pkg_cross_deps() {
cd $XBPS_MASTERDIR || return 1
msg_normal "${pkgver:-xbps-src}: removing autocrossdeps, please wait...\n"
- tmplogf=$(mktemp)
+ tmplogf=$(mktemp || exit 1)
if [ -z "$XBPS_REMOVE_XCMD" ]; then
source_file $XBPS_CROSSPFDIR/${XBPS_CROSS_BUILD}.sh
@@ -37,7 +37,7 @@ prepare_cross_sysroot() {
[ $? -eq 0 ] && return 0
msg_normal "Installing $cross cross pkg: cross-vpkg-dummy ...\n"
- errlog=$(mktemp)
+ errlog=$(mktemp || exit 1)
$XBPS_INSTALL_XCMD -Syfd cross-vpkg-dummy &>$errlog
rval=$?
if [ $rval -ne 0 -a $rval -ne 17 ]; then
@@ -71,7 +71,7 @@ install_cross_pkg() {
check_installed_pkg cross-${XBPS_CROSS_TRIPLET}-0.1_1
[ $? -eq 0 ] && return 0
- errlog=$(mktemp)
+ errlog=$(mktemp || exit 1)
msg_normal "Installing $cross cross compiler: cross-${XBPS_CROSS_TRIPLET} ...\n"
$XBPS_INSTALL_CMD -Syfd cross-${XBPS_CROSS_TRIPLET} &>$errlog
rval=$?
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 931816068dd..bb2c01149e6 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -48,7 +48,7 @@ remove_pkg_autodeps() {
cd $XBPS_MASTERDIR || return 1
msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n"
- tmplogf=$(mktemp)
+ tmplogf=$(mktemp || exit 1)
remove_pkg_cross_deps
$XBPS_RECONFIGURE_CMD -a >> $tmplogf 2>&1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: xbps-src: cleaned up usage of mktemp(1).
2019-06-17 13:14 [PR PATCH] xbps-src: cleaned up usage of mktemp(1) voidlinux-github
@ 2019-06-17 13:23 ` voidlinux-github
0 siblings, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-06-17 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
There's a merged pull request on the void-packages repository
xbps-src: cleaned up usage of mktemp(1).
https://github.com/void-linux/void-packages/pull/12511
Description: This one was on my TODO for a long while... fixes unportable
arguments (checked with the NetBSD's manual page).
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-17 13:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-17 13:14 [PR PATCH] xbps-src: cleaned up usage of mktemp(1) voidlinux-github
2019-06-17 13:23 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).