update: security/john

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

update: security/john

David Cathcart
Release announce:
http://marc.theaimsgroup.com/?l=openwall-announce&m=113485359606167&w=2


Index: Makefile
===================================================================
RCS file: /cvs/ports/security/john/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile 15 Sep 2005 22:52:01 -0000 1.33
+++ Makefile 17 Dec 2005 23:42:18 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= "extremely fast password cracker"
 
-DISTNAME= john-1.6.39
+DISTNAME= john-1.6.40
 CATEGORIES= security
 
 HOMEPAGE= http://www.openwall.com/john/
@@ -15,8 +15,6 @@
 WANTLIB= c m
 
 MASTER_SITES= ${HOMEPAGE}c/
-DISTFILES= ${DISTNAME}.tar.gz \
- john-1.6.tar.gz
 
 NO_REGRESS= Yes
 
@@ -28,24 +26,26 @@
 FLAVORS= no_mmx
 FLAVOR?=
 .if ${FLAVOR:L:Mno_mmx}
-ALL_TARGET= openbsd-x86-any-elf
+ALL_TARGET= openbsd-x86-any
 .else
-ALL_TARGET= openbsd-x86-mmx-elf
+ALL_TARGET= openbsd-x86-mmx
 .endif
+.elif ${MACHINE_ARCH} == "amd64"
+ALL_TARGET= openbsd-x86-64
 .elif ${MACHINE_ARCH} == "sparc"
 ALL_TARGET= openbsd-sparc
 .elif ${MACHINE_ARCH} == "vax"
 ALL_TARGET= openbsd-vax
 .elif ${MACHINE_ARCH} == "alpha"
-ALL_TARGET= linux-alpha
+ALL_TARGET= openbsd-alpha
 .elif ${MACHINE_ARCH} == "powerpc"
-ALL_TARGET= linux-ppc32
+ALL_TARGET= openbsd-ppc32
 .elif ${MACHINE_ARCH} == "powerpc64"
-ALL_TARGET= linux-ppc64
+ALL_TARGET= openbsd-ppc64
 .elif ${MACHINE_ARCH} == "hppa"
-ALL_TARGET= hpux-pa-risc-${CC}
+ALL_TARGET= openbsd-pa-risc
 .elif ${MACHINE_ARCH} == "sparc64"
-ALL_TARGET= "openbsd-sparc64"
+ALL_TARGET= openbsd-sparc64
 .else
 ALL_TARGET= generic
 .endif
@@ -68,8 +68,7 @@
  ln -sf john unafs && \
  ln -sf john unique
  ${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
- ${INSTALL_DATA} ${WRKDIR}/john-1.6/doc/* ${PREFIX}/share/doc/john
  ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
- ${INSTALL_DATA} ${WRKDIR}/john-1.6/run/*.chr ${PREFIX}/share/john
+ ${INSTALL_DATA} ${WRKDIST}/run/*.chr ${PREFIX}/share/john
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/john/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 15 Sep 2005 22:52:01 -0000 1.7
+++ distinfo 17 Dec 2005 23:42:18 -0000
@@ -1,8 +1,4 @@
-MD5 (john-1.6.39.tar.gz) = 823ee78095db8568aa68fb0721b1efea
-MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
-RMD160 (john-1.6.39.tar.gz) = 1f0f5dce55b06515db22af37f91f231c41e68ec7
-RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
-SHA1 (john-1.6.39.tar.gz) = abd9a9f8269b7288f6e834b402fa4d0c8f5191de
-SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
-SIZE (john-1.6.39.tar.gz) = 167425
-SIZE (john-1.6.tar.gz) = 497341
+MD5 (john-1.6.40.tar.gz) = 507916220812c5834136d378a13e48a0
+RMD160 (john-1.6.40.tar.gz) = b54e41eec65a9c185731b2e137fb155ae2eb348b
+SHA1 (john-1.6.40.tar.gz) = 1f9fc46d10eb218065f024775578db3642d2bd20
+SIZE (john-1.6.40.tar.gz) = 797220
Index: patches/patch-run_john_conf
===================================================================
RCS file: /cvs/ports/security/john/patches/patch-run_john_conf,v
retrieving revision 1.2
diff -u -r1.2 patch-run_john_conf
--- patches/patch-run_john_conf 6 Sep 2005 20:20:26 -0000 1.2
+++ patches/patch-run_john_conf 17 Dec 2005 23:42:18 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-run_john_conf,v 1.2 2005/09/06 20:20:26 aanriot Exp $
---- run/john.conf.orig Fri Jun 11 14:29:39 2004
-+++ run/john.conf Tue Sep  6 15:51:38 2005
+--- run/john.conf.orig Fri Dec 16 15:02:14 2005
++++ run/john.conf Sat Dec 17 23:14:45 2005
 @@ -5,7 +5,7 @@
 
  [Options]
@@ -10,7 +10,7 @@
  # Use idle cycles only
  Idle = N
  # Crash recovery file saving delay in seconds
-@@ -316,25 +316,25 @@ l$1$9<-$[6-0]$[9-0]
+@@ -323,31 +323,31 @@ lMT[*0]T[*1]T[*2]T[*3]T[*4]T[*5]T[*6]T[*
 
  # Incremental modes
  [Incremental:All]
@@ -33,6 +33,13 @@
  MinLen = 1
  MaxLen = 8
  CharCount = 10
+
+ [Incremental:Alnum]
+-File = $JOHN/alnum.chr
++File = %%JOHN%%/alnum.chr
+ MinLen = 1
+ MaxLen = 8
+ CharCount = 36
 
  [Incremental:LanMan]
 -File = $JOHN/lanman.chr
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/security/john/patches/patch-src_Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-src_Makefile
--- patches/patch-src_Makefile 31 May 2005 08:08:52 -0000 1.3
+++ patches/patch-src_Makefile 17 Dec 2005 23:42:18 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-src_Makefile,v 1.3 2005/05/31 08:08:52 sturm Exp $
---- src/Makefile.orig Wed May  4 19:49:31 2005
-+++ src/Makefile Tue May 31 09:44:24 2005
+--- src/Makefile.orig Mon Dec 12 18:53:36 2005
++++ src/Makefile Sat Dec 17 23:29:15 2005
 @@ -17,7 +17,7 @@ NULL = /dev/null
  CPPFLAGS = -E
  CFLAGS = -c -Wall -O2 -fomit-frame-pointer
@@ -17,20 +17,14 @@
 - ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD"
 + ASFLAGS="$(ASFLAGS) -DBSD"
 
- openbsd-sparc:
- $(MAKE) use-openbsd-sparc HAMMER=use-openbsd-sparc NAIL=sparc.h
-@@ -260,7 +260,13 @@ use-openbsd-sparc:
+ openbsd-x86-64:
+ $(LN) x86-64.h arch.h
+@@ -288,7 +288,7 @@ use-openbsd-sparc-a.out:
  $(MAKE) $(NAIL) \
  BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \
  JOHN_OBJS="$(JOHN_OBJS_ORIG) sparc.o" \
 - ASFLAGS="-c -DUNDERSCORES -DBSD"
 + ASFLAGS="-c -DBSD"
-+
-+openbsd-sparc64:
-+ $(LN) sparc64.h arch.h
-+ $(MAKE) $(PROJ) \
-+ CFLAGS="$(CFLAGS) -m64 -mcpu=ultrasparc" \
-+ LDFLAGS="-m64 -s"
 
- openbsd-vax:
- $(LN) vax.h arch.h
+ openbsd-ppc32:
+ $(LN) ppc32.h arch.h
Index: patches/patch-src_params_h
===================================================================
RCS file: /cvs/ports/security/john/patches/patch-src_params_h,v
retrieving revision 1.2
diff -u -r1.2 patch-src_params_h
--- patches/patch-src_params_h 31 May 2005 08:08:52 -0000 1.2
+++ patches/patch-src_params_h 17 Dec 2005 23:42:18 -0000
@@ -1,19 +1,22 @@
 $OpenBSD: patch-src_params_h,v 1.2 2005/05/31 08:08:52 sturm Exp $
---- src/params.h.orig Wed May 11 05:01:34 2005
-+++ src/params.h Tue May 31 10:01:20 2005
-@@ -22,12 +22,12 @@
+--- src/params.h.orig Fri Dec 16 15:47:25 2005
++++ src/params.h Sat Dec 17 22:56:33 2005
+@@ -22,15 +22,15 @@
   * will probably want to set this to 1 for their builds of John.
   */
  #ifndef JOHN_SYSTEMWIDE
 -#define JOHN_SYSTEMWIDE 0
-+#define JOHN_SYSTEMWIDE 1
++#define JOHN_SYSTEMWIDE 1
  #endif
 
  #if JOHN_SYSTEMWIDE
+ #ifndef JOHN_SYSTEMWIDE_EXEC
 -#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"
--#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
 +#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john"
+ #endif
+ #ifndef JOHN_SYSTEMWIDE_HOME
+-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
 +#define JOHN_SYSTEMWIDE_HOME "%%SYSCONFDIR%%"
+ #endif
  #define JOHN_PRIVATE_HOME "~/.john"
  #endif
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/john/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 15 Sep 2005 22:52:01 -0000 1.10
+++ pkg/PLIST 17 Dec 2005 23:42:18 -0000
@@ -14,7 +14,6 @@
 share/doc/john/INSTALL
 share/doc/john/LICENSE
 share/doc/john/MODES
-@comment share/doc/john/NEWS
 share/doc/john/OPTIONS
 share/doc/john/README
 share/doc/john/RULES
@@ -23,6 +22,7 @@
 @sample ${SYSCONFDIR}/john.conf
 share/john/
 share/john/all.chr
+share/john/alnum.chr
 share/john/alpha.chr
 share/john/digits.chr
 share/john/lanman.chr

Reply | Threaded
Open this post in threaded view
|

Re: update: security/john

Alexandre Anriot

Comments inline.

> Release announce:
> http://marc.theaimsgroup.com/?l=openwall-announce&m=113485359606167&w=2
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/john/Makefile,v
> retrieving revision 1.33
> diff -u -r1.33 Makefile
> --- Makefile 15 Sep 2005 22:52:01 -0000 1.33
> +++ Makefile 17 Dec 2005 23:42:18 -0000
> @@ -2,7 +2,7 @@
>  
>  COMMENT= "extremely fast password cracker"
>  
> -DISTNAME= john-1.6.39
> +DISTNAME= john-1.6.40
>  CATEGORIES= security
>  
>  HOMEPAGE= http://www.openwall.com/john/
> @@ -15,8 +15,6 @@
>  WANTLIB= c m
>  
>  MASTER_SITES= ${HOMEPAGE}c/
> -DISTFILES= ${DISTNAME}.tar.gz \
> - john-1.6.tar.gz

ok.

>  
>  NO_REGRESS= Yes
>  
> @@ -28,24 +26,26 @@
>  FLAVORS= no_mmx
>  FLAVOR?=
>  .if ${FLAVOR:L:Mno_mmx}
> -ALL_TARGET= openbsd-x86-any-elf
> +ALL_TARGET= openbsd-x86-any
>  .else
> -ALL_TARGET= openbsd-x86-mmx-elf
> +ALL_TARGET= openbsd-x86-mmx
>  .endif
> +.elif ${MACHINE_ARCH} == "amd64"
> +ALL_TARGET= openbsd-x86-64
>  .elif ${MACHINE_ARCH} == "sparc"
>  ALL_TARGET= openbsd-sparc
>  .elif ${MACHINE_ARCH} == "vax"
>  ALL_TARGET= openbsd-vax
>  .elif ${MACHINE_ARCH} == "alpha"
> -ALL_TARGET= linux-alpha
> +ALL_TARGET= openbsd-alpha
>  .elif ${MACHINE_ARCH} == "powerpc"
> -ALL_TARGET= linux-ppc32
> +ALL_TARGET= openbsd-ppc32
>  .elif ${MACHINE_ARCH} == "powerpc64"
> -ALL_TARGET= linux-ppc64
> +ALL_TARGET= openbsd-ppc64
>  .elif ${MACHINE_ARCH} == "hppa"
> -ALL_TARGET= hpux-pa-risc-${CC}
> +ALL_TARGET= openbsd-pa-risc
>  .elif ${MACHINE_ARCH} == "sparc64"
> -ALL_TARGET= "openbsd-sparc64"
> +ALL_TARGET= openbsd-sparc64
>  .else
>  ALL_TARGET= generic
>  .endif
> @@ -68,8 +68,7 @@
>   ln -sf john unafs && \
>   ln -sf john unique
>   ${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
> - ${INSTALL_DATA} ${WRKDIR}/john-1.6/doc/* ${PREFIX}/share/doc/john
>   ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
> - ${INSTALL_DATA} ${WRKDIR}/john-1.6/run/*.chr ${PREFIX}/share/john
> + ${INSTALL_DATA} ${WRKDIST}/run/*.chr ${PREFIX}/share/john

You should add something like (idea from Alexander Peslyak):

        @grep -v '^#!comment: ' ${WRKDIST}/run/password.lst \
                /usr/share/dict/words > ${WRKDIST}/run/words.lst

to use both John and OpenBSD words (a change in do-configure target is
required).

>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/security/john/distinfo,v
> retrieving revision 1.7
> diff -u -r1.7 distinfo
> --- distinfo 15 Sep 2005 22:52:01 -0000 1.7
> +++ distinfo 17 Dec 2005 23:42:18 -0000
> @@ -1,8 +1,4 @@
> -MD5 (john-1.6.39.tar.gz) = 823ee78095db8568aa68fb0721b1efea
> -MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
> -RMD160 (john-1.6.39.tar.gz) = 1f0f5dce55b06515db22af37f91f231c41e68ec7
> -RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
> -SHA1 (john-1.6.39.tar.gz) = abd9a9f8269b7288f6e834b402fa4d0c8f5191de
> -SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
> -SIZE (john-1.6.39.tar.gz) = 167425
> -SIZE (john-1.6.tar.gz) = 497341
> +MD5 (john-1.6.40.tar.gz) = 507916220812c5834136d378a13e48a0
> +RMD160 (john-1.6.40.tar.gz) = b54e41eec65a9c185731b2e137fb155ae2eb348b
> +SHA1 (john-1.6.40.tar.gz) = 1f9fc46d10eb218065f024775578db3642d2bd20
> +SIZE (john-1.6.40.tar.gz) = 797220
> Index: patches/patch-run_john_conf
> ===================================================================
> RCS file: /cvs/ports/security/john/patches/patch-run_john_conf,v
> retrieving revision 1.2
> diff -u -r1.2 patch-run_john_conf
> --- patches/patch-run_john_conf 6 Sep 2005 20:20:26 -0000 1.2
> +++ patches/patch-run_john_conf 17 Dec 2005 23:42:18 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-run_john_conf,v 1.2 2005/09/06 20:20:26 aanriot Exp $
> ---- run/john.conf.orig Fri Jun 11 14:29:39 2004
> -+++ run/john.conf Tue Sep  6 15:51:38 2005
> +--- run/john.conf.orig Fri Dec 16 15:02:14 2005
> ++++ run/john.conf Sat Dec 17 23:14:45 2005
>  @@ -5,7 +5,7 @@
>  
>   [Options]
> @@ -10,7 +10,7 @@
>   # Use idle cycles only
>   Idle = N
>   # Crash recovery file saving delay in seconds
> -@@ -316,25 +316,25 @@ l$1$9<-$[6-0]$[9-0]
> +@@ -323,31 +323,31 @@ lMT[*0]T[*1]T[*2]T[*3]T[*4]T[*5]T[*6]T[*
>  
>   # Incremental modes
>   [Incremental:All]
> @@ -33,6 +33,13 @@
>   MinLen = 1
>   MaxLen = 8
>   CharCount = 10
> +
> + [Incremental:Alnum]
> +-File = $JOHN/alnum.chr
> ++File = %%JOHN%%/alnum.chr
> + MinLen = 1
> + MaxLen = 8
> + CharCount = 36
>  
>   [Incremental:LanMan]
>  -File = $JOHN/lanman.chr
> Index: patches/patch-src_Makefile
> ===================================================================
> RCS file: /cvs/ports/security/john/patches/patch-src_Makefile,v
> retrieving revision 1.3
> diff -u -r1.3 patch-src_Makefile
> --- patches/patch-src_Makefile 31 May 2005 08:08:52 -0000 1.3
> +++ patches/patch-src_Makefile 17 Dec 2005 23:42:18 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-src_Makefile,v 1.3 2005/05/31 08:08:52 sturm Exp $
> ---- src/Makefile.orig Wed May  4 19:49:31 2005
> -+++ src/Makefile Tue May 31 09:44:24 2005
> +--- src/Makefile.orig Mon Dec 12 18:53:36 2005
> ++++ src/Makefile Sat Dec 17 23:29:15 2005
>  @@ -17,7 +17,7 @@ NULL = /dev/null
>   CPPFLAGS = -E
>   CFLAGS = -c -Wall -O2 -fomit-frame-pointer
> @@ -17,20 +17,14 @@
>  - ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD"
>  + ASFLAGS="$(ASFLAGS) -DBSD"
>  
> - openbsd-sparc:
> - $(MAKE) use-openbsd-sparc HAMMER=use-openbsd-sparc NAIL=sparc.h
> -@@ -260,7 +260,13 @@ use-openbsd-sparc:
> + openbsd-x86-64:
> + $(LN) x86-64.h arch.h
> +@@ -288,7 +288,7 @@ use-openbsd-sparc-a.out:
>   $(MAKE) $(NAIL) \
>   BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \
>   JOHN_OBJS="$(JOHN_OBJS_ORIG) sparc.o" \
>  - ASFLAGS="-c -DUNDERSCORES -DBSD"
>  + ASFLAGS="-c -DBSD"
> -+
> -+openbsd-sparc64:
> -+ $(LN) sparc64.h arch.h
> -+ $(MAKE) $(PROJ) \
> -+ CFLAGS="$(CFLAGS) -m64 -mcpu=ultrasparc" \
> -+ LDFLAGS="-m64 -s"
>  
> - openbsd-vax:
> - $(LN) vax.h arch.h
> + openbsd-ppc32:
> + $(LN) ppc32.h arch.h

Actually, the Makefile doesn't honor CFLAGS, CC, CPPFLAGS etc. It should
be fixed.


> Index: patches/patch-src_params_h
> ===================================================================
> RCS file: /cvs/ports/security/john/patches/patch-src_params_h,v
> retrieving revision 1.2
> diff -u -r1.2 patch-src_params_h
> --- patches/patch-src_params_h 31 May 2005 08:08:52 -0000 1.2
> +++ patches/patch-src_params_h 17 Dec 2005 23:42:18 -0000
> @@ -1,19 +1,22 @@
>  $OpenBSD: patch-src_params_h,v 1.2 2005/05/31 08:08:52 sturm Exp $
> ---- src/params.h.orig Wed May 11 05:01:34 2005
> -+++ src/params.h Tue May 31 10:01:20 2005
> -@@ -22,12 +22,12 @@
> +--- src/params.h.orig Fri Dec 16 15:47:25 2005
> ++++ src/params.h Sat Dec 17 22:56:33 2005
> +@@ -22,15 +22,15 @@
>    * will probably want to set this to 1 for their builds of John.
>    */
>   #ifndef JOHN_SYSTEMWIDE
>  -#define JOHN_SYSTEMWIDE 0
> -+#define JOHN_SYSTEMWIDE 1
> ++#define JOHN_SYSTEMWIDE 1
>   #endif
>  
>   #if JOHN_SYSTEMWIDE
> + #ifndef JOHN_SYSTEMWIDE_EXEC
>  -#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"
> --#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
>  +#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john"
> + #endif
> + #ifndef JOHN_SYSTEMWIDE_HOME
> +-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
>  +#define JOHN_SYSTEMWIDE_HOME "%%SYSCONFDIR%%"
> + #endif
>   #define JOHN_PRIVATE_HOME "~/.john"
>   #endif
> -

With the latest commit in John's src/params.h, you shoud be able to set
these values from port's Makefile environment and avoid this patch,
right?

> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/john/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -r1.10 PLIST
> --- pkg/PLIST 15 Sep 2005 22:52:01 -0000 1.10
> +++ pkg/PLIST 17 Dec 2005 23:42:18 -0000
> @@ -14,7 +14,6 @@
>  share/doc/john/INSTALL
>  share/doc/john/LICENSE
>  share/doc/john/MODES
> -@comment share/doc/john/NEWS
>  share/doc/john/OPTIONS
>  share/doc/john/README
>  share/doc/john/RULES
> @@ -23,6 +22,7 @@
>  @sample ${SYSCONFDIR}/john.conf

See above.

>  share/john/
>  share/john/all.chr
> +share/john/alnum.chr
>  share/john/alpha.chr
>  share/john/digits.chr
>  share/john/lanman.chr
>

Reply | Threaded
Open this post in threaded view
|

Re: update: security/john

David Cathcart
On Sun, Dec 18, 2005 at 01:18:46AM +0100, Alexandre Anriot wrote:
>
> Comments inline.

fresh diff addressing comments:

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/john/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile 15 Sep 2005 22:52:01 -0000 1.33
+++ Makefile 18 Dec 2005 01:42:24 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= "extremely fast password cracker"
 
-DISTNAME= john-1.6.39
+DISTNAME= john-1.6.40
 CATEGORIES= security
 
 HOMEPAGE= http://www.openwall.com/john/
@@ -15,12 +15,15 @@
 WANTLIB= c m
 
 MASTER_SITES= ${HOMEPAGE}c/
-DISTFILES= ${DISTNAME}.tar.gz \
- john-1.6.tar.gz
 
 NO_REGRESS= Yes
 
 WRKSRC= ${WRKDIST}/src
+
+MAKE_ENV= JOHN_SYSTEMWIDE=1 \
+ JOHN_SYSTEMWIDE_EXEC="${PREFIX}/bin/john" \
+ JOHN_SYSTEMWIDE_HOME="${SYSCONFDIR}"
+
 MAKE_FLAGS= CC=${CC} AS=${CC} LD=${CC} \
  CFLAGS="${CFLAGS} -c"
 
@@ -28,24 +31,26 @@
 FLAVORS= no_mmx
 FLAVOR?=
 .if ${FLAVOR:L:Mno_mmx}
-ALL_TARGET= openbsd-x86-any-elf
+ALL_TARGET= openbsd-x86-any
 .else
-ALL_TARGET= openbsd-x86-mmx-elf
+ALL_TARGET= openbsd-x86-mmx
 .endif
+.elif ${MACHINE_ARCH} == "amd64"
+ALL_TARGET= openbsd-x86-64
 .elif ${MACHINE_ARCH} == "sparc"
 ALL_TARGET= openbsd-sparc
 .elif ${MACHINE_ARCH} == "vax"
 ALL_TARGET= openbsd-vax
 .elif ${MACHINE_ARCH} == "alpha"
-ALL_TARGET= linux-alpha
+ALL_TARGET= openbsd-alpha
 .elif ${MACHINE_ARCH} == "powerpc"
-ALL_TARGET= linux-ppc32
+ALL_TARGET= openbsd-ppc32
 .elif ${MACHINE_ARCH} == "powerpc64"
-ALL_TARGET= linux-ppc64
+ALL_TARGET= openbsd-ppc64
 .elif ${MACHINE_ARCH} == "hppa"
-ALL_TARGET= hpux-pa-risc-${CC}
+ALL_TARGET= openbsd-pa-risc
 .elif ${MACHINE_ARCH} == "sparc64"
-ALL_TARGET= "openbsd-sparc64"
+ALL_TARGET= openbsd-sparc64
 .else
 ALL_TARGET= generic
 .endif
@@ -56,6 +61,9 @@
 
  @perl -pi -e 's,%%JOHN%%,${PREFIX}\/share\/john,g;' \
  ${WRKDIST}/run/john.conf
+
+ @grep -h -v '^#!comment:' ${WRKDIST}/run/password.lst \
+ /usr/share/dict/words > ${WRKDIST}/run/words.lst
 
 do-install:
  ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
@@ -68,8 +76,8 @@
  ln -sf john unafs && \
  ln -sf john unique
  ${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
- ${INSTALL_DATA} ${WRKDIR}/john-1.6/doc/* ${PREFIX}/share/doc/john
  ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
- ${INSTALL_DATA} ${WRKDIR}/john-1.6/run/*.chr ${PREFIX}/share/john
+ ${INSTALL_DATA} ${WRKDIST}/run/*.chr ${PREFIX}/share/john
+ ${INSTALL_DATA} ${WRKDIST}/run/words.lst ${PREFIX}/share/john
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/john/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 15 Sep 2005 22:52:01 -0000 1.7
+++ distinfo 18 Dec 2005 01:42:24 -0000
@@ -1,8 +1,4 @@
-MD5 (john-1.6.39.tar.gz) = 823ee78095db8568aa68fb0721b1efea
-MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
-RMD160 (john-1.6.39.tar.gz) = 1f0f5dce55b06515db22af37f91f231c41e68ec7
-RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
-SHA1 (john-1.6.39.tar.gz) = abd9a9f8269b7288f6e834b402fa4d0c8f5191de
-SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
-SIZE (john-1.6.39.tar.gz) = 167425
-SIZE (john-1.6.tar.gz) = 497341
+MD5 (john-1.6.40.tar.gz) = 507916220812c5834136d378a13e48a0
+RMD160 (john-1.6.40.tar.gz) = b54e41eec65a9c185731b2e137fb155ae2eb348b
+SHA1 (john-1.6.40.tar.gz) = 1f9fc46d10eb218065f024775578db3642d2bd20
+SIZE (john-1.6.40.tar.gz) = 797220
Index: patches/patch-run_john_conf
===================================================================
RCS file: /cvs/ports/security/john/patches/patch-run_john_conf,v
retrieving revision 1.2
diff -u -r1.2 patch-run_john_conf
--- patches/patch-run_john_conf 6 Sep 2005 20:20:26 -0000 1.2
+++ patches/patch-run_john_conf 18 Dec 2005 01:42:24 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-run_john_conf,v 1.2 2005/09/06 20:20:26 aanriot Exp $
---- run/john.conf.orig Fri Jun 11 14:29:39 2004
-+++ run/john.conf Tue Sep  6 15:51:38 2005
+--- run/john.conf.orig Fri Dec 16 15:02:14 2005
++++ run/john.conf Sat Dec 17 23:14:45 2005
 @@ -5,7 +5,7 @@
 
  [Options]
@@ -10,7 +10,7 @@
  # Use idle cycles only
  Idle = N
  # Crash recovery file saving delay in seconds
-@@ -316,25 +316,25 @@ l$1$9<-$[6-0]$[9-0]
+@@ -323,31 +323,31 @@ lMT[*0]T[*1]T[*2]T[*3]T[*4]T[*5]T[*6]T[*
 
  # Incremental modes
  [Incremental:All]
@@ -33,6 +33,13 @@
  MinLen = 1
  MaxLen = 8
  CharCount = 10
+
+ [Incremental:Alnum]
+-File = $JOHN/alnum.chr
++File = %%JOHN%%/alnum.chr
+ MinLen = 1
+ MaxLen = 8
+ CharCount = 36
 
  [Incremental:LanMan]
 -File = $JOHN/lanman.chr
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/security/john/patches/patch-src_Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-src_Makefile
--- patches/patch-src_Makefile 31 May 2005 08:08:52 -0000 1.3
+++ patches/patch-src_Makefile 18 Dec 2005 01:42:24 -0000
@@ -1,12 +1,32 @@
 $OpenBSD: patch-src_Makefile,v 1.3 2005/05/31 08:08:52 sturm Exp $
---- src/Makefile.orig Wed May  4 19:49:31 2005
-+++ src/Makefile Tue May 31 09:44:24 2005
-@@ -17,7 +17,7 @@ NULL = /dev/null
- CPPFLAGS = -E
- CFLAGS = -c -Wall -O2 -fomit-frame-pointer
+--- src/Makefile.orig Mon Dec 12 18:53:36 2005
++++ src/Makefile Sun Dec 18 01:06:04 2005
+@@ -3,10 +3,10 @@
+ # Copyright (c) 1996-2005 by Solar Designer
+ #
+
+-CPP = gcc
+-CC = gcc
+-AS = gcc
+-LD = gcc
++CPP = $(CC)
++CC = $(CC)
++AS = $(CC)
++LD = $(CC)
+ CP = cp
+ LN = ln -sf
+ RM = rm -f
+@@ -14,10 +14,10 @@ TR = tr
+ SED = sed
+ PERL = perl
+ NULL = /dev/null
+-CPPFLAGS = -E
+-CFLAGS = -c -Wall -O2 -fomit-frame-pointer
++CPPFLAGS+= -E
++CFLAGS+= -c -Wall -O2 -fomit-frame-pointer
  ASFLAGS = -c
 -LDFLAGS = -s
-+LDFLAGS = -s -lm
++LDFLAGS+= -s -lm
  OPT_NORMAL = -funroll-loops
  OPT_INLINE = -finline-functions
 
@@ -17,20 +37,14 @@
 - ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD"
 + ASFLAGS="$(ASFLAGS) -DBSD"
 
- openbsd-sparc:
- $(MAKE) use-openbsd-sparc HAMMER=use-openbsd-sparc NAIL=sparc.h
-@@ -260,7 +260,13 @@ use-openbsd-sparc:
+ openbsd-x86-64:
+ $(LN) x86-64.h arch.h
+@@ -288,7 +288,7 @@ use-openbsd-sparc-a.out:
  $(MAKE) $(NAIL) \
  BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \
  JOHN_OBJS="$(JOHN_OBJS_ORIG) sparc.o" \
 - ASFLAGS="-c -DUNDERSCORES -DBSD"
 + ASFLAGS="-c -DBSD"
-+
-+openbsd-sparc64:
-+ $(LN) sparc64.h arch.h
-+ $(MAKE) $(PROJ) \
-+ CFLAGS="$(CFLAGS) -m64 -mcpu=ultrasparc" \
-+ LDFLAGS="-m64 -s"
 
- openbsd-vax:
- $(LN) vax.h arch.h
+ openbsd-ppc32:
+ $(LN) ppc32.h arch.h
Index: patches/patch-src_params_h
===================================================================
RCS file: patches/patch-src_params_h
diff -N patches/patch-src_params_h
--- patches/patch-src_params_h 31 May 2005 08:08:52 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_params_h,v 1.2 2005/05/31 08:08:52 sturm Exp $
---- src/params.h.orig Wed May 11 05:01:34 2005
-+++ src/params.h Tue May 31 10:01:20 2005
-@@ -22,12 +22,12 @@
-  * will probably want to set this to 1 for their builds of John.
-  */
- #ifndef JOHN_SYSTEMWIDE
--#define JOHN_SYSTEMWIDE 0
-+#define JOHN_SYSTEMWIDE 1
- #endif
-
- #if JOHN_SYSTEMWIDE
--#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"
--#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
-+#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john"
-+#define JOHN_SYSTEMWIDE_HOME "%%SYSCONFDIR%%"
- #define JOHN_PRIVATE_HOME "~/.john"
- #endif
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/john/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 15 Sep 2005 22:52:01 -0000 1.10
+++ pkg/PLIST 18 Dec 2005 01:42:24 -0000
@@ -14,15 +14,15 @@
 share/doc/john/INSTALL
 share/doc/john/LICENSE
 share/doc/john/MODES
-@comment share/doc/john/NEWS
 share/doc/john/OPTIONS
 share/doc/john/README
 share/doc/john/RULES
 share/examples/john/
 share/examples/john/john.conf
-@sample ${SYSCONFDIR}/john.conf
 share/john/
 share/john/all.chr
+share/john/alnum.chr
 share/john/alpha.chr
 share/john/digits.chr
 share/john/lanman.chr
+share/john/words.lst

Reply | Threaded
Open this post in threaded view
|

Re: update: security/john

Alexandre Anriot
> On Sun, Dec 18, 2005 at 01:18:46AM +0100, Alexandre Anriot wrote:
> >
> > Comments inline.
>
> fresh diff addressing comments:

Sorry for my comments on this update, I'm wrong, as Nikolay told me.

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/john/Makefile,v
> retrieving revision 1.33
> diff -u -r1.33 Makefile
> --- Makefile 15 Sep 2005 22:52:01 -0000 1.33
> +++ Makefile 18 Dec 2005 01:42:24 -0000
> @@ -2,7 +2,7 @@
>  
>  COMMENT= "extremely fast password cracker"
>  
> -DISTNAME= john-1.6.39
> +DISTNAME= john-1.6.40
>  CATEGORIES= security
>  
>  HOMEPAGE= http://www.openwall.com/john/
> @@ -15,12 +15,15 @@
>  WANTLIB= c m
>  
>  MASTER_SITES= ${HOMEPAGE}c/
> -DISTFILES= ${DISTNAME}.tar.gz \
> - john-1.6.tar.gz
>  
>  NO_REGRESS= Yes
>  
>  WRKSRC= ${WRKDIST}/src
> +
> +MAKE_ENV= JOHN_SYSTEMWIDE=1 \
> + JOHN_SYSTEMWIDE_EXEC="${PREFIX}/bin/john" \
> + JOHN_SYSTEMWIDE_HOME="${SYSCONFDIR}"
> +
>  MAKE_FLAGS= CC=${CC} AS=${CC} LD=${CC} \
>   CFLAGS="${CFLAGS} -c"
>  
> @@ -28,24 +31,26 @@
>  FLAVORS= no_mmx
>  FLAVOR?=
>  .if ${FLAVOR:L:Mno_mmx}
> -ALL_TARGET= openbsd-x86-any-elf
> +ALL_TARGET= openbsd-x86-any
>  .else
> -ALL_TARGET= openbsd-x86-mmx-elf
> +ALL_TARGET= openbsd-x86-mmx
>  .endif
> +.elif ${MACHINE_ARCH} == "amd64"
> +ALL_TARGET= openbsd-x86-64
>  .elif ${MACHINE_ARCH} == "sparc"
>  ALL_TARGET= openbsd-sparc
>  .elif ${MACHINE_ARCH} == "vax"
>  ALL_TARGET= openbsd-vax
>  .elif ${MACHINE_ARCH} == "alpha"
> -ALL_TARGET= linux-alpha
> +ALL_TARGET= openbsd-alpha
>  .elif ${MACHINE_ARCH} == "powerpc"
> -ALL_TARGET= linux-ppc32
> +ALL_TARGET= openbsd-ppc32
>  .elif ${MACHINE_ARCH} == "powerpc64"
> -ALL_TARGET= linux-ppc64
> +ALL_TARGET= openbsd-ppc64
>  .elif ${MACHINE_ARCH} == "hppa"
> -ALL_TARGET= hpux-pa-risc-${CC}
> +ALL_TARGET= openbsd-pa-risc
>  .elif ${MACHINE_ARCH} == "sparc64"
> -ALL_TARGET= "openbsd-sparc64"
> +ALL_TARGET= openbsd-sparc64
>  .else
>  ALL_TARGET= generic
>  .endif
> @@ -56,6 +61,9 @@
>  
>   @perl -pi -e 's,%%JOHN%%,${PREFIX}\/share\/john,g;' \
>   ${WRKDIST}/run/john.conf
> +
> + @grep -h -v '^#!comment:' ${WRKDIST}/run/password.lst \
> + /usr/share/dict/words > ${WRKDIST}/run/words.lst
>  
>  do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
> @@ -68,8 +76,8 @@
>   ln -sf john unafs && \
>   ln -sf john unique
>   ${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
> - ${INSTALL_DATA} ${WRKDIR}/john-1.6/doc/* ${PREFIX}/share/doc/john
>   ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
> - ${INSTALL_DATA} ${WRKDIR}/john-1.6/run/*.chr ${PREFIX}/share/john
> + ${INSTALL_DATA} ${WRKDIST}/run/*.chr ${PREFIX}/share/john
> + ${INSTALL_DATA} ${WRKDIST}/run/words.lst ${PREFIX}/share/john
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/security/john/distinfo,v
> retrieving revision 1.7
> diff -u -r1.7 distinfo
> --- distinfo 15 Sep 2005 22:52:01 -0000 1.7
> +++ distinfo 18 Dec 2005 01:42:24 -0000
> @@ -1,8 +1,4 @@
> -MD5 (john-1.6.39.tar.gz) = 823ee78095db8568aa68fb0721b1efea
> -MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
> -RMD160 (john-1.6.39.tar.gz) = 1f0f5dce55b06515db22af37f91f231c41e68ec7
> -RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
> -SHA1 (john-1.6.39.tar.gz) = abd9a9f8269b7288f6e834b402fa4d0c8f5191de
> -SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
> -SIZE (john-1.6.39.tar.gz) = 167425
> -SIZE (john-1.6.tar.gz) = 497341
> +MD5 (john-1.6.40.tar.gz) = 507916220812c5834136d378a13e48a0
> +RMD160 (john-1.6.40.tar.gz) = b54e41eec65a9c185731b2e137fb155ae2eb348b
> +SHA1 (john-1.6.40.tar.gz) = 1f9fc46d10eb218065f024775578db3642d2bd20
> +SIZE (john-1.6.40.tar.gz) = 797220
> Index: patches/patch-run_john_conf
> ===================================================================
> RCS file: /cvs/ports/security/john/patches/patch-run_john_conf,v
> retrieving revision 1.2
> diff -u -r1.2 patch-run_john_conf
> --- patches/patch-run_john_conf 6 Sep 2005 20:20:26 -0000 1.2
> +++ patches/patch-run_john_conf 18 Dec 2005 01:42:24 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-run_john_conf,v 1.2 2005/09/06 20:20:26 aanriot Exp $
> ---- run/john.conf.orig Fri Jun 11 14:29:39 2004
> -+++ run/john.conf Tue Sep  6 15:51:38 2005
> +--- run/john.conf.orig Fri Dec 16 15:02:14 2005
> ++++ run/john.conf Sat Dec 17 23:14:45 2005
>  @@ -5,7 +5,7 @@
>  
>   [Options]
> @@ -10,7 +10,7 @@
>   # Use idle cycles only
>   Idle = N
>   # Crash recovery file saving delay in seconds
> -@@ -316,25 +316,25 @@ l$1$9<-$[6-0]$[9-0]
> +@@ -323,31 +323,31 @@ lMT[*0]T[*1]T[*2]T[*3]T[*4]T[*5]T[*6]T[*
>  
>   # Incremental modes
>   [Incremental:All]
> @@ -33,6 +33,13 @@
>   MinLen = 1
>   MaxLen = 8
>   CharCount = 10
> +
> + [Incremental:Alnum]
> +-File = $JOHN/alnum.chr
> ++File = %%JOHN%%/alnum.chr
> + MinLen = 1
> + MaxLen = 8
> + CharCount = 36
>  
>   [Incremental:LanMan]
>  -File = $JOHN/lanman.chr
> Index: patches/patch-src_Makefile
> ===================================================================
> RCS file: /cvs/ports/security/john/patches/patch-src_Makefile,v
> retrieving revision 1.3
> diff -u -r1.3 patch-src_Makefile
> --- patches/patch-src_Makefile 31 May 2005 08:08:52 -0000 1.3
> +++ patches/patch-src_Makefile 18 Dec 2005 01:42:24 -0000
> @@ -1,12 +1,32 @@
>  $OpenBSD: patch-src_Makefile,v 1.3 2005/05/31 08:08:52 sturm Exp $
> ---- src/Makefile.orig Wed May  4 19:49:31 2005
> -+++ src/Makefile Tue May 31 09:44:24 2005
> -@@ -17,7 +17,7 @@ NULL = /dev/null
> - CPPFLAGS = -E
> - CFLAGS = -c -Wall -O2 -fomit-frame-pointer
> +--- src/Makefile.orig Mon Dec 12 18:53:36 2005
> ++++ src/Makefile Sun Dec 18 01:06:04 2005
> +@@ -3,10 +3,10 @@
> + # Copyright (c) 1996-2005 by Solar Designer
> + #
> +
> +-CPP = gcc
> +-CC = gcc
> +-AS = gcc
> +-LD = gcc
> ++CPP = $(CC)
> ++CC = $(CC)
> ++AS = $(CC)
> ++LD = $(CC)
> + CP = cp
> + LN = ln -sf
> + RM = rm -f
> +@@ -14,10 +14,10 @@ TR = tr
> + SED = sed
> + PERL = perl
> + NULL = /dev/null
> +-CPPFLAGS = -E
> +-CFLAGS = -c -Wall -O2 -fomit-frame-pointer
> ++CPPFLAGS+= -E
> ++CFLAGS+= -c -Wall -O2 -fomit-frame-pointer
>   ASFLAGS = -c
>  -LDFLAGS = -s
> -+LDFLAGS = -s -lm
> ++LDFLAGS+= -s -lm
>   OPT_NORMAL = -funroll-loops
>   OPT_INLINE = -finline-functions
>  
> @@ -17,20 +37,14 @@
>  - ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD"
>  + ASFLAGS="$(ASFLAGS) -DBSD"
>  
> - openbsd-sparc:
> - $(MAKE) use-openbsd-sparc HAMMER=use-openbsd-sparc NAIL=sparc.h
> -@@ -260,7 +260,13 @@ use-openbsd-sparc:
> + openbsd-x86-64:
> + $(LN) x86-64.h arch.h
> +@@ -288,7 +288,7 @@ use-openbsd-sparc-a.out:
>   $(MAKE) $(NAIL) \
>   BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \
>   JOHN_OBJS="$(JOHN_OBJS_ORIG) sparc.o" \
>  - ASFLAGS="-c -DUNDERSCORES -DBSD"
>  + ASFLAGS="-c -DBSD"
> -+
> -+openbsd-sparc64:
> -+ $(LN) sparc64.h arch.h
> -+ $(MAKE) $(PROJ) \
> -+ CFLAGS="$(CFLAGS) -m64 -mcpu=ultrasparc" \
> -+ LDFLAGS="-m64 -s"
>  
> - openbsd-vax:
> - $(LN) vax.h arch.h
> + openbsd-ppc32:
> + $(LN) ppc32.h arch.h
> Index: patches/patch-src_params_h
> ===================================================================
> RCS file: patches/patch-src_params_h
> diff -N patches/patch-src_params_h
> --- patches/patch-src_params_h 31 May 2005 08:08:52 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-src_params_h,v 1.2 2005/05/31 08:08:52 sturm Exp $
> ---- src/params.h.orig Wed May 11 05:01:34 2005
> -+++ src/params.h Tue May 31 10:01:20 2005
> -@@ -22,12 +22,12 @@
> -  * will probably want to set this to 1 for their builds of John.
> -  */
> - #ifndef JOHN_SYSTEMWIDE
> --#define JOHN_SYSTEMWIDE 0
> -+#define JOHN_SYSTEMWIDE 1
> - #endif
> -
> - #if JOHN_SYSTEMWIDE
> --#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"
> --#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
> -+#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john"
> -+#define JOHN_SYSTEMWIDE_HOME "%%SYSCONFDIR%%"
> - #define JOHN_PRIVATE_HOME "~/.john"
> - #endif
> -
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/john/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -r1.10 PLIST
> --- pkg/PLIST 15 Sep 2005 22:52:01 -0000 1.10
> +++ pkg/PLIST 18 Dec 2005 01:42:24 -0000
> @@ -14,15 +14,15 @@
>  share/doc/john/INSTALL
>  share/doc/john/LICENSE
>  share/doc/john/MODES
> -@comment share/doc/john/NEWS
>  share/doc/john/OPTIONS
>  share/doc/john/README
>  share/doc/john/RULES
>  share/examples/john/
>  share/examples/john/john.conf
> -@sample ${SYSCONFDIR}/john.conf
>  share/john/
>  share/john/all.chr
> +share/john/alnum.chr
>  share/john/alpha.chr
>  share/john/digits.chr
>  share/john/lanman.chr
> +share/john/words.lst
>

Reply | Threaded
Open this post in threaded view
|

Re: update: security/john

Sebastian Rother
In reply to this post by David Cathcart
*cut*
What's about a commit to current...?

Kind regards,
Sebastian