From owner-svn-ports-head@freebsd.org Sun Jul 31 11:52:24 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20F10BA195A; Sun, 31 Jul 2016 11:52:24 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9634134B; Sun, 31 Jul 2016 11:52:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6VBqNjn038422; Sun, 31 Jul 2016 11:52:23 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VBqMZ8038419; Sun, 31 Jul 2016 11:52:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201607311152.u6VBqMZ8038419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 31 Jul 2016 11:52:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419360 - in head/ports-mgmt/pkg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 11:52:24 -0000 Author: bapt Date: Sun Jul 31 11:52:22 2016 New Revision: 419360 URL: https://svnweb.freebsd.org/changeset/ports/419360 Log: Add a hack in pkg to skip running predeinstall for javavmwrapper-2.5 During upgrades/reinstall javavmwrapper 2.5 pre deinstall script deletes the pkg temporary files preventing to finish the upgrade. A fixed version of javavmwrapper will be made soon, this hack will remain in the ports tree and not in pkg(8) itself. This hack is made to not bother users is only affecting upgrade/reinstall phase not proper deinstall PR: 210313 Added: head/ports-mgmt/pkg/files/patch-javavmwrapper (contents, props changed) Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Sun Jul 31 10:56:45 2016 (r419359) +++ head/ports-mgmt/pkg/Makefile Sun Jul 31 11:52:22 2016 (r419360) @@ -3,6 +3,7 @@ PORTNAME= pkg DISTVERSION= 1.8.7 _PKG_VERSION= ${DISTVERSION} +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/${PORTNAME}/ \ Added: head/ports-mgmt/pkg/files/patch-javavmwrapper ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-javavmwrapper Sun Jul 31 11:52:22 2016 (r419360) @@ -0,0 +1,33 @@ +diff --git libpkg/pkg_add.c libpkg/pkg_add.c +index 87fb248..778336c 100644 +--- libpkg/pkg_add.c ++++ libpkg/pkg_add.c +@@ -859,14 +859,20 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag + * Execute pre deinstall scripts + */ + if ((flags & PKG_ADD_NOSCRIPT) == 0) { +- if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS) +- ret = pkg_script_run(old, PKG_SCRIPT_PRE_UPGRADE); +- else +- ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL); +- if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) +- return (ret); +- else +- ret = EPKG_OK; ++ bool buggydeinstall = false; ++ if (strcmp(old->name, "javavmwrapper") == 0 && ++ strcmp(old->version, "2.5") == 0) ++ buggydeinstall = true; ++ if (!buggydeinstall) { ++ if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS) ++ ret = pkg_script_run(old, PKG_SCRIPT_PRE_UPGRADE); ++ else ++ ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL); ++ if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) ++ return (ret); ++ else ++ ret = EPKG_OK; ++ } + } + + /* Now remove files that no longer exist in the new package */