wok-next diff zonecheck/stuff/patches/25param-rb.patch @ rev 21312
inkscape: added build dependency dbus-glib-dev
author | Hans-G?nter Theisgen |
---|---|
date | Tue Dec 10 15:00:13 2019 +0100 (2019-12-10) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/zonecheck/stuff/patches/25param-rb.patch Tue Dec 10 15:00:13 2019 +0100 1.3 @@ -0,0 +1,37 @@ 1.4 +#!/bin/sh -e 1.5 +## by Arnaud Cornet <arnaud.cornet@gmail.com> 1.6 +## 1.7 +## All lines beginning with `## DP:' are a description of the patch. 1.8 +## DP: Fixes locale handling in case there is a trailing @\w+ at the 1.9 +## DP: end of the locale name (like in fr_FR@euro) 1.10 + 1.11 +if [ $# -lt 1 ]; then 1.12 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 1.13 + exit 1 1.14 +fi 1.15 + 1.16 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts 1.17 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" 1.18 + 1.19 +case "$1" in 1.20 + -patch) patch $patch_opts -p1 < $0;; 1.21 + -unpatch) patch $patch_opts -p1 -R < $0;; 1.22 + *) 1.23 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 1.24 + exit 1;; 1.25 +esac 1.26 + 1.27 +exit 0 1.28 + 1.29 +diff -puriN zonecheck-2.0.4.orig/zc/param.rb zonecheck-2.0.4/zc/param.rb 1.30 +--- zonecheck-2.0.4.orig/zc/param.rb 2007-04-06 11:58:50.000000000 +0200 1.31 ++++ zonecheck-2.0.4/zc/param.rb 2007-04-06 11:59:08.000000000 +0200 1.32 +@@ -523,7 +523,7 @@ class Param 1.33 + end 1.34 + 1.35 + def local=(resolv) 1.36 +- resolv = resolv.clone.untaint if resolv.tainted? 1.37 ++ resolv = resolv.dup.untaint if resolv.tainted? 1.38 + @local_name = if resolv.nil? || resolv =~ /^\s*$/ 1.39 + then nil 1.40 + else resolv