# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1552656538 -3600
# Node ID 5a01eb69483415ee6fd0de6da72987a383076aad
# Parent  215a6ab0a0791d196911554891c19c8b2f729a7b
updated john (1.7.8 -> 1.8.0)

diff -r 215a6ab0a079 -r 5a01eb694834 john/receipt
--- a/john/receipt	Fri Mar 15 13:54:40 2019 +0100
+++ b/john/receipt	Fri Mar 15 14:28:58 2019 +0100
@@ -1,50 +1,57 @@
 # SliTaz package receipt.
 
 PACKAGE="john"
-VERSION="1.7.8"
+VERSION="1.8.0"
 CATEGORY="system-tools"
 SHORT_DESC="Fast password cracker."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.openwall.com/john/"
-WGET_URL="${WEB_SITE}g/$TARBALL"
+WEB_SITE="https://www.openwall.com/john/"
+
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WGET_URL="${WEB_SITE}j/$TARBALL"
+
+DEPENDS="libdes openssl"
+BUILD_DEPENDS="libdes-dev openssl-dev"
 CONFIG_FILES="/etc/john/john.conf"
 
-DEPENDS="openssl libdes"
-BUILD_DEPENDS="libdes-dev openssl-dev"
-
-PATCH="http://www.openwall.com/john/g/$PACKAGE-$VERSION-jumbo-7.diff.gz"
-EXTRA_SOURCE_FILES="$PATCH"
+#PATCH="http://www.openwall.com/john/g/$PACKAGE-$VERSION-jumbo-7.diff.gz"
+#EXTRA_SOURCE_FILES="$PATCH"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	[ -s $SOURCES_REPOSITORY/$(basename $PATCH) ] ||
-		wget -P $SOURCES_REPOSITORY $PATCH
-	zcat $SRC/$(basename $PATCH) | patch -p1
+#	cd $src
+#	[ -s $SOURCES_REPOSITORY/$(basename $PATCH) ] ||
+#		wget -P $SOURCES_REPOSITORY $PATCH
+#	zcat $SRC/$(basename $PATCH) | patch -p1
+
 	cd $src/src
 	patch -Np0 -i $stuff/params.h.patch
-	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile
+#	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile
 	sed -i "s|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=$ARCH -DJOHN_SYSTEMWIDE=1|" Makefile
+
 	make clean generic
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/sbin $fs/etc/john $fs/usr/share/john
-	cp -a $src/run/john $fs/usr/sbin
-	cp -a $src/run/mailer $fs/usr/sbin
-	cp -a $src/run/unafs $fs/usr/sbin
-	cp -a $src/run/unique $fs/usr/sbin
-	cp -a $src/run/unshadow $fs/usr/sbin
-	cp -a $src/run/*.chr $fs/usr/share/john
-	cp -a $src/run/dumb??.conf $fs/usr/share/john
-	cp -a $src/run/generic.conf $fs/usr/share/john
-	cp -a $src/run/password.lst $fs/usr/share/john
-	cp $src/run/john.conf $fs/etc/john
+	mkdir -p		\
+		$fs/usr/sbin	\
+		$fs/etc/john	\
+		$fs/usr/share/john
+
+	cp -a $src/run/john		$fs/usr/sbin
+	cp -a $src/run/mailer		$fs/usr/sbin
+	cp -a $src/run/unafs		$fs/usr/sbin
+	cp -a $src/run/unique		$fs/usr/sbin
+	cp -a $src/run/unshadow		$fs/usr/sbin
+	cp -a $src/run/*.chr		$fs/usr/share/john
+	cp -a $src/run/dumb??.conf	$fs/usr/share/john
+	cp -a $src/run/generic.conf	$fs/usr/share/john
+	cp -a $src/run/password.lst	$fs/usr/share/john
+	cp $src/run/john.conf		$fs/etc/john
+
 	sed -i 's|$JOHN|/usr/share/john|g' $fs/etc/john/john.conf
 }
-