The attached patch: -- moves the crack files in question from /var/run/Crack to /var/lib/Crack -- modifies the postrm script to purge /var/lib/Crack also
Thus it fixes both #387756 and #611720. I didn't touched the debian/changelog; it will also need to be modified to reflect the changes of the new package's revision. regards George Zarkadas
diff --git a/Crack.make b/Crack.make index df6308f..201e0fd 100644 --- a/Crack.make +++ b/Crack.make @@ -141,7 +141,7 @@ fi # Hierarchy ### -for dir in run run/bin +for dir in lib lib/bin do test -d $dir || mkdir $dir || exit 1 done @@ -172,7 +172,7 @@ fi echo "Stamp: $bdname" echo "" -bindir=run/bin/$bdname +bindir=lib/bin/$bdname ### diff --git a/Makefile b/Makefile index 2c3b304..934cb60 100644 --- a/Makefile +++ b/Makefile @@ -39,17 +39,17 @@ clean: tidy: clean -scripts/plaster -scripts/fbmerge - -rm -f run/[DIEGTKM]* - -rm -f run/dict/gecos.* - -rm -f run/dict/gcperm.* + -rm -f lib/[DIEGTKM]* + -rm -f lib/dict/gecos.* + -rm -f lib/dict/gcperm.* spotless: tidy - -rm -rf run/bin + -rm -rf lib/bin rmdict: - -rm -rf run/dict + -rm -rf lib/dict clobber: spotless rmdict - -cat run/F-merged >> F-merged.save - -rm -rf run + -cat lib/F-merged >> F-merged.save + -rm -rf lib ( cd extra ; make clean ) diff --git a/debian/Crack.8 b/debian/Crack.8 index 1703d35..ffeb630 100644 --- a/debian/Crack.8 +++ b/debian/Crack.8 @@ -114,7 +114,7 @@ rule number, or to restart a run whilst skipping over a few rulesets, try: .SH FILES .I /usr/share/Crack Location of the Crack program and scripts. -.I /var/run/Crack/ +.I /var/lib/Crack/ Location for the temporary files used by Crack. .SH "SEE ALSO" diff --git a/debian/crack-md5.dirs b/debian/crack-md5.dirs index aaac1d9..0d7b6bd 100644 --- a/debian/crack-md5.dirs +++ b/debian/crack-md5.dirs @@ -2,4 +2,5 @@ usr/sbin usr/lib/Crack usr/share/Crack etc/Crack -var/run/Crack/bin +var/lib/Crack +var/lib/Crack/bin diff --git a/debian/crack.dirs b/debian/crack.dirs index aaac1d9..0d7b6bd 100644 --- a/debian/crack.dirs +++ b/debian/crack.dirs @@ -2,4 +2,5 @@ usr/sbin usr/lib/Crack usr/share/Crack etc/Crack -var/run/Crack/bin +var/lib/Crack +var/lib/Crack/bin diff --git a/debian/postrm b/debian/postrm index 6f0cf91..d495bc8 100644 --- a/debian/postrm +++ b/debian/postrm @@ -10,8 +10,10 @@ case "$1" in ;; purge) # If the user has run crack there is stuff in here + [ -d /var/lib/Crack ] && rm -rf /var/lib/Crack [ -d /usr/share/Crack ] && rm -rf /usr/share/Crack [ -d /etc/Crack ] && rm -rf /etc/Crack + ;; diff --git a/debian/rules b/debian/rules index e09bcf5..51ff019 100755 --- a/debian/rules +++ b/debian/rules @@ -35,12 +35,12 @@ build-stamp: configure-stamp chmod 755 Crack.make ./Crack.make # this is the crypt version, move it to other place - mv run/bin/debian/ run/bin/debian-crypt + 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.make - mv run/bin/debian/ run/bin/debian-md5 + mv lib/bin/debian/ lib/bin/debian-md5 # Now restore it to the previous situation mv src/libdes.orig src/libdes cd src/util && cp elcid.c.orig elcid.c @@ -59,7 +59,7 @@ clean: cd src/util && cp elcid.c.orig elcid.c ;\ fi -$(MAKE) spotless - -rm -rf run + -rm -rf lib dh_clean @@ -82,16 +82,16 @@ install: build cd debian/crack-common/usr/share/Crack/ && ln -s /etc/Crack conf chmod a+x debian/crack-common/usr/share/Crack/Crack debian/crack-common/usr/share/Crack/Reporter # For the DES version - cp -a run/bin/debian-crypt/* debian/crack/usr/lib/Crack - cd debian/crack/usr/share/Crack && ln -s /var/run/Crack run + cp -a lib/bin/debian-crypt/* debian/crack/usr/lib/Crack + cd debian/crack/usr/share/Crack && ln -s /var/lib/Crack run - cd debian/crack/var/run/Crack/bin/ && ln -s /usr/lib/Crack debian + cd debian/crack/var/lib/Crack/bin/ && ln -s /usr/lib/Crack debian install -m755 debian/Crack debian/Crack-Reporter debian/crack/usr/sbin/ # For the MD5 version - cp -a run/bin/debian-md5/* debian/crack-md5/usr/lib/Crack - cd debian/crack-md5/usr/share/Crack && ln -s /var/run/Crack run + cp -a lib/bin/debian-md5/* debian/crack-md5/usr/lib/Crack + cd debian/crack-md5/usr/share/Crack && ln -s /var/lib/Crack run - cd debian/crack-md5/var/run/Crack/bin/ && ln -s /usr/lib/Crack debian + cd debian/crack-md5/var/lib/Crack/bin/ && ln -s /usr/lib/Crack debian install -m755 debian/Crack debian/Crack-Reporter debian/crack-md5/usr/sbin/ # Could change into this the previous statements: # dh_movefiles
signature.asc
Description: This is a digitally signed message part