From owner-svn-ports-all@freebsd.org Thu Nov 24 14:55:02 2016 Return-Path: Delivered-To: svn-ports-all@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 E03D7C53D5A; Thu, 24 Nov 2016 14:55:02 +0000 (UTC) (envelope-from amdmi3@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 A26211D5; Thu, 24 Nov 2016 14:55:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAOEt1NZ084128; Thu, 24 Nov 2016 14:55:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAOEt1Hx084122; Thu, 24 Nov 2016 14:55:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201611241455.uAOEt1Hx084122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 24 Nov 2016 14:55:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427021 - in branches/2016Q4: . irc/znc irc/znc/files X-SVN-Group: ports-branches 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.23 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, 24 Nov 2016 14:55:03 -0000 Author: amdmi3 Date: Thu Nov 24 14:55:01 2016 New Revision: 427021 URL: https://svnweb.freebsd.org/changeset/ports/427021 Log: MFH: r426896 - Create znc user/group - Set permissions properly on ETCDIR - Add an information on znc user/group to pkg-message - Pass maintainership to dbaio PR: 200005 Submitted by: josh+freebsd@zevlag.com, dbaio@bsd.com.br Approved by: ports-secteam (feld) Added: branches/2016Q4/irc/znc/files/pkg-message.in - copied unchanged from r426896, head/irc/znc/files/pkg-message.in Deleted: branches/2016Q4/irc/znc/pkg-message Modified: branches/2016Q4/GIDs branches/2016Q4/UIDs branches/2016Q4/irc/znc/Makefile branches/2016Q4/irc/znc/distinfo branches/2016Q4/irc/znc/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/GIDs ============================================================================== --- branches/2016Q4/GIDs Thu Nov 24 14:50:36 2016 (r427020) +++ branches/2016Q4/GIDs Thu Nov 24 14:55:01 2016 (r427021) @@ -838,7 +838,7 @@ graylog:*:848: # free: 894 # free: 895 # free: 896 -# free: 897 +znc:*:897: ufdb:*:898: guacamole:*:899: seafile:*:900: Modified: branches/2016Q4/UIDs ============================================================================== --- branches/2016Q4/UIDs Thu Nov 24 14:50:36 2016 (r427020) +++ branches/2016Q4/UIDs Thu Nov 24 14:55:01 2016 (r427021) @@ -843,7 +843,7 @@ graylog:*:848:848::0:0:Graylog user:/non # free: 894 # free: 895 # free: 896 -# free: 897 +znc:*:897:897::0:0:ZNC User:/nonexistent:/usr/sbin/nologin ufdb:*:898:898::0:0:ufdb user:/nonexistent:/usr/sbin/nologin guacamole:*:899:899::0:0:Guacamole user:/nonexistent:/usr/sbin/nologin seafile:*:900:900::0:0:Seafile user:/nonexistent:/usr/bin/nologin Modified: branches/2016Q4/irc/znc/Makefile ============================================================================== --- branches/2016Q4/irc/znc/Makefile Thu Nov 24 14:50:36 2016 (r427020) +++ branches/2016Q4/irc/znc/Makefile Thu Nov 24 14:55:01 2016 (r427021) @@ -3,12 +3,12 @@ PORTNAME= znc PORTVERSION= 1.6.3 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= irc ipv6 MASTER_SITES= http://znc.in/releases/ \ http://znc.in/releases/archive/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dbaio@bsd.com.br COMMENT= Advanced IRC bouncer LICENSE= APACHE20 @@ -16,9 +16,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes USE_RC_SUBR= znc -USES= compiler:c++11-lib cpe gmake iconv pkgconfig +SUB_FILES= pkg-message +USES= compiler:c++11-lib cpe gmake iconv pathfix pkgconfig MAKE_ENV= V=1 +PORTDOCS= README.md + +USERS= znc +GROUPS= znc + OPTIONS_DEFINE= CHARSET CYRUS DEBUG DOCS IPV6 OPENSSL PERL PYTHON TCL OPTIONS_DEFAULT= OPENSSL PERL OPTIONS_SUB= yes @@ -53,8 +59,6 @@ TCL_CONFIGURE_ENABLE= tcl TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR} TCL_USES= tcl -PORTDOCS= README.md - # Instead of using bundled swig generated files, delete them to force # regeneration using swig 2.0.11+ (fixes port compilation using clang) # @@ -66,9 +70,6 @@ pre-configure-PYTHON-on: post-patch: @${REINPLACE_CMD} -e \ - 's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e \ 's#/usr/local#${LOCALBASE}#' ${WRKSRC}/configure post-install-DOCS-on: @@ -76,6 +77,8 @@ post-install-DOCS-on: .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}" + +post-install: + @${MKDIR} ${STAGEDIR}${ETCDIR} .include Modified: branches/2016Q4/irc/znc/distinfo ============================================================================== --- branches/2016Q4/irc/znc/distinfo Thu Nov 24 14:50:36 2016 (r427020) +++ branches/2016Q4/irc/znc/distinfo Thu Nov 24 14:55:01 2016 (r427021) @@ -1,2 +1,3 @@ +TIMESTAMP = 1475969471 SHA256 (znc-1.6.3.tar.gz) = 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SIZE (znc-1.6.3.tar.gz) = 1464200 Copied: branches/2016Q4/irc/znc/files/pkg-message.in (from r426896, head/irc/znc/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/irc/znc/files/pkg-message.in Thu Nov 24 14:55:01 2016 (r427021, copy of r426896, head/irc/znc/files/pkg-message.in) @@ -0,0 +1,19 @@ +***************************************************************************** + +If you are upgrading znc from a version prior to 1.0, please be aware that +znc will modify your configuration file to incorporate support for new +functionality. + +Please visit the following URL for more information: + +http://wiki.znc.in/ChangeLog/1.0 + +***************************************************************************** + +For generate your config file using znc user, execute: + +su -m znc -c 'znc -d %%ETCDIR%% --makeconf' +or +sudo -u znc znc -d %%ETCDIR%% --makeconf + +***************************************************************************** Modified: branches/2016Q4/irc/znc/pkg-plist ============================================================================== --- branches/2016Q4/irc/znc/pkg-plist Thu Nov 24 14:50:36 2016 (r427020) +++ branches/2016Q4/irc/znc/pkg-plist Thu Nov 24 14:55:01 2016 (r427021) @@ -169,3 +169,4 @@ man/man1/znc.1.gz %%DATADIR%%/webskins/ice/pub/pagebg.gif %%DATADIR%%/webskins/ice/tmpl/FooterTag.tmpl %%DATADIR%%/webskins/ice/tmpl/Header.tmpl +@dir(znc,znc,755) %%ETCDIR%%