diff options
author | joerg <joerg> | 2007-09-15 08:30:51 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-09-15 08:30:51 +0000 |
commit | e336811c1ab3dcc793cdbd2623da7c6df5631251 (patch) | |
tree | 11ccec360b4a35a576933d6a2302b3e9216a9b9d /security/libprelude/patches | |
parent | ceadab1bd3709dfbdfe779dff8b72bc3d1396cb5 (diff) | |
download | pkgsrc-e336811c1ab3dcc793cdbd2623da7c6df5631251.tar.gz |
Fix build issus on DragonFly with GNUlib and don't use d_reclen as the
assertion is ensured already by opendir.
Diffstat (limited to 'security/libprelude/patches')
-rw-r--r-- | security/libprelude/patches/patch-ac | 23 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ad | 13 |
2 files changed, 36 insertions, 0 deletions
diff --git a/security/libprelude/patches/patch-ac b/security/libprelude/patches/patch-ac new file mode 100644 index 00000000000..6457032db5b --- /dev/null +++ b/security/libprelude/patches/patch-ac @@ -0,0 +1,23 @@ +$NetBSD: patch-ac,v 1.5 2007/09/15 08:30:51 joerg Exp $ + +Hack around GNUlib idiosyncracy where the overwritten stdio.h includes +sys/types.h which includes stdint.h (overwritten!) which includes wchar.h +which includes stdio.h, BOOM. + +--- libmissing/stdio_.h.orig 2007-09-14 11:29:05.000000000 +0000 ++++ libmissing/stdio_.h +@@ -35,6 +35,14 @@ + #include <stdarg.h> + #include <stddef.h> + ++#ifdef __DragonFly__ ++#include <machine/stdint.h> ++#ifndef _SSIZE_T_DECLARED ++#define _SSIZE_T_DECLARED ++typedef __ssize_t ssize_t; ++#endif ++#endif ++ + #if (@GNULIB_FSEEKO@ && @REPLACE_FSEEKO@) \ + || (@GNULIB_FTELLO@ && @REPLACE_FTELLO@) \ + || (@GNULIB_GETDELIM@ && !@HAVE_DECL_GETDELIM@) \ diff --git a/security/libprelude/patches/patch-ad b/security/libprelude/patches/patch-ad new file mode 100644 index 00000000000..6dafcc4c813 --- /dev/null +++ b/security/libprelude/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.5 2007/09/15 08:30:51 joerg Exp $ + +--- src/prelude-failover.c.orig 2007-09-15 08:00:29.000000000 +0000 ++++ src/prelude-failover.c +@@ -381,7 +381,7 @@ static int get_failover_data_filename_an + + while ( (de = readdir(dir)) && ret != 1 ) { + +- if ( de->d_reclen <= 4 || ! isdigit(de->d_name[4]) ) ++ if (! isdigit(de->d_name[4]) ) + continue; + + if ( strncmp(de->d_name, "data", 4) != 0 || strchr(de->d_name, '.') ) |