diff options
| author | gson <gson@pkgsrc.org> | 2006-07-20 11:29:48 +0000 |
|---|---|---|
| committer | gson <gson@pkgsrc.org> | 2006-07-20 11:29:48 +0000 |
| commit | 9d4c7f77dee6fcfbd85d98ae71387d80eb09d1ba (patch) | |
| tree | 8328fe60b184ccd7831136ccfefae579f5fb2d8f /pkgtools | |
| parent | a22fa991e4c37ecc350c50cf23530622ed0f2f6d (diff) | |
| download | pkgsrc-9d4c7f77dee6fcfbd85d98ae71387d80eb09d1ba.tar.gz | |
Import the following change to add/perform.c from src to pkgsrc:
Fix uninitialized variable which was causing pkg_add -u to randomly
dump core. This may fix PR pkg/30292.
Also bump the pkgsrc PKGTOOLS_VERSION to 20060720.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index a00712dacc0..e1ffda9cbb6 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.42 2006/05/10 04:25:30 jlam Exp $ */ +/* $NetBSD: perform.c,v 1.43 2006/07/20 11:29:48 gson Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -14,7 +14,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.42 2006/05/10 04:25:30 jlam Exp $"); +__RCSID("$NetBSD: perform.c,v 1.43 2006/07/20 11:29:48 gson Exp $"); #endif #endif @@ -575,6 +575,8 @@ pkg_do(const char *pkg, lpkg_head_t *pkgs) plist_t *depp; char depC[MaxPathSize]; + depPlist.head = depPlist.tail = NULL; + s = strrchr(pkg2chk, '\n'); if (s) *s = '\0'; /* strip trailing '\n' */ diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 82e1a24b16c..152b0e341c5 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.60 2006/07/01 19:37:25 dillo Exp $ */ +/* $NetBSD: version.h,v 1.61 2006/07/20 11:29:48 gson Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -33,6 +33,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20060701" +#define PKGTOOLS_VERSION "20060720" #endif /* _INST_LIB_VERSION_H_ */ |