diff options
author | Dane Smith <c1pher@gentoo.org> | 2011-02-08 13:34:07 +0000 |
---|---|---|
committer | Dane Smith <c1pher@gentoo.org> | 2011-02-08 13:34:07 +0000 |
commit | b0fabbf2ae9214409a7c0728055f64d56961f36d (patch) | |
tree | a540e89416bd01c183e166ea9f85acf928696c20 /app-crypt/johntheripper | |
parent | Fix temp files creation in keyfile plugin bug #349003 (diff) | |
download | historical-b0fabbf2ae9214409a7c0728055f64d56961f36d.tar.gz historical-b0fabbf2ae9214409a7c0728055f64d56961f36d.tar.bz2 historical-b0fabbf2ae9214409a7c0728055f64d56961f36d.zip |
Fix whitespace issues in app-crypt/johntheripper-1.7.6-r1 in a cleaner way wrt bug 350730.
Package-Manager: portage-2.2.0_alpha4/cvs/Linux i686
Diffstat (limited to 'app-crypt/johntheripper')
-rw-r--r-- | app-crypt/johntheripper/ChangeLog | 7 | ||||
-rw-r--r-- | app-crypt/johntheripper/Manifest | 30 | ||||
-rw-r--r-- | app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild | 12 |
3 files changed, 27 insertions, 22 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index 6b7ab7307b2a..8d91c5fb7856 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/johntheripper # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.128 2011/02/08 12:50:10 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.129 2011/02/08 13:34:07 c1pher Exp $ + + 08 Feb 2011; Dane Smith <c1pher@gentoo.org> johntheripper-1.7.6-r1.ebuild: + Apply patch from Jeroen Roovers to fix too much / lack of enough + escaping as seen in bug 350730. No changes to installed files + therefore no revbump. 08 Feb 2011; Dane Smith <c1pher@gentoo.org> johntheripper-1.7.6-r1.ebuild: Revert back to ~hppa. The whitespace changes that caused issues on diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest index 2b3165374cb2..364d6043c57c 100644 --- a/app-crypt/johntheripper/Manifest +++ b/app-crypt/johntheripper/Manifest @@ -9,23 +9,23 @@ DIST john-1.7.3.4.tar.gz 816259 RMD160 975116059a26e7030cdd573109dae36812160543 DIST john-1.7.6-jumbo-4.diff.gz 206601 RMD160 53ac2218ca33d458eb7250bce18a9e9af5a881d6 SHA1 ccef570680a8496618d359a42a101b331d40aeb7 SHA256 12760c528c3eabe0e429954745f016107c08ce936ed4be2e63d2a75c64717f3a DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73 EBUILD johntheripper-1.7.3.4.ebuild 3725 RMD160 e2e85decaa7011571fa7efe895652b8c6503948c SHA1 412bbe56a70d3670490b8132916710adb5102eab SHA256 2cab00e06a9a9f19e1d18e3650681d471b46ec44d8a7deadcaf17bb113bcb93f -EBUILD johntheripper-1.7.6-r1.ebuild 4083 RMD160 550e4b3ef84da47813353834dd63a90b103dbe42 SHA1 9cd71352f7238d99b92a1a416844097d0a85aaa8 SHA256 e099c70e4ab2f9d6d417048df00dd9144cc02448c1a199990a93548f08631aa4 -MISC ChangeLog 20951 RMD160 9d7e1acf6a8456f6b70a47a05feee3bc0c27e83a SHA1 9d1cb9875c66b21035c67a65811a03dc0ba7a1b3 SHA256 477322b3aeff21f8be9a9dd0152c02597133d6e9cee28f3b49f1f5755460cdba +EBUILD johntheripper-1.7.6-r1.ebuild 4177 RMD160 1343b9d60aa9953b12aae34c0042aa1415335d06 SHA1 d263d600225d90fb3eab39ed4965793845caf83d SHA256 fb08ad54f7a41cd65523377d910ac350dcf309ebe3ff411f99f8d15f39733669 +MISC ChangeLog 21186 RMD160 444ddde7be6f2c5eb3ac342687af7e9392f6afac SHA1 25732f219dae0e91c1c8b41ff5051ad626b7595e SHA256 f7956547fc0d4bc356d007575b0612798251d3dc038501e00102a84acc981330 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJNUTusAAoJEEsurZwMLhUxsvsP/09vIND2uQCISMwL+eEg/qww -GkkXxPwFw9bw3VSwRo7gKTlv2Hkp1Jfl3erabATJSLqDZNbiQbm6hFTwzI1pYqSD -uvvc6CmfAWZAKrGhs860WspPSfWGD9uPl2IGIPjCuSc9yje41TZJYE/aP+puEpgP -H/INu3N7Emd/UdG6KSWMfk9vcpUCBFEW69BQEM91pcrjzjGWVQclKVpS+KuOyhRU -b6zfxmtQzVlBswmBUmeirJSy1NBsy+JrweHV2GjIp3o86sXagN5Mk9omuPrdZyF0 -u6qkDHr4KokFH97feZAqmDVWWSz+xFm+RY6bA6bTY6sgsnlDi5C4cks90VmvX0yq -ezOYKoRmzeO8Y9v9qVUvsQfpKOZjx+IRZ/z6V4/ZYEl1Kp1yIziFenoPYaQrhBgk -s5iZRdwURRzYDNW47waL23O5Pnf12Fi5RqWgVwzjg+51a6l2bKszKrQM6BOrqH3i -kgW9f6yErBP/iVeaIO3PoS7sI9d/ERdG5sVSFC6QpSQiNV2kTwRvMtNLIkxG1SQw -ry7Lh4JPZAFQlPFLJkPu6M8/lfJzj5r1y9iKuZnb0ZEylgh4oPNQm3MBLQPLRvzN -a9VaBOWMqa42zMr+9QIEBu70gAzwoUgrlRUkSn6jwhCYBRlzmr30PQGwZo4J3oUY -Z6S9C0t9HOGN8cL9ObXm -=JUkO +iQIcBAEBAgAGBQJNUUX4AAoJEEsurZwMLhUxBcQP/i2vV99qdG8pVpEk5Wp7H6q5 +Hf50tAhe9pVeec76i8+4TQ/NAbuw4JMqef3QbGXSXjI+mpdN2sg391ZHXrPXVEs1 +94fU9WcMmCHcOSksarDeetX93Ls6rUbyFn6YjoHqqgolguOMpbvkRchPbv8P6dQH +8JP3iNMYaLtNeyunEIn84F50z3a2sEaED5BxxYa2F3GY9g9uAa7u1P6vP2498fHN +Jvm6Jo2LEn9TijDAbmmKGHR8jU31z1PQPJJVtK4ugbBUJ62VciwVLe/g0A8AG+Mr +rJL0B++T3YlCFQiATgrosxUr/q44DuygjwcFErgi571nxBOnYPNEKNdvyPHU/+tH +dpPo2nKbRzfQR6iEMcj/Y0gMu225QuLjRgDYKuKUtWatbOfpqKvqwKav6Yh8KY2q +i6tFFFNsSgT8Gp30eblQbw9QqsufDo587ryr8JNKk44cE75k4Jn9rQvEdpoROd5Z +nc0VhUSzZ7KHQP+7TqwFzbbMyWNM4HIoOwxqWlp8ZBgwI7U/ByTMxPy6ob2XJgAR +BqNvD6lGh4rjleA4XpOwETVTLEpRcEloJIxTPcs71oME4n/NCMb/nCpmAs+2u0ms +AzdcBhwgI1fwFiDD63jt3Nkaoi18m7BiS6Lvb5TiGUCaw5g7xO5pVM8C0cxY26Tr +awpbxCueLLlZv45iEuFD +=v+sE -----END PGP SIGNATURE----- diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild index 7c4da8da56d6..29bcd256ae1e 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.8 2011/02/08 12:50:10 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.9 2011/02/08 13:34:07 c1pher Exp $ EAPI="2" @@ -93,16 +93,16 @@ src_compile() { local OMP='' use custom-cflags || strip-flags - append-flags -fPIC -fPIE \ - '-DJOHN_SYSTEMWIDE=1' \ - '-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \ - '-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"' + echo '#define JOHN_SYSTEMWIDE 1' >> config.gentoo + echo '#define JOHN_SYSTEMWIDE_HOME "/etc/john"' >> config.gentoo + echo '#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"' >> config.gentoo + append-flags -fPIC -fPIE -include "${S}"/config.gentoo gcc-specs-pie && append-ldflags -nopie use openmp && OMP="-fopenmp" CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) # use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc - emake -C src/\ + emake -C src/ \ CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \ CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \ LDFLAGS="${LDFLAGS}" \ |