Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 277811 - app-crypt/johntheripper-1.7.3.1 3rd-party patch update
Summary: app-crypt/johntheripper-1.7.3.1 3rd-party patch update
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: High enhancement (vote)
Assignee: Crypto team [DISABLED]
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-07-14 14:31 UTC by RB
Modified: 2009-09-05 20:28 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
diff against current ebuild (johntheripper-1.7.3.1-r1.ebuild.patch,3.27 KB, patch)
2009-07-14 14:37 UTC, RB
Details | Diff
1.7.3.1-r1 full ebuild (johntheripper-1.7.3.1-r1.ebuild,3.72 KB, text/plain)
2009-07-14 14:37 UTC, RB
Details
stackdefs for all-5 (johntheripper-1.7.3.1-all-5-stackdef.S.patch,666 bytes, patch)
2009-07-14 14:43 UTC, RB
Details | Diff
cflags patch from prefix (johntheripper-1.7.3.1-cflags.patch,2.16 KB, patch)
2009-07-14 14:43 UTC, RB
Details | Diff
updated stackdef.S patch (johntheripper-1.7.3.1-stackdef.S.patch,2.06 KB, patch)
2009-07-14 14:44 UTC, RB
Details | Diff
stackdefs for all-5 (v2) (johntheripper-1.7.3.1-all-5-stackdef.S.patch,668 bytes, patch)
2009-08-20 21:36 UTC, RB
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description RB 2009-07-14 14:31:58 UTC
The currently used patches (all-3 and mpi8-small) are rather out-of-date and missing a lot of recent updates.  I've submitted a revised MPI patch that is compatible with the all-5 jumbo patchset, and took the time to make the following updates to the ebuild:

 - update patches to all-5 and mpi10
 - remove outdated pkg_setup() warning
 - re-tooled stackdef.S patch to match default package
 - added all-5 stackdef.S patch to fix the ASM introduced with the jumbo patch
 - removed params.h patch (unnecessary, breaks prefix portage, see bug 265316)
 - brought in the cflags patch & LDFLAGS fixes from prefix
 - changed PIC/PIE flags (produced textrel in x86-hardened, tested in ~x86-hardened, ~amd64-hardened, and ~amd64)
 - added SYSTEMWIDE_EXEC define from prefix and made both defines ${ROOT} sensitive
 - updated src_install for new tools in all-5

Patches forthcoming; the only x86 system I've not tested this on is 32-bit non-hardened.
Comment 1 RB 2009-07-14 14:37:02 UTC
Created attachment 197922 [details, diff]
diff against current ebuild
Comment 2 RB 2009-07-14 14:37:51 UTC
Created attachment 197924 [details]
1.7.3.1-r1 full ebuild
Comment 3 RB 2009-07-14 14:43:09 UTC
Created attachment 197925 [details, diff]
stackdefs for all-5
Comment 4 RB 2009-07-14 14:43:33 UTC
Created attachment 197927 [details, diff]
cflags patch from prefix
Comment 5 RB 2009-07-14 14:44:06 UTC
Created attachment 197928 [details, diff]
updated stackdef.S patch
Comment 6 RB 2009-08-20 21:36:40 UTC
Created attachment 201817 [details, diff]
stackdefs for all-5 (v2)

Updated stackdef-all-5 patch, hadn't tested this on an MMX build yet.  This bug should be a quick win, updating and knocking out bugs at the same time.
Comment 7 Arfrever Frehtes Taifersar Arahesis (RETIRED) gentoo-dev 2009-08-20 22:35:40 UTC
Could you send this patch to upstream?
Comment 8 RB 2009-08-21 00:59:00 UTC
All the attached patches are Gentoo artifacts, and I've actually removed one from Gentoo's normal distribution since it was unnecessary and broke gentoo-prefix (params.h).  In a general sense, none of the patches fix anything that's broken, they only force JtR to fit within the Gentoo worldview.

The two stackdef.S patches are split from the original single one so they could be applied appropriately (according to USE=minimal).

The cflags patch is from gentoo-prefix and could be dropped, but for what it does seems petty to refuse an update for it.

To reiterate, I'm only fixing what is already there.  I will contact Solar Designer and see whether he's interested in incorporating the sandbox and CFLAG patches, but the upstream release cycle has sufficiently slowed that incorporation in any reasonable timescale is highly unlikely, if he even accepts them.
Comment 9 Patrick Lauer gentoo-dev 2009-09-03 12:36:40 UTC
+  03 Sep 2009; Patrick Lauer <patrick@gentoo.org>
+  +johntheripper-1.7.3.1-r1.ebuild,
+  +files/johntheripper-1.7.3.1-all-5-stackdef.S.patch,
+  +files/johntheripper-1.7.3.1-cflags.patch,
+  files/johntheripper-1.7.3.1-stackdef.S.patch:
+  Small set of fixes, thanks to RB. Closes #277811
Comment 10 Fabian Groffen gentoo-dev 2009-09-05 14:32:04 UTC
 		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
-		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
+		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"${ROOT}/etc/john\\\"\" -DJOHN_SYSTEMWIDE_EXEC=\"\\\"${ROOT}/usr/libexec/john\\\"\"" \
 		LDFLAGS="${LDFLAGS}" \


Hardcoding ROOT inside an application really is no good idea.  What made you think it?
Comment 11 Arfrever Frehtes Taifersar Arahesis (RETIRED) gentoo-dev 2009-09-05 14:38:00 UTC
(In reply to comment #10)

It's unrelated to this bug. Please file a separate bug.
Comment 12 Arfrever Frehtes Taifersar Arahesis (RETIRED) gentoo-dev 2009-09-05 14:38:53 UTC
(In reply to comment #10)

Anyway we can't use ${ROOT} in src_compile().
Comment 13 Fabian Groffen gentoo-dev 2009-09-05 14:40:03 UTC
maybe I was talking to the original reporter instead?
Comment 14 Arfrever Frehtes Taifersar Arahesis (RETIRED) gentoo-dev 2009-09-05 15:23:40 UTC
I removed use of ROOT.
Comment 15 RB 2009-09-05 19:01:26 UTC
Apologies; that was an artifact from a path I'd taken to being more Prefix-friendly and forgotten to take out.
Comment 16 Fabian Groffen gentoo-dev 2009-09-05 20:28:24 UTC
ah, I see.