[Forensics-changes] [crack] 06/40: Import Debian patch 5.0a-9.2
Giovani Augusto Ferreira
giovani-guest at moszumanska.debian.org
Wed Dec 28 02:47:52 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 d9aab2e6de6e8ea554284da42e5febe5014e373c
Author: gregor herrmann <gregoa at debian.org>
Date: Wed Apr 11 17:52:13 2012 +0200
Import Debian patch 5.0a-9.2
---
Crack.make | 4 ++--
Makefile | 14 +++++++-------
debian/Crack.8 | 2 +-
debian/changelog | 10 ++++++++++
...rack.doc-base.crack => crack-common.doc-base.crack} | 0
...-base.crack-faq => crack-common.doc-base.crack-faq} | 0
debian/crack-md5.dirs | 2 +-
debian/crack.dirs | 2 +-
debian/postrm | 1 +
debian/rules | 18 +++++++++---------
10 files changed, 32 insertions(+), 21 deletions(-)
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/changelog b/debian/changelog
index 7c9a21a..c522c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+crack (5.0a-9.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "Do not expect the /var/run/ content to persist":
+ apply patch from Georgios M. Zarkadas that moves the contents of /var/run
+ to /var/lib. (Closes: #387756)
+ * Move doc-base files to crack-common package (lintian error).
+
+ -- gregor herrmann <gregoa at debian.org> Wed, 11 Apr 2012 17:52:13 +0200
+
crack (5.0a-9.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/crack.doc-base.crack b/debian/crack-common.doc-base.crack
similarity index 100%
rename from debian/crack.doc-base.crack
rename to debian/crack-common.doc-base.crack
diff --git a/debian/crack.doc-base.crack-faq b/debian/crack-common.doc-base.crack-faq
similarity index 100%
rename from debian/crack.doc-base.crack-faq
rename to debian/crack-common.doc-base.crack-faq
diff --git a/debian/crack-md5.dirs b/debian/crack-md5.dirs
index aaac1d9..a720ba8 100644
--- a/debian/crack-md5.dirs
+++ b/debian/crack-md5.dirs
@@ -2,4 +2,4 @@ usr/sbin
usr/lib/Crack
usr/share/Crack
etc/Crack
-var/run/Crack/bin
+var/lib/Crack/bin
diff --git a/debian/crack.dirs b/debian/crack.dirs
index aaac1d9..a720ba8 100644
--- a/debian/crack.dirs
+++ b/debian/crack.dirs
@@ -2,4 +2,4 @@ usr/sbin
usr/lib/Crack
usr/share/Crack
etc/Crack
-var/run/Crack/bin
+var/lib/Crack/bin
diff --git a/debian/postrm b/debian/postrm
index 6f0cf91..ddd6fef 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -10,6 +10,7 @@ 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
--
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