diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | PKGBUILD | 44 | ||||
| -rw-r--r-- | kernel-4.14-compat.patch | 90 | ||||
| -rw-r--r-- | minisatip.conf | 2 | ||||
| -rw-r--r-- | minisatip.install | 1 | ||||
| -rw-r--r-- | minisatip.service | 2 | ||||
| -rw-r--r-- | minisatip.sysuser | 2 |
7 files changed, 127 insertions, 33 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Thu Feb 23 00:43:33 UTC 2017 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 = 2 + pkgrel = 3 url = https://minisatip.org install = minisatip.install arch = x86_64 @@ -17,19 +15,20 @@ pkgbase = minisatip depends = libdvbcsa depends = linuxtv-dvb-apps optdepends = oscam: channels descrambling - provides = minisatip conflicts = minisatip-git backup = etc/conf.d/minisatip - source = git+https://github.com/catalinii/minisatip#commit=bd493b1addd4a2d73ead880b5ea66a239e80224d - source = https://github.com/pipelka/minisatip/commit/814e794896078117368825421705af1c46a2bb90.diff + 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.service source = minisatip.sysuser source = minisatip.conf sha256sums = SKIP - sha256sums = d57af3559fe4ed74b21d5fe61cecd425aec1cc429aa127737113b6bffae9fecb - sha256sums = ea3b7b52c33946c156f174c043015e6922af0c28ef43f9a4b4615e3abb36d4ad - sha256sums = 9f0ea2c29ab6c69bd444a6e4021928bbafc332c71735e1af975c3a973c3e5c2e - sha256sums = 24a03332e662c80c00d8f7ce40a60b35bcd7c8d08052c8e4deeb7e0f6720a2aa + sha256sums = ac9a96ccf478e452a780b703ab8220b38dd44dc019266da3a3443f823634fe33 + sha256sums = b0596e4cbf432496e32c5fe15401eabd5758ab22081ef9cbbaead5d1cdf19167 + sha256sums = f049eff56a7ddfb7f59728084a7b8119a405a74e554979f7f07b6e2e890dfb75 + sha256sums = f6b2b61c99c94e693cee6cdd77360ab5a6299dde76dbe4b5fa36ad0dc098b383 + sha256sums = 92969280f6c5fc376b69d18d2f72784ee640e5ee1219230faf89dc7da00666fc pkgname = minisatip @@ -1,38 +1,44 @@ # 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" +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=2 +pkgrel=3 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') -url="https://minisatip.org" +url='https://minisatip.org' license=('GPL2') -provides=('minisatip') conflicts=('minisatip-git') makedepends=('git') depends=('libdvbcsa' 'linuxtv-dvb-apps') optdepends=('oscam: channels descrambling') backup=('etc/conf.d/minisatip') install='minisatip.install' -source=("git+https://github.com/catalinii/minisatip#commit=bd493b1addd4a2d73ead880b5ea66a239e80224d" - 'https://github.com/pipelka/minisatip/commit/814e794896078117368825421705af1c46a2bb90.diff' +source=('git+https://github.com/catalinii/minisatip.git#commit=bd493b1addd4a2d73ead880b5ea66a239e80224d' + 'https://github.com/pipelka/minisatip/commit/814e794896078117368825421705af1c46a2bb90.patch' + 'kernel-4.14-compat.patch' 'minisatip.service' 'minisatip.sysuser' 'minisatip.conf') sha256sums=('SKIP' - 'd57af3559fe4ed74b21d5fe61cecd425aec1cc429aa127737113b6bffae9fecb' - 'ea3b7b52c33946c156f174c043015e6922af0c28ef43f9a4b4615e3abb36d4ad' - '9f0ea2c29ab6c69bd444a6e4021928bbafc332c71735e1af975c3a973c3e5c2e' - '24a03332e662c80c00d8f7ce40a60b35bcd7c8d08052c8e4deeb7e0f6720a2aa') + 'ac9a96ccf478e452a780b703ab8220b38dd44dc019266da3a3443f823634fe33' + 'b0596e4cbf432496e32c5fe15401eabd5758ab22081ef9cbbaead5d1cdf19167' + 'f049eff56a7ddfb7f59728084a7b8119a405a74e554979f7f07b6e2e890dfb75' + 'f6b2b61c99c94e693cee6cdd77360ab5a6299dde76dbe4b5fa36ad0dc098b383' + '92969280f6c5fc376b69d18d2f72784ee640e5ee1219230faf89dc7da00666fc') -pkgver() { +prepare() { cd ${srcdir}/minisatip - tac minisatip.h | awk -F"[^.^0-9]*" '/VERSION_BUILD/ {printf $2}' + # 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 } -prepare() { +pkgver() { cd ${srcdir}/minisatip - # add EAC3 support - patch -p1 -i ${srcdir}/814e794896078117368825421705af1c46a2bb90.diff + tac minisatip.h | awk -F"[^.^0-9]*" '/VERSION_BUILD/ {printf $2}' } build() { @@ -44,11 +50,11 @@ build() { package() { cd ${srcdir}/minisatip - install -Dm644 ../minisatip.service ${pkgdir}/usr/lib/systemd/system/minisatip.service - install -Dm644 ../minisatip.sysuser ${pkgdir}/usr/lib/sysusers.d/minisatip.conf - install -Dm644 ../minisatip.conf ${pkgdir}/etc/conf.d/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 183:183 ${pkgdir}/var/lib/minisatip + chown -fR 188:188 ${pkgdir}/var/lib/minisatip } diff --git a/kernel-4.14-compat.patch b/kernel-4.14-compat.patch new file mode 100644 index 000000000000..b9f9d34b4850 --- /dev/null +++ b/kernel-4.14-compat.patch @@ -0,0 +1,90 @@ +--- 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 448c4f57c29b..646dfcda4fd2 100644 --- a/minisatip.conf +++ b/minisatip.conf @@ -1,2 +1,2 @@ -# Please omit the -f swich +# Please omit the -f switch SERVER_ARGS="" diff --git a/minisatip.install b/minisatip.install index 0e320665c557..c03f7006bf4e 100644 --- a/minisatip.install +++ b/minisatip.install @@ -1,6 +1,5 @@ post_upgrade() { setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/minisatip - systemd-sysusers } post_install() { diff --git a/minisatip.service b/minisatip.service index ed174ce6ced5..9dfa098e1b74 100644 --- a/minisatip.service +++ b/minisatip.service @@ -1,5 +1,5 @@ [Unit] -Description=Single threaded SAT>IP server +Description=Mini SAT>IP server After=network.target Wants=oscam.service diff --git a/minisatip.sysuser b/minisatip.sysuser index 23f475b35b2f..abb4004a6200 100644 --- a/minisatip.sysuser +++ b/minisatip.sysuser @@ -1,3 +1,3 @@ -u minisatip 183 minisatip /var/lib/minisatip +u minisatip 188 minisatip m minisatip video m minisatip uucp |