From owner-svn-ports-all@freebsd.org Sun Dec 20 12:27:06 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1DE3F4C0FF3; Sun, 20 Dec 2020 12:27:06 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CzML203Vkz4ljq; Sun, 20 Dec 2020 12:27:06 +0000 (UTC) (envelope-from meta@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E8B9B7537; Sun, 20 Dec 2020 12:27:05 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BKCR54W093850; Sun, 20 Dec 2020 12:27:05 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BKCR5lp093847; Sun, 20 Dec 2020 12:27:05 GMT (envelope-from meta@FreeBSD.org) Message-Id: <202012201227.0BKCR5lp093847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Sun, 20 Dec 2020 12:27:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558735 - in head/net/xrdp-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head/net/xrdp-devel: . files X-SVN-Commit-Revision: 558735 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2020 12:27:06 -0000 Author: meta Date: Sun Dec 20 12:27:05 2020 New Revision: 558735 URL: https://svnweb.freebsd.org/changeset/ports/558735 Log: add pkg-deinstall.in missed in the previous commit Added: head/net/xrdp-devel/files/pkg-deinstall.in (contents, props changed) Modified: head/net/xrdp-devel/Makefile head/net/xrdp-devel/distinfo Modified: head/net/xrdp-devel/Makefile ============================================================================== --- head/net/xrdp-devel/Makefile Sun Dec 20 09:18:00 2020 (r558734) +++ head/net/xrdp-devel/Makefile Sun Dec 20 12:27:05 2020 (r558735) @@ -3,7 +3,7 @@ PORTNAME= xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.9.14 +DISTVERSION= 0.9.15.p20201218 PORTEPOCH= 1 CATEGORIES= net PKGNAMESUFFIX= -devel @@ -29,9 +29,10 @@ USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_GITHUB= yes GNU_CONFIGURE= yes -GH_ACCOUNT= neutrinolabs +#GH_ACCOUNT= neutrinolabs +GH_ACCOUNT= metalefty GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter -GH_TAGNAME= v0.1.5:librfxcodec v0.1.1:libpainter +GH_TAGNAME= 70d231b v0.1.5:librfxcodec v0.1.1:libpainter CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ @@ -79,6 +80,7 @@ post-extract: @${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/ pre-configure: + @${REINPLACE_CMD} -e "s|0.9.14|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap post-install: Modified: head/net/xrdp-devel/distinfo ============================================================================== --- head/net/xrdp-devel/distinfo Sun Dec 20 09:18:00 2020 (r558734) +++ head/net/xrdp-devel/distinfo Sun Dec 20 12:27:05 2020 (r558735) @@ -1,7 +1,7 @@ -TIMESTAMP = 1598856500 -SHA256 (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = f46d90f3272531b9dec032fcf16104ea73d33b17f9720cd3d541203182df2c88 -SIZE (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = 695062 -SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8 -SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 48387 -SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 -SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929 +TIMESTAMP = 1608277642 +SHA256 (xrdp/metalefty-xrdp-v0.9.15.p20201218-70d231b_GH0.tar.gz) = 5e3bb5e5ce1426ecccaeec2f338979c51d6d798100c11a4ee8352f50908e81f8 +SIZE (xrdp/metalefty-xrdp-v0.9.15.p20201218-70d231b_GH0.tar.gz) = 703564 +SHA256 (xrdp/metalefty-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8 +SIZE (xrdp/metalefty-librfxcodec-v0.1.5_GH0.tar.gz) = 48387 +SHA256 (xrdp/metalefty-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 +SIZE (xrdp/metalefty-libpainter-v0.1.1_GH0.tar.gz) = 13929 Added: head/net/xrdp-devel/files/pkg-deinstall.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp-devel/files/pkg-deinstall.in Sun Dec 20 12:27:05 2020 (r558735) @@ -0,0 +1,34 @@ +#!/bin/sh +# vim:ts=4:sw=4:et + +if [ $# -ne 2 ]; then + echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2 + exit 1 +fi + +case $2 in + DEINSTALL) + : nothing to do here + ;; + POST-DEINSTALL) + RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini + PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem + CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem + + # if keys are generated during post-install script, remove it + # but do not remove user's keys + for f in $RSAKEYS $PRIVATEKEY $CERTIFICATE; + do + if cmp -s "${f}.sample" "${f}"; then + rm -f "${f}" + fi + rm -f "${f}.sample" + done + ;; + *) + echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2 + exit 1 + ;; +esac + +exit 0