From nobody Sat May 13 10:46:05 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJMk56DSvz4BFDQ; Sat, 13 May 2023 10:46:05 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJMk536CVz3qLt; Sat, 13 May 2023 10:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683974765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sotgmdNbpe3D1RpJn68GAj/z1jtU7OtbHSqJk9QTy20=; b=M2BTFQ+T132RNAZljyLvJprdGn3NmQyPPkPFAuX40JPA20P9/wxLwSmekY0ADFTYZeBmpp h1Diizx77hc2+nxKxUY9t787YxnR8MAW0F6r+uP1X7UQv9LNm2FW4vrUGGOtp8OR7ujyI4 EeCVms3Jy59k6Hct/TZZ/fQKP5Qnd6rag3g89o3JVi8PaGIyihyNKhVDaFNbnRoR5vtdMN 0rG6UVZS4CFDH1jE1kXFQv2Xg/yYtEVpTknfXzQbsATzaoNX71TJEVTiSJlurEY9cnW4QM iDSy0p7fmt05aFpoWKQVlKh2VAZLSG6dFxK3E45xthCbXQuHHFV/JmlRFmCWMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683974765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sotgmdNbpe3D1RpJn68GAj/z1jtU7OtbHSqJk9QTy20=; b=ou3BFTZ4hSJtwGJ+OyKXPTvCw6sNOFjXpmdIpvor9FVT5B4+CjteoDQzjXErUpFD7JkTKu CStj6JlOAnIx7BXM+NMnRUHXCTcqm9mpb34vGec9wpszF2Gmgy03lPGZJOqkvC5xv0MixE 8kACkwIVb5/TA3IzkvFly5U3wVckuPkZKX6PXTDbb4XGJxM5jEvN5+jb0eDfF+Phnw7qca QnR40XWfZNuqXO8dt8pdH/0r+Kwf3BN4Z96EAR2jlgxj7vyBANT58ImlyMZD5AixFsN5K3 rlIrEtBi9z8ym8OxeYbeZ+GoKKcHp4hzHPVjNerVwaYo63TZmYxc4BsK7AjYfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683974765; a=rsa-sha256; cv=none; b=xcGLvg6rHCJ5b5eDi0A2r7oarzDOTmX/ZB7PB/nGMZ6zlFnLoEA2FkxykkIKPwS90qWLW4 eYUrDWdVb3w34sO+A8sco+yMzApCpv4pzF0xJY2zU2c/GlqcI527skZOC4WD+ex3dvBbd7 EfjSLNhEpUdBGkh/DgeBqtBl2HbrZ8OHXQvsEFLZPk/i9Xl+gU9E9tREC6Yq0sfm86cgdF gvYKwwhO+sONHYuhvy5b8CpfO+4kkADwee1GInytRvc57/H4cpzp2xzafZ84DWccwLsFjP gbGrFOXuhaxURcFNmd+GfV2wqJxGSCwQ4HDq3Cm4/brev7ZY7on9O2f0ioU6EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJMk52CYXzF2p; Sat, 13 May 2023 10:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34DAk5ZC040188; Sat, 13 May 2023 10:46:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DAk5L5040187; Sat, 13 May 2023 10:46:05 GMT (envelope-from git) Date: Sat, 13 May 2023 10:46:05 GMT Message-Id: <202305131046.34DAk5L5040187@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Chris Rees Subject: git: 058a31c26a57 - 2023Q2 - audio/ampache: Update to 5.6.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: crees X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 058a31c26a57a3289298476c9a0f788a979c776b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=058a31c26a57a3289298476c9a0f788a979c776b commit 058a31c26a57a3289298476c9a0f788a979c776b Author: Chris Rees AuthorDate: 2023-05-13 10:41:24 +0000 Commit: Chris Rees CommitDate: 2023-05-13 10:45:47 +0000 audio/ampache: Update to 5.6.0 Fix the .htaccess issues with newer Apache-- see patchfile. Submitted upstream as pull request 3526 https://github.com/ampache/ampache/pull/3526 Changelog: https://github.com/ampache/ampache/blob/develop/docs/CHANGELOG.md MFH: 2023Q2 (cherry picked from commit 1fe33abd0b0111c87b0b50bf902e777c948aa03c) --- audio/ampache/Makefile | 3 +-- audio/ampache/distinfo | 6 ++--- audio/ampache/files/patch-htaccess | 53 ++++++++++++++++++++++++++++++++++++++ audio/ampache/pkg-plist | 9 ++++++- 4 files changed, 65 insertions(+), 6 deletions(-) diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile index afa502269498..0dcc32f02b8b 100644 --- a/audio/ampache/Makefile +++ b/audio/ampache/Makefile @@ -1,6 +1,5 @@ PORTNAME= ampache -PORTVERSION= 5.5.7 -PORTREVISION= 1 +PORTVERSION= 5.6.0 DISTVERSIONSUFFIX= _all CATEGORIES= audio www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/audio/ampache/distinfo b/audio/ampache/distinfo index 32ab5dc391b4..efdf403ca6eb 100644 --- a/audio/ampache/distinfo +++ b/audio/ampache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679911015 -SHA256 (ampache-5.5.7_all.zip) = d0b2241dc4ed74beea80d58612afab108a955d4814fd009221515813d7e52095 -SIZE (ampache-5.5.7_all.zip) = 58923907 +TIMESTAMP = 1683967385 +SHA256 (ampache-5.6.0_all.zip) = a3b6d8fe9179f49d0b2b3578b0ea02f9d38259d1d9584af81b26fa6cf98859ca +SIZE (ampache-5.6.0_all.zip) = 58936006 diff --git a/audio/ampache/files/patch-htaccess b/audio/ampache/files/patch-htaccess new file mode 100644 index 000000000000..ac721dff0d6f --- /dev/null +++ b/audio/ampache/files/patch-htaccess @@ -0,0 +1,53 @@ +Since Apache r1908095 [1], it has become far less forgiving of 'invalid characters' in Rewrite patterns, for example patterns with spaces. + +Songs often have spaces in the filenames, so it is necessary to pass them. + +[1] https://svn.apache.org/viewvc?view=revision&revision=1908095 + +[2] https://webmasters.stackexchange.com/questions/141837/ah10411-rewritten-query-string-contains-control-characters-or-spaces + +diff --git a/public/daap/.htaccess b/public/daap/.htaccess +index b1e0ee01b..0d8fc6e69 100644 +--- public/daap/.htaccess ++++ public/daap/.htaccess +@@ -2,5 +2,5 @@ + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-s +- RewriteRule ^(.+)$ /index.php?action=$1 [PT,L,QSA] +- +\ No newline at end of file ++ RewriteRule ^(.+)$ /index.php?action=$1 "[PT,L,QSA,B= ?,BNP]" ++ +diff --git a/public/play/.htaccess.dist b/public/play/.htaccess.dist +index e1320aaae..6a11825a9 100644 +--- public/play/.htaccess.dist ++++ public/play/.htaccess.dist +@@ -2,8 +2,8 @@ + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-s +- RewriteRule ^art/([^/]+)/([^/]+)/([0-9]+)/thumb([0-9]*)\.([a-z]+)$ /image.php?object_type=$2&object_id=$3&auth=$1&thumb=$4&name=art.jpg [L] +- RewriteRule ^([^/]+)/([^/]+)/([^/]+)/([^/]+)(/.*)?$ /play/$5?$1=$2&$3=$4 [N,QSA] +- RewriteRule ^([^/]+)/([^/]+)(/.*)?$ /play/$3?$1=$2 [N,QSA] +- RewriteRule ^(/[^/]+|[^/]+/|/?)$ /play/index.php [L,QSA] ++ RewriteRule ^art/([^/]+)/([^/]+)/([0-9]+)/thumb([0-9]*)\.([a-z]+)$ /image.php?object_type=$2&object_id=$3&auth=$1&thumb=$4&name=art.jpg "[L,B= ?,BNP]" ++ RewriteRule ^([^/]+)/([^/]+)/([^/]+)/([^/]+)(/.*)?$ /play/$5?$1=$2&$3=$4 "[N,QSA,B= ?,BNP]" ++ RewriteRule ^([^/]+)/([^/]+)(/.*)?$ /play/$3?$1=$2 "[N,QSA,B= ?,BNP]" ++ RewriteRule ^(/[^/]+|[^/]+/|/?)$ /play/index.php "[L,QSA,B= ?,BNP]" + +diff --git a/public/rest/.htaccess.dist b/public/rest/.htaccess.dist +index 182930219..65cff9e4f 100644 +--- public/rest/.htaccess.dist ++++ public/rest/.htaccess.dist +@@ -2,6 +2,6 @@ + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-s +- RewriteRule ^(.+)\.view$ /rest/index.php?ssaction=$1 [PT,L,QSA] +- RewriteRule ^fake/(.+)$ /play/$1 [PT,L,QSA] +- +\ No newline at end of file ++ RewriteRule ^(.+)\.view$ /rest/index.php?ssaction=$1 "[PT,L,QSA,B= ?,BNP]" ++ RewriteRule ^fake/(.+)$ /play/$1 "[PT,L,QSA,B= ?,BNP]" ++ diff --git a/audio/ampache/pkg-plist b/audio/ampache/pkg-plist index e80b0dd173d3..8bbf2b85492b 100644 --- a/audio/ampache/pkg-plist +++ b/audio/ampache/pkg-plist @@ -5916,6 +5916,7 @@ man/man1/ampache.1.gz %%WWWDIR%%/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php %%WWWDIR%%/vendor/myclabs/deep-copy/src/DeepCopy/Exception/CloneException.php %%WWWDIR%%/vendor/myclabs/deep-copy/src/DeepCopy/Exception/PropertyException.php +%%WWWDIR%%/vendor/myclabs/deep-copy/src/DeepCopy/Filter/ChainableFilter.php %%WWWDIR%%/vendor/myclabs/deep-copy/src/DeepCopy/Filter/Doctrine/DoctrineCollectionFilter.php %%WWWDIR%%/vendor/myclabs/deep-copy/src/DeepCopy/Filter/Doctrine/DoctrineEmptyCollectionFilter.php %%WWWDIR%%/vendor/myclabs/deep-copy/src/DeepCopy/Filter/Doctrine/DoctrineProxyFilter.php @@ -7359,7 +7360,7 @@ man/man1/ampache.1.gz %%WWWDIR%%/vendor/phpmailer/phpmailer/src/PHPMailer.php %%WWWDIR%%/vendor/phpmailer/phpmailer/src/POP3.php %%WWWDIR%%/vendor/phpmailer/phpmailer/src/SMTP.php -%%WWWDIR%%/vendor/phpunit/php-code-coverage/ChangeLog.md +%%WWWDIR%%/vendor/phpunit/php-code-coverage/ChangeLog-9.2.md %%WWWDIR%%/vendor/phpunit/php-code-coverage/LICENSE %%WWWDIR%%/vendor/phpunit/php-code-coverage/README.md %%WWWDIR%%/vendor/phpunit/php-code-coverage/composer.json @@ -10117,6 +10118,8 @@ man/man1/ampache.1.gz %%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.1.inc.fixed %%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.2.inc %%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.2.inc.fixed +%%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc +%%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc.fixed %%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.css %%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.css.fixed %%WWWDIR%%/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.js @@ -11081,6 +11084,10 @@ man/man1/ampache.1.gz %%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/FinallyTest.php %%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/GotoLabelTest.inc %%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/GotoLabelTest.php +%%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocNowdocCloserTest.inc +%%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocNowdocCloserTest.php +%%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocStringTest.inc +%%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocStringTest.php %%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.inc %%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.php %%WWWDIR%%/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NullsafeObjectOperatorTest.inc