diff options
author | drochner <drochner> | 2007-02-22 17:38:33 +0000 |
---|---|---|
committer | drochner <drochner> | 2007-02-22 17:38:33 +0000 |
commit | 19890fe747342e22b200faaa858630c134fd4986 (patch) | |
tree | 02562915337893b28fed379f3785ac3fb3d4d42b | |
parent | aeace90463daaa1dbcf8d33f106f9a47c7b015a8 (diff) | |
download | pkgsrc-19890fe747342e22b200faaa858630c134fd4986.tar.gz |
pull in some patches from lsh2 to make it compile with gcc4
-rw-r--r-- | security/lsh/distinfo | 6 | ||||
-rw-r--r-- | security/lsh/patches/patch-ae | 14 | ||||
-rw-r--r-- | security/lsh/patches/patch-af | 24 | ||||
-rw-r--r-- | security/lsh/patches/patch-ag | 18 | ||||
-rw-r--r-- | security/lsh/patches/patch-ah | 13 |
5 files changed, 74 insertions, 1 deletions
diff --git a/security/lsh/distinfo b/security/lsh/distinfo index 3b2dbf3965a..2d10d43a20f 100644 --- a/security/lsh/distinfo +++ b/security/lsh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2006/04/05 23:59:33 salo Exp $ +$NetBSD: distinfo,v 1.6 2007/02/22 17:38:33 drochner Exp $ SHA1 (lsh-1.4.3.tar.gz) = 25cb15a0851b3209cc5b3552344fedf80221ad6f RMD160 (lsh-1.4.3.tar.gz) = c5bc410396f6426e2e609ded97296424d8a3bd46 @@ -7,3 +7,7 @@ SHA1 (patch-aa) = 08cb6cf3f28ae2281d109e20dc9585111009ea50 SHA1 (patch-ab) = 179647434ecf7a4b42e301f1ac1c794f217d69d0 SHA1 (patch-ac) = af2659ae7edb797481172c467936383e6d5a7f8a SHA1 (patch-ad) = 6ac62f9b78cddc7815f124543d3cb8b9a76563e6 +SHA1 (patch-ae) = 37e1be88117e2b559e0ac0f43739b7ba2574cb63 +SHA1 (patch-af) = cf4f49c7712b7671ae12c566680a4cfd86bfa87b +SHA1 (patch-ag) = 3240576c0dd93e28b2cc09a661a571df3396fb96 +SHA1 (patch-ah) = 3812bcd443e315707076d84cdb8118f263660231 diff --git a/security/lsh/patches/patch-ae b/security/lsh/patches/patch-ae new file mode 100644 index 00000000000..cada1d2eb13 --- /dev/null +++ b/security/lsh/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 2007/02/22 17:38:34 drochner Exp $ + +--- src/nettle/desCode.h.orig 2007-02-09 13:49:23.000000000 +0100 ++++ src/nettle/desCode.h +@@ -9,9 +9,6 @@ + + #include "des.h" + +-extern const uint32_t des_keymap[]; +-extern const uint32_t des_bigmap[]; +- + /* optional customization: + * the idea here is to alter the code so it will still run correctly + * on any machine, but the quickest on the specific machine in mind. diff --git a/security/lsh/patches/patch-af b/security/lsh/patches/patch-af new file mode 100644 index 00000000000..8edcf9227d9 --- /dev/null +++ b/security/lsh/patches/patch-af @@ -0,0 +1,24 @@ +$NetBSD: patch-af,v 1.1 2007/02/22 17:38:34 drochner Exp $ + +--- src/nettle/des.c.orig 2007-02-09 13:54:54.000000000 +0100 ++++ src/nettle/des.c +@@ -36,9 +36,6 @@ + + #include <assert.h> + +-static ENCRYPT(DesSmallFipsEncrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS) +-static DECRYPT(DesSmallFipsDecrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS) +- + /* various tables */ + + static const uint32_t +@@ -56,6 +53,9 @@ parity[] = { + #include "parity.h" + }; + ++static ENCRYPT(DesSmallFipsEncrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS) ++static DECRYPT(DesSmallFipsDecrypt,TEMPSMALL, LOADFIPS,KEYMAPSMALL,SAVEFIPS) ++ + void + des_fix_parity(unsigned length, uint8_t *dst, + const uint8_t *src) diff --git a/security/lsh/patches/patch-ag b/security/lsh/patches/patch-ag new file mode 100644 index 00000000000..2a42304e507 --- /dev/null +++ b/security/lsh/patches/patch-ag @@ -0,0 +1,18 @@ +$NetBSD: patch-ag,v 1.1 2007/02/22 17:38:34 drochner Exp $ + +--- src/sftp/sftp_c.c.orig 2007-02-09 13:58:41.000000000 +0100 ++++ src/sftp/sftp_c.c +@@ -1097,8 +1097,11 @@ sftp_get_file_main(struct sftp_callback + int write_needed = 0; + UINT32 i; + +- /* FIXME: state is const */ +- state->mem.used = 0; ++ /* FIXME: This is ugly. The me object needs to be moved a pointer ++ * away, or redesigned so that we don't need to modify it here. (Or ++ * the constification of sftp_callback could be undone ++ * altogether). */ ++ ((struct sftp_callback *)state)->mem.used = 0; + + sftp_get_mem_main(next, msg, id, in, out, state ); + diff --git a/security/lsh/patches/patch-ah b/security/lsh/patches/patch-ah new file mode 100644 index 00000000000..14e180dc15b --- /dev/null +++ b/security/lsh/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2007/02/22 17:38:34 drochner Exp $ + +--- src/exception.h.orig 2007-02-09 14:08:16.000000000 +0100 ++++ src/exception.h +@@ -70,7 +70,7 @@ void exception_raise(struct exception_ha + { STATIC_HEADER, (r), (p), __FILE__ ":" STRING_LINE ": Static" } + + +-#define HANDLER_CONTEXT (__FILE__ ":" STRING_LINE ": " FUNCTION_NAME) ++#define HANDLER_CONTEXT (__FILE__ ":" STRING_LINE) + + + /* Exception types. */ |