OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Dec-2005 20:31:35
Branch: HEAD Handle: 2005121819313400
Modified files:
openpkg-src/john john.patch john.spec
Log:
upgrading package: john 1.6.39 -> 1.6.40
Summary:
Revision Changes Path
1.2 +8 -5 openpkg-src/john/john.patch
1.3 +4 -4 openpkg-src/john/john.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/john/john.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 john.patch
--- openpkg-src/john/john.patch 12 May 2005 19:15:56 -0000 1.1
+++ openpkg-src/john/john.patch 18 Dec 2005 19:31:34 -0000 1.2
@@ -1,7 +1,7 @@
Index: src/params.h
---- src/params.h.orig 2005-05-11 05:01:34 +0200
-+++ src/params.h 2005-05-12 21:05:07 +0200
-@@ -22,12 +22,12 @@
+--- src/params.h.orig 2005-12-16 16:47:25 +0100
++++ src/params.h 2005-12-18 20:29:41 +0100
+@@ -22,15 +22,15 @@
* will probably want to set this to 1 for their builds of John.
*/
#ifndef JOHN_SYSTEMWIDE
@@ -10,10 +10,13 @@
#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 "@l_prefix@/libexec/john"
+ #endif
+ #ifndef JOHN_SYSTEMWIDE_HOME
+-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
+#define JOHN_SYSTEMWIDE_HOME "@l_prefix@/etc/john"
+ #endif
#define JOHN_PRIVATE_HOME "~/.john"
#endif
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/john/john.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 john.spec
--- openpkg-src/john/john.spec 13 Sep 2005 19:07:00 -0000 1.2
+++ openpkg-src/john/john.spec 18 Dec 2005 19:31:34 -0000 1.3
@@ -32,8 +32,8 @@
Class: EVAL
Group: System
License: GPL
-Version: 1.6.39
-Release: 20050913
+Version: 1.6.40
+Release: 20051218
# list of sources
Source0: http://www.openwall.com/john/c/john-%{version}.tar.gz
@@ -69,8 +69,8 @@
( cd src
platform="generic"
case "%{l_platform -t}" in
- i?86-freebsd* ) platform="freebsd-x86-any-elf" ;;
- i?86-linux* ) platform="linux-x86-any-elf" ;;
+ i?86-freebsd* ) platform="freebsd-x86-any" ;;
+ i?86-linux* ) platform="linux-x86-any" ;;
sun4u-sunos* ) platform="solaris-sparc64-gcc" ;;
esac
%{l_make} %{l_mflags} $platform CC="%{l_cc}"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
