From owner-svn-ports-all@freebsd.org Thu Apr 6 07:08:12 2017 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 7F076D3119C; Thu, 6 Apr 2017 07:08:12 +0000 (UTC) (envelope-from danfe@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 29D6D274; Thu, 6 Apr 2017 07:08:12 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3678BpW016427; Thu, 6 Apr 2017 07:08:11 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3678BkD016425; Thu, 6 Apr 2017 07:08:11 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201704060708.v3678BkD016425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 6 Apr 2017 07:08:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437856 - in head/www/thttpd: . files X-SVN-Group: ports-head 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, 06 Apr 2017 07:08:12 -0000 Author: danfe Date: Thu Apr 6 07:08:10 2017 New Revision: 437856 URL: https://svnweb.freebsd.org/changeset/ports/437856 Log: - Fix location of makeweb(1) in post-install message - Rename IPREAL -> REAL_IP option while I'm here PR: 218414 Modified: head/www/thttpd/Makefile head/www/thttpd/files/pkg-message.in Modified: head/www/thttpd/Makefile ============================================================================== --- head/www/thttpd/Makefile Thu Apr 6 06:43:30 2017 (r437855) +++ head/www/thttpd/Makefile Thu Apr 6 07:08:10 2017 (r437856) @@ -19,11 +19,11 @@ SUB_FILES= pkg-message thttpd.conf.sampl SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} CPE_VENDOR= acme -OPTIONS_DEFINE= SENDFILE IPREAL INDEXES HTACCESS STATS LOG_UNKNOWN FLUSH_LOG -OPTIONS_DEFAULT= SENDFILE IPREAL STATS FLUSH_LOG +OPTIONS_DEFINE= SENDFILE REAL_IP INDEXES HTACCESS STATS LOG_UNKNOWN FLUSH_LOG +OPTIONS_DEFAULT= SENDFILE REAL_IP STATS FLUSH_LOG SENDFILE_DESC= Use sendfile(2) to serve files -IPREAL_DESC= Respect (pass on) "X-Forwarded-For" header +REAL_IP_DESC= Respect (pass on) "X-Forwarded-For" header INDEXES_DESC= Generate index pages for directories HTACCESS_DESC= IP-based authorization (.htaccess) support STATS_DESC= Collect internal stats and print to system log @@ -31,7 +31,7 @@ LOG_UNKNOWN_DESC= Log unknown request he FLUSH_LOG_DESC= fflush() the log file after each request SENDFILE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-config.h -IPREAL_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ip_real +REAL_IP_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ip_real HTACCESS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-htaccess LOG_UNKNOWN_EXTRA_PATCHES= ${FILESDIR}/extra-patch-log_unknown_headers Modified: head/www/thttpd/files/pkg-message.in ============================================================================== --- head/www/thttpd/files/pkg-message.in Thu Apr 6 06:43:30 2017 (r437855) +++ head/www/thttpd/files/pkg-message.in Thu Apr 6 07:08:10 2017 (r437856) @@ -3,8 +3,8 @@ If you want users to be able to create t subdirectories off of the main web directory, you need to: 1. Add a group for www admins (or use "%%WWWGRP%%") - 2. chgrp thatgroup %%PREFIX%%/bin/makeweb %%WWWDIR%% - 3. chmod g+sx %%PREFIX%%/bin/makeweb + 2. chgrp thatgroup %%PREFIX%%/sbin/makeweb %%WWWDIR%% + 3. chmod g+sx %%PREFIX%%/sbin/makeweb 4. Tell users about makeweb(1) See http://www.acme.com/software/thttpd/notes.html for more