From owner-svn-ports-head@freebsd.org Tue Sep 10 09:02:51 2019 Return-Path: Delivered-To: svn-ports-head@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 9468ED045E; Tue, 10 Sep 2019 09:02:51 +0000 (UTC) (envelope-from amdmi3@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 46SJvv3LmYz4C3l; Tue, 10 Sep 2019 09:02:51 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 568D223D59; Tue, 10 Sep 2019 09:02:51 +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 x8A92plJ045237; Tue, 10 Sep 2019 09:02:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8A92omL045234; Tue, 10 Sep 2019 09:02:50 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201909100902.x8A92omL045234@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 10 Sep 2019 09:02:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511751 - in head/www/mod_limitipconn2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/www/mod_limitipconn2: . files X-SVN-Commit-Revision: 511751 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2019 09:02:51 -0000 Author: amdmi3 Date: Tue Sep 10 09:02:50 2019 New Revision: 511751 URL: https://svnweb.freebsd.org/changeset/ports/511751 Log: - Add LICENSE_FILE - Switch to options helpers - Don't install useless INSTALL file - Regenerate patch - Update WWW Approved by: portmgr blanket Modified: head/www/mod_limitipconn2/Makefile head/www/mod_limitipconn2/files/patch-mod_limitipconn.c head/www/mod_limitipconn2/pkg-descr Modified: head/www/mod_limitipconn2/Makefile ============================================================================== --- head/www/mod_limitipconn2/Makefile Tue Sep 10 08:45:00 2019 (r511750) +++ head/www/mod_limitipconn2/Makefile Tue Sep 10 09:02:50 2019 (r511751) @@ -14,17 +14,18 @@ MAINTAINER= ychsiao@ychsiao.org COMMENT= Allows you to limit the number of simultaneous connexions LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE USES= apache:2.2+ tar:bzip2 AP_FAST_BUILD= yes AP_GENPLIST= yes -PORTDOCS= ChangeLog INSTALL README +PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ Modified: head/www/mod_limitipconn2/files/patch-mod_limitipconn.c ============================================================================== --- head/www/mod_limitipconn2/files/patch-mod_limitipconn.c Tue Sep 10 08:45:00 2019 (r511750) +++ head/www/mod_limitipconn2/files/patch-mod_limitipconn.c Tue Sep 10 09:02:50 2019 (r511751) @@ -1,6 +1,6 @@ ---- ./mod_limitipconn.c.orig 2012-04-26 00:19:48.000000000 +0200 -+++ ./mod_limitipconn.c 2014-02-02 16:47:28.000000000 +0100 -@@ -42,6 +42,9 @@ +--- mod_limitipconn.c.orig 2012-04-25 22:19:48 UTC ++++ mod_limitipconn.c +@@ -42,6 +42,9 @@ typedef struct { /* array of MIME types to limit check; all other types are exempt */ apr_array_header_t *excl_limit; @@ -10,7 +10,7 @@ } limitipconn_config; static limitipconn_config *create_config(apr_pool_t *p) -@@ -53,6 +56,7 @@ +@@ -53,6 +56,7 @@ static limitipconn_config *create_config(apr_pool_t *p cfg->limit = 0; cfg->no_limit = apr_array_make(p, 0, sizeof(char *)); cfg->excl_limit = apr_array_make(p, 0, sizeof(char *)); @@ -18,7 +18,7 @@ return cfg; } -@@ -75,6 +79,7 @@ +@@ -75,6 +79,7 @@ static int check_limit(request_rec *r, limitipconn_con /* convert Apache arrays to normal C arrays */ char **nolim = (char **) cfg->no_limit->elts; char **exlim = (char **) cfg->excl_limit->elts; @@ -26,7 +26,7 @@ const char *address; -@@ -112,7 +117,7 @@ +@@ -112,7 +117,7 @@ static int check_limit(request_rec *r, limitipconn_con /* Only check the MIME-type if we have MIME-type stuff in our config. The extra subreq can be quite expensive. */ @@ -35,7 +35,7 @@ /* Look up the Content-type of this request. We need a subrequest * here since this module might be called before the URI has been * translated into a MIME type. */ -@@ -129,6 +134,20 @@ +@@ -129,6 +134,20 @@ static int check_limit(request_rec *r, limitipconn_con "mod_limitipconn: uri: %s Content-Type: %s", r->uri, content_type); @@ -56,7 +56,7 @@ /* Cycle through the exempt list; if our content_type is exempt, * return OK */ #if AP_MODULE_MAGIC_AT_LEAST(20090131, 0) -@@ -328,6 +347,24 @@ +@@ -328,6 +347,24 @@ static const char *excl_limit_config_cmd(cmd_parms *pa return NULL; } @@ -81,7 +81,7 @@ /* Array describing structure of configuration directives */ static command_rec limitipconn_cmds[] = { AP_INIT_TAKE1("MaxConnPerIP", limit_config_cmd, NULL, OR_LIMIT|RSRC_CONF, -@@ -336,6 +373,8 @@ +@@ -336,6 +373,8 @@ static command_rec limitipconn_cmds[] = { "MIME types for which limit checking is disabled"), AP_INIT_ITERATE("OnlyIPLimit", excl_limit_config_cmd, NULL, OR_LIMIT|RSRC_CONF, "restrict limit checking to these MIME types only"), Modified: head/www/mod_limitipconn2/pkg-descr ============================================================================== --- head/www/mod_limitipconn2/pkg-descr Tue Sep 10 08:45:00 2019 (r511750) +++ head/www/mod_limitipconn2/pkg-descr Tue Sep 10 09:02:50 2019 (r511751) @@ -3,4 +3,4 @@ to limit the number of simultaneous downloads permitte IP address. Proxy tracking possibility is not supported yet since apache isn't patched. -WWW: http://dominia.org/djao/limitipconn2.html +WWW: https://dominia.org/djao/limitipconn2.html