Index: head/net/open-isns/Makefile =================================================================== --- head/net/open-isns/Makefile (revision 489386) +++ head/net/open-isns/Makefile (revision 489387) @@ -1,69 +1,72 @@ # $FreeBSD$ PORTNAME= open-isns -PORTVERSION= 0.97 +PORTVERSION= 0.99 DISTVERSIONPREFIX= v CATEGORIES= net MAINTAINER= pavelivolkov@gmail.com COMMENT= Internet Storage Name Service (iSNS) LICENSE= LGPL21 +USES= autoreconf gmake pathfix +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= open-iscsi -GH_TAGNAME= 94e3bc9 +GH_TAGNAME= cfdbcff -USES= autoreconf gmake pathfix GNU_CONFIGURE= yes -USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared INSTALL_TARGET= install install_lib USE_RC_SUBR= isnsd DATABASE_PLACE?= /var/db/isns OPTIONS_SUB= yes OPTIONS_DEFINE= DEV SECURITY SLP OPTIONS_DEFAULT= SECURITY DEV_DESC= Install Headers & Static lib DEV_CONFIGURE_ENABLE= static DEV_VARS= INSTALL_TARGET+=install_hdrs SECURITY_DESC= Enable iSNS authentication SECURITY_CONFIGURE_WITH= security SECURITY_USES= ssl SLP_DESC= Enable SLP for server discovery SLP_CONFIGURE_WITH= slp SLP_LIB_DEPENDS= libslp.so:net/openslp +SLP_CPPFLAGS= -I${PREFIX}/include +SLP_LDFLAGS= -L${PREFIX}/lib .include post-patch: ${REINPLACE_CMD} -E \ -e "s|^([[:blank:]]*#define ISNS_ETCDIR[[:blank:]]+\")(.*)$$|\1${PREFIX}\2|" \ -e "s|^([[:blank:]]*#define ISCSI_DEFAULT_INITIATORNAME[[:blank:]]+\")(.*)$$|\1${PREFIX}\2|" \ ${WRKSRC}/include/libisns/paths.h.in ${REINPLACE_CMD} -E \ -e "1,10s|^(vardir[[:blank:]]*=[[:blank:]]*)(.*)$$|\1${DATABASE_PLACE}|" \ ${WRKSRC}/Makefile.in .for FILE in isnsadm.conf isnsd.conf isnsdd.conf ${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 post-patch-SLP-off: ${REINPLACE_CMD} -E \ -e "s|^(.*SLPRegister[[:blank:]]*=[[:blank:]]*)(.*)$$|\10|" \ ${WRKSRC}/etc/isnsd.conf post-install: .for FILE in sbin/isnsadm sbin/isnsd sbin/isnsdd lib/libisns.so.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${FILE} .endfor .include Property changes on: head/net/open-isns/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/open-isns/distinfo =================================================================== --- head/net/open-isns/distinfo (revision 489386) +++ head/net/open-isns/distinfo (revision 489387) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491477988 -SHA256 (open-iscsi-open-isns-v0.97-94e3bc9_GH0.tar.gz) = dbbcfc27648a3f696425b6ba94a6a444c428ce1f9056471edef7bc4b7a3b231c -SIZE (open-iscsi-open-isns-v0.97-94e3bc9_GH0.tar.gz) = 278367 +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 Property changes on: head/net/open-isns/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -ON \ No newline at end of property +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/open-isns/files/patch-Makefile.in =================================================================== --- head/net/open-isns/files/patch-Makefile.in (revision 489386) +++ head/net/open-isns/files/patch-Makefile.in (revision 489387) @@ -1,34 +1,34 @@ ---- Makefile.in.orig 2017-04-08 09:26:35 UTC +--- Makefile.in.orig 2018-10-27 08:58:20 UTC +++ Makefile.in -@@ -3,7 +3,7 @@ exec_prefix = @exec_prefix@ +@@ -4,7 +4,7 @@ exec_prefix = @exec_prefix@ sbindir = @sbindir@ mandir = @mandir@ libdir = @libdir@ -etcdir = /etc +etcdir = $(prefix)/etc vardir = /var/lib/isns systemddir = $(prefix)/lib/systemd/system datarootdir = @datarootdir@ -@@ -107,18 +107,16 @@ all: $(LIB) $(SOLIB) isnsd isnsadm isnsd +@@ -109,18 +109,16 @@ all: $(LIB) $(SOLIB) isnsd isnsadm isnsd install: @echo "*** Installing Open-iSNS ***" - $(INSTALL) -m 755 -d $(CFGDIR) $(MANDIR)/man8 $(MANDIR)/man5 $(SBINDIR) $(SYSTEMDDIR) + $(INSTALL) -m 755 -d $(CFGDIR) $(MANDIR)/man8 $(MANDIR)/man5 $(SBINDIR) $(INSTALL) -m 700 -d $(VARDIR) $(INSTALL) -m 555 isnsd isnsadm isnsdd $(SBINDIR) -- $(INSTALL) -m 644 etc/isnsd.conf $(CFGDIR) -- $(INSTALL) -m 644 etc/isnsdd.conf $(CFGDIR) -- $(INSTALL) -m 644 etc/isnsadm.conf $(CFGDIR) -+ $(INSTALL) -m 644 etc/isnsd.conf $(CFGDIR)/isnsd.conf.sample -+ $(INSTALL) -m 644 etc/isnsdd.conf $(CFGDIR)/isnsdd.conf.sample -+ $(INSTALL) -m 644 etc/isnsadm.conf $(CFGDIR)/isnsadm.conf.sample - $(INSTALL) -m 644 doc/isnsd.8 $(MANDIR)/man8 - $(INSTALL) -m 644 doc/isnsdd.8 $(MANDIR)/man8 - $(INSTALL) -m 644 doc/isnsadm.8 $(MANDIR)/man8 - $(INSTALL) -m 644 doc/isns_config.5 $(MANDIR)/man5 -- $(INSTALL) -m 644 isnsd.service $(SYSTEMDDIR) -- $(INSTALL) -m 644 isnsd.socket $(SYSTEMDDIR) +- $(INSTALL) -m 644 $(srcdir)/etc/isnsd.conf $(CFGDIR) +- $(INSTALL) -m 644 $(srcdir)/etc/isnsdd.conf $(CFGDIR) +- $(INSTALL) -m 644 $(srcdir)/etc/isnsadm.conf $(CFGDIR) ++ $(INSTALL) -m 644 $(srcdir)/etc/isnsd.conf $(CFGDIR)/isnsd.conf.sample ++ $(INSTALL) -m 644 $(srcdir)/etc/isnsdd.conf $(CFGDIR)/isnsdd.conf.sample ++ $(INSTALL) -m 644 $(srcdir)/etc/isnsadm.conf $(CFGDIR)/isnsadm.conf.sample + $(INSTALL) -m 644 $(srcdir)/doc/isnsd.8 $(MANDIR)/man8 + $(INSTALL) -m 644 $(srcdir)/doc/isnsdd.8 $(MANDIR)/man8 + $(INSTALL) -m 644 $(srcdir)/doc/isnsadm.8 $(MANDIR)/man8 + $(INSTALL) -m 644 $(srcdir)/doc/isns_config.5 $(MANDIR)/man5 +- $(INSTALL) -m 644 $(srcdir)/isnsd.service $(SYSTEMDDIR) +- $(INSTALL) -m 644 $(srcdir)/isnsd.socket $(SYSTEMDDIR) install_hdrs: @echo '*** Installing Open-iSNS header files ***' Property changes on: head/net/open-isns/files/patch-Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -ON \ No newline at end of property +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/open-isns/files/patch-attrs.c =================================================================== --- head/net/open-isns/files/patch-attrs.c (nonexistent) +++ head/net/open-isns/files/patch-attrs.c (revision 489387) @@ -0,0 +1,11 @@ +--- attrs.c.orig 2018-10-28 09:10:34 UTC ++++ attrs.c +@@ -777,7 +777,7 @@ isns_attr_decode(buf_t *bp, isns_attr_t + { + isns_attr_t *attr = NULL; + isns_value_t *value; +- uint32_t tag, len; ++ uint32_t tag, len=0; + + if (!buf_get32(bp, &tag) + || !buf_get32(bp, &len)) Property changes on: head/net/open-isns/files/patch-attrs.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property