From owner-svn-ports-all@freebsd.org Thu Feb 6 16:25:02 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 4324A22F9E0; Thu, 6 Feb 2020 16:25:02 +0000 (UTC) (envelope-from egypcio@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) server-signature RSA-PSS (4096 bits) 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 48D3gL14MLz4Cnv; Thu, 6 Feb 2020 16:25:02 +0000 (UTC) (envelope-from egypcio@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 1FF4D1E641; Thu, 6 Feb 2020 16:25:02 +0000 (UTC) (envelope-from egypcio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 016GP2ol028576; Thu, 6 Feb 2020 16:25:02 GMT (envelope-from egypcio@FreeBSD.org) Received: (from egypcio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 016GP1i7028573; Thu, 6 Feb 2020 16:25:01 GMT (envelope-from egypcio@FreeBSD.org) Message-Id: <202002061625.016GP1i7028573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: egypcio set sender to egypcio@FreeBSD.org using -f From: =?UTF-8?Q?Vin=c3=adcius_Zavam?= Date: Thu, 6 Feb 2020 16:25:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525386 - head/net-mgmt/resource-agents X-SVN-Group: ports-head X-SVN-Commit-Author: egypcio X-SVN-Commit-Paths: head/net-mgmt/resource-agents X-SVN-Commit-Revision: 525386 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.29 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: Thu, 06 Feb 2020 16:25:02 -0000 Author: egypcio Date: Thu Feb 6 16:25:01 2020 New Revision: 525386 URL: https://svnweb.freebsd.org/changeset/ports/525386 Log: net-mgmt/resource-agents: update 4.1.1_2 to 4.4.0 while here, adopt the port; fix how its v= (VERSION) is detected; add LICENSE_FILE; patch against wrong use of 'md5sum'; /etc/cluster is under LOCALBASE; make portlint a bit happier; not copying 'systemd' config file to STAGEDIR. * https://github.com/ClusterLabs/resource-agents/blob/v4.4.0/ChangeLog PR: 243930 Modified: head/net-mgmt/resource-agents/Makefile head/net-mgmt/resource-agents/distinfo head/net-mgmt/resource-agents/pkg-plist Modified: head/net-mgmt/resource-agents/Makefile ============================================================================== --- head/net-mgmt/resource-agents/Makefile Thu Feb 6 16:24:35 2020 (r525385) +++ head/net-mgmt/resource-agents/Makefile Thu Feb 6 16:25:01 2020 (r525386) @@ -2,38 +2,37 @@ # $FreeBSD$ PORTNAME= resource-agents -PORTVERSION= 4.1.1 +PORTVERSION= 4.4.0 DISTVERSIONPREFIX=v -PORTREVISION= 2 CATEGORIES= net-mgmt -MAINTAINER= ports@FreeBSD.org +MAINTAINER= egypcio@FreeBSD.org COMMENT= OCF Compliant Resource Agents LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash RUN_DEPENDS= bash:shells/bash -CONFLICTS= heartbeat-[0-9]* - +USES= autoreconf gmake gnome pkgconfig python shebangfix +USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= ClusterLabs -USES= autoreconf gmake gnome pkgconfig python shebangfix -USE_GNOME= glib20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-fatal-warnings +CONFIGURE_ARGS= --disable-fatal-warnings --with-version=${PORTVERSION} \ + PACKAGE_STRING="${PORTNAME} ${PORTVERSION}" \ + PACKAGE_VERSION="${PORTVERSION}" +CONFLICTS= heartbeat-[0-9]* + SHEBANG_LANG= sh sh_OLD_CMD= /bin/sh sh_CMD= ${LOCALBASE}/bin/bash SHEBANG_FILES= heartbeat/* \ ldirectord/ldirectord.in \ - rgmanager/src/resources/*.sh \ rgmanager/src/resources/*.sh.in \ - rgmanager/src/resources/ocf-shellfuncs \ - rgmanager/src/resources/svclib_nfslock \ rgmanager/src/resources/utils/*.pl \ rgmanager/src/resources/utils/*.sh \ tools/ocft/ocft.in \ @@ -45,5 +44,20 @@ OPTIONS_SUB= yes MANPAGES_BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ xsltproc:textproc/libxslt + +post-patch: + ${REINPLACE_CMD} 's|v=UNKNOWN|v=${PORTVERSION}|g' \ + ${WRKSRC}/make/git-version-gen + ${REINPLACE_CMD} 's|/etc/cluster|${LOCALBASE}/etc/cluster|g' \ + ${WRKSRC}/heartbeat/sybaseASE.in \ + ${WRKSRC}/rgmanager/src/resources/utils/config-utils.sh.in \ + ${WRKSRC}/rgmanager/src/resources/ASEHAagent.sh.in + +post-configure: + ${REINPLACE_CMD} 's|md5sum|md5|g' \ + ${WRKSRC}/heartbeat/iSCSILogicalUnit + +post-install: + ${RM} ${STAGEDIR}/${LOCALBASE}/resource-agents.conf .include Modified: head/net-mgmt/resource-agents/distinfo ============================================================================== --- head/net-mgmt/resource-agents/distinfo Thu Feb 6 16:24:35 2020 (r525385) +++ head/net-mgmt/resource-agents/distinfo Thu Feb 6 16:25:01 2020 (r525386) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525901739 -SHA256 (ClusterLabs-resource-agents-v4.1.1_GH0.tar.gz) = decc370bce20ee7a034886eb19ddb54d823f5e95c58f4d121f53cc965147f736 -SIZE (ClusterLabs-resource-agents-v4.1.1_GH0.tar.gz) = 717079 +TIMESTAMP = 1580896683 +SHA256 (ClusterLabs-resource-agents-v4.4.0_GH0.tar.gz) = 256b7fbcd1ed71c69e082626f7439d5a6e90b7495a03f598d0b0a2b14c9b7f03 +SIZE (ClusterLabs-resource-agents-v4.4.0_GH0.tar.gz) = 783702 Modified: head/net-mgmt/resource-agents/pkg-plist ============================================================================== --- head/net-mgmt/resource-agents/pkg-plist Thu Feb 6 16:24:35 2020 (r525385) +++ head/net-mgmt/resource-agents/pkg-plist Thu Feb 6 16:25:01 2020 (r525386) @@ -16,6 +16,7 @@ lib/ocf/lib/heartbeat/ocf-distro lib/ocf/lib/heartbeat/ocf-rarun lib/ocf/lib/heartbeat/ocf-returncodes lib/ocf/lib/heartbeat/ocf-shellfuncs +lib/ocf/lib/heartbeat/ocf.py lib/ocf/lib/heartbeat/ora-common.sh lib/ocf/lib/heartbeat/sapdb-nosha.sh lib/ocf/lib/heartbeat/sapdb.sh @@ -62,6 +63,7 @@ lib/ocf/resource.d/heartbeat/WinPopup lib/ocf/resource.d/heartbeat/Xen lib/ocf/resource.d/heartbeat/Xinetd lib/ocf/resource.d/heartbeat/ZFS +lib/ocf/resource.d/heartbeat/aliyun-vpc-move-ip lib/ocf/resource.d/heartbeat/anything lib/ocf/resource.d/heartbeat/apache lib/ocf/resource.d/heartbeat/asterisk @@ -69,6 +71,7 @@ lib/ocf/resource.d/heartbeat/aws-vpc-move-ip lib/ocf/resource.d/heartbeat/aws-vpc-route53 lib/ocf/resource.d/heartbeat/awseip lib/ocf/resource.d/heartbeat/awsvip +lib/ocf/resource.d/heartbeat/azure-events lib/ocf/resource.d/heartbeat/azure-lb lib/ocf/resource.d/heartbeat/clvm lib/ocf/resource.d/heartbeat/conntrackd @@ -76,12 +79,14 @@ lib/ocf/resource.d/heartbeat/db2 lib/ocf/resource.d/heartbeat/dhcpd lib/ocf/resource.d/heartbeat/dnsupdate lib/ocf/resource.d/heartbeat/docker +lib/ocf/resource.d/heartbeat/dovecot lib/ocf/resource.d/heartbeat/eDir88 lib/ocf/resource.d/heartbeat/ethmonitor lib/ocf/resource.d/heartbeat/exportfs lib/ocf/resource.d/heartbeat/fio lib/ocf/resource.d/heartbeat/galera lib/ocf/resource.d/heartbeat/garbd +lib/ocf/resource.d/heartbeat/gcp-vpc-move-ip lib/ocf/resource.d/heartbeat/iSCSILogicalUnit lib/ocf/resource.d/heartbeat/iSCSITarget lib/ocf/resource.d/heartbeat/ids @@ -107,6 +112,9 @@ lib/ocf/resource.d/heartbeat/named lib/ocf/resource.d/heartbeat/nfsnotify lib/ocf/resource.d/heartbeat/nfsserver lib/ocf/resource.d/heartbeat/nginx +lib/ocf/resource.d/heartbeat/openstack-cinder-volume +lib/ocf/resource.d/heartbeat/openstack-floating-ip +lib/ocf/resource.d/heartbeat/openstack-info lib/ocf/resource.d/heartbeat/oraasm lib/ocf/resource.d/heartbeat/oracle lib/ocf/resource.d/heartbeat/oralsnr @@ -114,6 +122,7 @@ lib/ocf/resource.d/heartbeat/ovsmonitor lib/ocf/resource.d/heartbeat/pgagent lib/ocf/resource.d/heartbeat/pgsql lib/ocf/resource.d/heartbeat/pingd +lib/ocf/resource.d/heartbeat/podman lib/ocf/resource.d/heartbeat/portblock lib/ocf/resource.d/heartbeat/postfix lib/ocf/resource.d/heartbeat/pound @@ -127,10 +136,12 @@ lib/ocf/resource.d/heartbeat/scsi2reservation lib/ocf/resource.d/heartbeat/sfex lib/ocf/resource.d/heartbeat/sg_persist lib/ocf/resource.d/heartbeat/slapd +lib/ocf/resource.d/heartbeat/sybaseASE lib/ocf/resource.d/heartbeat/symlink lib/ocf/resource.d/heartbeat/syslog-ng lib/ocf/resource.d/heartbeat/tomcat lib/ocf/resource.d/heartbeat/varnish +lib/ocf/resource.d/heartbeat/vdo-vol lib/ocf/resource.d/heartbeat/vmware lib/ocf/resource.d/heartbeat/vsftpd lib/ocf/resource.d/heartbeat/zabbixserver @@ -174,13 +185,16 @@ libexec/heartbeat/findif %%MANPAGES%%man/man7/ocf_heartbeat_WinPopup.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_Xen.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_Xinetd.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_ZFS.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_aliyun-vpc-move-ip.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_anything.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_apache.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_asterisk.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_aws-vpc-move-ip.7.gz -%%MANPAGES%%man/man7/ocf_heartbeat_aws-vpc-route53.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_aws-vpc-route5%%PYTHON_VER%%.gz %%MANPAGES%%man/man7/ocf_heartbeat_awseip.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_awsvip.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_azure-events.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_azure-lb.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_clvm.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_conntrackd.7.gz @@ -188,12 +202,14 @@ libexec/heartbeat/findif %%MANPAGES%%man/man7/ocf_heartbeat_dhcpd.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_dnsupdate.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_docker.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_dovecot.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_eDir88.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_ethmonitor.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_exportfs.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_fio.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_galera.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_garbd.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_gcp-vpc-move-ip.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_iSCSILogicalUnit.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_iSCSITarget.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_ids.7.gz @@ -209,6 +225,7 @@ libexec/heartbeat/findif %%MANPAGES%%man/man7/ocf_heartbeat_lxd-info.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_machine-info.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_mariadb.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_minio.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_mpathpersist.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_mysql-proxy.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_mysql.7.gz @@ -217,29 +234,38 @@ libexec/heartbeat/findif %%MANPAGES%%man/man7/ocf_heartbeat_nfsnotify.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_nfsserver.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_nginx.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_openstack-cinder-volume.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_openstack-floating-ip.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_openstack-info.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_oraasm.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_oracle.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_oralsnr.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_ovsmonitor.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_pgagent.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_pgsql.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_pingd.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_podman.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_portblock.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_postfix.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_pound.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_proftpd.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_rabbitmq-cluster.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_redis.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_rkt.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_rsyncd.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_rsyslog.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_scsi2reservation.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_sfex.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_sg_persist.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_slapd.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_sybaseASE.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_symlink.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_syslog-ng.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_tomcat.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_varnish.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_vdo-vol.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_vmware.7.gz +%%MANPAGES%%man/man7/ocf_heartbeat_vsftpd.7.gz %%MANPAGES%%man/man7/ocf_heartbeat_zabbixserver.7.gz %%MANPAGES%%man/man8/ldirectord.8.gz %%MANPAGES%%man/man8/ocf-tester.8.gz