main/oscam: new snapshot and misc fixes

simplified init.d script with pid generation
set pax flags to prevent segfault on grsec

1 files changed, 7 insertions, 25 deletions

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
 }