wok-next rev 21055
Small updates.
line diff
1.1 Binary file privatebin/.icon.png has changed
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/privatebin/receipt Mon Dec 03 02:55:21 2018 +0200 2.3 @@ -0,0 +1,74 @@ 2.4 +# SliTaz package receipt v2. 2.5 + 2.6 +PACKAGE="privatebin" 2.7 +VERSION="1.2.1" 2.8 +CATEGORY="network" 2.9 +SHORT_DESC="Online pastebin where the server has zero knowledge of pasted data" 2.10 +MAINTAINER="al.bobylev@gmail.com" 2.11 +LICENSE="zlib/libpng GPL2 BSD MIT Apache CC-BY" 2.12 +WEB_SITE="https://privatebin.info/" 2.13 +HOST_ARCH="any" 2.14 + 2.15 +TARBALL="$PACKAGE-$VERSION.tar.gz" 2.16 +WGET_URL="https://github.com/PrivateBin/PrivateBin/archive/$VERSION.tar.gz" 2.17 + 2.18 +DEPENDS_std="php php-gd" 2.19 +CONFIG_FILES_std="/etc/privatebin/conf.php" 2.20 +TAGS_std="pastebin privacy" 2.21 + 2.22 +compile_rules() { 2.23 + mkdir -p $install/usr/share/privatebin 2.24 + cp -R * $install/usr/share/privatebin 2.25 + 2.26 + mkdir -p $install/etc/ 2.27 + mv $install/usr/share/privatebin/cfg \ 2.28 + $install/etc/privatebin/ 2.29 + ln -s /etc/privatebin $install/usr/share/privatebin/cfg 2.30 + cp $install/etc/privatebin/conf.sample.php $install/etc/privatebin/conf.php 2.31 + 2.32 + # data and runtime folders 2.33 + for i in model purgelimit trafficlimits; do 2.34 + mkdir -p $install/var/lib/privatebin/$i 2.35 + done 2.36 + chown -R www.www $install/var/lib/privatebin/* 2.37 + 2.38 + cook_pick_docs *.md 2.39 + 2.40 + fix symlinks 2.41 +} 2.42 + 2.43 +post_install() { 2.44 + # Configure lighttpd server 2.45 + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then 2.46 + if ! grep -q /usr/share/privatebin/ "$1/etc/lighttpd/lighttpd.conf"; then 2.47 + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/paste/" => "/usr/share/privatebin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" 2.48 + if [ -z "$1" ]; then 2.49 + # Start Web server. 2.50 + /etc/init.d/lighttpd stop 2.51 + /etc/init.d/lighttpd start 2.52 + fi 2.53 + fi 2.54 + fi 2.55 + 2.56 + # Configure apache server 2.57 + if [ -f "$1/etc/apache/httpd.conf" ]; then 2.58 + sed -i 's/lighttpd/apache/' "$1/etc/rcS.conf" 2.59 + if [ ! -f "$1/etc/apache/conf.d/pastebin" ]; then 2.60 + cat > "$1/etc/apache/conf.d/pastebin" <<EOT 2.61 +<IfModule mod_alias.c> 2.62 + Alias /paste /usr/share/pastebin/ 2.63 +</IfModule> 2.64 +<DirectoryMatch /usr/share/pastebin/> 2.65 + php_value upload_max_filesize 2147483647 2.66 + DirectoryIndex index.php 2.67 + AllowOverride None 2.68 + Order allow,deny 2.69 + Allow from all 2.70 +</DirectoryMatch> 2.71 +EOT 2.72 + 2.73 + # Start Web server. 2.74 + [ -n "$1" ] || /etc/init.d/apache restart 2.75 + fi 2.76 + fi 2.77 +}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/privatebin/stuff/patches/config.patch Mon Dec 03 02:55:21 2018 +0200 3.3 @@ -0,0 +1,39 @@ 3.4 +diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php 3.5 +index 28dae77..8028191 100644 3.6 +--- a/cfg/conf.sample.php 3.7 ++++ b/cfg/conf.sample.php 3.8 +@@ -111,7 +111,7 @@ limit = 10 3.9 + ; header = "X_FORWARDED_FOR" 3.10 + 3.11 + ; directory to store the traffic limits in 3.12 +-dir = PATH "data" 3.13 ++dir = "/var/lib/privatebin/trafficlimits" 3.14 + 3.15 + [purge] 3.16 + ; minimum time limit between two purgings of expired pastes, it is only 3.17 +@@ -125,14 +125,14 @@ limit = 300 3.18 + batchsize = 10 3.19 + 3.20 + ; directory to store the purge limit in 3.21 +-dir = PATH "data" 3.22 ++dir = "/var/lib/privatebin/purgelimit" 3.23 + 3.24 + [model] 3.25 + ; name of data model class to load and directory for storage 3.26 + ; the default model "Filesystem" stores everything in the filesystem 3.27 + class = Filesystem 3.28 + [model_options] 3.29 +-dir = PATH "data" 3.30 ++dir = "/var/lib/privatebin/model" 3.31 + 3.32 + ;[model] 3.33 + ; example of DB configuration for MySQL 3.34 +@@ -148,7 +148,7 @@ dir = PATH "data" 3.35 + ; example of DB configuration for SQLite 3.36 + ;class = Database 3.37 + ;[model_options] 3.38 +-;dsn = "sqlite:" PATH "data/db.sq3" 3.39 ++;dsn = "sqlite:" "/var/lib/privatebin/data/db.sq3" 3.40 + ;usr = null 3.41 + ;pwd = null 3.42 + ;opt[12] = true ; PDO::ATTR_PERSISTENT
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/privatebin/stuff/patches/series Mon Dec 03 02:55:21 2018 +0200 4.3 @@ -0,0 +1,2 @@ 4.4 +# From Arch Linux: https://aur.archlinux.org/packages/privatebin 4.5 +config.patch
5.1 --- a/runcom/receipt Sat Dec 01 18:32:50 2018 +0200 5.2 +++ b/runcom/receipt Mon Dec 03 02:55:21 2018 +0200 5.3 @@ -18,11 +18,15 @@ 5.4 # sed '/linuxstart/!d;s/.*href="\([^"]*\)".*/\1/') 5.5 #wget $WEB_SITE/$tarball 5.6 #tar xzf $tarball 5.7 + # may use web archive: https://web.archive.org/web/20161227063415/http://bellard.org/jslinux/tech.html 5.8 + 5.9 mkdir -p $install/usr/bin 5.10 - cc -o $install/usr/bin/runcom $stuff/runcom.c 5.11 - cc -o $src/debug.o -Wa,-a=$src/debug.lst -c $stuff/debug.S 5.12 - objcopy -O binary $src/debug.o $install/usr/bin/debug.bin 5.13 - cp $stuff/debug.com $install/usr/bin 5.14 + cc -o $install/usr/bin/runcom $stuff/runcom.c && 5.15 + 5.16 + cc -o $src/debug.o -Wa,-a=$src/debug.lst -c $stuff/debug.S && 5.17 + objcopy -O binary $src/debug.o $install/usr/bin/debug.bin && 5.18 + 5.19 + cp $stuff/debug.com $install/usr/bin && 5.20 chmod +x $install/usr/bin/debug.* 5.21 } 5.22
6.1 Binary file terminator/.icon.png has changed
7.1 --- a/terminator/receipt Sat Dec 01 18:32:50 2018 +0200 7.2 +++ b/terminator/receipt Mon Dec 03 02:55:21 2018 +0200 7.3 @@ -1,25 +1,22 @@ 7.4 -# SliTaz package receipt. 7.5 +# SliTaz package receipt v2. 7.6 7.7 PACKAGE="terminator" 7.8 -VERSION="0.96" 7.9 +VERSION="1.91" 7.10 CATEGORY="x-window" 7.11 -SHORT_DESC="Tool for arranging terminals" 7.12 +SHORT_DESC="Terminal emulator that supports tabs and grids" 7.13 MAINTAINER="devel@slitaz.org" 7.14 LICENSE="GPL2" 7.15 -WEB_SITE="https://launchpad.net/terminator/" 7.16 +WEB_SITE="https://gnometerminator.blogspot.com/p/introduction.html" 7.17 +HOST_ARCH="any" 7.18 7.19 -TARBALL="${PACKAGE}_$VERSION.tar.gz" 7.20 -WGET_URL="https://launchpad.net/terminator/trunk/$VERSION/+download/$TARBALL" 7.21 +TARBALL="$PACKAGE-$VERSION.tar.gz" 7.22 +WGET_URL="https://launchpad.net/terminator/gtk3/$VERSION/+download/$TARBALL" 7.23 7.24 BUILD_DEPENDS="python-dev gettext-dev intltool" 7.25 +DEPENDS_std="python python-pygtk notify-python" 7.26 7.27 compile_rules() { 7.28 - python -B setup.py install --root=$install 7.29 + python -B setup.py install --root=$install || return 1 7.30 + 7.31 + find $install -type f -exec chmod g-w '{}' \; 7.32 } 7.33 - 7.34 -genpkg_rules() { 7.35 - mkdir -p $fs/usr 7.36 - cp -a $install/usr/bin $fs/usr 7.37 - cp -a $install/usr/lib $fs/usr 7.38 - DEPENDS="python python-pygtk notify-python" 7.39 -}
8.1 --- a/terminus-font/receipt Sat Dec 01 18:32:50 2018 +0200 8.2 +++ b/terminus-font/receipt Mon Dec 03 02:55:21 2018 +0200 8.3 @@ -8,6 +8,7 @@ 8.4 LICENSE="OFL" 8.5 WEB_SITE="http://terminus-font.sourceforge.net/" 8.6 HOST_ARCH="any" 8.7 +REPOLOGY="fonts:terminus" 8.8 8.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 8.10 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
9.1 --- a/xstroke/receipt Sat Dec 01 18:32:50 2018 +0200 9.2 +++ b/xstroke/receipt Mon Dec 03 02:55:21 2018 +0200 9.3 @@ -6,12 +6,15 @@ 9.4 SHORT_DESC="Full-screen gesture recognition program for X" 9.5 MAINTAINER="devel@slitaz.org" 9.6 LICENSE="GPL2" 9.7 -WEB_SITE="https://cworth.org/cworth/papers/xstroke/" 9.8 +#WEB_SITE="https://cworth.org/cworth/papers/xstroke/" 9.9 +#WEB_SITE="https://web.archive.org/web/20170829030627/https://cworth.org/cworth/papers/xstroke/" 9.10 +WEB_SITE="https://www.usenix.org/legacy/publications/library/proceedings/usenix03/tech/freenix03/full_papers/worth/worth_html/xstroke.html" 9.11 9.12 TARBALL="$PACKAGE-$VERSION.tar.gz" 9.13 WGET_URL="http://davesource.com/Projects/xstroke/xstroke.tar.gz" 9.14 9.15 BUILD_DEPENDS="xorg-libX11-dev" 9.16 +DEPENDS_std="xorg-libX11" 9.17 9.18 compile_rules() { 9.19 sed \ 9.20 @@ -23,10 +26,6 @@ 9.21 make xstroke || return 1 9.22 9.23 install -Dm755 xstroke $install/usr/bin/xstroke 9.24 + chmod 644 xstroke.man 9.25 cook_pick_docs xstroke.man 9.26 } 9.27 - 9.28 -genpkg_rules() { 9.29 - copy @std 9.30 - DEPENDS="xorg-libX11" 9.31 -}
10.1 --- a/zerobin/receipt Sat Dec 01 18:32:50 2018 +0200 10.2 +++ b/zerobin/receipt Mon Dec 03 02:55:21 2018 +0200 10.3 @@ -1,16 +1,22 @@ 10.4 # SliTaz package receipt v2. 10.5 10.6 PACKAGE="zerobin" 10.7 -GITHASH="8cae64d6eab99fb0d31868df77846285c0958ed0" # 6 feb 2014 10.8 -VERSION="${GITHASH:0:7}" 10.9 +VERSION="0.19" 10.10 +COMMIT="8ec0948" 10.11 CATEGORY="network" 10.12 -SHORT_DESC="Online pastebin where the server has zero knowledge of pasted data" 10.13 +SHORT_DESC="Online pastebin where the server has zero knowledge of pasted data \ 10.14 +[ unmaintained, consider switch to privatebin ]" 10.15 MAINTAINER="pascal.bellard@slitaz.org" 10.16 LICENSE="zlib/libpng" 10.17 -WEB_SITE="http://sebsauvage.net/wiki/doku.php?id=php:zerobin" 10.18 +WEB_SITE="https://sebsauvage.net/wiki/doku.php?id=php:zerobin" 10.19 +HOST_ARCH="any" 10.20 10.21 -TARBALL="$PACKAGE-$VERSION.tar.gz" 10.22 -WGET_URL="https://github.com/sebsauvage/ZeroBin/archive/$VERSION.tar.gz" 10.23 +TARBALL="$PACKAGE-${COMMIT:-VERSION}.tar.gz" 10.24 +WGET_URL="https://github.com/sebsauvage/ZeroBin/archive/${COMMIT:-VERSION}.tar.gz" 10.25 + 10.26 +DEPENDS_std="php" 10.27 +SUGGESTED_std="php-gd" 10.28 +TAGS_std="pastebin privacy" 10.29 10.30 compile_rules() { 10.31 mkdir -p \ 10.32 @@ -21,13 +27,10 @@ 10.33 cp $stuff/purge.sh $install/var/lib/zerobin/data/ 10.34 ln -s /var/lib/zerobin/data $install/usr/share/zerobin/data 10.35 ln -s /var/lib/zerobin/tmp $install/usr/share/zerobin/tmp 10.36 - chown -R www.www $install/usr/share/zerobin $install/var/lib/zerobin/* 10.37 -} 10.38 + chown -R www.www $install/usr/share/zerobin/ $install/var/lib/zerobin/* 10.39 10.40 -genpkg_rules() { 10.41 - copy @std 10.42 - DEPENDS="php" 10.43 - SUGGESTED="php-gd" 10.44 + fix symlinks 10.45 + find $install -exec chmod g-w '{}' \; 10.46 } 10.47 10.48 post_install() { 10.49 @@ -51,7 +54,7 @@ 10.50 Alias /paste /usr/share/zerobin/ 10.51 </IfModule> 10.52 <DirectoryMatch /usr/share/zerobin/> 10.53 - php_value upload_max_filesize 2147483647 10.54 + php_value upload_max_filesize 2147483647 10.55 DirectoryIndex index.php 10.56 AllowOverride None 10.57 Order allow,deny
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/zerobin/stuff/overrides Mon Dec 03 02:55:21 2018 +0200 11.3 @@ -0,0 +1,9 @@ 11.4 +80:80 /usr/share/zerobin/* 11.5 +80:80 /usr/share/zerobin/css/* 11.6 +80:80 /usr/share/zerobin/img/* 11.7 +80:80 /usr/share/zerobin/js/* 11.8 +80:80 /usr/share/zerobin/js/highlight.styles/* 11.9 +80:80 /usr/share/zerobin/lib/* 11.10 +80:80 /usr/share/zerobin/tpl/* 11.11 +80:80 /var/lib/zerobin/data/purge.sh 11.12 +80:80 /var/lib/zerobin/tmp/
12.1 --- a/zim/receipt Sat Dec 01 18:32:50 2018 +0200 12.2 +++ b/zim/receipt Mon Dec 03 02:55:21 2018 +0200 12.3 @@ -1,12 +1,13 @@ 12.4 # SliTaz package receipt v2. 12.5 12.6 PACKAGE="zim" 12.7 -VERSION="0.65" 12.8 +VERSION="0.68" 12.9 CATEGORY="utilities" 12.10 SHORT_DESC="A desktop wiki" 12.11 MAINTAINER="devel@slitaz.org" 12.12 LICENSE="GPL2" 12.13 WEB_SITE="http://zim-wiki.org/" 12.14 +HOST_ARCH="any" 12.15 12.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 12.17 WGET_URL="http://zim-wiki.org/downloads/$TARBALL" 12.18 @@ -14,17 +15,12 @@ 12.19 BUILD_DEPENDS="python-dev python-pygtk python-pygobject2 python-simplejson \ 12.20 python-pyxdg desktop-file-utils shared-mime-info xdg-utils python-pycairo-dev \ 12.21 python-pygobject2-dev python-pygtk-dev" 12.22 +DEPENDS_std="python python-pygtk python-pygobject2 python-simplejson \ 12.23 +python-pyxdg desktop-file-utils shared-mime-info xdg-utils" 12.24 +TAGS_std="wiki notebook" 12.25 12.26 compile_rules() { 12.27 - python -B setup.py install --root=$install install 12.28 + python -B setup.py install --root=$install install || return 1 12.29 + 12.30 + find $install -type f -exec chmod g-w '{}' \; 12.31 } 12.32 - 12.33 -genpkg_rules() { 12.34 - mkdir -p $fs/usr/share 12.35 - cp -a $install/usr/bin $fs/usr 12.36 - cp -a $install/usr/lib $fs/usr 12.37 - cp -a $install/usr/share/zim $fs/usr/share 12.38 - DEPENDS="python python-pygtk python-pygobject2 python-simplejson \ 12.39 - python-pyxdg desktop-file-utils shared-mime-info xdg-utils" 12.40 - TAGS="wiki notebook" 12.41 -}
13.1 Binary file zonecheck/.icon.png has changed
14.1 --- a/zonecheck/receipt Sat Dec 01 18:32:50 2018 +0200 14.2 +++ b/zonecheck/receipt Mon Dec 03 02:55:21 2018 +0200 14.3 @@ -6,27 +6,24 @@ 14.4 SHORT_DESC="Check that a zone or domain name is correctly configured in the DNS" 14.5 MAINTAINER="pascal.bellard@slitaz.org" 14.6 LICENSE="GPL3" 14.7 -WEB_SITE="https://www.zonemaster.fr/" 14.8 +WEB_SITE="https://github.com/zonemaster" 14.9 +HOST_ARCH="any" 14.10 14.11 -TARBALL="$PACKAGE-$VERSION.tgz" 14.12 -WGET_URL="$WEB_SITE/download/$TARBALL" 14.13 +TARBALL="zonecheck_3.0.5.orig.tar.gz" 14.14 +WGET_URL="http://deb.debian.org/debian/pool/main/z/zonecheck/$TARBALL" 14.15 14.16 BUILD_DEPENDS="ruby-dev" 14.17 +DEPENDS_std="ruby" 14.18 +CONFIG_FILES_std="/etc/zonecheck/" 14.19 14.20 compile_rules() { 14.21 + fix utf-8; export LC_ALL=en_US.UTF-8 14.22 ruby \ 14.23 ./installer.rb all \ 14.24 - -DPREFIX=$install/usr \ 14.25 - -DETCDIR=$install/etc \ 14.26 - -DMANDIR=$install/usr/share/man 14.27 - grep -rl $install $install/usr/libexec | xargs sed -i "s|$install||" 14.28 + -DPREFIX=/usr \ 14.29 + -DETCDIR=/etc \ 14.30 + -DMANDIR=/usr/share/man \ 14.31 + -DCHROOT=$install \ 14.32 + || return 1 14.33 + fix symlinks 14.34 } 14.35 - 14.36 -genpkg_rules() { 14.37 - cp -a $install/* $fs 14.38 - tmp=$(readlink $fs/usr/bin/zonecheck) 14.39 - rm -f $fs/usr/bin/zonecheck 14.40 - ln -s ${tmp#$install} $fs/usr/bin/zonecheck 14.41 - DEPENDS="ruby" 14.42 - CONFIG_FILES="/etc/zonecheck" 14.43 -}
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/zonecheck/stuff/patches/10installer-rb.patch Mon Dec 03 02:55:21 2018 +0200 15.3 @@ -0,0 +1,90 @@ 15.4 +#! /bin/sh /usr/share/dpatch/dpatch-run 15.5 +## filecSt9Ia.dpatch by Sebastien Delafond <sdelafond@gmx.net> 15.6 +## 15.7 +## All lines beginning with `## DP:' are a description of the patch. 15.8 +## DP: better handling of the CGI home. 15.9 + 15.10 +if [ $# -lt 1 ]; then 15.11 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 15.12 + exit 1 15.13 +fi 15.14 + 15.15 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts 15.16 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" 15.17 + 15.18 +case "$1" in 15.19 + -patch) patch $patch_opts -p1 < $0;; 15.20 + -unpatch) patch $patch_opts -p1 -R < $0;; 15.21 + *) 15.22 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 15.23 + exit 1;; 15.24 +esac 15.25 + 15.26 +exit 0 15.27 + 15.28 +diff -urNad zonecheck-2.0.4/installer.rb /tmp/dpep.gXpF1A/zonecheck-2.0.4/installer.rb 15.29 +--- zonecheck-2.0.4/installer.rb 2005-01-21 16:29:46.000000000 -0800 15.30 ++++ /tmp/dpep.gXpF1A/zonecheck-2.0.4/installer.rb 2005-01-21 16:29:57.000000000 -0800 15.31 +@@ -55,7 +55,8 @@ 15.32 + ENV['DOCDIR' ] ||= "#{ENV['PREFIX']}/share/doc" 15.33 + ENV['ETCDIR' ] ||= "#{ENV['PREFIX']}/etc" 15.34 + ENV['CGIDIR' ] ||= "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}/cgi-bin" 15.35 +- ENV['WWWDIR' ] ||= "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}/www" 15.36 ++ ENV['WWWDIR' ] ||= "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}/www" 15.37 ++ ENV['WWWCGIDIR' ] ||= "#{ENV['HTML_PATH']}/cgi-bin" 15.38 + 15.39 + ENV['VERSION' ] ||= VERSION 15.40 + 15.41 +@@ -165,8 +166,11 @@ 15.42 + def inst_cli 15.43 + puts "==> Installing CLI" 15.44 + mkdir_p "#{ENV['CHROOT']}#{ENV['BINDIR']}", :verbose => @verbose 15.45 +- ln_s @zc, "#{ENV['CHROOT']}#{ENV['BINDIR']}/#{ENV['PROGNAME']}", 15.46 ++ @p = pwd 15.47 ++ cd @ch_installdir, :verbose => @verbose 15.48 ++ ln_s "../share/zonecheck/zc/zc.rb", "../../bin/#{ENV['PROGNAME']}", 15.49 + :force => true, :verbose => @verbose 15.50 ++ cd @p 15.51 + mkdir_p "#{ENV['CHROOT']}#{ENV['MANDIR']}/man1",:verbose => @verbose 15.52 + install "man/zonecheck.1", 15.53 + "#{ENV['CHROOT']}#{ENV['MANDIR']}/man1/#{ENV['PROGNAME']}.1", 15.54 +@@ -177,9 +181,11 @@ 15.55 + 15.56 + def patch_cgi 15.57 + puts "==> Patching HTML pages" 15.58 +- Dir["#{@ch_wwwdir}/www/html/*.html.*"].each { |page| 15.59 +- page_content = File.readlines(page) 15.60 +- page_content.each { |line| 15.61 ++ Dir["#{@ch_wwwdir}/*.html.*"].each { |page| 15.62 ++ page_content = File.readlines(page) 15.63 ++ page_content.each { |line| 15.64 ++ line.gsub!(/HTML_PATH\/cgi-bin/, ENV['WWWCGIDIR']) 15.65 ++ line.gsub!(/\/(fr|en)\/(.*)\"/, "/\\2.\\1\"" ) 15.66 + line.gsub!(/HTML_PATH/, ENV['HTML_PATH']) } 15.67 + File::open(page, "w", 0644) { |io| io.puts page_content } 15.68 + } 15.69 +@@ -189,15 +195,22 @@ 15.70 + def inst_cgi 15.71 + puts "==> Installing HTML pages" 15.72 + mkdir_p @ch_wwwdir, :verbose => @verbose 15.73 +- Dir["www/*"].each { |entry| 15.74 ++ ["www/img", "www/js", "www/style"].each { |entry| 15.75 + cp_r entry, @ch_wwwdir, :verbose => @verbose 15.76 + } 15.77 ++ Dir["www/html/*"].each { |entry| 15.78 ++ cp entry, @ch_wwwdir, :verbose => @verbose 15.79 ++ } 15.80 + puts 15.81 + 15.82 + puts "==> Installing CGI" 15.83 ++ mkdir_p @ch_installdir, :verbose => @verbose 15.84 + mkdir_p "#{ENV['CHROOT']}#{ENV['CGIDIR']}", :verbose => @verbose 15.85 +- ln_s @zc, "#{ENV['CHROOT']}#{ENV['CGIDIR']}/zc.cgi", 15.86 ++ @p = pwd 15.87 ++ cd @ch_installdir, :verbose => @verbose 15.88 ++ ln_s "../../share/zonecheck/zc/zc.rb", "../../lib/cgi-bin/zc.cgi", 15.89 + :force => true, :verbose => @verbose 15.90 ++ cd @p 15.91 + puts 15.92 + end 15.93 +
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/zonecheck/stuff/patches/20locale-rb.patch Mon Dec 03 02:55:21 2018 +0200 16.3 @@ -0,0 +1,38 @@ 16.4 +#!/bin/sh -e 16.5 +## by Sebastien Delafond <sdelafond@gmx.net> 16.6 +## 16.7 +## All lines beginning with `## DP:' are a description of the patch. 16.8 +## DP: Fixes locale handling in case there is a trailing @\w+ at the 16.9 +## DP: end of the locale name (like in fr_FR@euro) 16.10 + 16.11 +if [ $# -lt 1 ]; then 16.12 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 16.13 + exit 1 16.14 +fi 16.15 + 16.16 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts 16.17 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" 16.18 + 16.19 +case "$1" in 16.20 + -patch) patch $patch_opts -p1 < $0;; 16.21 + -unpatch) patch $patch_opts -p1 -R < $0;; 16.22 + *) 16.23 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 16.24 + exit 1;; 16.25 +esac 16.26 + 16.27 +exit 0 16.28 + 16.29 +Index: zonecheck-3.0.0/zc/locale.rb 16.30 +=================================================================== 16.31 +--- zonecheck-3.0.0.orig/zc/locale.rb 2010-06-07 10:51:25.000000000 +0200 16.32 ++++ zonecheck-3.0.0/zc/locale.rb 2010-06-24 11:06:43.000000000 +0200 16.33 +@@ -32,7 +32,7 @@ 16.34 + # 16.35 + module ZoneCheck 16.36 + class Locale 16.37 +- LANGRegex = /^(\w+?)(?:_(\w+))?(?:\.([\w\-]+))?$/ 16.38 ++ LANGRegex = /^(\w+?)(?:_(\w+))?(?:\.([\w\-]+))?(?:@\w+)?$/ 16.39 + 16.40 + # 16.41 + # Normalize lang
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/zonecheck/stuff/patches/25param-rb.patch Mon Dec 03 02:55:21 2018 +0200 17.3 @@ -0,0 +1,37 @@ 17.4 +#!/bin/sh -e 17.5 +## by Arnaud Cornet <arnaud.cornet@gmail.com> 17.6 +## 17.7 +## All lines beginning with `## DP:' are a description of the patch. 17.8 +## DP: Fixes locale handling in case there is a trailing @\w+ at the 17.9 +## DP: end of the locale name (like in fr_FR@euro) 17.10 + 17.11 +if [ $# -lt 1 ]; then 17.12 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 17.13 + exit 1 17.14 +fi 17.15 + 17.16 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts 17.17 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" 17.18 + 17.19 +case "$1" in 17.20 + -patch) patch $patch_opts -p1 < $0;; 17.21 + -unpatch) patch $patch_opts -p1 -R < $0;; 17.22 + *) 17.23 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 17.24 + exit 1;; 17.25 +esac 17.26 + 17.27 +exit 0 17.28 + 17.29 +diff -puriN zonecheck-2.0.4.orig/zc/param.rb zonecheck-2.0.4/zc/param.rb 17.30 +--- zonecheck-2.0.4.orig/zc/param.rb 2007-04-06 11:58:50.000000000 +0200 17.31 ++++ zonecheck-2.0.4/zc/param.rb 2007-04-06 11:59:08.000000000 +0200 17.32 +@@ -523,7 +523,7 @@ class Param 17.33 + end 17.34 + 17.35 + def local=(resolv) 17.36 +- resolv = resolv.clone.untaint if resolv.tainted? 17.37 ++ resolv = resolv.dup.untaint if resolv.tainted? 17.38 + @local_name = if resolv.nil? || resolv =~ /^\s*$/ 17.39 + then nil 17.40 + else resolv
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/zonecheck/stuff/patches/30webpages.patch Mon Dec 03 02:55:21 2018 +0200 18.3 @@ -0,0 +1,40 @@ 18.4 +#!/bin/sh -e 18.5 +## by Sebastien Delafond <sdelafond@gmx.net> 18.6 +## 18.7 +## All lines beginning with `## DP:' are a description of the patch. 18.8 +## DP: zonecheck-webpages.dpatch 18.9 +## DP: - Makes direct link from form.html.en to form.html.fr and vice-versa 18.10 + 18.11 +Index: zonecheck-3.0.0/www/html/form.html.en 18.12 +=================================================================== 18.13 +--- zonecheck-3.0.0.orig/www/html/form.html.en 2010-06-24 11:09:51.000000000 +0200 18.14 ++++ zonecheck-3.0.0/www/html/form.html.en 2010-06-24 11:09:57.000000000 +0200 18.15 +@@ -70,7 +70,7 @@ 18.16 + <body> 18.17 + 18.18 + 18.19 +- <div class="paragraph" id="lang">Lang: <b>EN</b> / <a href="/zonecheck/fr/">FR</a></div> 18.20 ++ <div class="paragraph" id="lang">Lang: <b>EN</b> / <a href="/zonecheck/fr/form.html">FR</a></div> 18.21 + 18.22 + <!-- Logo --> 18.23 + <h1 id="logo"> 18.24 +Index: zonecheck-3.0.0/www/html/form.html.fr 18.25 +=================================================================== 18.26 +--- zonecheck-3.0.0.orig/www/html/form.html.fr 2010-06-24 11:09:27.000000000 +0200 18.27 ++++ zonecheck-3.0.0/www/html/form.html.fr 2010-06-24 11:09:39.000000000 +0200 18.28 +@@ -68,7 +68,7 @@ 18.29 + <body> 18.30 + 18.31 + 18.32 +- <div class="paragraph" id="lang">Lang: <a href="HTML_PATH/en/">EN</a> / <b>FR</b></div> 18.33 ++ <div class="paragraph" id="lang">Lang: <a href="HTML_PATH/en/form.html">EN</a> / <b>FR</b></div> 18.34 + 18.35 + <!-- Logo --> 18.36 + <h1 id="logo"> 18.37 +@@ -571,4 +571,4 @@ 18.38 + <!-- mode: html --> 18.39 + <!-- End: --> 18.40 + 18.41 +-</html> 18.42 +\ No newline at end of file 18.43 ++</html>
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/zonecheck/stuff/patches/35_apache-conf.patch Mon Dec 03 02:55:21 2018 +0200 19.3 @@ -0,0 +1,16 @@ 19.4 +--- /dev/null 19.5 ++++ b/doc/apache.conf 19.6 +@@ -0,0 +1,13 @@ 19.7 ++AliasMatch ^/zonecheck/?$ /usr/share/zonecheck-cgi/html/form.html 19.8 ++AliasMatch ^/zonecheck/(en|fr)/?$ /usr/share/zonecheck-cgi/html/form.html.$1 19.9 ++AliasMatch ^/zonecheck/(en|fr)/(.*)$ /usr/share/zonecheck-cgi/html/$2.$1 19.10 ++ScriptAlias /zonecheck/cgi-bin/zc.cgi /usr/share/zonecheck/zc/zc.rb 19.11 ++ScriptAlias /zonecheck/cgi-bin/ /usr/share/zonecheck/zc/ 19.12 ++Alias /zonecheck/js/ /usr/share/zonecheck-cgi/js/ 19.13 ++Alias /zonecheck/style/ /usr/share/zonecheck-cgi/style/ 19.14 ++Alias /zonecheck/img/ /usr/share/zonecheck-cgi/img/ 19.15 ++Alias /zonecheck/ /usr/share/zonecheck-cgi/html/ 19.16 ++ 19.17 ++<Directory /usr/share/zonecheck-cgi/> 19.18 ++ Options Includes FollowSymLinks MultiViews 19.19 ++</Directory>
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/zonecheck/stuff/patches/40man-1.patch Mon Dec 03 02:55:21 2018 +0200 20.3 @@ -0,0 +1,272 @@ 20.4 +#!/bin/sh -e 20.5 +## 40man-1.dpatch by Sebastien Delafond <sdelafond@gmx.net> 20.6 +## 20.7 +## All lines beginning with `## DP:' are a description of the patch. 20.8 +## 20.9 +## DP: Escape '-' signs where needed, per 20.10 +## DP: http://lists.debian.org/debian-devel/2003/03/msg01481.html 20.11 + 20.12 +if [ $# -lt 1 ]; then 20.13 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 20.14 + exit 1 20.15 +fi 20.16 + 20.17 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts 20.18 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" 20.19 + 20.20 +case "$1" in 20.21 + -patch) patch $patch_opts -p1 < $0;; 20.22 + -unpatch) patch $patch_opts -p1 -R < $0;; 20.23 + *) 20.24 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" 20.25 + exit 1;; 20.26 +esac 20.27 + 20.28 +exit 0 20.29 + 20.30 +Index: zonecheck-3.0.0/man/zonecheck.1 20.31 +=================================================================== 20.32 +--- zonecheck-3.0.0.orig/man/zonecheck.1 2010-06-03 10:09:28.000000000 +0200 20.33 ++++ zonecheck-3.0.0/man/zonecheck.1 2010-06-24 11:41:45.000000000 +0200 20.34 +@@ -62,7 +62,7 @@ 20.35 + .B \-voet 20.36 + .I opt 20.37 + ] [ 20.38 +-.B -46 20.39 ++.B \-46 20.40 + ] [ 20.41 + .B \-c 20.42 + .I conf 20.43 +@@ -91,12 +91,12 @@ 20.44 + that case happens the most recent option will be taken into account, 20.45 + silently discarding the others. 20.46 + .TP 20.47 +-\fB--lang\fR \fIlang\fR 20.48 ++\fB\-\-lang\fR \fIlang\fR 20.49 + Select another language (en, fr, ...). The syntax is the same as for the 20.50 + environment variable \fILANG\fR. 20.51 + . 20.52 + .TP 20.53 +-\fB--debug\fR, \fB-d\fR \fIlvl\fR 20.54 ++\fB\-\-debug\fR, \fB\-d\fR \fIlvl\fR 20.55 + Select the debugging messages to print or activate debugging code. 20.56 + This parameter will override the value of the environment variable \fIZC_DEBUG\fR. 20.57 + .br 20.58 +@@ -116,15 +116,15 @@ 20.59 + 0x4000 : Disable caching 20.60 + 0x8000 : Don't try to rescue exceptions 20.61 + .TP 20.62 +-\fB--help\fR, \fB-h\fR 20.63 ++\fB\-\-help\fR, \fB\-h\fR 20.64 + Show a short description of the different options available in \fIZoneCheck\fR. 20.65 + . 20.66 + .TP 20.67 +-\fB--version\fR, \fB-V\fR 20.68 ++\fB\-\-version\fR, \fB\-V\fR 20.69 + Display the version and exit. 20.70 + . 20.71 + .TP 20.72 +-\fB--batch\fR, \fB-B\fR \fIfilename\fR 20.73 ++\fB\-\-batch\fR, \fB\-B\fR \fIfilename\fR 20.74 + Depreciated option. You can use this script instead : 20.75 + .br 20.76 + for domain in `cat list_dom`; do 20.77 +@@ -133,19 +133,19 @@ 20.78 + done 20.79 + . 20.80 + .TP 20.81 +-\fB--config\fR, \fB-c\fR \fIfilename\fR 20.82 ++\fB\-\-config\fR, \fB\-c\fR \fIfilename\fR 20.83 + Specify the location of the configuration file (default is \fIzc.conf\fR). 20.84 + . 20.85 + .TP 20.86 +-\fB--testdir\fR \fIdirectory\fR 20.87 ++\fB\-\-testdir\fR \fIdirectory\fR 20.88 + Location of the directory holding the tests definition. 20.89 + . 20.90 + .TP 20.91 +-\fB--profile\fR, \fB-P\fR \fIprofilename\fR 20.92 ++\fB\-\-profile\fR, \fB\-P\fR \fIprofilename\fR 20.93 + Force uses of profile \fIprofilename\fR. 20.94 + . 20.95 + .TP 20.96 +-\fB--category\fR, \fB-C\fR \fIcatlist\fR 20.97 ++\fB\-\-category\fR, \fB\-C\fR \fIcatlist\fR 20.98 + Limit the test to perform to the categories specified by \fIcatlist\fR. 20.99 + The syntax for the catgory description is as follow: 20.100 + allow=[+|] disallow=[-|!] subcomponent=: separator=, 20.101 +@@ -153,21 +153,21 @@ 20.102 + don't perform DNS tests that are not SOA related 20.103 + . 20.104 + .TP 20.105 +-\fB--test\fR, \fB-T\fR \fItestname\fR 20.106 ++\fB\-\-test\fR, \fB\-T\fR \fItestname\fR 20.107 + \fItestname\fR is the test to perform. In this case failing to pass 20.108 + the test is considered as fatal. 20.109 + . 20.110 + .TP 20.111 +-\fB--testlist\fR 20.112 ++\fB\-\-testlist\fR 20.113 + List all the tests available. 20.114 + . 20.115 + .TP 20.116 +-\fB--testdesc\fR \fIdesctype\fR 20.117 ++\fB\-\-testdesc\fR \fIdesctype\fR 20.118 + Give a description of the test, the possible values for \fIdesctype\fR 20.119 + are \fBname\fR, \fBsuccess\fR, \fBfailure\fR, \fBexplanation\fR. 20.120 + . 20.121 + .TP 20.122 +-\fB--resolver\fR, \fB-r\fR \fIresolver\fR 20.123 ++\fB\-\-resolver\fR, \fB\-r\fR \fIresolver\fR 20.124 + Resolver to use (only IP address is accepted) for finding the information 20.125 + about the tested zone, 20.126 + by default the name servers used are the one specified in 20.127 +@@ -175,7 +175,7 @@ 20.128 + should already have been delegated. 20.129 + . 20.130 + .TP 20.131 +-\fB--ns\fR, \fB-n\fR \fInslist\fR 20.132 ++\fB\-\-ns\fR, \fB\-n\fR \fInslist\fR 20.133 + List of nameservers for the domain. Nameservers name are separated by 20.134 + a semicolon, the name can be followed by the equal sign and its 20.135 + IP addresses separated by a colon. 20.136 +@@ -183,7 +183,7 @@ 20.137 + This can give the following example: ns1;ns2=ip1,ip2;ns3=ip3 20.138 + . 20.139 + .TP 20.140 +-\fB--securedelegation\fR, \fB-s\fR \fI[dsordnskey]\fR 20.141 ++\fB\-\-securedelegation\fR, \fB\-s\fR \fI[dsordnskey]\fR 20.142 + Force the execution of the full DNSSEC profile. Arguments are optional. 20.143 + You can precise the Trust Anchor of your zone by giving the DNSKEY 20.144 + or the DS and the algorithm used to hash your key. Several Trust 20.145 +@@ -193,20 +193,20 @@ 20.146 + \fBDNSKEY:af1Bs0F+4rg-g19\fP 20.147 + . 20.148 + .TP 20.149 +-\fB--quiet\fR, \fB-q\fR 20.150 ++\fB\-\-quiet\fR, \fB\-q\fR 20.151 + Don't display extra titles. 20.152 + . 20.153 + .TP 20.154 +-\fB--one\fR, \fB-1\fR 20.155 ++\fB\-\-one\fR, \fB\-1\fR 20.156 + Only display the most relevant message in a compact format. 20.157 + . 20.158 + .TP 20.159 +-\fB--tagonly\fR, \fB-g\fR 20.160 ++\fB\-\-tagonly\fR, \fB\-g\fR 20.161 + Display only tag. This option should be used for scripting. 20.162 + . 20.163 + .TP 20.164 +-\fB--verbose\fR, \fB-v\fR \fIoptions\fR 20.165 +-Display extra information, they can be prefix by '-' or '!' 20.166 ++\fB\-\-verbose\fR, \fB\-v\fR \fIoptions\fR 20.167 ++Display extra information, they can be prefix by '\-' or '!' 20.168 + to remove the effect, available options are: 20.169 + . 20.170 + .RS 20.171 +@@ -241,7 +241,7 @@ 20.172 + .RE 20.173 + . 20.174 + .TP 20.175 +-\fB--output\fR, \fB-o\fR \fIoptions\fR 20.176 ++\fB\-\-output\fR, \fB\-o\fR \fIoptions\fR 20.177 + Output rendering/format selection, avalaible options are: 20.178 + .RS 20.179 + .TP 20.180 +@@ -266,7 +266,7 @@ 20.181 + .RE 20.182 + . 20.183 + .TP 20.184 +-\fB--error\fR, \fB-e\fR \fIoptions\fR 20.185 ++\fB\-\-error\fR, \fB\-e\fR \fIoptions\fR 20.186 + Behaviour in case of error, available options are: 20.187 + .RS 20.188 + .TP 20.189 +@@ -292,7 +292,7 @@ 20.190 + .RE 20.191 + . 20.192 + .TP 20.193 +-\fB--transp\fR, \fB-t\fR \fIoptions\fR 20.194 ++\fB\-\-transp\fR, \fB\-t\fR \fIoptions\fR 20.195 + Transport/routing layer selection, available options are: 20.196 + .RS 20.197 + .TP 20.198 +@@ -322,20 +322,20 @@ 20.199 + route to name servers can carry EDNS queries. 20.200 + . 20.201 + .TP 20.202 +-\fB--ipv4\fR, \fB-4\fR 20.203 ++\fB\-\-ipv4\fR, \fB\-4\fR 20.204 + Only check the zone with IPv4 connectivity. 20.205 + . 20.206 + .TP 20.207 +-\fB--ipv6\fR, \fB-6\fR 20.208 ++\fB\-\-ipv6\fR, \fB\-6\fR 20.209 + Only check the zone with IPv6 connectivity. 20.210 + . 20.211 + .TP 20.212 +-\fB--preset\fR \fIname\fR 20.213 ++\fB\-\-preset\fR \fIname\fR 20.214 + Use of a preset configuration defined in the zc.conf configuration file. 20.215 + . 20.216 + .TP 20.217 +-\fB--option\fR \fIoptions\fR 20.218 +-Set extra options. The syntax is: -,-opt,opt,opt=foo 20.219 ++\fB\-\-option\fR \fIoptions\fR 20.220 ++Set extra options. The syntax is: \-,\-opt,opt,opt=foo 20.221 + .RS 20.222 + .TP 20.223 + \fBihtml\fR 20.224 +@@ -355,14 +355,14 @@ 20.225 + .TP 20.226 + .I ZC_CONFIG_FILE 20.227 + Name of the configuration file to use (defaul to zc.conf), it is 20.228 +-override by the \fB--config\fR option. 20.229 ++override by the \fB\-\-config\fR option. 20.230 + .TP 20.231 + .I ZC_LOCALIZATION_DIR 20.232 + Directory where all the localization files are located. 20.233 + .TP 20.234 + .I ZC_TEST_DIR 20.235 + Directory where all the tests are located, it is override by the 20.236 +-\fB--testdir\fR option. 20.237 ++\fB\-\-testdir\fR option. 20.238 + .TP 20.239 + .I ZC_HTML_PATH 20.240 + Path relative to the web server to use when generating HTML pages. 20.241 +@@ -439,14 +439,14 @@ 20.242 + and details of failed tests. 20.243 + .RS 20.244 + .nf 20.245 +-\fBzonecheck -6 --verbose=i,x,d domain_name\fP 20.246 ++\fBzonecheck \-6 \-\-verbose=i,x,d domain_name\fP 20.247 + .fi 20.248 + .RE 20.249 + .LP 20.250 + Ask for the 'error' message associated with the test 'soa'. 20.251 + .RS 20.252 + .nf 20.253 +-\fBzonecheck --testdesc error -T soa\fP 20.254 ++\fBzonecheck \-\-testdesc error \-T soa\fP 20.255 + .fi 20.256 + .RE 20.257 + .LP 20.258 +@@ -455,7 +455,7 @@ 20.259 + a short description of why their domains are not correctly configured. 20.260 + .RS 20.261 + .nf 20.262 +-\fBzonecheck -q -vn,d,x,f domain_name\fP 20.263 ++\fBzonecheck \-q \-vn,d,x,f domain_name\fP 20.264 + .fi 20.265 + .RE 20.266 + .LP 20.267 +@@ -465,7 +465,7 @@ 20.268 + autodetection will failed). 20.269 + .RS 20.270 + .nf 20.271 +-\fBzonecheck -4 -vi,x,d,c domain_name\fP 20.272 ++\fBzonecheck \-4 \-vi,x,d,c domain_name\fP 20.273 + .fi 20.274 + .RE 20.275 + .
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/zonecheck/stuff/patches/50_libxml_407896-fix.patch Mon Dec 03 02:55:21 2018 +0200 21.3 @@ -0,0 +1,24 @@ 21.4 +#! /bin/sh /usr/share/dpatch/dpatch-run 21.5 +## 50_libxml_407896-fix.dpatch by Sebastien Delafond <seb@debian.org> 21.6 +## 21.7 +## All lines beginning with `## DP:' are a description of the patch. 21.8 +## DP: Don't use libxml even if it's available. 21.9 + 21.10 +@DPATCH@ 21.11 +diff -urNad 2.0.4~/zc/ext/myxml.rb 2.0.4/zc/ext/myxml.rb 21.12 +--- 2.0.4~/zc/ext/myxml.rb 2004-01-07 08:44:56.000000000 -0800 21.13 ++++ 2.0.4/zc/ext/myxml.rb 2007-04-06 12:30:17.000000000 -0700 21.14 +@@ -46,12 +46,7 @@ 21.15 + if $zc_xml_parser 21.16 + $zc_xml_parser.intern 21.17 + else 21.18 +- begin 21.19 +- require 'xml/libxml' 21.20 +- :libxml 21.21 +- rescue LoadError 21.22 +- :rexml 21.23 +- end 21.24 ++ :rexml 21.25 + end 21.26 + }).call 21.27 +
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/zonecheck/stuff/patches/60_update-rootservers_463638-fix.patch Mon Dec 03 02:55:21 2018 +0200 22.3 @@ -0,0 +1,45 @@ 22.4 +#! /bin/sh /usr/share/dpatch/dpatch-run 22.5 +## 60_update-rootservers_463638-fix.dpatch by Sebastien Delafond <seb@debian.org> 22.6 +## 22.7 +## All lines beginning with `## DP:' are a description of the patch. 22.8 +## DP: New IP for l.root-servers.net, plus IPv6 addresses. 22.9 + 22.10 +@DPATCH@ 22.11 +diff -urNad 2.0.4~/etc/zonecheck/rootservers 2.0.4/etc/zonecheck/rootservers 22.12 +--- 2.0.4~/etc/zonecheck/rootservers 2008-02-27 16:21:24.000000000 -0800 22.13 ++++ 2.0.4/etc/zonecheck/rootservers 2008-02-27 16:22:03.000000000 -0800 22.14 +@@ -11,22 +11,22 @@ 22.15 + # This list can be generated by the following shell-script (sh): 22.16 + # 22.17 + # for ns in `dig +short . ns | tr 'A-Z' 'a-z' | sort` ; do 22.18 +-# ips=`(dig +short $ns a; dig +short $ns aaaa) | tr '\n' ',' | sed 's/,$//'` 22.19 ++# ips=`(dig +short $ns a; dig +short $ns aaaa) | tr '\n' ', ' | sed 's/,$//'` 22.20 + # echo "$ns: [ $ips ]" 22.21 + # done 22.22 + # 22.23 + 22.24 +-a.root-servers.net.: [ 198.41.0.4 ] 22.25 ++a.root-servers.net.: [ 198.41.0.4, 2001:503:ba3e::2:30 ] 22.26 + b.root-servers.net.: [ 192.228.79.201 ] 22.27 +-c.root-servers.net.: [ 192.33.4.12 ] 22.28 +-d.root-servers.net.: [ 128.8.10.90 ] 22.29 ++c.root-servers.net.: [ 192.33.4.12 ] 22.30 ++d.root-servers.net.: [ 128.8.10.90 ] 22.31 + e.root-servers.net.: [ 192.203.230.10 ] 22.32 +-f.root-servers.net.: [ 192.5.5.241 ] 22.33 +-g.root-servers.net.: [ 192.112.36.4 ] 22.34 +-h.root-servers.net.: [ 128.63.2.53 ] 22.35 +-i.root-servers.net.: [ 192.36.148.17 ] 22.36 +-j.root-servers.net.: [ 192.58.128.30 ] 22.37 +-k.root-servers.net.: [ 193.0.14.129 ] 22.38 +-l.root-servers.net.: [ 198.32.64.12 ] 22.39 +-m.root-servers.net.: [ 202.12.27.33 ] 22.40 ++f.root-servers.net.: [ 192.5.5.241, 2001:500:2f::f ] 22.41 ++g.root-servers.net.: [ 192.112.36.4 ] 22.42 ++h.root-servers.net.: [ 128.63.2.53, 2001:500:1::803f:235 ] 22.43 ++i.root-servers.net.: [ 192.36.148.17 ] 22.44 ++j.root-servers.net.: [ 192.58.128.30, 2001:503:c27::2:30 ] 22.45 ++k.root-servers.net.: [ 193.0.14.129, 2001:7fd::1 ] 22.46 ++l.root-servers.net.: [ 199.7.83.42 ] 22.47 ++m.root-servers.net.: [ 202.12.27.33, 2001:dc3::35 ] 22.48 +
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/zonecheck/stuff/patches/70_zc-locale_472300-fix.patch Mon Dec 03 02:55:21 2018 +0200 23.3 @@ -0,0 +1,20 @@ 23.4 +#! /bin/sh /usr/share/dpatch/dpatch-run 23.5 +## 70_zc-locale_472300-fix.dpatch by Sebastien Delafond <seb@debian.org> 23.6 +## 23.7 +## All lines beginning with `## DP:' are a description of the patch. 23.8 +## DP: Rename locale to zc-locale to avoid conflict with liblocale-ruby. 23.9 + 23.10 +@DPATCH@ 23.11 +Index: zonecheck-3.0.0/zc/zc.rb 23.12 +=================================================================== 23.13 +--- zonecheck-3.0.0.orig/zc/zc.rb 2010-06-24 11:19:54.000000000 +0200 23.14 ++++ zonecheck-3.0.0/zc/zc.rb 2010-06-24 11:21:16.000000000 +0200 23.15 +@@ -192,7 +192,7 @@ 23.16 + 23.17 + 23.18 + # ZoneCheck component 23.19 +-require 'locale' 23.20 ++require 'zc-locale' 23.21 + require 'msgcat' 23.22 + require 'console' 23.23 + require 'zonecheck'
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/zonecheck/stuff/patches/80_no-rubygems.patch Mon Dec 03 02:55:21 2018 +0200 24.3 @@ -0,0 +1,31 @@ 24.4 +Description: Do not require rubygems. 24.5 +Author: Sébastien Delafond <seb@debian.org> 24.6 + 24.7 +Index: zonecheck-3.0.0/zc/zc.rb 24.8 +=================================================================== 24.9 +--- zonecheck-3.0.0.orig/zc/zc.rb 2010-06-24 11:40:08.000000000 +0200 24.10 ++++ zonecheck-3.0.0/zc/zc.rb 2010-06-24 11:40:18.000000000 +0200 24.11 +@@ -207,22 +207,7 @@ 24.12 + $dbg.level = ENV['ZC_DEBUG'] if ENV['ZC_DEBUG'] 24.13 + 24.14 + 24.15 +-begin 24.16 +- require 'rubygems' 24.17 +-rescue LoadError => e 24.18 +- $dbg.msg(ZoneCheck::DBG::INIT, "Unable to require rubygems (#{e})") 24.19 +- $stderr.puts "ERROR: You have to install rubygems and Dnsruby in order to execute ZoneCheck" 24.20 +- exit EXIT_ERROR 24.21 +-end 24.22 +- 24.23 +-# External libraries 24.24 +-begin 24.25 +- require 'dnsruby' 24.26 +-rescue LoadError => e 24.27 +- $dbg.msg(ZoneCheck::DBG::INIT, "Unable to require dnsruby (#{e})") 24.28 +- $stderr.puts "ERROR: You have to install Dnsruby in order to execute ZoneCheck" 24.29 +- exit EXIT_ERROR 24.30 +-end 24.31 ++require 'dnsruby' 24.32 + 24.33 + if Dnsruby.version < 1.47 24.34 + $dbg.msg(ZoneCheck::DBG::INIT, "Unable to require dnsruby (#{e})")
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/zonecheck/stuff/patches/94_yaml1_676173_fix.patch Mon Dec 03 02:55:21 2018 +0200 25.3 @@ -0,0 +1,18 @@ 25.4 +Description: Proper YAML syntax error exception handling for Ruby 1.9 25.5 + The default YAML engine does not have a ParseError exception, but a SyntaxError one. 25.6 +Author: Antonio Terceiro <terceiro@debian.org> 25.7 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676173 25.8 + 25.9 +--- 25.10 + 25.11 +--- zonecheck-3.0.3.orig/test/rootserver.rb 25.12 ++++ zonecheck-3.0.3/test/rootserver.rb 25.13 +@@ -82,7 +82,7 @@ module CheckNetworkAddress 25.14 + if f = $rootserver_hintfile 25.15 + begin 25.16 + rootserver = RootServerList.from_hintfile(f) 25.17 +- rescue YAML::ParseError,SystemCallError => e 25.18 ++ rescue YAML::SyntaxError,SystemCallError => e 25.19 + Dbg.msg(DBG::CONFIG, 25.20 + "Unable to read/parse rootserver hint file (#{e})") 25.21 + end
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/zonecheck/stuff/patches/98_yaml2_676173_fix.patch Mon Dec 03 02:55:21 2018 +0200 26.3 @@ -0,0 +1,69 @@ 26.4 +Description: Proper YAML syntax for rootservers file 26.5 + The default YAML parser in Ruby 1.9 is more strict with the format. This patch 26.6 + converts the rootservers file to a more correct (and more readable) format. 26.7 +Author: Antonio Terceiro <terceiro@debian.org> 26.8 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676173 26.9 + 26.10 +--- zonecheck-3.0.3.orig/etc/zonecheck/rootservers 26.11 ++++ zonecheck-3.0.3/etc/zonecheck/rootservers 26.12 +@@ -11,21 +11,44 @@ 26.13 + # This list can be generated by the following shell-script (sh): 26.14 + # 26.15 + # for ns in `dig +short . ns | tr 'A-Z' 'a-z' | sort` ; do 26.16 +-# ips=`(dig +short $ns a; dig +short $ns aaaa) | tr '\n' ',' | sed 's/,$//'` 26.17 +-# echo "$ns: [ $ips ]" 26.18 ++# echo "$ns:" 26.19 ++# for ip in $(dig +short $ns a; dig +short $ns aaaa); do 26.20 ++# echo " - '$ip'" 26.21 ++# done 26.22 + # done 26.23 +-# TODO: bad syntax? 26.24 + 26.25 +-a.root-servers.net.: [ 198.41.0.4 , 2001:503:ba3e::2:30 ] 26.26 +-b.root-servers.net.: [ 192.228.79.201 ] 26.27 +-c.root-servers.net.: [ 192.33.4.12 ] 26.28 +-d.root-servers.net.: [ 128.8.10.90 ] 26.29 +-e.root-servers.net.: [ 192.203.230.10 ] 26.30 +-f.root-servers.net.: [ 192.5.5.241 , 2001:500:2f::f ] 26.31 +-g.root-servers.net.: [ 192.112.36.4 ] 26.32 +-h.root-servers.net.: [ 128.63.2.53 , 2001:500:1::803f:235 ] 26.33 +-i.root-servers.net.: [ 192.36.148.17, 2001:7FE:0:0:0:0:0:53 ] 26.34 +-j.root-servers.net.: [ 192.58.128.30 , 2001:503:c27::2:30 ] 26.35 +-k.root-servers.net.: [ 193.0.14.129 , 2001:7fd::1 ] 26.36 +-l.root-servers.net.: [ 199.7.83.42 , 2001:500:3::42 ] 26.37 +-m.root-servers.net.: [ 202.12.27.33 , 2001:dc3::35 ] 26.38 ++a.root-servers.net.: 26.39 ++ - '198.41.0.4' 26.40 ++ - '2001:503:ba3e::2:30' 26.41 ++b.root-servers.net.: 26.42 ++ - '192.228.79.201' 26.43 ++c.root-servers.net.: 26.44 ++ - '192.33.4.12' 26.45 ++d.root-servers.net.: 26.46 ++ - '128.8.10.90' 26.47 ++ - '2001:500:2d::d' 26.48 ++e.root-servers.net.: 26.49 ++ - '192.203.230.10' 26.50 ++f.root-servers.net.: 26.51 ++ - '192.5.5.241' 26.52 ++ - '2001:500:2f::f' 26.53 ++g.root-servers.net.: 26.54 ++ - '192.112.36.4' 26.55 ++h.root-servers.net.: 26.56 ++ - '128.63.2.53' 26.57 ++ - '2001:500:1::803f:235' 26.58 ++i.root-servers.net.: 26.59 ++ - '192.36.148.17' 26.60 ++ - '2001:7fe::53' 26.61 ++j.root-servers.net.: 26.62 ++ - '192.58.128.30' 26.63 ++ - '2001:503:c27::2:30' 26.64 ++k.root-servers.net.: 26.65 ++ - '193.0.14.129' 26.66 ++ - '2001:7fd::1' 26.67 ++l.root-servers.net.: 26.68 ++ - '199.7.83.42' 26.69 ++ - '2001:500:3::42' 26.70 ++m.root-servers.net.: 26.71 ++ - '202.12.27.33' 26.72 ++ - '2001:dc3::35'
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/zonecheck/stuff/patches/99_update-rootservers_715479-fix.patch Mon Dec 03 02:55:21 2018 +0200 27.3 @@ -0,0 +1,11 @@ 27.4 +--- a/etc/zonecheck/rootservers 27.5 ++++ b/etc/zonecheck/rootservers 27.6 +@@ -25,7 +25,7 @@ 27.7 + c.root-servers.net.: 27.8 + - '192.33.4.12' 27.9 + d.root-servers.net.: 27.10 +- - '128.8.10.90' 27.11 ++ - '199.7.91.13' 27.12 + - '2001:500:2d::d' 27.13 + e.root-servers.net.: 27.14 + - '192.203.230.10'
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/zonecheck/stuff/patches/series Mon Dec 03 02:55:21 2018 +0200 28.3 @@ -0,0 +1,15 @@ 28.4 +# https://packages.debian.org/oldstable/source/zonecheck 28.5 + 28.6 +#10installer-rb.patch 28.7 +20locale-rb.patch 28.8 +#25param-rb.patch 28.9 +30webpages.patch 28.10 +35_apache-conf.patch 28.11 +40man-1.patch 28.12 +50_libxml_407896-fix.patch 28.13 +#60_update-rootservers_463638-fix.patch 28.14 +70_zc-locale_472300-fix.patch 28.15 +#80_no-rubygems.patch 28.16 +94_yaml1_676173_fix.patch 28.17 +98_yaml2_676173_fix.patch 28.18 +99_update-rootservers_715479-fix.patch