Tue Aug 5 22:25:54 2008 UTC ()

Call chmod directly and just use 555 for the deinstall script.


(joerg)

diff -r1.23.2.8 -r1.23.2.9 pkgsrc/pkgtools/pkg_install/files/delete/perform.c

--- pkgsrc/pkgtools/pkg_install/files/delete/Attic/perform.c 2008/08/05 20:41:04 1.23.2.8
+++ pkgsrc/pkgtools/pkg_install/files/delete/Attic/perform.c 2008/08/05 22:25:54 1.23.2.9

 @@ -1,27 +1,27 @@
-/*	$NetBSD: perform.c,v 1.23.2.8 2008/08/05 20:41:04 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.23.2.9 2008/08/05 22:25:54 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.23.2.8 2008/08/05 20:41:04 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.23.2.9 2008/08/05 22:25:54 joerg Exp $");
 #endif
 #endif
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -730,27 +730,28 @@ pkg_do(char *pkg)
 			target = "VIEW-DEINSTALL";
 			text = "view deinstall";
 		} else {
 			target = "DEINSTALL";
 			text = "deinstall";
+		}
 		free(fname2);
 		if (Fake) {
 			printf("Would execute %s script at this point "
 			    "(arg: %s).\n", text, target);
 		} else {
 			pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
-			(void) fexec(CHMOD_CMD, "+x", fname, NULL);	/* make sure */
+			if (chmod(fname, 0555))
 				warn("chmod of %s failed", fname);
 			if (fcexec(pkgdir, fname, pkg, target, NULL)) {
 				warnx("%s script returned error status", text);
 				if (!Force) {
 					free(pkgdir);
 					return 1;
+				}
+			}
 			free(pkgdir);
+		}
+	}
 	free(fname);
 	if (!Fake) {
 @@ -794,27 +795,28 @@ pkg_do(char *pkg)
 		require_delete(1);
+	}
 	fname = pkgdb_pkg_file(pkg, DEINSTALL_FNAME);
 	if (!NoDeInstall && fexists(fname)) {
 		char *fname2;
 		fname2 = pkgdb_pkg_file(pkg, DEPOT_FNAME);
 		if (!fexists(fname2)) {
 			if (Fake)
 				printf("Would execute post-de-install script at this point (arg: POST-DEINSTALL).\n");
 			else {
 				pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
-				(void) fexec(CHMOD_CMD, "+x", fname, NULL);	/* make sure */
+				if (chmod(fname, 0555))
 					warn("chmod of %s failed", fname);
 				if (fcexec(pkgdir, fname, pkg, "POST-DEINSTALL", NULL)) {
 					warnx("post-deinstall script returned error status");
 					if (!Force) {
 						free(pkgdir);
 						free(fname);
 						free(fname2);
 						return 1;
+					}
+				}
 				free(pkgdir);
+			}
+		}
 		free(fname2);