Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/c210e225255d60767e147cac63e17e7dd10a4ac0)

7 files changed, 37 insertions, 163 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e659062a9b3..1f7384dead1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
+# Generated by makepkg 5.1.3
+# Sat Oct 12 17:30:12 UTC 2019
 pkgbase = minisatip
 	pkgdesc = SAT>IP server, tested with DVB-S, DVB-S2, DVB-T, DVB-T2, DVB-C, DVB-C2, ATSC and ISDB-T cards
-	pkgver = 0.5.69
-	pkgrel = 3
+	pkgver = 1.0.2
+	pkgrel = 1
 	url = https://minisatip.org
-	install = minisatip.install
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -11,24 +12,21 @@ pkgbase = minisatip
 	arch = armv7h
 	arch = aarch64
 	license = GPL2
-	makedepends = git
 	depends = libdvbcsa
 	depends = linuxtv-dvb-apps
+	depends = openssl
+	depends = libmcli
 	optdepends = oscam: channels descrambling
 	conflicts = minisatip-git
 	backup = etc/conf.d/minisatip
-	source = git+https://github.com/catalinii/minisatip.git#commit=bd493b1addd4a2d73ead880b5ea66a239e80224d
-	source = https://github.com/pipelka/minisatip/commit/814e794896078117368825421705af1c46a2bb90.patch
-	source = kernel-4.14-compat.patch
+	source = minisatip-1.0.2.tar.gz::https://github.com/catalinii/minisatip/archive/1.0.2.tar.gz
 	source = minisatip.service
 	source = minisatip.sysuser
 	source = minisatip.conf
-	sha256sums = SKIP
-	sha256sums = ac9a96ccf478e452a780b703ab8220b38dd44dc019266da3a3443f823634fe33
-	sha256sums = b0596e4cbf432496e32c5fe15401eabd5758ab22081ef9cbbaead5d1cdf19167
-	sha256sums = f049eff56a7ddfb7f59728084a7b8119a405a74e554979f7f07b6e2e890dfb75
-	sha256sums = f6b2b61c99c94e693cee6cdd77360ab5a6299dde76dbe4b5fa36ad0dc098b383
-	sha256sums = 92969280f6c5fc376b69d18d2f72784ee640e5ee1219230faf89dc7da00666fc
+	sha256sums = 095c44e5a62710ecead71d35f2bdf542ea1c83f2427f3c56ec340f559c4c29a3
+	sha256sums = 36631c2467b3486cf5f4d2fd3f9374959ac0aa89b0e6443a3883aa62440d682a
+	sha256sums = 7f4e7fde7ded632f88b30b7cd0481c78309f8191b40369ae323cbb7240fdc199
+	sha256sums = f7a28ad30d30c68ef54ba65cc562ce0d9a131f0ee2be20071cd93159f196946f
 
 pkgname = minisatip
 
diff --git a/PKGBUILD b/PKGBUILD
index dae71fa4b9c3..1858a9e5e299 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,38 @@
+# Maintainer: Manuel Reimer <manuel.reimer@gmx.de>
 # Maintainer: Tomasz Maciej Nowak <com[dot]gmail[at]tmn505>
 
-# All my PKGBUILDs are managed at https://github.com/tmn505/AUR
-
 pkgname='minisatip'
 pkgdesc='SAT>IP server, tested with DVB-S, DVB-S2, DVB-T, DVB-T2, DVB-C, DVB-C2, ATSC and ISDB-T cards'
-pkgver=0.5.69
-pkgrel=3
+pkgver=1.0.2
+pkgrel=1
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://minisatip.org'
 license=('GPL2')
 conflicts=('minisatip-git')
-makedepends=('git')
-depends=('libdvbcsa' 'linuxtv-dvb-apps')
+depends=('libdvbcsa' 'linuxtv-dvb-apps' 'openssl' 'libmcli')
 optdepends=('oscam: channels descrambling')
 backup=('etc/conf.d/minisatip')
-install='minisatip.install'
-source=('git+https://github.com/catalinii/minisatip.git#commit=bd493b1addd4a2d73ead880b5ea66a239e80224d'
-        'https://github.com/pipelka/minisatip/commit/814e794896078117368825421705af1c46a2bb90.patch'
-        'kernel-4.14-compat.patch'
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/catalinii/minisatip/archive/${pkgver}.tar.gz"
         'minisatip.service'
         'minisatip.sysuser'
         'minisatip.conf')
-sha256sums=('SKIP'
-            'ac9a96ccf478e452a780b703ab8220b38dd44dc019266da3a3443f823634fe33'
-            'b0596e4cbf432496e32c5fe15401eabd5758ab22081ef9cbbaead5d1cdf19167'
-            'f049eff56a7ddfb7f59728084a7b8119a405a74e554979f7f07b6e2e890dfb75'
-            'f6b2b61c99c94e693cee6cdd77360ab5a6299dde76dbe4b5fa36ad0dc098b383'
-            '92969280f6c5fc376b69d18d2f72784ee640e5ee1219230faf89dc7da00666fc')
-
-prepare() {
-	cd ${srcdir}/minisatip
-	# fix compilation after DMX_SET_SOURCE removal
-	patch -p1 -i ${srcdir}/kernel-4.14-compat.patch
-	# add EAC3 support
-	patch -p1 -i ${srcdir}/814e794896078117368825421705af1c46a2bb90.patch
-}
-
-pkgver() {
-	cd ${srcdir}/minisatip
-	tac minisatip.h | awk -F"[^.^0-9]*" '/VERSION_BUILD/ {printf $2}'
-}
+sha256sums=('095c44e5a62710ecead71d35f2bdf542ea1c83f2427f3c56ec340f559c4c29a3'
+            '36631c2467b3486cf5f4d2fd3f9374959ac0aa89b0e6443a3883aa62440d682a'
+            '7f4e7fde7ded632f88b30b7cd0481c78309f8191b40369ae323cbb7240fdc199'
+            'f7a28ad30d30c68ef54ba65cc562ce0d9a131f0ee2be20071cd93159f196946f')
 
 build() {
-	cd ${srcdir}/minisatip
-	./configure
-	sed -i 's/FLAGS?/FLAGS/g' Makefile
-	make EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --with-mcli=/usr/include/libmcli
+  make
 }
 
 package() {
-	cd ${srcdir}/minisatip
-	install -Dm644 ${srcdir}/minisatip.service ${pkgdir}/usr/lib/systemd/system/minisatip.service
-	install -Dm644 ${srcdir}/minisatip.sysuser ${pkgdir}/usr/lib/sysusers.d/minisatip.conf
-	install -Dm644 ${srcdir}/minisatip.conf ${pkgdir}/etc/conf.d/minisatip
-	install -Dm755 minisatip ${pkgdir}/usr/bin/minisatip
-	mkdir -p ${pkgdir}/var/lib/minisatip
-	cp -ar html ${pkgdir}/var/lib/minisatip
-	chown -fR 188:188 ${pkgdir}/var/lib/minisatip
+  cd ${srcdir}/${pkgname}-${pkgver}
+  install -Dm644 ${srcdir}/minisatip.service ${pkgdir}/usr/lib/systemd/system/minisatip.service
+  install -Dm644 ${srcdir}/minisatip.sysuser ${pkgdir}/usr/lib/sysusers.d/minisatip.conf
+  install -Dm644 ${srcdir}/minisatip.conf ${pkgdir}/etc/conf.d/minisatip
+  install -Dm755 minisatip ${pkgdir}/usr/bin/minisatip
+  mkdir -p "${pkgdir}/usr/share/minisatip/html"
+  cp -r html "${pkgdir}/usr/share/minisatip"
 }
diff --git a/kernel-4.14-compat.patch b/kernel-4.14-compat.patch
deleted file mode 100644
index b9f9d34b4850..000000000000
--- a/kernel-4.14-compat.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/adapter.c
-+++ b/adapter.c
-@@ -1562,6 +1562,7 @@ void set_adapters_delsys(char *o)
- 
- }
- 
-+#ifdef DMX_SET_SOURCE
- void set_adapter_dmxsource(char *o)
- {
- 	int i, j, la, st, end, fd;
-@@ -1601,6 +1602,7 @@ void set_adapter_dmxsource(char *o)
- 	}
- 
- }
-+#endif
- 
- int delsys_match(adapter *ad, int del_sys)
- {
---- a/adapter.h
-+++ b/adapter.h
-@@ -136,7 +136,9 @@ void set_diseqc_adapters(char *o);
- void set_diseqc_timing(char *o);
- void set_slave_adapters(char *o);
- void set_nopm_adapters(char *o);
-+#ifdef DMX_SET_SOURCE
- void set_adapter_dmxsource(char *o);
-+#endif
- void reset_pids_type(int aid, int clear_pat);
- void reset_ecm_type_for_key(int aid, int key);
- int delsys_match(adapter *ad, int del_sys);
---- a/dvb.c
-+++ b/dvb.c
-@@ -353,6 +353,7 @@ int dvb_open_device(adapter *ad)
- 	else
- 		LOG("DVR buffer set to %d bytes", opts.dvr_buffer);
- 
-+#ifdef DMX_SET_SOURCE
- 	if (ad->dmx_source >= 0)
- 	{
- 		sprintf(buf, "/dev/dvb/adapter%d/demux%d", ad->pa, ad->fn);
-@@ -370,6 +371,7 @@ int dvb_open_device(adapter *ad)
- 		close(ad->dmx);
- 		ad->dmx = -1;	
- 	}
-+#endif
- 
- 	return 0;
- }
---- a/minisatip.c
-+++ b/minisatip.c
-@@ -123,7 +123,9 @@ static const struct option long_options[] =
- #define DOCUMENTROOT_OPT 'R'
- #define XML_OPT 'X'
- #define THREADS_OPT 'T'
-+#ifdef DMX_SET_SOURCE
- #define DMXSOURCE_OPT '9'
-+#endif
- #define LNB_OPT 'L'
- #define DROP_ENCRYPTED_OPT 'E'
- #define UDPPORT_OPT 'P'
-@@ -243,9 +245,15 @@ Help\n\
- 	* eg: --delsys 1:dvbt,2:dvbs\n\
- 	- specifies adapter 1 as a DVBT device, adapter 2 as DVB-S, which overrides the system detection of the adapter\n\
- \n\
-+"
-+#ifdef DMX_SET_SOURCE
-+			"\
- * --dmx-source ADAPTER1:FRONTENDX - specifies the frontend number specified as argument for DMX_SET_SOURCE \n\
- 	* eg: --dmx-source 0:1 - enables DMX_SET_SOURCE ioctl call with parameter 1 for adapter 0\n\
- \n\
-+"
-+#endif
-+			"\
- * -e --enable-adapters list_of_enabled adapters: enable only specified adapters\n\
- 	* eg: -e 0-2,5,7 (no spaces between parameters)\n\
- 	- keep in mind that the first adapters are the local ones starting with 0 after that are the satip adapters \n\
-@@ -538,11 +546,13 @@ void set_options(int argc, char *argv[])
- 			break;
- 		}
- 
-+#ifdef DMX_SET_SOURCE
- 		case DMXSOURCE_OPT:
- 		{
- 			set_adapter_dmxsource(optarg);
- 			break;
- 		}
-+#endif
- 
- 		case UNICABLE_OPT:
- 		{
diff --git a/minisatip.conf b/minisatip.conf
index 646dfcda4fd2..2608e7db6e4a 100644
--- a/minisatip.conf
+++ b/minisatip.conf
@@ -1,2 +1,2 @@
-# Please omit the -f switch
+# Please omit the -f and -R switch
 SERVER_ARGS=""
diff --git a/minisatip.install b/minisatip.install
deleted file mode 100644
index c03f7006bf4e..000000000000
--- a/minisatip.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-	setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/minisatip
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	getent passwd minisatip &>/dev/null && userdel minisatip >/dev/null
-	getent group minisatip &>/dev/null && groupdel minisatip >/dev/null
-	return 0
-}
diff --git a/minisatip.service b/minisatip.service
index 9dfa098e1b74..1e8921b1e52f 100644
--- a/minisatip.service
+++ b/minisatip.service
@@ -1,15 +1,16 @@
 [Unit]
 Description=Mini SAT>IP server
-After=network.target
-Wants=oscam.service
+After=network-online.target
+Wants=network-online.target oscam.service
 
 [Service]
 User=minisatip
 Group=minisatip
-WorkingDirectory=/var/lib/minisatip
 Type=simple
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+RuntimeDirectory=libmcli
 EnvironmentFile=-/etc/conf.d/minisatip
-ExecStart=/usr/bin/minisatip -f $SERVER_ARGS
+ExecStart=/usr/bin/minisatip -f -R /usr/share/minisatip/html $SERVER_ARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/minisatip.sysuser b/minisatip.sysuser
index abb4004a6200..1f297fd721af 100644
--- a/minisatip.sysuser
+++ b/minisatip.sysuser
@@ -1,3 +1,3 @@
-u minisatip 188 minisatip
+u minisatip - -
 m minisatip video
 m minisatip uucp