diff options
| -rw-r--r-- | main/oscam/APKBUILD | 17 | ||||
| -rw-r--r-- | main/oscam/oscam.confd | 3 | ||||
| -rw-r--r-- | main/oscam/oscam.initd | 1 | ||||
| -rw-r--r-- | main/oscam/oscam.pre-install | 3 |
4 files changed, 14 insertions, 10 deletions
diff --git a/main/oscam/APKBUILD b/main/oscam/APKBUILD index cda386b7ab2..fdb518e6be1 100644 --- a/main/oscam/APKBUILD +++ b/main/oscam/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=oscam pkgver=0_svn20140428 -pkgrel=0 +pkgrel=1 pkgdesc="An Open Source Conditional Access Module software" url="http://www.streamboard.tv/oscam/" arch="all" @@ -48,6 +48,7 @@ build() { package() { cd "$_builddir" install -d "$pkgdir"/var/log/$pkgname/cw \ + "$pkgdir"/var/run/$pkgname \ "$pkgdir"/usr/share/doc/oscam/example \ "$pkgdir"/usr/share/doc/oscam/monitor \ "$pkgdir"/usr/share/man/man1 \ @@ -66,7 +67,7 @@ package() { "$pkgdir/usr/bin/oscam" || return 1 install -D -m644 "$srcdir"/$pkgname.conf \ "$pkgdir"/etc/$pkgname/$pkgname.conf || return 1 - chown -R $pkgname "$pkgdir"/var/log/$pkgname \ + chown -R $pkgname "$pkgdir"/var/*/$pkgname \ "$pkgdir"/etc/$pkgname || return 1 install -D -m755 "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname || return 1 @@ -87,14 +88,14 @@ list_smargo() { } md5sums="569a79f30a8fd087de0b911b691ff4b2 oscam-0_svn20140428.tar.gz -774b3d2661b31a73901519cc43fac65c oscam.initd -d7f61959a7133bab168db9cf9eb6358d oscam.confd +222cb70633d6c65760054efa064255e1 oscam.initd +3108b2f38140b5791d15cf49dae4ad35 oscam.confd 90939047384482ba8d4428b127b53785 oscam.conf" sha256sums="a4ef289b1ed8fff2d8aa1cebc9d2b8236647cf43e0e2c06585953679af7fb448 oscam-0_svn20140428.tar.gz -2fd7c0ddfa8f0a1453006f0c7152ae0df883aa8d1464b97201512cf37b272947 oscam.initd -58fdd92544670c479232e5c158bfcb30ffda7966a048da7b8e6b7232a6ce0c08 oscam.confd +47a4fdb10c43b9908960872aa1c8b73295170a0d8c3b6cf2359e75d24ed7bae9 oscam.initd +dd66db5c280ea6c695b55aafb972c3713e297c7ff47deff9f15f40e9c080f3fd oscam.confd 7a2e4cb5da504027b858086966eee57fcc1cc14115a7978997857e631e459b6e oscam.conf" sha512sums="8b23f56f5007f084f92d7a3654171b50c23165348df5992ec5a94b16073317e62821f994f3f713c2ee8f7a6ea7a10e0b5e7260b8dea178ef99002b0e480e0021 oscam-0_svn20140428.tar.gz -1b0e4dc2c6473d2c6ff74a0942aef8377f963c4eaa9bcf4f39df873abbd21027aadda3852e37c4a9630999d4d69b01e5181e9c154314c9d1b864a3146f2a569e oscam.initd -7ad6102f8d3136203c4c34c96800b76d941a8a418458f46b686cfa251d57796046e16dc3d1b6e32294b401a986ed13294fe6c9735407da3cb42742ab3c014bb7 oscam.confd +e7eaca8dc67a67daf3e4d861bdff005dd525bdfbd9fa2f98d52581f2441a7b45891bb15254b59d43ce669d0892038f124d0427ca231cefd270bff3d4a6798df4 oscam.initd +73998e9b9212c4868284aa4ed7d3a53fb61c087658f6dd8615de331fe12e1a9a1ea8941ebcc880804579d161d7954ead098315130cd07fc0fb2b368475f74e96 oscam.confd 0f3c4b9940bd27169dfe934599525558bc712d43f07959f19dce6ccfbf0e4d35d345272500fba2bff30e4ecf23f11f72b75321f8a45df908373620349d7f8808 oscam.conf" diff --git a/main/oscam/oscam.confd b/main/oscam/oscam.confd index b1ca11620e2..4625cbb9d08 100644 --- a/main/oscam/oscam.confd +++ b/main/oscam/oscam.confd @@ -1,2 +1,3 @@ -oscam_pid="/var/run/oscam.pid" +oscam_pid="/var/run/oscam/oscam.pid" +oscam_user="oscam" oscam_args="--daemon --pidfile $oscam_pid" diff --git a/main/oscam/oscam.initd b/main/oscam/oscam.initd index 564f3ac6d40..7b225d24151 100644 --- a/main/oscam/oscam.initd +++ b/main/oscam/oscam.initd @@ -4,6 +4,7 @@ name=oscam command=/usr/bin/oscam command_args=$oscam_args pidfile=$oscam_pid +start_stop_daemon_args="${oscam_user:+--user} $oscam_user" depend() { use logger dns diff --git a/main/oscam/oscam.pre-install b/main/oscam/oscam.pre-install index 3cd07483b8b..fe379e11c1f 100644 --- a/main/oscam/oscam.pre-install +++ b/main/oscam/oscam.pre-install @@ -1,3 +1,4 @@ #!/bin/sh -adduser -H -G video -D -s /sbin/nologin oscam 2>/dev/null +adduser -H -D -s /sbin/nologin oscam 2>/dev/null +addgroup oscam usb 2>/dev/null exit 0 |