From owner-svn-ports-all@freebsd.org Wed Apr 29 19:09:53 2020 Return-Path: Delivered-To: svn-ports-all@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 D295A2BF84A; Wed, 29 Apr 2020 19:09:53 +0000 (UTC) (envelope-from tcberner@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 49C7PF5BGJz3BqQ; Wed, 29 Apr 2020 19:09:53 +0000 (UTC) (envelope-from tcberner@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 AD278A481; Wed, 29 Apr 2020 19:09:53 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03TJ9rw3024288; Wed, 29 Apr 2020 19:09:53 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03TJ9riX024286; Wed, 29 Apr 2020 19:09:53 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202004291909.03TJ9riX024286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Wed, 29 Apr 2020 19:09:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533389 - in head/net-im/prosody: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/net-im/prosody: . files X-SVN-Commit-Revision: 533389 X-SVN-Commit-Repository: ports 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.29 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: Wed, 29 Apr 2020 19:09:53 -0000 Author: tcberner Date: Wed Apr 29 19:09:53 2020 New Revision: 533389 URL: https://svnweb.freebsd.org/changeset/ports/533389 Log: net-im/prosody: Fix http files download net-im/prosody: fix ETag creation * Include patch from upstream to fix crash in mod_http_files when encountering large device- or inode-numbers [1] [1] https://issues.prosody.im/1498 PR: 244618 Submitted by: Thomas Morper (maintainer) Reported by: rozhuk.im@gmail.com Added: head/net-im/prosody/files/patch-plugins_mod__http__files.lua (contents, props changed) Modified: head/net-im/prosody/Makefile Modified: head/net-im/prosody/Makefile ============================================================================== --- head/net-im/prosody/Makefile Wed Apr 29 19:09:39 2020 (r533388) +++ head/net-im/prosody/Makefile Wed Apr 29 19:09:53 2020 (r533389) @@ -3,6 +3,7 @@ PORTNAME= prosody PORTVERSION= 0.11.5 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://prosody.im/downloads/source/ Added: head/net-im/prosody/files/patch-plugins_mod__http__files.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/prosody/files/patch-plugins_mod__http__files.lua Wed Apr 29 19:09:53 2020 (r533389) @@ -0,0 +1,11 @@ +--- plugins/mod_http_files.lua.orig 2020-01-19 15:50:32 UTC ++++ plugins/mod_http_files.lua +@@ -112,7 +112,7 @@ function serve(opts) + local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification); + response_headers.last_modified = last_modified; + +- local etag = ('"%02x-%x-%x-%x"'):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0); ++ local etag = ('"%x-%x-%x"'):format(attr.change or 0, attr.size or 0, attr.modification or 0); + response_headers.etag = etag; + + local if_none_match = request_headers.if_none_match