From 4dd9320140988c58abc574e73693fe399450d57c Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Tue, 6 Dec 2016 14:50:57 +0100 Subject: community/minidlna: move to community and update db dir moved db dir from /var/cache to /var/lib added a check in post-upgrade to notify use of this change --- community/minidlna/APKBUILD | 72 ++++++++++++++++++++++++++++++++ community/minidlna/minidlna.confd | 14 +++++++ community/minidlna/minidlna.initd | 26 ++++++++++++ community/minidlna/minidlna.post-upgrade | 10 +++++ community/minidlna/minidlna.pre-install | 7 ++++ main/minidlna/APKBUILD | 71 ------------------------------- main/minidlna/minidlna.confd | 14 ------- main/minidlna/minidlna.initd | 26 ------------ main/minidlna/minidlna.pre-install | 7 ---- 9 files changed, 129 insertions(+), 118 deletions(-) create mode 100644 community/minidlna/APKBUILD create mode 100644 community/minidlna/minidlna.confd create mode 100644 community/minidlna/minidlna.initd create mode 100644 community/minidlna/minidlna.post-upgrade create mode 100644 community/minidlna/minidlna.pre-install delete mode 100644 main/minidlna/APKBUILD delete mode 100644 main/minidlna/minidlna.confd delete mode 100755 main/minidlna/minidlna.initd delete mode 100644 main/minidlna/minidlna.pre-install diff --git a/community/minidlna/APKBUILD b/community/minidlna/APKBUILD new file mode 100644 index 0000000000..cab6b58ea9 --- /dev/null +++ b/community/minidlna/APKBUILD @@ -0,0 +1,72 @@ +# Contributor: Carlo Landmeter +# Maintainer: Francesco Colista +pkgname=minidlna +pkgver=1.1.5 +pkgrel=3 +pkgdesc="A small dlna server" +url="http://sourceforge.net/projects/minidlna/" +arch="all" +license="GPL" +depends= +makedepends=" + bsd-compat-headers + libvorbis-dev + libogg-dev + libid3tag-dev + libexif-dev + libjpeg-turbo-dev + sqlite-dev + ffmpeg-dev + flac-dev + " +install="minidlna.pre-install minidlna.post-upgrade" +subpackages="$pkgname-doc" +pkgusers="$pkgname" +pkggroups="$pkgname" +source="http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz + $pkgname.initd + $pkgname.confd + " + +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --with-os-name="Alpine Linux" \ + --with-db-path=/var/lib/minidlna \ + --with-log-path=/var/log/minidlna \ + || return 1 + make || return 1 +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install || return 1 + install -dm750 -o $pkgusers -g $pkggroups \ + "$pkgdir/var/lib/$pkgname" \ + "$pkgdir/var/log/$pkgname" || return 1 + install -m755 -D "$srcdir/$pkgname.initd" \ + "$pkgdir/etc/init.d/$pkgname" || return 1 + install -m644 -D "$srcdir/$pkgname.confd" \ + "$pkgdir/etc/conf.d/$pkgname" || return 1 + install -m644 -D "$pkgname.conf" \ + "$pkgdir"/etc/$pkgname.conf || return 1 + install -Dm644 "$srcdir"/$pkgname-$pkgver/minidlna.conf.5 \ + "$pkgdir"/usr/share/man/man5/minidlna.conf.5 || return 1 + install -Dm644 "$srcdir"/$pkgname-$pkgver/minidlnad.8 \ + "$pkgdir"/usr/share/man/man8/minidlnad.8 || return 1 +} + +md5sums="1970e553a1eb8a3e7e302e2ce292cbc4 minidlna-1.1.5.tar.gz +6dd1ec5560ac30d7a04244101e912d45 minidlna.initd +59d14c1bf3cd637138bfa58db7255d78 minidlna.confd" +sha256sums="8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b minidlna-1.1.5.tar.gz +251e790bb8adb91b4d00dd47543b9b02409879ade0853ebc3bd0fc0184bd485e minidlna.initd +67603d65c6bd3918255f050cb5cfd6fc1373b024bca1ce728f03491a90d79e19 minidlna.confd" +sha512sums="2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa minidlna-1.1.5.tar.gz +e16961bb68c004297f1e26422b1d15bd8583ba2e0e36c88902a45573b685993fff88d2d0dae8c624eaeddb0deca614dbc13b8345f34b4c348961c00b05c0df30 minidlna.initd +e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 minidlna.confd" diff --git a/community/minidlna/minidlna.confd b/community/minidlna/minidlna.confd new file mode 100644 index 0000000000..97d15b00c3 --- /dev/null +++ b/community/minidlna/minidlna.confd @@ -0,0 +1,14 @@ +# /etc/conf.d/minidlna + +# Should minidlna rescan the entire collection on startup? +# Warning: This may take a long time! +RESCAN="false" + +# The location of the config file +#CONFIG="/etc/minidlna.conf" + +# Specify the user/group minidlna should run as +#M_USER="minidlna" +#M_GROUP="minidlna" + +# vim: ft=gentoo-conf-d diff --git a/community/minidlna/minidlna.initd b/community/minidlna/minidlna.initd new file mode 100644 index 0000000000..f91733bbee --- /dev/null +++ b/community/minidlna/minidlna.initd @@ -0,0 +1,26 @@ +#!/sbin/openrc-run + +name="MiniDLNA" +configfile="${CONFIG:-/etc/minidlna.conf}" +start_stop_daemon_args="--user ${M_USER:-minidlna} --group ${M_GROUP:-minidlna}" +pidfile="/run/minidlna/minidlna.pid" +command=/usr/sbin/minidlnad +command_args="-f ${configfile} -P $pidfile" + +depend() { + need net +} + +start_pre() { + if ! [ -f "${configfile}" ]; then + eerror "${configfile} is missing" + return 1 + fi + if yesno "${RESCAN}"; then + command_args="$command_args -R" + fi + + checkpath --owner ${M_USER:-minidlna}:${M_GROUP:-minidlna} \ + --directory ${pidfile%/*} +} + diff --git a/community/minidlna/minidlna.post-upgrade b/community/minidlna/minidlna.post-upgrade new file mode 100644 index 0000000000..a51e9bf0cd --- /dev/null +++ b/community/minidlna/minidlna.post-upgrade @@ -0,0 +1,10 @@ +#!/bin/sh + +db_dir="/var/cache/minidlna" + +if [ -d "$db_dir" ]; then + echo "WARNING: $db_dir found!" + echo "Please move $db_dir to /var/lib/minidlna" +fi + +exit 0 diff --git a/community/minidlna/minidlna.pre-install b/community/minidlna/minidlna.pre-install new file mode 100644 index 0000000000..e06c1c7c1a --- /dev/null +++ b/community/minidlna/minidlna.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +addgroup -S minidlna 2>/dev/null +adduser -S -D -H -h /var/run/minidlna -s /sbin/nologin -G minidlna \ + -g minidlna minidlna 2>/dev/null + +exit 0 diff --git a/main/minidlna/APKBUILD b/main/minidlna/APKBUILD deleted file mode 100644 index bf38101ee9..0000000000 --- a/main/minidlna/APKBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# Contributor: Carlo Landmeter -# Maintainer: Francesco Colista -pkgname=minidlna -pkgver=1.1.5 -pkgrel=2 -pkgdesc="A small dlna server" -url="http://sourceforge.net/projects/minidlna/" -arch="all" -license="GPL" -depends= -depends_dev="" -makedepends="$depends_dev bsd-compat-headers libvorbis-dev libogg-dev - libid3tag-dev libexif-dev libjpeg-turbo-dev sqlite-dev ffmpeg-dev flac-dev" -install="minidlna.pre-install" -subpackages="$pkgname-doc" -pkgusers="$pkgname" -pkggroups="$pkgname" -source="http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz - $pkgname.initd - $pkgname.confd" - -_builddir="$srcdir/$pkgname-$pkgver" - -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done - #update_config_sub || return 1 -} - -build() { - cd "$_builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - mkdir -p "$pkgdir"/var/cache/$pkgname || return 1 - chown $pkgusers:$pkggroups \ - "$pkgdir"/var/cache/$pkgname || return 1 - install -m755 -D "$srcdir/$pkgname.initd" \ - "$pkgdir/etc/init.d/$pkgname" || return 1 - install -m644 -D "$srcdir/$pkgname.confd" \ - "$pkgdir/etc/conf.d/$pkgname" || return 1 - install -m755 -D "$pkgname.conf" \ - "$pkgdir"/etc/$pkgname.conf || return 1 - install -Dm644 "$srcdir"/$pkgname-$pkgver/minidlna.conf.5 \ - "$pkgdir"/usr/share/man/man5/minidlna.conf.5 || return 1 - install -Dm644 "$srcdir"/$pkgname-$pkgver/minidlnad.8 \ - "$pkgdir"/usr/share/man/man8/minidlnad.8 || return 1 -} - -md5sums="1970e553a1eb8a3e7e302e2ce292cbc4 minidlna-1.1.5.tar.gz -a27293006f33c6252de92599b5163eaa minidlna.initd -59d14c1bf3cd637138bfa58db7255d78 minidlna.confd" -sha256sums="8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b minidlna-1.1.5.tar.gz -3129a8b71322ceccebb05be8d0c25c28315888b5697eb9b746b66aabb8ed77ce minidlna.initd -67603d65c6bd3918255f050cb5cfd6fc1373b024bca1ce728f03491a90d79e19 minidlna.confd" -sha512sums="2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa minidlna-1.1.5.tar.gz -36ff0287e5db38bce9bf885ab89ad53e0f15f250dbb87bb508c1e643d0de866eea54b49b5798b65fed1af052134357134311f63f6698b5072c4134c07d159cac minidlna.initd -e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 minidlna.confd" diff --git a/main/minidlna/minidlna.confd b/main/minidlna/minidlna.confd deleted file mode 100644 index 97d15b00c3..0000000000 --- a/main/minidlna/minidlna.confd +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/conf.d/minidlna - -# Should minidlna rescan the entire collection on startup? -# Warning: This may take a long time! -RESCAN="false" - -# The location of the config file -#CONFIG="/etc/minidlna.conf" - -# Specify the user/group minidlna should run as -#M_USER="minidlna" -#M_GROUP="minidlna" - -# vim: ft=gentoo-conf-d diff --git a/main/minidlna/minidlna.initd b/main/minidlna/minidlna.initd deleted file mode 100755 index 4d5a2fe902..0000000000 --- a/main/minidlna/minidlna.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run - -name="MiniDLNA" -configfile="${CONFIG:-/etc/minidlna.conf}" -start_stop_daemon_args="--user ${M_USER:-minidlna} --group ${M_GROUP:-minidlna}" -pidfile="/var/run/minidlna/minidlna.pid" -command=/usr/sbin/minidlnad -command_args="-f ${configfile} -P $pidfile" - -depend() { - need net -} - -start_pre() { - if ! [ -f "${configfile}" ]; then - eerror "${configfile} is missing" - return 1 - fi - if yesno "${RESCAN}"; then - command_args="$command_args -R" - fi - - checkpath --owner ${M_USER:-minidlna}:${M_GROUP:-minidlna} \ - --directory ${pidfile%/*} -} - diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install deleted file mode 100644 index e06c1c7c1a..0000000000 --- a/main/minidlna/minidlna.pre-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -addgroup -S minidlna 2>/dev/null -adduser -S -D -H -h /var/run/minidlna -s /sbin/nologin -G minidlna \ - -g minidlna minidlna 2>/dev/null - -exit 0 -- cgit v1.2.3