CVS commit: pkgsrc/pkgtools/pkg_install

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov  3 13:37:25 UTC 2021

Modified Files:
        pkgsrc/pkgtools/pkg_install: Makefile
Added Files:
        pkgsrc/pkgtools/pkg_install: DEINSTALL

Log Message:
pkg_install: Add an explicit dummy DEINSTALL script.

Even with DEINSTALL_SRC set empty, changes in the pkgsrc infrastructure over
the past few years will now create a dynamic +DEINSTALL script regardless,
and while only containing "exit 0", may have a #! using a shell from pkgsrc.

This can lead to upgrade issues if that shell happens to be unavailable
while pkg_install is being upgraded.  Creating our own dummy script that
explicitly uses /bin/sh avoids that problem.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/pkg_install/DEINSTALL
cvs rdiff -u -r1.235 -r1.236 pkgsrc/pkgtools/pkg_install/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_install/Makefile
diff -u pkgsrc/pkgtools/pkg_install/Makefile:1.235 pkgsrc/pkgtools/pkg_install/Makefile:1.236
--- pkgsrc/pkgtools/pkg_install/Makefile:1.235  Sat Jun  5 14:17:32 2021
+++ pkgsrc/pkgtools/pkg_install/Makefile        Wed Nov  3 13:37:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.235 2021/06/05 14:17:32 nia Exp $
+# $NetBSD: Makefile,v 1.236 2021/11/03 13:37:25 jperkin Exp $
 
 # Notes to package maintainers:
 #
@@ -86,7 +86,7 @@ EGDIR=                        ${PREFIX}/share/examples/pkg_in
 
 PLIST_SUBST+=          PKG_DBDIR=${PKG_DBDIR}
 
-DEINSTALL_SRC=         # empty
+DEINSTALL_SRC=         ${PKGDIR}/DEINSTALL
 INSTALL_SRC=           ${PKGDIR}/INSTALL
 FILES_SUBST+=          PKG_DBDIR=${PKG_DBDIR}                  \
                        PKG_TOOLS_BIN=${PKG_TOOLS_BIN:Q}        \

Added files:

Index: pkgsrc/pkgtools/pkg_install/DEINSTALL
diff -u /dev/null pkgsrc/pkgtools/pkg_install/DEINSTALL:1.1
--- /dev/null   Wed Nov  3 13:37:25 2021
+++ pkgsrc/pkgtools/pkg_install/DEINSTALL       Wed Nov  3 13:37:25 2021
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Dummy script to ensure pkgsrc never creates its own DEINSTALL script for
+# this package that uses a pkgsrc shell, as that can cause upgrade issues.
+#
+exit 0