summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Shalygin2019-04-16 08:21:22 +0700
committerKonstantin Shalygin2019-04-16 08:21:22 +0700
commitdcea6fd0b760d6f461c9457c54061fd2ba27e5ff (patch)
tree3756ea54b68e5c3905a13f26243ee8e861a3248c
parentda677d82b969b0af3bbc63be084c959d41aa7e80 (diff)
downloadaur-xupnpd.tar.gz
Use bundled lua.
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD9
-rw-r--r--res_and_conf_dirs.patch12
-rw-r--r--xupnpd.service4
4 files changed, 12 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 73f5920fa9a..b047543ee09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Apr 6 05:09:36 UTC 2019
+# Tue Apr 16 01:20:51 UTC 2019
pkgbase = xupnpd
pkgdesc = eXtensible UPnP agent (proxy IP TV multicast to DLNA)
pkgver = 1.033
- pkgrel = 7
+ pkgrel = 8
url = http://xupnpd.org
arch = x86_64
arch = i686
@@ -12,8 +12,7 @@ pkgbase = xupnpd
arch = armv7h
license = GPL2
makedepends = git
- makedepends = lua
- makedepends = lua52-luajson
+ depends = openssl
optdepends = udpxy: custom udp to http proxy
backup = var/lib/xupnpd/xupnpd.lua
source = xupnpd::git+https://github.com/clark15b/xupnpd
@@ -21,8 +20,8 @@ pkgbase = xupnpd
source = xupnpd.service
source = sysusers.conf
sha256sums = SKIP
- sha256sums = 95d436d2bc55bd6fb8affdc4901045d0600092a6045a34f977f79a5950638114
- sha256sums = 0f6c2a42f676c24dba7bebc804a34f363b12e2dcb4c61bc547c0b722afe09808
+ sha256sums = d1a0060f3cfd2c89ccbaa4322ca184f152919991332b0c40da998d47cde4e01e
+ sha256sums = c5404309699c528e09ff399da1253e3ab6006040c51a1ad6c63d59f1f43c356e
sha256sums = 3f669a1034bcfb9923822fb0adf6d5a379beb7a184a89cd4d72a5b02bc072852
pkgname = xupnpd
diff --git a/PKGBUILD b/PKGBUILD
index adeb4dd0403..66415760395 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,19 +5,20 @@
pkgname='xupnpd'
pkgdesc="eXtensible UPnP agent (proxy IP TV multicast to DLNA)"
pkgver='1.033'
-pkgrel='7'
+pkgrel='8'
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
url="http://${pkgname}.org"
license=('GPL2')
-makedepends=('git' 'lua' 'lua52-luajson')
+depends=('openssl')
+makedepends=('git')
optdepends=('udpxy: custom udp to http proxy')
source=("${pkgname}::git+https://github.com/clark15b/${pkgname}"
"res_and_conf_dirs.patch"
"${pkgname}.service"
"sysusers.conf")
sha256sums=('SKIP'
- '95d436d2bc55bd6fb8affdc4901045d0600092a6045a34f977f79a5950638114'
- '0f6c2a42f676c24dba7bebc804a34f363b12e2dcb4c61bc547c0b722afe09808'
+ 'd1a0060f3cfd2c89ccbaa4322ca184f152919991332b0c40da998d47cde4e01e'
+ 'c5404309699c528e09ff399da1253e3ab6006040c51a1ad6c63d59f1f43c356e'
'3f669a1034bcfb9923822fb0adf6d5a379beb7a184a89cd4d72a5b02bc072852')
_var="var/lib/${pkgname}"
_usr="usr/share/${pkgname}"
diff --git a/res_and_conf_dirs.patch b/res_and_conf_dirs.patch
index a7db5d9efc3..39ed6257fd5 100644
--- a/res_and_conf_dirs.patch
+++ b/res_and_conf_dirs.patch
@@ -1,15 +1,3 @@
-diff -Naupr xupnpd_orig/src/main.cpp xupnpd/src/main.cpp
---- xupnpd_orig/src/main.cpp 2015-08-01 14:24:27.000000000 +0600
-+++ xupnpd/src/main.cpp 2015-08-01 14:25:51.843062978 +0600
-@@ -43,7 +43,7 @@ int main(int argc,char** argv)
- if(fp)
- fclose(fp);
- else
-- rc=chdir("/usr/share/xupnpd/");
-+ rc=chdir("/var/lib/xupnpd/");
- }
-
- lua_State* L=lua_open();
diff -Naupr xupnpd_orig/src/xupnpd.lua xupnpd/src/xupnpd.lua
--- xupnpd_orig/src/xupnpd.lua 2015-08-01 14:24:27.000000000 +0600
+++ xupnpd/src/xupnpd.lua 2015-08-01 14:26:57.139964797 +0600
diff --git a/xupnpd.service b/xupnpd.service
index bbf4c2d6fd2..5ca29963ddb 100644
--- a/xupnpd.service
+++ b/xupnpd.service
@@ -6,8 +6,8 @@ Wants=udpxy.service
[Service]
User=xupnpd
Group=xupnpd
-Type=forking
-PIDFile=/run/xupnpd/xupnpd.pid
+Type=simple
+Environment=XUPNPDROOTDIR=/var/lib/xupnpd/
ExecStart=/usr/bin/xupnpd
[Install]