diff options
| author | joerg <joerg@pkgsrc.org> | 2007-09-15 08:30:51 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-09-15 08:30:51 +0000 |
| commit | 8ea6894b6c582b477e62da1ed2bbaa7c2b3886b5 (patch) | |
| tree | 11ccec360b4a35a576933d6a2302b3e9216a9b9d /security | |
| parent | 49ddcf978ccef6437a7910a5d2465e5544592e75 (diff) | |
| download | pkgsrc-8ea6894b6c582b477e62da1ed2bbaa7c2b3886b5.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')
| -rw-r--r-- | security/libprelude/distinfo | 4 | ||||
| -rw-r--r-- | security/libprelude/patches/patch-ac | 23 | ||||
| -rw-r--r-- | security/libprelude/patches/patch-ad | 13 |
3 files changed, 39 insertions, 1 deletions
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo index 2cf6241e7e4..7878e2cc255 100644 --- a/security/libprelude/distinfo +++ b/security/libprelude/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.18 2007/09/05 18:58:19 shannonjr Exp $ +$NetBSD: distinfo,v 1.19 2007/09/15 08:30:51 joerg Exp $ SHA1 (libprelude-0.9.15.2.tar.gz) = ee11319f2f526318642900fa27da0c3e4bbdf9bc RMD160 (libprelude-0.9.15.2.tar.gz) = c69e21175d60fd6c858935b927d85e6043cbb486 Size (libprelude-0.9.15.2.tar.gz) = 1949284 bytes SHA1 (patch-aa) = c8aff1bce0b649b77554eefca4625f69393ac1c2 SHA1 (patch-ab) = 3fa1b01b728cd1210cf22717e2f6c81a3d3b70cc +SHA1 (patch-ac) = d459148ce7035ef26440e52ae9154c32080ae1a5 +SHA1 (patch-ad) = e89900459ed7834801ae22b7a4a711163ec3f86b 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, '.') ) |