From 7ecb7fa0e684285ad0668d349f32247e26a118e95ce18bd3bf8ad2ab046b9e3b Mon Sep 17 00:00:00 2001 From: c unix Date: Wed, 3 Feb 2021 16:04:03 +0000 Subject: [PATCH] Accepting request 868981 from home:cunix:server_dns bsc#1181502 OBS-URL: https://build.opensuse.org/request/show/868981 OBS-URL: https://build.opensuse.org/package/show/server:dns/dnscrypt-proxy?expand=0&rev=35 --- dnscrypt-proxy.changes | 5 +++++ find_licenses.sh | 2 +- install_licenses.sh | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dnscrypt-proxy.changes b/dnscrypt-proxy.changes index 7a02c46..cceee78 100644 --- a/dnscrypt-proxy.changes +++ b/dnscrypt-proxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 30 12:00:00 UTC 2021 - cunix@mail.de + +- Use less predictable temporary files during build (bsc#1181502). + ------------------------------------------------------------------- Thu Jan 7 20:00:00 UTC 2021 - cunix@mail.de diff --git a/find_licenses.sh b/find_licenses.sh index 1a5f434..02037e8 100644 --- a/find_licenses.sh +++ b/find_licenses.sh @@ -12,7 +12,7 @@ vendor_licenses_dir=$1 username=$(whoami) workingdir=$(pwd) -licenses_file=/tmp/license_files.txt +licenses_file=$(mktemp /tmp/license_files_XXXXXXXXXX.txt) goahead=0 hash_list=() filename_list=() diff --git a/install_licenses.sh b/install_licenses.sh index 6286ae8..97626bf 100644 --- a/install_licenses.sh +++ b/install_licenses.sh @@ -1,6 +1,7 @@ #!/bin/bash # written by cunix in 2019 +# updated in 2021 # # Installs or links previously found licenses. # @@ -9,8 +10,8 @@ vendor_licenses_dir=$1 install_licenses_dir=$2 -licenses_files=/tmp/real_license_files.txt -licenses_links=/tmp/link_license_files.txt +licenses_files=$(mktemp /tmp/real_license_files_XXXXXXXXXX.txt) +licenses_links=$(mktemp /tmp/link_license_files_XXXXXXXXXX.txt) rm $licenses_files rm $licenses_links @@ -21,6 +22,7 @@ find -P $vendor_licenses_dir -type l -fprintf $licenses_links "%f %l\n" while read line do install -D -m 0644 $vendor_licenses_dir/$line $install_licenses_dir/$line + echo installed: $line done < $licenses_files cd $install_licenses_dir @@ -28,4 +30,5 @@ while read line do combo=($line) ln -s ${combo[1]} ${combo[0]} + echo linked: $line done < $licenses_links