[Forensics-changes] [crack] 36/40: Revert "Merge debian-specific build script Crack.make into Crack"
Giovani Augusto Ferreira
giovani-guest at moszumanska.debian.org
Wed Dec 28 02:47:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
giovani-guest pushed a commit to branch debian
in repository crack.
commit 1edd7579a77059a06debdb04239be6e6145063b5
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Mon Oct 10 03:25:19 2016 +0200
Revert "Merge debian-specific build script Crack.make into Crack"
This reverts commit 542e409bff863fd20fb6347f0a1c659fe355d642.
It seems as if Crack itself is used at runtime in the binary package
and Crack.make at build time in the source package. *sigh*
---
debian/changelog | 1 -
debian/patches/Crack.make.patch | 216 ++++++++++++++++++
debian/patches/Crack.patch | 479 ++++++++--------------------------------
debian/patches/series | 1 +
debian/rules | 5 +-
5 files changed, 316 insertions(+), 386 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0f0de35..be4cdc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,6 @@ crack (5.0a-10) UNRELEASED; urgency=medium
debian/crack*.{docs,examples,manpages,link,install}.
* Switch to source format "3.0 (quilt)" using diff2patches.
+ Add minimal DEP3-style patch headers.
- + Merge debian-specific build script Crack.make into Crack.
+ Drop file-creating patches and put the files under debian/ instead.
* Add Homepage header and update upstream website in debian/copyright.
* Recode debian/copyright from ISO-8859-1 to UTF-8.
diff --git a/debian/patches/Crack.make.patch b/debian/patches/Crack.make.patch
new file mode 100644
index 0000000..18e8069
--- /dev/null
+++ b/debian/patches/Crack.make.patch
@@ -0,0 +1,216 @@
+Description: Debian-specific build script based on the upstream one
+ Imported from .diff.gz of crack 5.0a-9.4
+
+--- crack-5.0a.orig/Crack.make
++++ crack-5.0a/Crack.make
+@@ -0,0 +1,210 @@
++#!/bin/sh
++###
++# This program was written by and is copyright Alec Muffett 1991,
++# 1992, 1993, 1994, 1995, and 1996, and is provided as part of the
++# Crack v5.0 Password Cracking package.
++#
++# The copyright holder disclaims all responsibility or liability with
++# respect to its usage or its effect upon hardware or computer
++# systems, and maintains copyright as set out in the "LICENCE"
++# document which accompanies distributions of Crack v5.0 and upwards.
++#
++# This is the Crack.makeonly version which *only* compiles the utilities
++# under run/dir used for Crack
++#
++# This program was made based on Crack by Javier Fernández-Sanguino Peña
++# for the Debian GNU/Linux distribution
++
++###
++# User-configurable junk for Crack
++###
++
++# nice, generic path (RedHat Linux, Solaris1, Solaris2)
++CRACK_PATH=/usr/local/bin:/usr/ccs/bin:/usr/sbin:/sbin:/usr/bin:/bin:/usr/ucb:/usr/etc:$PATH
++
++# compiler options for crack 5.0
++#
++# -DUSE_BZERO /* add this to C5FLAGS if you don't have memset() */
++# -DUSE_MALLOC_H
++# -DUSE_PWD_H
++# -DUSE_SIGNAL_H
++# -DUSE_STDLIB_H
++# -DUSE_STRINGS_H
++# -DUSE_STRING_H
++# -DUSE_SYS_TYPES_H
++# -DUSE_UNISTD_H
++# -DMAXWORDLEN= /* ignore if you don't read the code */
++# -DNUMWORDS= /* ignore if you don't read the code */
++# -DSTRINGSIZE= /* ignore if you don't read the code */
++
++# this set tested on:
++# - solaris 2.5
++# - redhat linux 4.0
++# - digital unix v4.0
++
++C5FLAGS="-DUSE_STRING_H -DUSE_STDLIB_H -DUSE_SIGNAL_H -DUSE_SYS_TYPES_H -DUSE_UNISTD_H -DUSE_PWD_H"
++
++#
++# now pick your compiler
++#
++
++# vanilla unix cc
++#CC=cc
++#CFLAGS="-g -O $C5FLAGS"
++#LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
++
++# gcc 2.7.2
++CC=gcc
++CFLAGS="-g -O2 -Wall $C5FLAGS"
++LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
++
++# digital unix v4.0, CFLAGS for ev4/ev5 chipsets (pick one)
++#CC=cc
++#CFLAGS="-O4 -fast -tune ev4 $C5FLAGS"
++#CFLAGS="-O4 -fast -tune ev5 $C5FLAGS"
++#LIBS=
++
++# Uncomment the next two lines if a) you are running Crack in
++# networking mode, and b) your environment's operating system will not
++# necessarily run binaries compiled on other revs of the same
++# operating system which have the same architecture and the same
++# *MAJOR* revision number.
++#
++# eg: if you have Foonix 2.0 boxes as well as Foonix 2.1 boxes; in
++# this example, the major revision number is "2". If the Foonix 2.1
++# O/S will not run Foonix 2.0 binaries for some reason, or vice-versa,
++# then uncomment these lines.
++
++#STRICT_OSREV=yes
++#export STRICT_OSREV
++
++# Uncomment and/or modify on HP/UX or similar where the UCB "rsh"
++# command has been renamed. See scripts/crack-rsh also
++#CRACK_RSH=remsh
++#CRACK_RCP=rcp
++
++###########################################################
++###########################################################
++#################### THAT'S ALL, FOLKS ####################
++#### NOW GO CONFIGURE YOUR CRYPT ALGORITHM, EG: LIBDES ####
++###########################################################
++###########################################################
++
++###
++# security
++###
++
++umask 077
++export CRACK_PATH # So it can be picked up later
++PATH=$CRACK_PATH # For temporary use...
++export PATH
++
++###
++# Defaults
++###
++
++usage="Usage: Crack [options] [bindir] [[-fmt format] files]..."
++
++version="5.0a" # version string
++deffmt=trad # for default trad2spf
++dodie="" # for verbose usage/die
++debug="false" # ...guess...
++node=`uname -n` # more portable then `hostname`
++
++###
++# home base
++###
++
++CRACK_HOME=.
++
++if cd $CRACK_HOME
++then
++ CRACK_HOME=`pwd`
++else
++ echo "Fatal Error: $CRACK_HOME: cannot chdir" 1>&2
++ exit 1
++fi
++
++export CRACK_HOME
++
++###
++# sanity check
++###
++
++if [ ! -f "$CRACK_HOME/Crack" ]
++then
++ echo "Fatal Error: $CRACK_HOME: something weird going down" 1>&2
++ exit 1
++fi
++
++###
++# Hierarchy
++###
++
++for dir in lib lib/bin
++do
++ test -d $dir || mkdir $dir || exit 1
++done
++
++###
++# Flagwaving
++###
++
++echo "Crack $version: The Password Cracker."
++echo "(c) Alec Muffett, 1991, 1992, 1993, 1994, 1995, 1996"
++echo "System:" `uname -a 2>/dev/null`
++echo "Home: $CRACK_HOME"
++echo "Invoked: $0 $*"
++
++
++###
++# Sanity test bindir - written in gruntscript for clarity.
++###
++
++bdname=`scripts/binstamp 2>/dev/null`
++
++if [ "x$bdname" = "x" ]
++then
++ echo "Crack: error: cannot continue as binstamp returned empty string" 1>&2
++ exit 0
++fi
++
++echo "Stamp: $bdname"
++echo ""
++
++bindir=lib/bin/$bdname
++
++
++###
++# Reset PATH in advance
++###
++
++PATH=$CRACK_HOME/scripts:$CRACK_HOME/$bindir:$PATH
++export PATH
++
++###
++# Make the binaries
++###
++
++echo "Crack: making utilities in $bindir"
++
++if [ ! -d $bindir ] # small redundancy, big benefit
++then
++ mkdir $bindir || exit 1
++fi
++
++make clean || exit 1
++
++make ARGS="\"XDIR=../../$bindir\" \"XCFLAGS=$CFLAGS\" \"XCC=$CC\" \"XLIBS=$LIBS\"" utils || exit 1
++
++###
++# Make Only ?
++###
++
++if [ "x$makeonlyflag" != "x" ]
++then
++ echo "Crack: makeonly done"
++ exit 0
++fi
++
++exit 0
diff --git a/debian/patches/Crack.patch b/debian/patches/Crack.patch
index dcfd23a..a3f9623 100644
--- a/debian/patches/Crack.patch
+++ b/debian/patches/Crack.patch
@@ -1,410 +1,123 @@
Description: Remove unneeded stuff from Crack's build script
- Patch imported from .diff.gz of crack 5.0a-9.4 (where it was shipped
- as Crack.make).
+ Patch imported from .diff.gz of crack 5.0a-9.4
---- a/Crack
-+++ b/Crack
-@@ -8,6 +8,13 @@
- # respect to its usage or its effect upon hardware or computer
- # systems, and maintains copyright as set out in the "LICENCE"
- # document which accompanies distributions of Crack v5.0 and upwards.
-+#
-+# This is the Crack.makeonly version which *only* compiles the utilities
-+# under run/dir used for Crack
-+#
-+# This program was made based on Crack by Javier Fernández-Sanguino Peña
-+# for the Debian GNU/Linux distribution
-+
- ###
- # User-configurable junk for Crack
- ###
-@@ -42,14 +49,14 @@
- #
+--- crack-5.0a.orig/Crack
++++ crack-5.0a/Crack
+@@ -15,74 +15,6 @@
+ # nice, generic path (RedHat Linux, Solaris1, Solaris2)
+ CRACK_PATH=/usr/local/bin:/usr/ccs/bin:/usr/sbin:/sbin:/usr/bin:/bin:/usr/ucb:/usr/etc:$PATH
- # vanilla unix cc
+-# compiler options for crack 5.0
+-#
+-# -DUSE_BZERO /* add this to C5FLAGS if you don't have memset() */
+-# -DUSE_MALLOC_H
+-# -DUSE_PWD_H
+-# -DUSE_SIGNAL_H
+-# -DUSE_STDLIB_H
+-# -DUSE_STRINGS_H
+-# -DUSE_STRING_H
+-# -DUSE_SYS_TYPES_H
+-# -DUSE_UNISTD_H
+-# -DMAXWORDLEN= /* ignore if you don't read the code */
+-# -DNUMWORDS= /* ignore if you don't read the code */
+-# -DSTRINGSIZE= /* ignore if you don't read the code */
+-
+-# this set tested on:
+-# - solaris 2.5
+-# - redhat linux 4.0
+-# - digital unix v4.0
+-
+-C5FLAGS="-DUSE_STRING_H -DUSE_STDLIB_H -DUSE_SIGNAL_H -DUSE_SYS_TYPES_H -DUSE_UNISTD_H -DUSE_PWD_H"
+-
+-#
+-# now pick your compiler
+-#
+-
+-# vanilla unix cc
-CC=cc
-CFLAGS="-g -O $C5FLAGS"
-+#CC=cc
-+#CFLAGS="-g -O $C5FLAGS"
- #LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
-
- # gcc 2.7.2
+-#LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
+-
+-# gcc 2.7.2
-#CC=gcc
-#CFLAGS="-g -O2 -Wall $C5FLAGS"
-#LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
-+CC=gcc
-+CFLAGS="-g -O2 -Wall $C5FLAGS"
-+LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
-
- # digital unix v4.0, CFLAGS for ev4/ev5 chipsets (pick one)
- #CC=cc
-@@ -108,12 +115,7 @@
- # home base
- ###
-
--CRACK_HOME=`echo $0 | sed -e 's/Crack$//'`
--
--if [ "$CRACK_HOME" = "" ]
--then
-- CRACK_HOME=.
--fi
-+CRACK_HOME=.
-
- if cd $CRACK_HOME
- then
-@@ -139,7 +141,7 @@
- # Hierarchy
- ###
-
--for dir in run run/bin
-+for dir in lib lib/bin
- do
- test -d $dir || mkdir $dir || exit 1
- done
-@@ -154,126 +156,6 @@
- echo "Home: $CRACK_HOME"
- echo "Invoked: $0 $*"
-
--###
--# Parse Arguments
--###
--
--argbackup1="$*"
--
--while [ "x$1" != "x" ]
--do
-- case $1 in
-- -fmt)
-- $debug && echo "beginning of filespecs detected"
-- break
-- ;;
--
-- -recover)
-- echo "Option: $1 enabled"
-- recover=true
-- shift
-- ;;
--
-- -keep)
-- echo "Option: $1 enabled"
-- keep=true
-- shift
-- ;;
--
-- -debug)
-- echo "Option: $1 enabled"
-- debug=true
-- set -x
-- shift
-- ;;
--
-- -network)
-- echo "Option: $1 enabled"
-- networkflag=$1
-- shift
-- ;;
--
-- -remote)
-- echo "Option: $1 enabled"
-- remoteflag=$1
-- shift
-- ;;
--
-- -makeonly)
-- echo "Option: $1 enabled"
-- makeonlyflag=$1
-- shift
-- ;;
-
-- -makedict*)
-- echo "Option: $1 enabled"
-- makedictflag="-makedict"
-- shift
-- ;;
+-# digital unix v4.0, CFLAGS for ev4/ev5 chipsets (pick one)
+-#CC=cc
+-#CFLAGS="-O4 -fast -tune ev4 $C5FLAGS"
+-#CFLAGS="-O4 -fast -tune ev5 $C5FLAGS"
+-#LIBS=
+-
+-# Uncomment the next two lines if a) you are running Crack in
+-# networking mode, and b) your environment's operating system will not
+-# necessarily run binaries compiled on other revs of the same
+-# operating system which have the same architecture and the same
+-# *MAJOR* revision number.
+-#
+-# eg: if you have Foonix 2.0 boxes as well as Foonix 2.1 boxes; in
+-# this example, the major revision number is "2". If the Foonix 2.1
+-# O/S will not run Foonix 2.0 binaries for some reason, or vice-versa,
+-# then uncomment these lines.
+-
+-#STRICT_OSREV=yes
+-#export STRICT_OSREV
+-
+-# Uncomment and/or modify on HP/UX or similar where the UCB "rsh"
+-# command has been renamed. See scripts/crack-rsh also
+-#CRACK_RSH=remsh
+-#CRACK_RCP=rcp
+-
+-###########################################################
+-###########################################################
+-#################### THAT'S ALL, FOLKS ####################
+-#### NOW GO CONFIGURE YOUR CRYPT ALGORITHM, EG: LIBDES ####
+-###########################################################
+-###########################################################
-
-- -fgnd)
-- echo "Option: $1 enabled"
-- fgndflag=$1
-- shift
-- ;;
--
-- -mail) # pass to cracker
-- echo "Option: $1 enabled"
-- mailflag=$1
-- shift
-- ;;
--
-- -nice) # pass to cracker
-- echo "Option: $1 enabled"
-- if [ "$2" = "" ]
-- then
-- echo "Crack: -nice needs an argument" 1>&2
-- exit 1
-- fi
-- niceflag="$1 $2"
-- shift 2
-- ;;
--
-- -from) # pass to cracker
-- echo "Option: $1 enabled"
-- if [ "$2" = "" ]
-- then
-- echo "Crack: -from needs an argument" 1>&2
-- exit 1
-- fi
-- fromflag="$1 $2"
-- shift 2
-- ;;
--
-- -kill) # pass to cracker
-- echo "Option: $1 enabled"
-- if [ "$2" = "" ]
-- then
-- echo "Crack: -kill needs an argument" 1>&2
-- exit 1
-- fi
-- killflag="$2"
-- shift 2
-- ;;
--
-- -*)
-- echo "Crack: unrecognised argument $1" 1>&2
-- dodie=yes
-- shift
-- ;;
--
-- *)
-- $debug && echo "End of options detected."
-- break
-- ;;
-- esac
--done
--
--if [ "x$dodie" != "x" ]
--then
-- echo $usage 1>&2
-- exit 1
--fi
-
###
- # Sanity test bindir - written in gruntscript for clarity.
-@@ -290,40 +172,8 @@
- echo "Stamp: $bdname"
- echo ""
-
-+bindir=lib/bin/$bdname
-
--if [ "x$1" != "x" ]
--then
-- if [ "$1" = "-fmt" ] # use generic name
-- then
-- bindir=run/bin/$bdname
-- elif [ -d run/bin/$1 ] # have been here before
-- then
-- bindir=run/bin/$1
-- shift
-- elif [ ! -f $1 ] # use specified name
-- then
-- bindir=run/bin/$1
-- shift
-- else # use generic name
-- bindir=run/bin/$bdname
-- fi
--else # supporting "-makeonly"
-- if [ "$makeonlyflag" != "" ]
-- then
-- bindir=run/bin/$bdname
--
-- elif [ "$makedictflag" != "" ]
-- then
-- bindir=run/bin/$bdname
--
-- elif [ "$remoteflag" != "" ]
-- then
-- bindir=run/bin/$bdname
-- else
-- echo $usage 1>&2
-- exit 1
-- fi
--fi
-
+ # security
+ ###
+@@ -330,32 +262,8 @@
###
- # Reset PATH in advance
-@@ -357,177 +207,4 @@
- exit 0
- fi
--###
--# Make the dictionary passes
--###
--
--dp=run/dict
--dplf=$dp/.dictmade
--
--if [ ! -f $dplf ]
--then
-- test -d $dp && rm -rf $dp
--
-- echo "Crack: making dictionary groups, please be patient..."
-- mkdictgrps $dp || exit 1
--
-- echo "Crack: Created new dictionaries..."
-- date > $dplf
--else
-- echo "Crack: The dictionaries seem up to date..."
--fi
+ PATH=$CRACK_HOME/scripts:$CRACK_HOME/$bindir:$PATH
+-export PATH
-
-###
--# Make Dict Only ?
+-# Make the binaries
-###
-
--if [ "x$makedictflag" != "x" ]
--then
-- echo "Crack: makedict done"
-- exit 0
--fi
--
--###
--# We're on a roll...
--###
+-echo "Crack: making utilities in $bindir"
-
--# F-files are feedback
--crackin=run/I$node.$$ # I-files are input to the cracker
--crackfb=run/D.boot.$$ # D-files are data from the cracker/fb
--crackout=run/D$node.$$
--crackerr=run/E$node.$$ # E-files are errors from the cracker
--
--if [ "x$killflag" = "x" ]
--then
-- crackkf=run/K$node.$$ # K-files are kill file for 'plaster'
--else
-- crackkf=$killflag
--fi
--
--if [ "x$mailflag" != "x" ]
+-if [ ! -d $bindir ] # small redundancy, big benefit
-then
-- crackmf=run/M$node.$$ # M-files are for mail commands
+- mkdir $bindir || exit 1
-fi
++export PATH
+
+-make clean || exit 1
-
+-make ARGS="\"XDIR=../../$bindir\" \"XCFLAGS=$CFLAGS\" \"XCC=$CC\" \"XLIBS=$LIBS\"" utils || exit 1
-
-###
--# SPF
--###
--
--# The SPF scripts are frontend processors for creating "Single
--# Password Format" files which Crack can work on, from any of a
--# variety of possible inputs.
--
--# if your target system uses a non-traditional passwd-file format (eg:
--# /etc/master.passwd in FreeBSD) then you can use/write a spf script
--# (eg: freebsd2spf) to convert the data, and invoke it thusly:
--
--# Crack -fmt freebsd /etc/master.passwd
--
--# If your system has shadow passwords but the core of the password
--# data is held in a "traditional" format and uses the standard
--# crypt(), function it is recommended that you coerce your data into a
--# BSD format file to feed into Crack, by using one of the supplied
--# "shadmrg" scripts, or by your own means.
--
--# if your target system is running a non-traditional crypt()
--# algorithm, you will have to modify the ELCID code, too.
--
--if [ "x$remoteflag" = "x" ]
--then
-- echo "Crack: Sorting out and merging feedback, please be patient..."
-- fbmerge
--
-- echo "Crack: Merging password files..."
-- argbackup2="$*"
--
-- (
-- cat run/F-merged # first the feedback
--
-- while [ "x$1" != "x" ]
-- do
-- if [ "$1" = "-fmt" ]
-- then
-- shift || exit 1
-- deffmt=$1
--
-- elif [ "$deffmt" = "spf" ]
-- then
-- cat $1 1>&3 # skip the sort
-- else
-- ${deffmt}2spf $1
-- fi
--
-- shift
-- done |
-- crack-sort -t: +1
-- ) 3>&1 |
-- fbfilt $crackfb $crackmf > $crackin # remove feedback-guessable users
--
-- if [ "x$crackmf" != "x" ]
-- then
-- if [ -s $crackmf ]
-- then
-- echo "Crack: mailing nastygrams..."
-- sh -x $crackmf
-- fi
-- rm -f $crackmf
-- fi
--
-- if [ "x$recover" = "x" ]
-- then
-- echo "Crack: Creating gecos-derived dictionaries"
-- mkgecosd $dp $crackin
-- else
-- echo "Crack: -recover: using existing gecos-derived dictionaries"
-- fi
--else
-- echo "Crack: reading data from stdin..."
-- cat > $crackin # has already been thru fbfilt on master
-- ls -l $crackin
--fi
--
--###
--# Launch it...
+-# Make Only ?
-###
-
--flags="$fromflag $niceflag $mailflag"
--
--if [ "x$networkflag" != "x" ]
--then
-- if [ "x$remoteflag" != "x" ]
-- then
-- echo "Error: cannot -network AND -remote" 1>&2
-- exit 1
-- elif [ "x$fgndflag" != "x" ]
-- then
-- echo "Error: cannot -network AND -foreground" 1>&2
-- exit 1
-- fi
--
-- echo "Crack: launching: netcrack $flags"
-- netcrack $flags <$crackin
--
--elif [ "x$fgndflag" != "x" ]
--then
-- echo "Crack: exec: cracker -kill $crackkf $flags"
-- exec cracker $flags <$crackin
--else
-- echo "Crack: launching: cracker -kill $crackkf $flags"
-- exec 3>&- 4>&- 5>&- 6>&- 7>&- 8>&- 9>&-
-- nohup cracker -kill $crackkf $flags <$crackin >$crackout 2>$crackerr &
--fi
--
--if [ "x$keep" = "x" ]
+-if [ "x$makeonlyflag" != "x" ]
-then
-- sleep 3
-- rm $crackin # Aye, some things never change...
+- echo "Crack: makeonly done"
+- exit 0
-fi
--
--###
--# Exit
--###
--
--echo "Done"
--
- exit 0
+
+ ###
+ # Make the dictionary passes
+@@ -460,7 +368,7 @@
+
+ shift
+ done |
+- crack-sort -t: +1
++ crack-sort -t: -k 1
+ ) 3>&1 |
+ fbfilt $crackfb $crackmf > $crackin # remove feedback-guessable users
+
diff --git a/debian/patches/series b/debian/patches/series
index 7998131..593cc5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+Crack.make.patch
Crack.patch
Makefile.patch
conf___dictgrps.conf.patch
diff --git a/debian/rules b/debian/rules
index 3cced27..642c23a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,14 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
dh $@
override_dh_auto_build:
- ./Crack
+ chmod 755 Crack.make
+ ./Crack.make
# this is the crypt version, move it to other place
mv lib/bin/debian/ lib/bin/debian-crypt
# To build the MD5 version
mv src/libdes src/libdes.orig
cd src/util && cp elcid.c elcid.c.orig && cp elcid.c,bsd elcid.c
- ./Crack
+ ./Crack.make
mv lib/bin/debian/ lib/bin/debian-md5
# Now restore it to the previous situation
mv src/libdes.orig src/libdes
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/crack.git
More information about the forensics-changes
mailing list