From 66dfb6e4a54623f5f902fd1864a423f5f80544a1 Mon Sep 17 00:00:00 2001 From: he Date: Thu, 16 Sep 2004 16:12:57 +0000 Subject: Add patches to work around compile problems for this package on NetBSD-1.6.2_STABLE. Gets rid of a parse error when only one argument is given to HDN_WARN, which leaves us with "fprintf(fp, arg, )". This may be a failure of the compiler on this platform to properly do varargs macros, but the changes are noops and gets it building there. --- security/hydan/distinfo | 6 +++- security/hydan/patches/patch-aa | 13 +++++++ security/hydan/patches/patch-ab | 13 +++++++ security/hydan/patches/patch-ac | 78 +++++++++++++++++++++++++++++++++++++++++ security/hydan/patches/patch-ad | 22 ++++++++++++ 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 security/hydan/patches/patch-aa create mode 100644 security/hydan/patches/patch-ab create mode 100644 security/hydan/patches/patch-ac create mode 100644 security/hydan/patches/patch-ad (limited to 'security') diff --git a/security/hydan/distinfo b/security/hydan/distinfo index 9af75f5d880..18fdb71ce18 100644 --- a/security/hydan/distinfo +++ b/security/hydan/distinfo @@ -1,4 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/08/13 10:26:03 agc Exp $ +$NetBSD: distinfo,v 1.2 2004/09/16 16:12:57 he Exp $ SHA1 (hydan-0.13.tar.gz) = 3c76bf1a1adb36a5124163cbbd55f9aff1afdb6e Size (hydan-0.13.tar.gz) = 180409 bytes +SHA1 (patch-aa) = 34120bf1202ed25060743a9f9a390ba3c73515f8 +SHA1 (patch-ab) = 028a4bb8313b4cf5d016603757865af6bd7f846c +SHA1 (patch-ac) = bb978ce95b03a3887bd8b91b9494c47fbf3e78b7 +SHA1 (patch-ad) = 2dcf378abfc6f5509fb91173723fbe073ddc8055 diff --git a/security/hydan/patches/patch-aa b/security/hydan/patches/patch-aa new file mode 100644 index 00000000000..48d82d3a53a --- /dev/null +++ b/security/hydan/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2004/09/16 16:12:57 he Exp $ + +--- hdn_decode.c.orig Thu Jun 24 02:09:54 2004 ++++ hdn_decode.c +@@ -120,7 +120,7 @@ int hdn_decode_main (int argc, char **ar + */ + if (!(sh = hdn_exe_get_sections (host_data->content))) + { +- HDN_WARN ("Error extracting sections from host file"); ++ HDN_WARN ("Error extracting sections from host file", ""); + goto out; + } + diff --git a/security/hydan/patches/patch-ab b/security/hydan/patches/patch-ab new file mode 100644 index 00000000000..5fa449f8453 --- /dev/null +++ b/security/hydan/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2004/09/16 16:12:57 he Exp $ + +--- hdn_crypto.c.orig Thu Jun 24 03:03:49 2004 ++++ hdn_crypto.c +@@ -36,7 +36,7 @@ void hdn_crypto_srandom (char *pass) + } + else + { +- HDN_WARN ("Error: Invalid pass. Using default seed instead"); ++ HDN_WARN ("Error: Invalid pass. Using default seed instead", ""); + } + + srandom (seed); diff --git a/security/hydan/patches/patch-ac b/security/hydan/patches/patch-ac new file mode 100644 index 00000000000..53160f2ef81 --- /dev/null +++ b/security/hydan/patches/patch-ac @@ -0,0 +1,78 @@ +$NetBSD: patch-ac,v 1.1 2004/09/16 16:12:57 he Exp $ + +--- hdn_exe.c.orig Wed May 26 21:42:44 2004 ++++ hdn_exe.c +@@ -40,7 +40,7 @@ static char _is_valid_exe (uint8_t *bin) + memcpy (&dos_hdr, bin, sizeof (IMAGE_DOS_HEADER)); + if (dos_hdr.e_magic != IMAGE_DOS_SIGNATURE) + { +- HDN_WARN ("Host file is not in PE format: DOS sig mismatch"); ++ HDN_WARN ("Host file is not in PE format: DOS sig mismatch", ""); + return 0; + } + +@@ -51,7 +51,7 @@ static char _is_valid_exe (uint8_t *bin) + + if (nt_sig != IMAGE_NT_SIGNATURE) + { +- HDN_WARN ("Host file is not in PE format: NT sig mismatch"); ++ HDN_WARN ("Host file is not in PE format: NT sig mismatch", ""); + return 0; + } + +@@ -66,7 +66,7 @@ static int _is_valid_exe (uint8_t *bin) + /* make sure this is in elf format */ + if (memcmp (ehdr->e_ident, magic, sizeof magic)) + { +- HDN_WARN ("Host file is not in ELF format"); ++ HDN_WARN ("Host file is not in ELF format", ""); + return 0; + } + +@@ -74,32 +74,32 @@ static int _is_valid_exe (uint8_t *bin) + if (ehdr->e_ident[EI_CLASS] != ELFCLASS32 || + ehdr->e_ident[EI_DATA ] != ELFDATA2LSB) + { +- HDN_WARN ("Host file is not in elf32 lsb format"); ++ HDN_WARN ("Host file is not in elf32 lsb format", ""); + return 0; + } + + /* make sure this is indeed an executable */ + if (ehdr->e_type != ET_EXEC) + { +- HDN_WARN ("Host file is not an executable"); ++ HDN_WARN ("Host file is not an executable", ""); + return 0; + } + + if (!ehdr->e_phoff) + { +- HDN_WARN ("Host file has no ELF program header"); ++ HDN_WARN ("Host file has no ELF program header", ""); + return 0; + } + + if (!ehdr->e_shoff) + { +- HDN_WARN ("Host file has no ELF section header"); ++ HDN_WARN ("Host file has no ELF section header", ""); + return 0; + } + + if (ehdr->e_shstrndx == SHN_UNDEF) + { +- HDN_WARN ("Host file has no section name string table"); ++ HDN_WARN ("Host file has no section name string table", ""); + return 0; + } + +@@ -203,7 +203,7 @@ hdn_sections_t *hdn_exe_get_sections (ui + } + + if (!sections) +- HDN_WARN ("couldn't find any sections in the PE file!"); ++ HDN_WARN ("couldn't find any sections in the PE file!", ""); + + return sections; + } diff --git a/security/hydan/patches/patch-ad b/security/hydan/patches/patch-ad new file mode 100644 index 00000000000..763056bc628 --- /dev/null +++ b/security/hydan/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2004/09/16 16:12:57 he Exp $ + +--- hdn_stats.c.orig Thu Jun 24 00:35:17 2004 ++++ hdn_stats.c +@@ -99,7 +99,7 @@ static uint32_t _count_fns (char *argv0) + */ + if (!(sh = hdn_exe_get_sections (host_data->content))) + { +- HDN_WARN ("Error extracting .text segment from host file"); ++ HDN_WARN ("Error extracting .text segment from host file", ""); + goto out; + } + +@@ -327,7 +327,7 @@ int hdn_stats_main (int argc, char **arg + */ + if (!(sh = hdn_exe_get_sections (host_data->content))) + { +- HDN_WARN ("Error extracting .text segment from host file"); ++ HDN_WARN ("Error extracting .text segment from host file", ""); + goto out; + } + -- cgit v1.2.3