diff options
Diffstat (limited to 'ports-mgmt/bpm/files/patch-src__refresh.c')
| -rw-r--r-- | ports-mgmt/bpm/files/patch-src__refresh.c | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/ports-mgmt/bpm/files/patch-src__refresh.c b/ports-mgmt/bpm/files/patch-src__refresh.c new file mode 100644 index 000000000000..9214865d503d --- /dev/null +++ b/ports-mgmt/bpm/files/patch-src__refresh.c @@ -0,0 +1,61 @@ +--- src/refresh.c.orig 2004-08-23 19:40:08.000000000 -0700 ++++ src/refresh.c 2008-03-05 14:30:58.000000000 -0800 +@@ -62,8 +62,18 @@ + __RCSID("$Id: refresh.c,v 1.32 2004/08/24 02:40:08 sethk Exp $"); + + /* XXX use libinstall/lib.h */ ++#if __FreeBSD_version >= 800000 ++#define INDEX_FN PORTS_BASE "/INDEX-8" ++#elif __FreeBSD_version >= 700000 ++#define INDEX_FN PORTS_BASE "/INDEX-7" ++#elif __FreeBSD_version >= 600000 ++#define INDEX_FN PORTS_BASE "/INDEX-6" ++#elif __FreeBSD_version >= 500036 ++#define INDEX_FN PORTS_BASE "/INDEX-5" ++#else + #define INDEX_FN PORTS_BASE "/INDEX" +-#define INDEX_MAXLN 4096 ++#endif ++#define INDEX_MAXLN 16384 + #define DB_DIR "/var/db/pkg" + #define ITER_BYTES (128 * 1024) + #define ITER_ENTS 32 +@@ -183,10 +193,12 @@ + if (*sp == '|') + ++i; + +- if (i != (PFIELD_NFIELD - 1)) ++ if (i < (PFIELD_NFIELD - 1)) + { + #ifdef DEBUG +- warnx("invalid number of fields"); ++ warnx("invalid number of fields (%d should be %d)", ++ i + 1, ++ PFIELD_NFIELD); + #endif /* DEBUG */ + return FALSE; + } +@@ -195,12 +207,9 @@ + + for (i = 0; i < PFIELD_NFIELD; ++i) + { +- if (i < PFIELD_NFIELD - 1) +- { +- if (!(sp = strchr(line, '|'))) +- break; +- *sp++ = '\0'; +- } ++ if (!(sp = strchr(line, '|')) && i < PFIELD_NFIELD - 1) ++ break; ++ *sp++ = '\0'; + + switch (i) + { +@@ -320,7 +329,6 @@ + + if (_refresh_index_parse(ln, portdp, rdp) != TRUE) + { +- _refresh_portfree(portdp); + #ifdef DEBUG + warnx("%s:%u: invalid format", INDEX_FN, rdp->rd_linec); + #endif /* DEBUG */ |