Merge branch '3.2' into 3.3

ddrescue/.footprint

@@ -2,7 +2,8 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ddrescue
 -rwxr-xr-x	root/root	usr/bin/ddrescuelog
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/ddrescue.1.gz
--rw-r--r--	root/root	usr/man/man1/ddrescuelog.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/ddrescue.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ddrescuelog.1.gz

ddrescue/.md5sum

@@ -1 +1 @@
-ed6b5b82d74cbd925db2b829350e74b1  ddrescue-1.19.tar.lz
+7801daa8db1fde557540d2cbfaeef416  ddrescue-1.21.tar.lz

ddrescue/Pkgfile

@@ -1,23 +1,20 @@
 # Description: ddrescue is a data recovery tool. It copies data from one file or block device (hard disc, cdrom, etc) to another, trying hard to rescue data in case of read errors.
-# URL: http://www.gnu.org/software/ddrescue/ddrescue.html
+# URL: https://www.gnu.org/software/ddrescue/ddrescue.html
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Danny Rawlins, crux at romster dot me
 
 name=ddrescue
-version=1.19
+version=1.21
 release=1
-source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.lz)
+source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.lz)
 
 build() {
 	bsdtar -xf $name-$version.tar.lz
 	cd $name-$version
 
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/man
+	./configure --prefix=/usr
 
-	[ "$CXX" ] || CXX=g++
-	make CXXFLAGS="$CXXFLAGS" CXX="$CXX" $MAKEFLAGS
+	make CXXFLAGS="$CXXFLAGS" $MAKEFLAGS
 	make DESTDIR=$PKG install
 
 	rm -rf $PKG/usr/share/info

libsoup/Pkgfile

@@ -1,8 +1,8 @@
 # Description: HTTP library implementation in C.
-# URL: http://live.gnome.org/LibSoup
+# URL: https://wiki.gnome.org/action/show/Projects/libsoup
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: glib-networking libxml2 sqlite3 gobject-introspection
+# Depends on: glib-networking gobject-introspection krb5 libxml2
 # Optional: vala
 
 ## gobject-introspection is optional but required for webkitgtk
@@ -10,7 +10,7 @@
 name=libsoup
 version=2.56.0
 release=1
-source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
+source=(https://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version

testdisk/Pkgfile

@@ -1,5 +1,5 @@
 # Description: Recover lost partitions and files. 
-# URL: http://www.cgsecurity.org/wiki/TestDisk
+# URL: https://www.cgsecurity.org/wiki/TestDisk
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Hannes Mayer, kontakt at ecarux dot de
 # Depends on: ntfs-3g libjpeg-turbo
@@ -7,7 +7,7 @@
 name=testdisk
 version=7.0
 release=1
-source=(http://www.cgsecurity.org/$name-$version.tar.bz2)
+source=(https://www.cgsecurity.org/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version