CVS commit: pkgsrc/security/john

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jun 13 15:23:37 UTC 2026

Modified Files:
        pkgsrc/security/john: Makefile PLIST

Log Message:
john: install config file as proper name

>From Hubert Feyrer in PR 60328.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/john/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/john/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/john/Makefile
diff -u pkgsrc/security/john/Makefile:1.31 pkgsrc/security/john/Makefile:1.32
--- pkgsrc/security/john/Makefile:1.31  Sat Aug  8 12:48:56 2020
+++ pkgsrc/security/john/Makefile       Sat Jun 13 15:23:37 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2020/08/08 12:48:56 leot Exp $
-#
+# $NetBSD: Makefile,v 1.32 2026/06/13 15:23:37 wiz Exp $
 
 DISTNAME=      john-1.9.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security textproc
 MASTER_SITES=  http://www.openwall.com/john/k/
 EXTRACT_SUFX=  .tar.xz
@@ -85,7 +84,7 @@ do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/run/john ${DESTDIR}${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKSRC}/run/mailer ${DESTDIR}${PREFIX}/bin
        # configuration file
-       ${INSTALL_DATA} ${WRKSRC}/run/john.conf ${DESTDIR}${PREFIX}/share/john
+       ${INSTALL_DATA} ${WRKSRC}/run/john.conf ${DESTDIR}${PREFIX}/share/john/john.ini
        # symbolic links
 .for i in unafs unique unshadow
        ${LN} -sf john ${DESTDIR}${PREFIX}/bin/${i}

Index: pkgsrc/security/john/PLIST
diff -u pkgsrc/security/john/PLIST:1.6 pkgsrc/security/john/PLIST:1.7
--- pkgsrc/security/john/PLIST:1.6      Sat Aug  8 12:42:22 2020
+++ pkgsrc/security/john/PLIST  Sat Jun 13 15:23:37 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/08/08 12:42:22 leot Exp $
+@comment $NetBSD: PLIST,v 1.7 2026/06/13 15:23:37 wiz Exp $
 bin/john
 bin/mailer
 bin/unafs
@@ -15,7 +15,7 @@ share/john/alnum.chr
 share/john/alpha.chr
 share/john/ascii.chr
 share/john/digits.chr
-share/john/john.conf
+share/john/john.ini
 share/john/lm_ascii.chr
 share/john/lower.chr
 share/john/lowernum.chr