Date: Tue, 9 Feb 2021 06:56:15 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564768 - in head/net/open-isns: . files Message-ID: <202102090656.1196uFmm095523@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Tue Feb 9 06:56:15 2021 New Revision: 564768 URL: https://svnweb.freebsd.org/changeset/ports/564768 Log: net/open-isns: Update to 0.101 ChangeLog: https://github.com/open-iscsi/open-isns/blob/master/ChangeLog PR: 253343 Submitted by: pavelivolkov@gmail.com (maintainer) Deleted: head/net/open-isns/files/patch-Makefile.in Modified: head/net/open-isns/Makefile head/net/open-isns/distinfo head/net/open-isns/files/patch-attrs.c head/net/open-isns/pkg-plist Modified: head/net/open-isns/Makefile ============================================================================== --- head/net/open-isns/Makefile Tue Feb 9 06:53:33 2021 (r564767) +++ head/net/open-isns/Makefile Tue Feb 9 06:56:15 2021 (r564768) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= open-isns -PORTVERSION= 0.99 DISTVERSIONPREFIX= v +DISTVERSION= 0.101 CATEGORIES= net MAINTAINER= pavelivolkov@gmail.com @@ -10,61 +10,80 @@ COMMENT= Internet Storage Name Service (iSNS) LICENSE= LGPL21 -USES= autoreconf gmake pathfix -USE_LDCONFIG= yes +USES= autoreconf gmake pathfix python:3.6+,test shebangfix USE_GITHUB= yes GH_ACCOUNT= open-iscsi -GH_TAGNAME= cfdbcff +USE_LDCONFIG= yes +USE_RC_SUBR= isnsd +SHEBANG_FILES= isnssetup ${TEST_WRKSRC}/*.py ${TEST_WRKSRC}/*.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared INSTALL_TARGET= install install_lib -USE_RC_SUBR= isnsd -DATABASE_PLACE?= /var/db/isns +TEST_ARGS= LD_LIBRARY_PATH=${WRKSRC} +TEST_WRKSRC= ${WRKSRC}/tests -OPTIONS_SUB= yes OPTIONS_DEFINE= DEV SECURITY SLP OPTIONS_DEFAULT= SECURITY +OPTIONS_SUB= yes DEV_DESC= Install Headers & Static lib +SECURITY_DESC= Enable iSNS authentication +SLP_DESC= Enable SLP for server discovery + DEV_CONFIGURE_ENABLE= static DEV_VARS= INSTALL_TARGET+=install_hdrs -SECURITY_DESC= Enable iSNS authentication -SECURITY_CONFIGURE_WITH= security SECURITY_USES= ssl +SECURITY_CONFIGURE_WITH= security +SECURITY_TEST_TARGET= tests +SECURITY_TEST_TARGET_OFF= tests-no-security -SLP_DESC= Enable SLP for server discovery -SLP_CONFIGURE_WITH= slp SLP_LIB_DEPENDS= libslp.so:net/openslp +SLP_CONFIGURE_WITH= slp SLP_CPPFLAGS= -I${PREFIX}/include SLP_LDFLAGS= -L${PREFIX}/lib +_DATABASE_PLACE?= ${DESTDIR}/var/db/isns + .include <bsd.port.options.mk> post-patch: + # + # Move paths to configurations according to the variable ${PREFIX} and ${_DATABASE_PLACE}. ${REINPLACE_CMD} -E \ - -e "s|^([[:blank:]]*#define ISNS_ETCDIR[[:blank:]]+\")(.*)$$|\1${PREFIX}\2|" \ - -e "s|^([[:blank:]]*#define ISCSI_DEFAULT_INITIATORNAME[[:blank:]]+\")(.*)$$|\1${PREFIX}\2|" \ + -e "s|(/etc/)|${PREFIX}\1|g" \ + -e "s|^(.*Database[[:blank:]]*=[[:blank:]]*)(.*)$$|\1${_DATABASE_PLACE}|" \ + ${WRKSRC}/etc/isnsadm.conf \ + ${WRKSRC}/etc/isnsd.conf \ + ${WRKSRC}/etc/isnsdd.conf \ + ${WRKSRC}/isnssetup \ ${WRKSRC}/include/libisns/paths.h.in + # + # Move paths to configurations according to the variables ${PREFIX} and ${_DATABASE_PLACE}, remove the dependencies on the systemd. ${REINPLACE_CMD} -E \ - -e "1,10s|^(vardir[[:blank:]]*=[[:blank:]]*)(.*)$$|\1${DATABASE_PLACE}|" \ + -e "1,12s|(/etc)|${PREFIX}\1|" \ + -e "1,12s|^(vardir[[:blank:]]*=[[:blank:]]*)(.*)$$|\1${_DATABASE_PLACE}|" \ + -e "s|^(.*)[[:blank:]]+\\$$\(SYSTEMDDIR\)$$|\1|" \ + -e "/isnsd\.(service|socket)/d" \ ${WRKSRC}/Makefile.in -.for FILE in isnsadm.conf isnsd.conf isnsdd.conf + # + # Move paths to configurations according to the variable ${PREFIX}, remove bashism. ${REINPLACE_CMD} -E \ - -e "s|^(.*AuthKeyFile[[:blank:]]*=[[:blank:]]*)(.*)$$|\1${PREFIX}\2|" \ - -e "s|^(.*ServerKeyFile[[:blank:]]*=[[:blank:]]*)(.*)$$|\1${PREFIX}\2|" \ - -e "s|^(.*Database[[:blank:]]*=[[:blank:]]*)(.*)$$|\1${DATABASE_PLACE}|" \ - ${WRKSRC}/etc/${FILE} -.endfor + -e "1,3s|ba(sh)|\1|" \ + -e "1,27s|(/etc/)|${PREFIX}\1|g" \ + -e "s|^[[:blank:]]*function[[:blank:]]+([^[:blank:]]+)(.*)$$|\1()\2|" \ + ${WRKSRC}/tests/genkey post-patch-SLP-off: - ${REINPLACE_CMD} -E \ + ${REINPLACE_CMD} -E -i.bak-SLP \ -e "s|^(.*SLPRegister[[:blank:]]*=[[:blank:]]*)(.*)$$|\10|" \ ${WRKSRC}/etc/isnsd.conf post-install: + ${INSTALL_SCRIPT} ${WRKSRC}/isnssetup ${STAGEDIR}${PREFIX}/sbin + ${FIND} ${STAGEDIR}${PREFIX}/etc/isns -type f -a -name '*.conf' -exec ${MV} '{}' '{}.sample' ';' .for FILE in sbin/isnsadm sbin/isnsd sbin/isnsdd lib/libisns.so.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${FILE} .endfor Modified: head/net/open-isns/distinfo ============================================================================== --- head/net/open-isns/distinfo Tue Feb 9 06:53:33 2021 (r564767) +++ head/net/open-isns/distinfo Tue Feb 9 06:56:15 2021 (r564768) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540627511 -SHA256 (open-iscsi-open-isns-v0.99-cfdbcff_GH0.tar.gz) = cbfccc69b468cce39ad7cda4800baeca18de91aa363042cc72938f0756b7f218 -SIZE (open-iscsi-open-isns-v0.99-cfdbcff_GH0.tar.gz) = 282862 +TIMESTAMP = 1612586523 +SHA256 (open-iscsi-open-isns-v0.101_GH0.tar.gz) = f672ec86b6c9e984843a7a28d76f07e26393499c486f86034b8b18caa8deb556 +SIZE (open-iscsi-open-isns-v0.101_GH0.tar.gz) = 301912 Modified: head/net/open-isns/files/patch-attrs.c ============================================================================== --- head/net/open-isns/files/patch-attrs.c Tue Feb 9 06:53:33 2021 (r564767) +++ head/net/open-isns/files/patch-attrs.c Tue Feb 9 06:56:15 2021 (r564768) @@ -1,6 +1,6 @@ ---- attrs.c.orig 2018-10-28 09:10:34 UTC +--- attrs.c.orig 2021-02-06 13:40:34 UTC +++ attrs.c -@@ -777,7 +777,7 @@ isns_attr_decode(buf_t *bp, isns_attr_t +@@ -777,7 +777,7 @@ isns_attr_decode(buf_t *bp, isns_attr_t **result) { isns_attr_t *attr = NULL; isns_value_t *value; Modified: head/net/open-isns/pkg-plist ============================================================================== --- head/net/open-isns/pkg-plist Tue Feb 9 06:53:33 2021 (r564767) +++ head/net/open-isns/pkg-plist Tue Feb 9 06:56:15 2021 (r564768) @@ -17,7 +17,9 @@ man/man5/isns_config.5.gz man/man8/isnsadm.8.gz man/man8/isnsd.8.gz man/man8/isnsdd.8.gz +man/man8/isnssetup.8.gz sbin/isnsadm sbin/isnsd sbin/isnsdd +sbin/isnssetup @dir /var/db/isns
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102090656.1196uFmm095523>