mirror of
https://codeberg.org/Toasterson/ips.git
synced 2026-04-10 21:30:41 +00:00
106 lines
3.4 KiB
Diff
106 lines
3.4 KiB
Diff
|
smf(5) support in cups upstream was introduced in times of
|
||
|
|
Open Solaris enthusiasm. Currently the community do not like
|
||
|
|
to support anything non-Apple.
|
||
|
|
It might worth to ask to remove the smf(5) support from
|
||
|
|
cups upstream entirely then keep it on by own.
|
||
|
|
|
||
|
|
diff -wpruN '--exclude=*.orig' a~/scheduler/cups.xml.in a/scheduler/cups.xml.in
|
||
|
|
--- a~/scheduler/cups.xml.in 1970-01-01 00:00:00
|
||
|
|
+++ a/scheduler/cups.xml.in 1970-01-01 00:00:00
|
||
|
|
@@ -41,7 +41,6 @@
|
||
|
|
<service_fmri value='svc:/network/loopback' />
|
||
|
|
</dependency>
|
||
|
|
|
||
|
|
-
|
||
|
|
<dependency
|
||
|
|
name='network'
|
||
|
|
grouping='optional_all'
|
||
|
|
@@ -50,21 +49,13 @@
|
||
|
|
<service_fmri value='svc:/milestone/network' />
|
||
|
|
</dependency>
|
||
|
|
|
||
|
|
- <dependency
|
||
|
|
- name='lpsched'
|
||
|
|
- grouping='exclude_all'
|
||
|
|
- restart_on='none'
|
||
|
|
- type='service'>
|
||
|
|
- <service_fmri value='svc:/application/print/server' />
|
||
|
|
- </dependency>
|
||
|
|
-
|
||
|
|
<exec_method
|
||
|
|
type='method'
|
||
|
|
name='stop'
|
||
|
|
exec=':kill'
|
||
|
|
timeout_seconds='60' />
|
||
|
|
|
||
|
|
- <instance name='default' enabled='false' >
|
||
|
|
+ <instance name='default' enabled='true' >
|
||
|
|
|
||
|
|
<dependency
|
||
|
|
name='config_data'
|
||
|
|
@@ -79,16 +70,20 @@
|
||
|
|
name='start'
|
||
|
|
exec='@sbindir@/cupsd'
|
||
|
|
timeout_seconds='60' >
|
||
|
|
- <method_context>
|
||
|
|
+ <method_context security_flags="aslr">
|
||
|
|
<method_credential user='root' group='@CUPS_GROUP@' />
|
||
|
|
</method_context>
|
||
|
|
</exec_method>
|
||
|
|
|
||
|
|
<property_group name='general' type='framework'>
|
||
|
|
+ <propval name='active' type='boolean'
|
||
|
|
+ value='true' />
|
||
|
|
<propval name='action_authorization' type='astring'
|
||
|
|
value='solaris.smf.manage.cups' />
|
||
|
|
<propval name='value_authorization' type='astring'
|
||
|
|
- value='solaris.smf.value.cups' />
|
||
|
|
+ value='solaris.smf.manage.cups' />
|
||
|
|
+ <!-- sub-process core dumps shouldn't restart session -->
|
||
|
|
+ <propval name='ignore_error' type='astring' value='core,signal' />
|
||
|
|
</property_group>
|
||
|
|
|
||
|
|
<template>
|
||
|
|
@@ -142,21 +137,13 @@
|
||
|
|
<service_fmri value='svc:/milestone/network' />
|
||
|
|
</dependency>
|
||
|
|
|
||
|
|
- <dependency
|
||
|
|
- name='in-lpd'
|
||
|
|
- grouping='exclude_all'
|
||
|
|
- restart_on='none'
|
||
|
|
- type='service'>
|
||
|
|
- <service_fmri value='svc:/application/print/rfc1179' />
|
||
|
|
- </dependency>
|
||
|
|
-
|
||
|
|
<exec_method
|
||
|
|
type='method'
|
||
|
|
name='stop'
|
||
|
|
exec=':kill'
|
||
|
|
timeout_seconds='60' />
|
||
|
|
|
||
|
|
- <instance name='default' enabled='false' >
|
||
|
|
+ <instance name='default' enabled='true' >
|
||
|
|
<dependency
|
||
|
|
name='cupsd'
|
||
|
|
grouping='require_all'
|
||
|
|
@@ -170,7 +157,7 @@
|
||
|
|
name='inetd_start'
|
||
|
|
exec='@CUPS_SERVERBIN@/daemon/cups-lpd -o document-format=application/octet-stream'
|
||
|
|
timeout_seconds='0'>
|
||
|
|
- <method_context>
|
||
|
|
+ <method_context security_flags="aslr">
|
||
|
|
<method_credential user='@CUPS_USER@' group='@CUPS_GROUP@' />
|
||
|
|
</method_context>
|
||
|
|
</exec_method>
|
||
|
|
@@ -188,7 +175,7 @@
|
||
|
|
<propval name='action_authorization' type='astring'
|
||
|
|
value='solaris.smf.manage.cups' />
|
||
|
|
<propval name='value_authorization' type='astring'
|
||
|
|
- value='solaris.smf.value.cups' />
|
||
|
|
+ value='solaris.smf.manage.cups' />
|
||
|
|
</property_group>
|
||
|
|
|
||
|
|
<template>
|
||
|
|
|