diff options
| -rw-r--r-- | pkgtools/pkg_install/distinfo | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/patches/patch-ad | 11 | ||||
| -rw-r--r-- | pkgtools/pkg_install/patches/patch-ae | 23 | ||||
| -rw-r--r-- | pkgtools/pkg_install/patches/patch-ai | 8 |
4 files changed, 34 insertions, 16 deletions
diff --git a/pkgtools/pkg_install/distinfo b/pkgtools/pkg_install/distinfo index c420c087a9e..ef13667e33d 100644 --- a/pkgtools/pkg_install/distinfo +++ b/pkgtools/pkg_install/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.17 2002/08/05 15:55:12 wiz Exp $ +$NetBSD: distinfo,v 1.18 2002/08/06 11:51:01 wiz Exp $ SHA1 (pkg_install-20020723.tar.gz) = c16763363a8ff4341c866d50e40dfa2639288009 Size (pkg_install-20020723.tar.gz) = 81502 bytes SHA1 (patch-aa) = 3a61d2bbc3d5f046c5e8325066a0d620637920eb SHA1 (patch-ab) = 0b5effbb41b34f96877d3f9494d6cf5054795414 SHA1 (patch-ac) = fb24ffdc0fbf4ca85d588afcfac39a960b763706 -SHA1 (patch-ad) = a4dbed4ec4be7f008064bc50f17f20aacc4cf8b5 -SHA1 (patch-ae) = ea360800e97e0cfdaf7cfe5790f70d8145aa0e23 +SHA1 (patch-ad) = 8c34aeb2e0ed41d6a59e4d90a71ea7ea333a36f3 +SHA1 (patch-ae) = dc5ec1e5e6b5dfa670cd94cd198583c61a44f494 SHA1 (patch-af) = b1d9ce8d3c3e592a67db7ac9676a72317a1485c5 SHA1 (patch-ag) = e30435f0a626a893934c725c605486a145e27690 SHA1 (patch-ah) = ae0cee4e6f6efd740fc0d4288f8f71dd0039a913 -SHA1 (patch-ai) = fc16e812952f20a2db10e6b947521b5d18a7b6ae +SHA1 (patch-ai) = 9636b51fdc386cd445684a934f5f77a6612c6bca SHA1 (patch-aj) = 7d220018c533849f7d9b7e68828f89bbe67ec68c diff --git a/pkgtools/pkg_install/patches/patch-ad b/pkgtools/pkg_install/patches/patch-ad index 2b7e777faca..84f50057e25 100644 --- a/pkgtools/pkg_install/patches/patch-ad +++ b/pkgtools/pkg_install/patches/patch-ad @@ -1,12 +1,13 @@ -$NetBSD: patch-ad,v 1.3 2002/08/01 14:43:39 schmonz Exp $ +$NetBSD: patch-ad,v 1.4 2002/08/06 11:51:02 wiz Exp $ ---- lib/Makefile.orig Thu Aug 1 04:46:31 2002 +--- lib/Makefile.orig Thu Aug 1 10:46:31 2002 +++ lib/Makefile -@@ -5,13 +5,31 @@ LIB+= install +@@ -5,13 +5,36 @@ SRCS+= exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \ plist.c str.c version.c path.c +OPSYS!= uname -s ++RELEASE!= uname -r + +.if ${OPSYS} == "Darwin" +SRCS+= md5c.c md5hl.c strlcpy.c @@ -16,6 +17,10 @@ $NetBSD: patch-ad,v 1.3 2002/08/01 14:43:39 schmonz Exp $ +SRCS+= fgetln.c md5c.c md5hl.c +.endif + ++.if ${OPSYS} == "NetBSD" && (${RELEASE:M1.4.[12]} != "" || ${RELEASE:M1.4} != "") ++SRCS+= strlcpy.c ++.endif ++ NOLINT= # defined NOMAN= # defined NOPIC= # defined diff --git a/pkgtools/pkg_install/patches/patch-ae b/pkgtools/pkg_install/patches/patch-ae index 67aef04debf..1fdf150980c 100644 --- a/pkgtools/pkg_install/patches/patch-ae +++ b/pkgtools/pkg_install/patches/patch-ae @@ -1,15 +1,26 @@ -$NetBSD: patch-ae,v 1.2 2002/08/01 09:31:16 martti Exp $ +$NetBSD: patch-ae,v 1.3 2002/08/06 11:51:02 wiz Exp $ --- lib/lib.h.orig Thu Aug 1 10:46:31 2002 -+++ lib/lib.h Thu Aug 1 10:57:31 2002 -@@ -281,6 +281,10 @@ ++++ lib/lib.h +@@ -40,6 +40,10 @@ + + #include "path.h" + ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 104000300) ++size_t strlcpy(char *, const char *, size_t); ++#endif ++ + /* Macros */ + #define SUCCESS (0) + #define FAIL (-1) +@@ -280,6 +284,10 @@ + /* For all */ int pkg_perform(lpkg_head_t *); - ++ +#ifdef FGETLN_MISSING +char *fgetln(FILE *, size_t *); +#endif -+ + /* Externs */ extern Boolean Verbose; - extern Boolean Fake; diff --git a/pkgtools/pkg_install/patches/patch-ai b/pkgtools/pkg_install/patches/patch-ai index 002f4c56f86..562dc7d2e1e 100644 --- a/pkgtools/pkg_install/patches/patch-ai +++ b/pkgtools/pkg_install/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1 2002/08/01 14:43:39 schmonz Exp $ +$NetBSD: patch-ai,v 1.2 2002/08/06 11:51:02 wiz Exp $ ---- lib/strlcpy.c.orig Thu Aug 1 10:21:56 2002 +--- lib/strlcpy.c.orig Mon Aug 5 18:09:56 2002 +++ lib/strlcpy.c -@@ -0,0 +1,64 @@ +@@ -0,0 +1,66 @@ +/* + * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> + * All rights reserved. @@ -34,6 +34,8 @@ $NetBSD: patch-ai,v 1.1 2002/08/01 14:43:39 schmonz Exp $ +#include <assert.h> +#include <string.h> + ++size_t strlcpy(char *, const char *, size_t); ++ +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). |