Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ampache: update to 5.5.1.
@ 2022-08-29 19:50 TinfoilSubmarine
  2022-08-29 19:51 ` [PR PATCH] [Updated] " TinfoilSubmarine
  2022-09-06  6:01 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 2 replies; 3+ messages in thread
From: TinfoilSubmarine @ 2022-08-29 19:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/ampache
https://github.com/void-linux/void-packages/pull/38973

ampache: update to 5.5.1.
add note about upgrading from 4.x.x to 5.x.x

devendor nginx config, upstream has instructions for a bunch of
different webservers in their wiki

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38973.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/ampache-38973.patch --]
[-- Type: text/x-diff, Size: 4350 bytes --]

From b9552a334f7fccb415bf4b141331b073df8ae9fe Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 29 Aug 2022 15:29:57 -0400
Subject: [PATCH] ampache: update to 5.5.1.

add note about upgrading from 4.x.x to 5.x.x

devendor nginx config, upstream has instructions for a bunch of
different webservers in their wiki
---
 srcpkgs/ampache/INSTALL.msg              |  5 ++
 srcpkgs/ampache/files/nginx-example.conf | 80 ------------------------
 srcpkgs/ampache/template                 |  9 ++-
 3 files changed, 9 insertions(+), 85 deletions(-)
 create mode 100644 srcpkgs/ampache/INSTALL.msg
 delete mode 100644 srcpkgs/ampache/files/nginx-example.conf

diff --git a/srcpkgs/ampache/INSTALL.msg b/srcpkgs/ampache/INSTALL.msg
new file mode 100644
index 000000000000..406c05ff3b0d
--- /dev/null
+++ b/srcpkgs/ampache/INSTALL.msg
@@ -0,0 +1,5 @@
+WARNING: There have been breaking changes from ampache 4.x.x to 5.x.x
+
+Be sure to check the upstream documentation and make necessary changes:
+
+https://github.com/ampache/ampache/wiki/Ampache-next-Changes
diff --git a/srcpkgs/ampache/files/nginx-example.conf b/srcpkgs/ampache/files/nginx-example.conf
deleted file mode 100644
index ced954925819..000000000000
--- a/srcpkgs/ampache/files/nginx-example.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-server {
-   listen   80;
-   server_name FQDN;
-   charset utf-8;
-
-   root PATH;
-   index index.php;
-
-   # Rewrite rule for Subsonic backend
-   if ( !-d $request_filename ) {
-      rewrite ^/rest/(.*).view$ /rest/index.php?action=$1 last;
-      rewrite ^/rest/fake/(.+)$ /play/$1 last;
-   }
-
-   # Rewrite rule for Plex backend
-   if ( !-d $request_filename ) {
-      rewrite ^/plex/(.*)$ /plex/index.php?action=$1 last;
-   }
-
-   # Rewrite rule for Channels
-   if (!-d $request_filename){
-      rewrite ^/channel/([0-9]+)/(.*)$ /channel/index.php?channel=$1&target=$2 last;
-   }
-
-   # Beautiful URL Rewriting
-   rewrite ^/play/ssid/(\w+)/type/(\w+)/oid/([0-9]+)/uid/([0-9]+)/name/(.*)$ /play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&name=$5 last;
-   rewrite ^/play/ssid/(\w+)/type/(\w+)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/name/(.*)$ /play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&name=$7 last;
-   location /play {
-      if (!-e $request_filename) {
-         rewrite ^/play/art/([^/]+)/([^/]+)/([0-9]+)/thumb([0-9]*)\.([a-z]+)$ /image.php?object_type=$2&object_id=$3&auth=$1;
-         break;
-      }
-
-      rewrite ^/([^/]+)/([^/]+)(/.*)?$ /play/$3?$1=$2;
-      rewrite ^/(/[^/]+|[^/]+/|/?)$ /play/index.php last;
-      break;
-   }
-
-   location /rest {
-      limit_except GET POST {
-         deny all;
-      }
-   }
-
-   location /plex {
-      limit_except GET POST {
-         deny all;
-      }
-   }
-
-   location ^~ /bin/ {
-      deny all;
-      return 403;
-   }
-
-   location ^~ /config/ {
-      deny all;
-      return 403;
-   }
-
-   location / {
-      limit_except GET POST HEAD{
-         deny all;
-      }
-   }
-
-   location ~ ^/.*.php {
-    # PHP config...
-   }
-
-   # Rewrite rule for WebSocket
-   location /ws {
-    rewrite ^/ws/(.*) /$1 break;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $host;
-    proxy_pass http://127.0.0.1:8100/;
-   }
-}
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index b54f63865063..04d125cb3023 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,6 +1,6 @@
 # Template file for 'ampache'
 pkgname=ampache
-version=4.2.3
+version=5.5.1
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -10,12 +10,11 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="http://ampache.org"
 distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=26e5984d5582c0bd1789626c7b07ce86ada86d64e0e5549baac625236a36e5ad
-python_version=2
+checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+python_version=3
 
 do_install() {
 	vmkdir usr/share/webapps/${pkgname}
 	cp -rT ${wrksrc} ${DESTDIR}/usr/share/webapps/${pkgname}
-	vlicense docs/AGPL-LICENSE
-	vinstall ${FILESDIR}/nginx-example.conf 644 usr/share/doc/${pkgname}
+	vlicense LICENSE.md
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] ampache: update to 5.5.1.
  2022-08-29 19:50 [PR PATCH] ampache: update to 5.5.1 TinfoilSubmarine
@ 2022-08-29 19:51 ` TinfoilSubmarine
  2022-09-06  6:01 ` [PR PATCH] [Merged]: " classabbyamp
  1 sibling, 0 replies; 3+ messages in thread
From: TinfoilSubmarine @ 2022-08-29 19:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/ampache
https://github.com/void-linux/void-packages/pull/38973

ampache: update to 5.5.1.
add note about upgrading from 4.x.x to 5.x.x

devendor nginx config, upstream has instructions for a bunch of
different webservers in their wiki

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38973.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/ampache-38973.patch --]
[-- Type: text/x-diff, Size: 4449 bytes --]

From 96460d76f09e006d13eca86a6b1aa7983c188d22 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 29 Aug 2022 15:29:57 -0400
Subject: [PATCH] ampache: update to 5.5.1.

add note about upgrading from 4.x.x to 5.x.x

devendor nginx config, upstream has instructions for a bunch of
different webservers in their wiki
---
 srcpkgs/ampache/INSTALL.msg              |  5 ++
 srcpkgs/ampache/files/nginx-example.conf | 80 ------------------------
 srcpkgs/ampache/template                 | 11 ++--
 3 files changed, 10 insertions(+), 86 deletions(-)
 create mode 100644 srcpkgs/ampache/INSTALL.msg
 delete mode 100644 srcpkgs/ampache/files/nginx-example.conf

diff --git a/srcpkgs/ampache/INSTALL.msg b/srcpkgs/ampache/INSTALL.msg
new file mode 100644
index 000000000000..406c05ff3b0d
--- /dev/null
+++ b/srcpkgs/ampache/INSTALL.msg
@@ -0,0 +1,5 @@
+WARNING: There have been breaking changes from ampache 4.x.x to 5.x.x
+
+Be sure to check the upstream documentation and make necessary changes:
+
+https://github.com/ampache/ampache/wiki/Ampache-next-Changes
diff --git a/srcpkgs/ampache/files/nginx-example.conf b/srcpkgs/ampache/files/nginx-example.conf
deleted file mode 100644
index ced954925819..000000000000
--- a/srcpkgs/ampache/files/nginx-example.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-server {
-   listen   80;
-   server_name FQDN;
-   charset utf-8;
-
-   root PATH;
-   index index.php;
-
-   # Rewrite rule for Subsonic backend
-   if ( !-d $request_filename ) {
-      rewrite ^/rest/(.*).view$ /rest/index.php?action=$1 last;
-      rewrite ^/rest/fake/(.+)$ /play/$1 last;
-   }
-
-   # Rewrite rule for Plex backend
-   if ( !-d $request_filename ) {
-      rewrite ^/plex/(.*)$ /plex/index.php?action=$1 last;
-   }
-
-   # Rewrite rule for Channels
-   if (!-d $request_filename){
-      rewrite ^/channel/([0-9]+)/(.*)$ /channel/index.php?channel=$1&target=$2 last;
-   }
-
-   # Beautiful URL Rewriting
-   rewrite ^/play/ssid/(\w+)/type/(\w+)/oid/([0-9]+)/uid/([0-9]+)/name/(.*)$ /play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&name=$5 last;
-   rewrite ^/play/ssid/(\w+)/type/(\w+)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/name/(.*)$ /play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&name=$7 last;
-   location /play {
-      if (!-e $request_filename) {
-         rewrite ^/play/art/([^/]+)/([^/]+)/([0-9]+)/thumb([0-9]*)\.([a-z]+)$ /image.php?object_type=$2&object_id=$3&auth=$1;
-         break;
-      }
-
-      rewrite ^/([^/]+)/([^/]+)(/.*)?$ /play/$3?$1=$2;
-      rewrite ^/(/[^/]+|[^/]+/|/?)$ /play/index.php last;
-      break;
-   }
-
-   location /rest {
-      limit_except GET POST {
-         deny all;
-      }
-   }
-
-   location /plex {
-      limit_except GET POST {
-         deny all;
-      }
-   }
-
-   location ^~ /bin/ {
-      deny all;
-      return 403;
-   }
-
-   location ^~ /config/ {
-      deny all;
-      return 403;
-   }
-
-   location / {
-      limit_except GET POST HEAD{
-         deny all;
-      }
-   }
-
-   location ~ ^/.*.php {
-    # PHP config...
-   }
-
-   # Rewrite rule for WebSocket
-   location /ws {
-    rewrite ^/ws/(.*) /$1 break;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $host;
-    proxy_pass http://127.0.0.1:8100/;
-   }
-}
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index b54f63865063..fd67feb0d0ec 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,21 +1,20 @@
 # Template file for 'ampache'
 pkgname=ampache
-version=4.2.3
+version=5.5.1
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
-depends="php mariadb"
+depends="php8.1 mariadb"
 short_desc="Web-based tool for managing your audio/video files"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="http://ampache.org"
 distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=26e5984d5582c0bd1789626c7b07ce86ada86d64e0e5549baac625236a36e5ad
-python_version=2
+checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+python_version=3
 
 do_install() {
 	vmkdir usr/share/webapps/${pkgname}
 	cp -rT ${wrksrc} ${DESTDIR}/usr/share/webapps/${pkgname}
-	vlicense docs/AGPL-LICENSE
-	vinstall ${FILESDIR}/nginx-example.conf 644 usr/share/doc/${pkgname}
+	vlicense LICENSE.md
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: ampache: update to 5.5.1.
  2022-08-29 19:50 [PR PATCH] ampache: update to 5.5.1 TinfoilSubmarine
  2022-08-29 19:51 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-09-06  6:01 ` classabbyamp
  1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2022-09-06  6:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]

There's a merged pull request on the void-packages repository

ampache: update to 5.5.1.
https://github.com/void-linux/void-packages/pull/38973

Description:
add note about upgrading from 4.x.x to 5.x.x

devendor nginx config, upstream has instructions for a bunch of
different webservers in their wiki

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-09-06  6:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-29 19:50 [PR PATCH] ampache: update to 5.5.1 TinfoilSubmarine
2022-08-29 19:51 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-09-06  6:01 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).