Update to 0.8.0

Thanks to @ArkadST for letting me know about the new upstream.

Unfortunately it doesn’t seem to be quite nicely cleaned up, I ended
up finding that running “make” multiple times forces a build to work.

.SRCINFO

@@ -1,34 +1,17 @@
-# Generated by mksrcinfo v8
-# Thu Jan 18 01:01:25 UTC 2018
 pkgbase = jigdo
 	pkgdesc = Distribute large images by sending and receiving the files that make them up
-	pkgver = 0.7.3
+	pkgver = 0.8.0
-	pkgrel = 7
+	pkgrel = 1
-	url = http://atterer.org/jigdo/
+	url = https://www.einval.com/~steve/software/jigdo/
-	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = docbook-utils
 	makedepends = docbook-sgml
 	makedepends = perl-sgmls
-	depends = db
+	depends = db4.8
 	depends = wget
-	source = http://atterer.org/sites/atterer/files/2009-08/jigdo/jigdo-0.7.3.tar.bz2
+	source = https://www.einval.com/~steve/software/jigdo/download/jigdo-0.8.0.tar.xz
-	source = 00.richard_fixes.patch
+	b2sums = 0d3ef3c50394174fb6d5c9b6f8e5cdbffe86d428b7c4c4552025678ffbdba88331aa58e4b6a7594e67866fcba6531fdcae20aa0feb1abd82f5264df585360567
-	source = 01.hardening.patch
-	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

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

01.hardening.patch

@@ -1,29 +0,0 @@
---- 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

@@ -1,19 +0,0 @@
---- 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

@@ -1,11 +0,0 @@
---- 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

@@ -1,11 +0,0 @@
---- 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

@@ -1,11 +0,0 @@
---- 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,16 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
 
 pkgname=jigdo
-pkgver=0.7.3
+pkgver=0.8.0
-pkgrel=7
+pkgrel=1
 pkgdesc="Distribute large images by sending and receiving the files that make them up"
-arch=('i686' 'x86_64')
+arch=('x86_64')
-url="http://atterer.org/jigdo/"
+url="https://www.einval.com/~steve/software/jigdo/"
 license=('GPL2')
 depends=('db' 'wget')
 makedepends=('docbook-utils' 'docbook-sgml' 'perl-sgmls')
-source=("http://atterer.org/sites/atterer/files/2009-08/$pkgname/$pkgname-$pkgver.tar.bz2"
+source=("${url}download/jigdo-${pkgver}.tar.xz")
-	"00.richard_fixes.patch"
+b2sums=('0d3ef3c50394174fb6d5c9b6f8e5cdbffe86d428b7c4c4552025678ffbdba88331aa58e4b6a7594e67866fcba6531fdcae20aa0feb1abd82f5264df585360567')
-	"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')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -41,12 +27,17 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --without-gui --enable-nls --mandir=/usr/share/man
+  ./configure --prefix=/usr --without-gui --enable-nls
-  make -j1
+
+  # The compilation is stupid... seems to work just forcing it a few times
+  make -j1 || true
+  make -j1 || true
+  make
 }
 
 package() {
   cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
+  chmod -x "$pkgdir"/usr/share/man/man1/*
 }