diff -Nru wsl-0.2.1/debian/changelog wsl-0.2.1/debian/changelog --- wsl-0.2.1/debian/changelog 2021-01-25 17:14:07.000000000 +0000 +++ wsl-0.2.1/debian/changelog 2022-01-24 01:40:15.000000000 +0000 @@ -1,3 +1,11 @@ +wsl (0.2.1-3) unstable; urgency=medium + + * QA upload. + * Use a proper tempfile instead of hardcoded 'temp'. (Closes: #1003579) + * Switch from deprecated 'which' to 'command -v'. + + -- Andreas Beckmann Mon, 24 Jan 2022 02:40:15 +0100 + wsl (0.2.1-2) unstable; urgency=medium * QA upload. diff -Nru wsl-0.2.1/debian/copyright wsl-0.2.1/debian/copyright --- wsl-0.2.1/debian/copyright 2012-10-25 19:43:20.000000000 +0000 +++ wsl-0.2.1/debian/copyright 2022-01-24 01:33:37.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: wsl Source: http://linux.dell.com/files/wsl/ diff -Nru wsl-0.2.1/debian/patches/series wsl-0.2.1/debian/patches/series --- wsl-0.2.1/debian/patches/series 2012-11-05 22:02:15.000000000 +0000 +++ wsl-0.2.1/debian/patches/series 2022-01-24 01:20:11.000000000 +0000 @@ -1,2 +1,4 @@ MYPATH.patch sensible-editor.patch +tempfile.patch +which.patch diff -Nru wsl-0.2.1/debian/patches/tempfile.patch wsl-0.2.1/debian/patches/tempfile.patch --- wsl-0.2.1/debian/patches/tempfile.patch 1970-01-01 00:00:00.000000000 +0000 +++ wsl-0.2.1/debian/patches/tempfile.patch 2022-01-24 01:40:15.000000000 +0000 @@ -0,0 +1,24 @@ +Author: Andreas Beckmann +Description: use a proper tempfile instead of hardcoded 'temp' +Bug-Debian: https://bugs.debian.org/1003579 + +--- a/wsl-functions ++++ b/wsl-functions +@@ -602,12 +602,14 @@ if [ -z "${WSLNOINIT}" ] && [ "1" = "${K + CWSENDPOINT="${WSENDPOINT}" + CWSUSER="${WSUSER}" + CWSPASS="${WSPASS}" ++ tmpenv=$(mktemp) ++ chmod =rw ${tmpenv} # honors umask + if [ -e "${MYENV}" ]; then + . ${MYENV} +- cat ${MYENV} | grep -v "^#" | sort | uniq >temp ++ cat ${MYENV} | grep -v "^#" | sort | uniq >${tmpenv} + fi +- echo "##### history ends #####" >>temp +- /bin/mv temp ${MYENV} ++ echo "##### history ends #####" >>${tmpenv} ++ /bin/mv ${tmpenv} ${MYENV} + [ -z "${CWSENDPOINT}" ] && CWSENDPOINT="${WSENDPOINT}" + [ -z "${CWSUSER}" ] && CWSUSER="${WSUSER}" + [ -z "${CWSPASS}" ] && CWSPASS="${WSPASS}" diff -Nru wsl-0.2.1/debian/patches/which.patch wsl-0.2.1/debian/patches/which.patch --- wsl-0.2.1/debian/patches/which.patch 1970-01-01 00:00:00.000000000 +0000 +++ wsl-0.2.1/debian/patches/which.patch 2022-01-24 01:22:45.000000000 +0000 @@ -0,0 +1,41 @@ +Author: Andreas Beckmann +Description: switch from deprecated 'which' to 'command -v' + +--- a/wsl-functions ++++ b/wsl-functions +@@ -61,7 +61,7 @@ ENVIPINTERACTIVE=$IPINTERACTIVE + + if [ ! -e ~/${MYCONFIG} ]; then + DRIVER="#USEWGET=true" +- which curl 2>/dev/null >/dev/null ++ command -v curl 2>/dev/null >/dev/null + [ $? -ne 0 ] && DRIVER="USEWGET=true" + + cat < ~/${MYCONFIG} +@@ -336,7 +336,7 @@ fCreateCredFile() { + + fGetCredFileContents() { + credfile="$1" +- which gpg 2>&1 >/dev/null ++ command -v gpg 2>&1 >/dev/null + if [ $? -eq 0 ]; then + export CREDPAIR=$(gpg -d --batch --passphrase=`uname -n` "${credfile}" 2>"${LOGFILE}") + else +@@ -551,7 +551,7 @@ fNormalizeClass() { + + fCheckReqOrUsage() { + name="$1" +- which ${name} 2>/dev/null >/dev/null ++ command -v ${name} 2>/dev/null >/dev/null + [ $? -ne 0 ] && echo -e "Failed to detect ${name}! This is a runtime requirement, verify installation and try again.\n" && usage + } + +@@ -564,7 +564,7 @@ fCheckReqsOrUsage() { + fCheckReqOrUsage xmllint + } + +-XsLTSTAT=1 ; which xsltproc 2>&1 >/dev/null ; XsLTSTAT=$? ++XsLTSTAT=1 ; command -v xsltproc 2>&1 >/dev/null ; XsLTSTAT=$? + + fDisplayResponse() { + vFile="$1"