Update to version 6.2.9080

Instead of extracting SOME of the configuration variables into /etc/madsonic6.conf you'll have to edit madsonic.sh directly
Also this package has no conflicts with subsonic besides the same default port.

5 files changed, 16 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4286601c5b2..542b1781ecc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,22 @@
-# Generated by mksrcinfo v8
-# Wed Feb 10 20:56:50 UTC 2016
 pkgbase = madsonic6
 	pkgdesc = Madsonic Mashup Mod is a fork of the Subsonic Server Build with some Subsonic Data schema modifications! This is the latest stable version.:
-	pkgver = 6.0.7860
+	pkgver = 6.2.9080
 	pkgrel = 1
 	url = http://madsonic.org/
 	install = madsonic6.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = jre7-openjdk-headless
+	depends = java-runtime-headless
 	depends = fontconfig
 	depends = libcups
 	optdepends = ffmpeg: Audio Transcoding
-	conflicts = subsonic-beta
-	conflicts = subsonic
-	conflicts = subsonic-git
-	conflicts = madsonic-beta
-	conflicts = madsonic
 	backup = var/madsonic6/db
 	backup = var/madsonic6/madsonic.sh
-	backup = etc/madsonic6.conf
-	source = http://madsonic.org/download/6.0/20160109_madsonic-6.0.7860-standalone.tar.gz
+	source = http://madsonic.org/download/6.2/20161222_madsonic-6.2.9080-standalone.tar.gz
 	source = madsonic6.service
-	source = enable_config_v6.patch
-	source = madsonic6.conf
-	md5sums = 8a818cb0d3d8cf509e2f5f0964d08c84
-	md5sums = 2d9b4da84d5e148a6d09a9e07d7050f2
-	md5sums = 7ec18a1247f9215670a5e41ac047dcf1
-	md5sums = fcc60cd39c137f39d27e5be56ea3ef0e
+	sha256sums = a92968d4338ac1f3e89adc07bc8796b03fb4ca0acf986bfb39d298b4afe2d42a
+	sha256sums = e2a088a5207175e6e91470ba8e5a7db44ef98b6a5936d1e17b8f20013b99f926
 
 pkgname = madsonic6
 
diff --git a/PKGBUILD b/PKGBUILD
index 33ba9b6b3c38..83d9f26504c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,25 @@
-# Maintainer: Chris <alostengineer at narmos dot org>
+# Maintainer: Robert Sprunk <archlinux@sprunk.me>
+
 pkgname=madsonic6
-pkgver=6.0.7860
-pkgvera=6.0
-pkgdate=20160109
+pkgver=6.2.9080
+pkgvera=6.2
+pkgdate=20161222
 pkgrel=1
 pkgdesc="Madsonic Mashup Mod is a fork of the Subsonic Server Build with some Subsonic Data schema modifications! This is the latest stable version.:"
 arch=('i686' 'x86_64')
 url="http://madsonic.org/"
 license=('GPL')
-depends=('jre7-openjdk-headless' 'fontconfig' 'libcups')
+depends=('java-runtime-headless' 'fontconfig' 'libcups')
 optdepends=('ffmpeg: Audio Transcoding')
-conflicts=('subsonic-beta' 'subsonic' 'subsonic-git' 'madsonic-beta' 'madsonic')
 
 
 source=(http://madsonic.org/download/${pkgvera}/${pkgdate}_madsonic-${pkgver}-standalone.tar.gz
-'madsonic6.service' 
-'enable_config_v6.patch' 
-'madsonic6.conf')
+'madsonic6.service')
 
-md5sums=('8a818cb0d3d8cf509e2f5f0964d08c84'
-	 '2d9b4da84d5e148a6d09a9e07d7050f2'
-	 '7ec18a1247f9215670a5e41ac047dcf1'
-	 'fcc60cd39c137f39d27e5be56ea3ef0e'  )
+sha256sums=('a92968d4338ac1f3e89adc07bc8796b03fb4ca0acf986bfb39d298b4afe2d42a'
+	 'e2a088a5207175e6e91470ba8e5a7db44ef98b6a5936d1e17b8f20013b99f926')
 
-backup=('var/madsonic6/db' 'var/madsonic6/madsonic.sh' 'etc/madsonic6.conf')
+backup=('var/madsonic6/db' 'var/madsonic6/madsonic.sh')
 install=$pkgname.install
 #changelog=CHANGELOG
  
@@ -34,10 +30,5 @@ package() {
   install -m 644 -t $pkgdir/var/madsonic6 $srcdir/license.txt
   mkdir -p $pkgdir/usr/lib/systemd/system
   install -m 644 -t $pkgdir/usr/lib/systemd/system $srcdir/madsonic6.service
-  mkdir -p $pkgdir/etc
-  install -m 644 -t $pkgdir/etc $srcdir/madsonic6.conf
-
-# Compatibility with both java runtime available in repos and AUR; locale fixes
-  patch $pkgdir/var/madsonic6/madsonic.sh $srcdir/enable_config_v6.patch
 }
 
diff --git a/enable_config_v6.patch b/enable_config_v6.patch
deleted file mode 100644
index d75165790df8..000000000000
--- a/enable_config_v6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- madsonic.sh	2015-08-06 12:49:44.168119164 -0400
-+++ madsonic-new.sh	2015-08-06 13:18:28.224548446 -0400
-@@ -9,20 +9,35 @@
- # Shell script for starting Madsonic.  See http://madsonic.org.
- ###################################################################################
- 
--MADSONIC_HOME=/var/madsonic
--MADSONIC_HOST=0.0.0.0
--MADSONIC_PORT=4040
-+JAVA_HOME=/opt/java/jre:/usr/lib/jvm/java-7-openjdk
-+export LANG=en_US.UTF-8
-+export LC_CTYPE=en_US.UTF-8
-+
-+# Check for config and source it
-+[[ -f /etc/madsonic.conf && -r /etc/madsonic.conf ]] && . /etc/madsonic.conf
-+
-+# Disable IPv6 if not enabled in config
-+USEIPV6=${LISTENIPV6:-true}
-+[[ $USEIPV6 == false ]] && export _JAVA_OPTIONS="-Djava.net.preferIPv4Stack=true"
-+
-+# Values can be set in config
-+MADSONIC_HOME=${MADSONIC_BASEDIR:-/var/madsonic6}
-+MADSONIC_HOST=${LISTEN_ADDR:-0.0.0.0}
-+MADSONIC_PORT=${LISTEN_PORT:-4040}
-+MADSONIC_INIT_MEMORY=${INIT_MEMORY:-192}
-+MADSONIC_MAX_MEMORY=${MAX_MEMORY:-384}
-+
- MADSONIC_HTTPS_PORT=0
- MADSONIC_CONTEXT_PATH=/
--MADSONIC_INIT_MEMORY=192
--MADSONIC_MAX_MEMORY=512
--MADSONIC_DEFAULT_MUSIC_FOLDER=/var/media/artists
--MADSONIC_DEFAULT_UPLOAD_FOLDER=/var/media/incoming
--MADSONIC_DEFAULT_PODCAST_FOLDER=/var/media/podcast
--MADSONIC_DEFAULT_PLAYLIST_IMPORT_FOLDER=/var/media/playlists/import
--MADSONIC_DEFAULT_PLAYLIST_EXPORT_FOLDER=/var/media/playlists/export
--MADSONIC_DEFAULT_PLAYLIST_BACKUP_FOLDER=/var/media/playlists/backup
-+
-+MADSONIC_DEFAULT_MUSIC_FOLDER=${MS_MUSIC_DIR:-/var/media/artists}
-+MADSONIC_DEFAULT_UPLOAD_FOLDER=${MS_UPLOAD_DIR:-/var/media/incoming}
-+MADSONIC_DEFAULT_PODCAST_FOLDER=${MS_PODCAST_DIR:-/var/media/podcast}
-+MADSONIC_DEFAULT_PLAYLIST_IMPORT_FOLDER=${MS_PLAYLIST_IMPORT_DIR:-/var/media/playlists/import}
-+MADSONIC_DEFAULT_PLAYLIST_EXPORT_FOLDER=${MS_PLAYLIST_EXPORT_DIR:-/var/media/playlists/export}
-+MADSONIC_DEFAULT_PLAYLIST_BACKUP_FOLDER=${MS_PLAYLIST_BACKUP_DIR:-/var/media/playlists/backup}
-+
- MADSONIC_DEFAULT_TRANSCODE_FOLDER=
- MADSONIC_DEFAULT_TIMEZONE=
diff --git a/madsonic6.conf b/madsonic6.conf
deleted file mode 100644
index 7cbc0412db4d..000000000000
--- a/madsonic6.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/webapps/madsonic.conf
-
-# Enable listening on IPv6
-# Values: false true
-# Default: true (IPv6 enabled)
-LISTENIPV6=true
-
-# Where madsonic lives
-# Default: /var/madsonic
-MADSONIC_BASEDIR=/var/madsonic6
-
-# Listen address and port
-# Default address: 0.0.0.0
-# Default port: 4040
-LISTEN_ADDR=0.0.0.0
-LISTEN_PORT=4040
-
-# Minimum and Maximum memory usage, in MB
-# Default Init: 192
-# Default Max: 314
-INIT_MEMORY=192
-MAX_MEMORY=314
-
-# Default directories
-MS_MUSIC_DIR=/var/media/artists
-MS_UPLOAD_DIR=/var/media/incoming
-MS_PODCAST_DIR=/var/media/podcast
-MS_PLAYLIST_IMPORT_DIR=/var/media/playlists/import
-MS_PLAYLIST_EXPORT_DIR=/var/media/playlists/export
-MS_PLAYLIST_BACKUP_DIR=/var/media/playlists/backup
diff --git a/madsonic6.install b/madsonic6.install
index d954ab35c44e..ee3c60c15196 100644
--- a/madsonic6.install
+++ b/madsonic6.install
@@ -3,7 +3,7 @@ post_install() {
   chown -R madsonic6:madsonic6 /var/madsonic6
   systemctl daemon-reload &> /dev/null
   echo "*************************************************"
-  echo "* Edit /etc/madsonic.conf to configure madsonic *"
+  echo "* Edit /var/madsonic6/madsonic.sh to configure madsonic *"
   echo "* Start with systemctl start madsonic6.service  *"
   echo "*************************************************"
 }