Thu Oct 21 13:05:25 2021 UTC ()

pkg_install: Update to 20211021.

Apply patch from Michal Maruska in NetBSD/pkgsrc#95 to ensure package files
are correctly cleaned up should the POST-INSTALL script phase fail.


(jperkin)

diff -r1.120 -r1.121 pkgsrc/pkgtools/pkg_install/files/add/perform.c
diff -r1.187 -r1.188 pkgsrc/pkgtools/pkg_install/files/lib/version.h

--- pkgsrc/pkgtools/pkg_install/files/add/perform.c 2021/04/10 20:10:48 1.120
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c 2021/10/21 13:05:25 1.121

 @@ -1,22 +1,22 @@
-/*	$NetBSD: perform.c,v 1.120 2021/04/10 20:10:48 nia Exp $	*/
+/*	$NetBSD: perform.c,v 1.121 2021/10/21 13:05:25 jperkin Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.120 2021/04/10 20:10:48 nia Exp $");
+__RCSID("$NetBSD: perform.c,v 1.121 2021/10/21 13:05:25 jperkin Exp $");
 /*-
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
  * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
  * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * Copyright (c) 2010 Thomas Klausner <wiz@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
 @@ -1535,27 +1535,27 @@ pkg_do(const char *pkgpath, int mark_aut
 			goto clean_memory;
 		if (write_meta_data(pkg))
 			goto nuke_pkgdb;
+	}
 	if (run_install_script(pkg, "PRE-INSTALL"))
 		goto nuke_pkgdb;
 	if (extract_files(pkg))
 		goto nuke_pkg;
 	if (run_install_script(pkg, "POST-INSTALL"))
-		goto nuke_pkgdb;
+		goto nuke_pkg;
 	/* XXX keep +INSTALL_INFO for updates? */
 	/* XXX keep +PRESERVE for updates? */
 	if (mark_automatic)
 		mark_as_automatic_installed(pkg->pkgname, 1);
 	pkg_register_depends(pkg);
 	if (Verbose)
 		printf("Package %s registered in %s\n", pkg->pkgname, pkg->install_logdir);
 	if (pkg->meta_data.meta_display != NULL)
 		fputs(pkg->meta_data.meta_display, stdout);

--- pkgsrc/pkgtools/pkg_install/files/lib/version.h 2021/04/10 11:36:56 1.187
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h 2021/10/21 13:05:25 1.188

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.187 2021/04/10 11:36:56 nia Exp $	*/
+/*	$NetBSD: version.h,v 1.188 2021/10/21 13:05:25 jperkin Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION 20210410
+#define PKGTOOLS_VERSION 20211021
 #endif /* _INST_LIB_VERSION_H_ */