diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2014-04-28 13:22:29 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2014-04-28 13:22:29 +0000 |
| commit | 1164a45081f2c3b9916d7f42da66353d39a70666 (patch) | |
| tree | 475708103113d656d357eb13c15ad428256f9ac1 /main/oscam | |
| parent | 5af70673f0e99e9c59eb40b3c2abe52f34b094dc (diff) | |
| download | aports-1164a45081f2c3b9916d7f42da66353d39a70666.tar.bz2 aports-1164a45081f2c3b9916d7f42da66353d39a70666.tar.xz | |
main/oscam: new snapshot and misc fixes
simplified init.d script with pid generation
set pax flags to prevent segfault on grsec
Diffstat (limited to 'main/oscam')
| -rw-r--r-- | main/oscam/APKBUILD | 27 | ||||
| -rw-r--r-- | main/oscam/oscam.confd | 7 | ||||
| -rw-r--r-- | main/oscam/oscam.initd | 32 |
3 files changed, 25 insertions, 41 deletions
diff --git a/main/oscam/APKBUILD b/main/oscam/APKBUILD index 89f5823c49..cda386b7ab 100644 --- a/main/oscam/APKBUILD +++ b/main/oscam/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=oscam -pkgver=0_svn20140414 +pkgver=0_svn20140428 pkgrel=0 pkgdesc="An Open Source Conditional Access Module software" url="http://www.streamboard.tv/oscam/" @@ -9,7 +9,7 @@ arch="all" license="GPL" depends="" depends_dev="openssl-dev libusbx-dev pcsc-lite-dev" -makedepends="$depends_dev bash subversion" +makedepends="$depends_dev bash subversion paxctl" install="$pkgname.pre-install" pkgusers="$pkgname" subpackages="$pkgname-doc $pkgname-list-smargo:list_smargo $pkgname-dbg" @@ -73,6 +73,11 @@ package() { install -D -m644 "$srcdir"/$pkgname.confd \ "$pkgdir"/etc/conf.d/$pkgname || return 1 rm -f "$pkgdir"/usr/lib/*.la + # do not enforce secure memory protections + local paxflags="-m" + # x86 need looser pax restrictions + [ "$CARCH" = "x86" ] && paxflags="-msp" + paxctl -c $paxflags "$pkgdir/usr/bin/oscam" || return 1 } list_smargo() { @@ -81,15 +86,15 @@ list_smargo() { "$subpkgdir"/usr/bin/list_smargo || return 1 } -md5sums="e1c9941d5cf405a6b8e1823867667d3e oscam-0_svn20140414.tar.gz -56f8a71e018973b6fb8f2efa2873b6cb oscam.initd -209c3747e235def3ba374b4aab237a15 oscam.confd +md5sums="569a79f30a8fd087de0b911b691ff4b2 oscam-0_svn20140428.tar.gz +774b3d2661b31a73901519cc43fac65c oscam.initd +d7f61959a7133bab168db9cf9eb6358d oscam.confd 90939047384482ba8d4428b127b53785 oscam.conf" -sha256sums="968ada44ea59b32b963f16d5fdcbbc97b78a6e07330a4683f8daf15a4ab41bec oscam-0_svn20140414.tar.gz -3b925940d39eff9dd98733b777214e4503cef7e845fb24ef29cdd2ecc2e6fbc7 oscam.initd -71464c3c2f8a25899fe064d9a99938ca7fc9871e1b99e15e9a6babcd266b68d9 oscam.confd +sha256sums="a4ef289b1ed8fff2d8aa1cebc9d2b8236647cf43e0e2c06585953679af7fb448 oscam-0_svn20140428.tar.gz +2fd7c0ddfa8f0a1453006f0c7152ae0df883aa8d1464b97201512cf37b272947 oscam.initd +58fdd92544670c479232e5c158bfcb30ffda7966a048da7b8e6b7232a6ce0c08 oscam.confd 7a2e4cb5da504027b858086966eee57fcc1cc14115a7978997857e631e459b6e oscam.conf" -sha512sums="7214cf52ded450b1da67de59d4b7aaabc8914577c6486dbf69de40151ac66a303c30ab132b55e671528d68d99480365af8ffc66df7e4657fa45dd43996f60926 oscam-0_svn20140414.tar.gz -f33821de7441fb59a2339d0323b18199d326c7f47a139128f02bf0661bc43c36dfa9dc2a9d6b4d9415da576d829d50123173537037008be93adb4a0458e6613a oscam.initd -c5567457763eb01f6287215f29547c867ae3f5b224691ff690616bb7598ea831299f73784064a571284b88d34c6504a2594b46e8275d5db2e1fb1394c11945eb oscam.confd +sha512sums="8b23f56f5007f084f92d7a3654171b50c23165348df5992ec5a94b16073317e62821f994f3f713c2ee8f7a6ea7a10e0b5e7260b8dea178ef99002b0e480e0021 oscam-0_svn20140428.tar.gz +1b0e4dc2c6473d2c6ff74a0942aef8377f963c4eaa9bcf4f39df873abbd21027aadda3852e37c4a9630999d4d69b01e5181e9c154314c9d1b864a3146f2a569e oscam.initd +7ad6102f8d3136203c4c34c96800b76d941a8a418458f46b686cfa251d57796046e16dc3d1b6e32294b401a986ed13294fe6c9735407da3cb42742ab3c014bb7 oscam.confd 0f3c4b9940bd27169dfe934599525558bc712d43f07959f19dce6ccfbf0e4d35d345272500fba2bff30e4ecf23f11f72b75321f8a45df908373620349d7f8808 oscam.conf" diff --git a/main/oscam/oscam.confd b/main/oscam/oscam.confd index 86bd30ec90..b1ca11620e 100644 --- a/main/oscam/oscam.confd +++ b/main/oscam/oscam.confd @@ -1,5 +1,2 @@ -# oscam confd file - -user="oscam" -group="video" -args="-b" +oscam_pid="/var/run/oscam.pid" +oscam_args="--daemon --pidfile $oscam_pid" diff --git a/main/oscam/oscam.initd b/main/oscam/oscam.initd index ed9918fd27..564f3ac6d4 100644 --- a/main/oscam/oscam.initd +++ b/main/oscam/oscam.initd @@ -1,30 +1,12 @@ #!/sbin/runscript -# oscam init.d - -name="oscam" -daemon="/usr/bin/$name" +name=oscam +command=/usr/bin/oscam +command_args=$oscam_args +pidfile=$oscam_pid depend() { - use net -} - -start() { - ebegin "Starting oscam" - start-stop-daemon --start \ - --quiet \ - --user $user \ - --group $group \ - --name $name \ - --exec $daemon \ - -- $args - eend $? -} - -stop() { - ebegin "Stopping oscam" - start-stop-daemon --stop \ - --signal 2 \ - --name $name - eend $? + use logger dns + need net + after firewall } |