Initial commit -- use Debian’s patches

.SRCINFO

@@ -1,20 +1,33 @@
 # Generated by mksrcinfo v8
-# Wed Jun 15 07:43:01 UTC 2016
+# Wed Jan 17 11:47:48 UTC 2018
 pkgbase = jigdo
-	pkgdesc = Jigsaw Download, or short jigdo, is a tool designed to ease the distribution of very large files over the internet, for example CD or DVD images
+	pkgdesc = Distribute large images by sending and receiving the files that make them up
 	pkgver = 0.7.3
-	pkgrel = 5
+	pkgrel = 1
 	url = http://atterer.org/jigdo/
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = gtk2>=2.4.0
+	makedepends = docbook-utils
-	depends = bzip2
+	makedepends = docbook-sgml
-	depends = curl
+	depends = db
+	depends = wget
 	source = http://atterer.org/sites/atterer/files/2009-08/jigdo/jigdo-0.7.3.tar.bz2
-	source = https://raw2.github.com/sputnick-dev/aur/master/jigdo/jigdo-0.7.3-gcc43.patch
+	source = 00.richard_fixes.patch
-	md5sums = bbc1d9ac750bb34e0748f0b57157cc72
+	source = 01.hardening.patch
-	md5sums = 0133ce4fd63c872a26e1c19b627eb2db
+	source = 02.address_change.patch
+	source = 03.jigdo-lite-https.patch
+	source = 04.jigdo-lite-tmpdir.patch
+	source = 05.jigdo-lite-grep-options.patch
+	source = 06.jigdo-lite-store-filesPerFetch.patch
+	sha512sums = e183a2d93126935057244b9eb6bf6dadc1900cb17c36194f69e63a15d70ddfea81ce1167de5abfcdfd7507ac9fe6250a05be9d9d29392c961d44fde796158f7c
+	sha512sums = a6d576aecdbba65d655e449b12dc9bf795db7db0d6aa2aa069265948c33509e633ed1936e74119539829b33e463bd2b90219cf69cd2ccaa2debd96d120a675ad
+	sha512sums = cec50d1edd3f3e8d81b22069a61824b5d139e7e21dac919798630200e0610b6af43ebf17680918bd64ebb00f231ede9c5d5467d45136f4181210743c87345422
+	sha512sums = 23bc3b1037d655c707b6fb06ad167623db11bbae66741bc9a0d1b06fcd73b8c8272b4a15808354ee38d7cc27ce37328f98b277bf12de0ab47280a975268ecc2a
+	sha512sums = e7642a3369959cb77f64431608b7a4f93565fe34cd186a6a808d82fb2ed6b5e17b1a1dc71ebaf455692df2d7f09d9b0a99b03e1df417120a4d30082baba6f1af
+	sha512sums = 6a01da354dd504e2670089d1646dcf548d2f3e840a2d7bda6e33bf7d5bda9ade70c6001c2da50805550c654a4752821ba4380b6ff43094e8336132cde94423e5
+	sha512sums = 465dc1518dd0d966e9e245bd79900c33e37a889228921b617fd78f1a15060f3bb6d0c39a0bbdb78752d435dd74ebfefefced0847556e3388f075caf54fb41fba
+	sha512sums = e7b69d0aa1be31afb5960d51d090b0bff778e678cd09b50dd2725151211288148a91eead85fba72dd0d503bb9eb054d40465050719367d2cb0e0440d70ef23e2
 
 pkgname = jigdo
 

.gitignore

@@ -0,0 +1,5 @@
+*.pkg.tar*
+*.src.tar*
+*.bz2
+src
+pkg

01.hardening.patch

@@ -0,0 +1,29 @@
+--- jigdo-0.7.3.orig/Makefile.in
++++ jigdo-0.7.3/Makefile.in
+@@ -32,7 +32,7 @@ catalogs =	@CATALOGS@
+ # "gfx" symlink is needed for the pixmaps to be found by jigdo
+ all doc mostlyclean dep depend: Makefile
+ 		-test -h gfx -o -d gfx || ln -s "$(srcdir)/gfx" gfx
+-		cd src && $(MAKE) $@
++		cd src && $(MAKE) $@ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CXXFLAGS="$(EXTRA_CXXFLAGS)" EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)"
+ 		cd doc && $(MAKE) $@
+ 		cd po  && $(MAKE) $@
+ check test: Makefile
+--- jigdo-0.7.3.orig/src/Makefile.in
++++ jigdo-0.7.3/src/Makefile.in
+@@ -24,12 +24,12 @@ CPPFLAGS =	@CPPFLAGS@ -I. -I"$(srcdir)"
+ 		-DPACKAGE_LOCALE_DIR="\"$(datadir)/locale\"" \
+ 		$(GTKCFLAGS) $(CURLCFLAGS) # $(LIBWWWCFLAGS)
+ CC =		@CC@
+-CFLAGS =	@CFLAGS@ $(X)
++CFLAGS =	@CFLAGS@ $(X) $(EXTRA_CFLAGS)
+ CXX =		@CXX@
+-CXXFLAGS =	@CXXFLAGS@ $(X)
++CXXFLAGS =	@CXXFLAGS@ $(X) $(EXTRA_CXXFLAGS)
+ LD =		@CXX@
+ LD_C =		@CC@
+-LDFLAGS =	@LIBS@ @LDFLAGS@ $(Y)
++LDFLAGS =	@LIBS@ @LDFLAGS@ $(Y) $(EXTRA_LDFLAGS)
+ LIBS =		@LIBS@
+ AWK =		@AWK@
+ GLADECODE =	glade-2 -w # Create code from .glade file

03.jigdo-lite-https.patch

@@ -0,0 +1,19 @@
+--- jigdo-0.7.3.orig/scripts/jigdo-lite
++++ jigdo-0.7.3/scripts/jigdo-lite
+@@ -46,10 +46,14 @@
+ #______________________________________________________________________
+ 
+ # isURI <string>
+-# Returns 0 (true) if the supplied string is a HTTP/FTP URL, otherwise 1
++# Returns 0 (true) if the supplied string is a HTTP/HTTPS/FTP/FILE
++# URL, otherwise 1
+ isURI() {
+   case "$1" in
+-    http:*|ftp:*|HTTP:*|FTP:*|file:*|FILE:*) return 0;;
++    [hH][tT][tT][pP]:*) return 0;;
++    [hH][tT][tT][pP][sS]:*) return 0;;
++    [fF][tT][pP]:*) return 0;;
++    [fF][iI][lL][eE]:*) return 0;;
+     *) return 1;
+   esac
+ }

04.jigdo-lite-tmpdir.patch

@@ -0,0 +1,11 @@
+--- jigdo-0.7.3.orig/scripts/jigdo-lite
++++ jigdo-0.7.3/scripts/jigdo-lite
+@@ -510,7 +514,7 @@
+   list="$image.list"
+ 
+   # Create name of temporary dir, by stripping extension from $image
+-  imageTmp="`echo $image | sed 's%\.\(tmp|iso|raw\)%%'`"
++  imageTmp="$tmpDir/`echo $image | sed 's%\.\(tmp|iso|raw\)%%'`.tmpdir"
+   if test -f "$imageTmp" -o "x$imageTmp" = "x$image"; then
+     imageTmp="$imageTmp.tmpdir"
+   fi

05.jigdo-lite-grep-options.patch

@@ -0,0 +1,11 @@
+--- jigdo-0.7.3.orig/scripts/jigdo-lite	2017-12-07 16:35:00.806877547 +0000
++++ jigdo-0.7.3/scripts/jigdo-lite	2017-12-07 16:35:03.514902976 +0000
+@@ -14,6 +14,8 @@
+ maxMissing=30 # Don't try fallback servers if x% or more of files missing
+ rcFile="$HOME/.jigdo-lite"
+ 
++unset GREP_OPTIONS
++
+ if test "x$OSTYPE" = "xmsys"; then
+   windows=true
+   OSTYPE=Windows

06.jigdo-lite-store-filesPerFetch.patch

@@ -0,0 +1,11 @@
+--- jigdo-0.7.3.orig/scripts/jigdo-lite	2017-12-07 16:58:48.404806438 +0000
++++ jigdo-0.7.3/scripts/jigdo-lite	2017-12-07 17:00:09.493596969 +0000
+@@ -251,6 +251,8 @@
+     "$tmpDir" "$jigdoOpts" >>"$rcFile"
+   printf "wgetOpts='%s'${nl}scanMenu='%s'${nl}" \
+     "$wgetOpts" "$scanMenu" >>"$rcFile"
++  printf "filesPerFetch='%s'${nl}" \
++    "$filesPerFetch" >>"$rcFile"
+ }
+ #______________________________________________________________________
+ 

PKGBUILD

@@ -1,30 +1,52 @@
-# Maintener : sputnick <gilles DOT quenot AT gmail DOT com>
+# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
-# Contributor: Carlos Ruiz <cailovirtual@gmail.com>
 
 pkgname=jigdo
 pkgver=0.7.3
-pkgrel=5
+pkgrel=1
-pkgdesc="Jigsaw Download, or short jigdo, is a tool designed to ease the distribution of very large files over the internet, for example CD or DVD images"
+pkgdesc="Distribute large images by sending and receiving the files that make them up"
-url="http://atterer.org/jigdo/"
-license=("GPL2")
 arch=('i686' 'x86_64')
-depends=('gtk2>=2.4.0' 'bzip2' 'curl')
+url="http://atterer.org/jigdo/"
-source=(
+license=('GPL2')
-    "http://atterer.org/sites/atterer/files/2009-08/$pkgname/$pkgname-$pkgver.tar.bz2"
+depends=('db' 'wget')
-    "https://raw2.github.com/sputnick-dev/aur/master/$pkgname/$pkgname-$pkgver-gcc43.patch"
+makedepends=('docbook-utils' 'docbook-sgml')
-)
+source=("http://atterer.org/sites/atterer/files/2009-08/$pkgname/$pkgname-$pkgver.tar.bz2"
+	"00.richard_fixes.patch"
+	"01.hardening.patch"
+	"02.address_change.patch"
+	"03.jigdo-lite-https.patch"
+	"04.jigdo-lite-tmpdir.patch"
+	"05.jigdo-lite-grep-options.patch"
+	"06.jigdo-lite-store-filesPerFetch.patch")
+sha512sums=('e183a2d93126935057244b9eb6bf6dadc1900cb17c36194f69e63a15d70ddfea81ce1167de5abfcdfd7507ac9fe6250a05be9d9d29392c961d44fde796158f7c'
+            'a6d576aecdbba65d655e449b12dc9bf795db7db0d6aa2aa069265948c33509e633ed1936e74119539829b33e463bd2b90219cf69cd2ccaa2debd96d120a675ad'
+            'cec50d1edd3f3e8d81b22069a61824b5d139e7e21dac919798630200e0610b6af43ebf17680918bd64ebb00f231ede9c5d5467d45136f4181210743c87345422'
+            '23bc3b1037d655c707b6fb06ad167623db11bbae66741bc9a0d1b06fcd73b8c8272b4a15808354ee38d7cc27ce37328f98b277bf12de0ab47280a975268ecc2a'
+            'e7642a3369959cb77f64431608b7a4f93565fe34cd186a6a808d82fb2ed6b5e17b1a1dc71ebaf455692df2d7f09d9b0a99b03e1df417120a4d30082baba6f1af'
+            '6a01da354dd504e2670089d1646dcf548d2f3e840a2d7bda6e33bf7d5bda9ade70c6001c2da50805550c654a4752821ba4380b6ff43094e8336132cde94423e5'
+            '465dc1518dd0d966e9e245bd79900c33e37a889228921b617fd78f1a15060f3bb6d0c39a0bbdb78752d435dd74ebfefefced0847556e3388f075caf54fb41fba'
+            'e7b69d0aa1be31afb5960d51d090b0bff778e678cd09b50dd2725151211288148a91eead85fba72dd0d503bb9eb054d40465050719367d2cb0e0440d70ef23e2')
 
-md5sums=('bbc1d9ac750bb34e0748f0b57157cc72'
+prepare() {
-     '0133ce4fd63c872a26e1c19b627eb2db')
+  cd "$pkgname-$pkgver"
+
+  for patch in ../*.patch; do
+    if [ ! -f "$patch" ]; then
+	break;
+    else
+      patch -p1 -i "$patch"
+    fi
+  done
+}
 
 build() {
-   cd $startdir/src/$pkgname-$pkgver
+  cd "$pkgname-$pkgver"
-   patch -Np1 -i ../jigdo-0.7.3-gcc43.patch || return 1
+
-   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  ./configure --prefix=/usr --without-gui --enable-nls --mandir=/usr/share/man
-   make || return 1
+  make -j1
 }
 
 package() {
-    cd $startdir/src/$pkgname-$pkgver
+  cd "$pkgname-$pkgver"
-    make DESTDIR=$pkgdir install || return 1
+
+  make DESTDIR="$pkgdir" install
 }

jigdo-0.7.3-gcc43.patch

@@ -1,80 +0,0 @@
-diff -ur jigdo-0.7.3.orig/src/compat.hh jigdo-0.7.3/src/compat.hh
---- jigdo-0.7.3.orig/src/compat.hh	2005-07-02 10:21:35.000000000 -0700
-+++ jigdo-0.7.3/src/compat.hh	2008-03-11 23:01:45.000000000 -0700
-@@ -20,6 +20,7 @@
- 
- #include <string>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd-jigdo.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-diff -ur jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc jigdo-0.7.3/src/gtk/gtk-single-url.cc
---- jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc	2005-10-15 14:27:39.000000000 -0700
-+++ jigdo-0.7.3/src/gtk/gtk-single-url.cc	2008-03-11 23:05:48.000000000 -0700
-@@ -15,6 +15,7 @@
- 
- #include <time.h>
- #include <errno.h>
-+#include <string.h>
- 
- #include <autoptr.hh>
- #include <gtk-single-url.hh>
-diff -ur jigdo-0.7.3.orig/src/gtk/jigdo.cc jigdo-0.7.3/src/gtk/jigdo.cc
---- jigdo-0.7.3.orig/src/gtk/jigdo.cc	2005-07-09 15:21:04.000000000 -0700
-+++ jigdo-0.7.3/src/gtk/jigdo.cc	2008-03-11 23:06:26.000000000 -0700
-@@ -16,6 +16,8 @@
- #  include <unistd-jigdo.h>
- #endif
- 
-+#include <string.h>
-+
- #include <iostream>
- #include <string>
- #include <vector>
-diff -ur jigdo-0.7.3.orig/src/recursedir.cc jigdo-0.7.3/src/recursedir.cc
---- jigdo-0.7.3.orig/src/recursedir.cc	2006-05-14 11:23:31.000000000 -0700
-+++ jigdo-0.7.3/src/recursedir.cc	2008-03-11 23:04:21.000000000 -0700
-@@ -32,6 +32,7 @@
- #include <recursedir.hh>
- 
- #include <iostream>
-+#include <string.h>
- #include <errno.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-diff -ur jigdo-0.7.3.orig/src/util/configfile.cc jigdo-0.7.3/src/util/configfile.cc
---- jigdo-0.7.3.orig/src/util/configfile.cc	2003-09-27 14:31:04.000000000 -0700
-+++ jigdo-0.7.3/src/util/configfile.cc	2008-03-11 23:05:00.000000000 -0700
-@@ -19,6 +19,8 @@
- #include <iostream>
- #include <fstream>
- 
-+#include <string.h>
-+
- #include <configfile.hh>
- #include <string.hh>
- //______________________________________________________________________
-diff -ur jigdo-0.7.3.orig/src/util/md5sum.hh jigdo-0.7.3/src/util/md5sum.hh
---- jigdo-0.7.3.orig/src/util/md5sum.hh	2005-04-09 16:09:52.000000000 -0700
-+++ jigdo-0.7.3/src/util/md5sum.hh	2008-03-11 23:07:04.000000000 -0700
-@@ -28,6 +28,8 @@
- 
- #include <config.h>
- 
-+#include <string.h>
-+
- #include <cstdlib>
- #include <iosfwd>
- #include <string>
-diff -ur jigdo-0.7.3.orig/src/util/string-utf.cc jigdo-0.7.3/src/util/string-utf.cc
---- jigdo-0.7.3.orig/src/util/string-utf.cc	2004-09-11 16:26:30.000000000 -0700
-+++ jigdo-0.7.3/src/util/string-utf.cc	2008-03-11 23:07:43.000000000 -0700
-@@ -15,6 +15,7 @@
- #include <glib.h>
- #include <stdarg.h>
- #include <stdio.h>
-+#include <string.h>
- 
- #include <debug.hh>
- #include <string-utf.hh>