Merge pull request #243 from frank-dittrich/unstable-jumbo

remove unused variable in putty_fmt_plug.c, valid()
Bug fixes to thin dynamic formats PHPS, formspring, mediawiki, osc and
phpassMD5. They over-ran buffer when given bad input files.
More robust valid() in salted sha1 / nsldap formats.
Do some actual validation in SIP valid().
Actually, while at it we should just as well validate it is lower-case hex.
WOW-SRP fixes. Not sure I found all, this is a mess.
Revert "Fix crash in zip format found by Alexander Cherepanov"

My worst patch ever :(

This reverts commit 0762dcb247b8ab1ca4b28f7f9ea438d4e648713c.
Hopefully the "right" fix for the zip crash
Merge pull request #244 from kholia/zip-crash-fix

Hopefully the "right" fix for the zip crash
misc. fixes for zip stuff

1. Don't use the inappropriate free function in zip format.

2. Don't free memory which will be freed later on in zip format.

3. Use correct free function in zip2john.
timer.h: remove unneeded include (sys/timeb.h)

not only is the header not needed, it was obsoleted in posix
and thus is missing in musl libc.
factor out struct tcphdr

that struct is unportable (neither C nor POSIX) and depends on
glibc specific hacks to get the right definition anyway,
so it's better to provide our own copy.
fixes build on musl libc.
Makefile: allow JOHN_LDFLAGS

there's JOHN_CFLAGS to add custom CFLAGS, so do the same for the
LDFLAGS.
tcphdr.h: remove unneeded typedef
Merge pull request #246 from kholia/zip-fixes

misc. fixes for zip stuff
Merge pull request #253 from rofl0r/johnldflags

Makefile: allow JOHN_LDFLAGS
Merge pull request #248 from rofl0r/tcphdr

factor out struct tcphdr
tcphdr.h: special-case endian.h for mac/bsd
Fix crash in dmd5 format found by Alexander Cherepanov

(don't you just hate that guy?) ;)
Merge pull request #256 from rofl0r/tcphdrfix

tcphdr.h: special-case endian.h for mac/bsd