| 1 |
slords |
1.1 |
diff -ruN smeserver-sane-0.1.orig/createlinks smeserver-sane-0.1/createlinks |
| 2 |
|
|
--- smeserver-sane-0.1.orig/createlinks 2008-04-18 08:12:13.000000000 -0600 |
| 3 |
|
|
+++ smeserver-sane-0.1/createlinks 2008-04-18 08:00:45.000000000 -0600 |
| 4 |
|
|
@@ -4,13 +4,8 @@ |
| 5 |
|
|
|
| 6 |
|
|
# config sane |
| 7 |
|
|
foreach (qw( |
| 8 |
|
|
- /etc/xinetd.conf |
| 9 |
|
|
/etc/sane.d/saned.conf |
| 10 |
|
|
)) |
| 11 |
|
|
{ |
| 12 |
|
|
- templates2events($_, qw(remoteaccess-update bootstrap-console-save)); |
| 13 |
|
|
+ templates2events($_, qw(bootstrap-console-save)); |
| 14 |
|
|
} |
| 15 |
|
|
- |
| 16 |
|
|
-safe_symlink("reload", "root/etc/e-smith/events/remoteaccess-update/services2adjust/xinetd"); |
| 17 |
|
|
- |
| 18 |
|
|
-service_link_enhanced("xinetd", "S56", "7"); |
| 19 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/accounts/migrate/80saned smeserver-sane-0.1/root/etc/e-smith/db/accounts/migrate/80saned |
| 20 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/accounts/migrate/80saned 2008-04-09 03:41:50.000000000 -0600 |
| 21 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/accounts/migrate/80saned 1969-12-31 17:00:00.000000000 -0700 |
| 22 |
|
|
@@ -1,15 +0,0 @@ |
| 23 |
|
|
- |
| 24 |
|
|
-{ |
| 25 |
|
|
- my $group_sane = $DB->get('saned'); |
| 26 |
|
|
- return "" if $group_sane; |
| 27 |
|
|
- |
| 28 |
|
|
- $group_sane = $DB->new_record('saned', {type => 'group'}); |
| 29 |
|
|
- |
| 30 |
|
|
- $group_sane->set_prop('Description', 'saned'); |
| 31 |
|
|
- $group_sane->set_prop('Members', 'saned'); |
| 32 |
|
|
- |
| 33 |
|
|
- unless ( system("/sbin/e-smith/signal-event group-create saned") == 0 ) |
| 34 |
|
|
- { |
| 35 |
|
|
- die "group-create saned failed\n"; |
| 36 |
|
|
- } |
| 37 |
|
|
-} |
| 38 |
|
|
\ No newline at end of file |
| 39 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/access smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/access |
| 40 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/access 1969-12-31 17:00:00.000000000 -0700 |
| 41 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/access 2008-04-18 07:33:28.000000000 -0600 |
| 42 |
|
|
@@ -0,0 +1 @@ |
| 43 |
|
|
+private |
| 44 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/status |
| 45 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/status 1969-12-31 17:00:00.000000000 -0700 |
| 46 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/status 2008-04-18 07:33:28.000000000 -0600 |
| 47 |
|
|
@@ -0,0 +1 @@ |
| 48 |
|
|
+enabled |
| 49 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/TCPPort smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/TCPPort |
| 50 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/TCPPort 1969-12-31 17:00:00.000000000 -0700 |
| 51 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/TCPPort 2008-04-18 07:33:28.000000000 -0600 |
| 52 |
|
|
@@ -0,0 +1 @@ |
| 53 |
|
|
+6566 |
| 54 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/type |
| 55 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/type 1969-12-31 17:00:00.000000000 -0700 |
| 56 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/type 2008-04-18 07:33:28.000000000 -0600 |
| 57 |
|
|
@@ -0,0 +1 @@ |
| 58 |
|
|
+service |
| 59 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/access smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/access |
| 60 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/access 2008-04-18 08:12:13.000000000 -0600 |
| 61 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/access 1969-12-31 17:00:00.000000000 -0700 |
| 62 |
|
|
@@ -1 +0,0 @@ |
| 63 |
|
|
-private |
| 64 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/status |
| 65 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/status 2008-04-18 08:12:13.000000000 -0600 |
| 66 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/status 1969-12-31 17:00:00.000000000 -0700 |
| 67 |
|
|
@@ -1 +0,0 @@ |
| 68 |
|
|
-enabled |
| 69 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort |
| 70 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort 2008-04-18 08:12:13.000000000 -0600 |
| 71 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort 1969-12-31 17:00:00.000000000 -0700 |
| 72 |
|
|
@@ -1 +0,0 @@ |
| 73 |
|
|
-6566 |
| 74 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/type |
| 75 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/type 2008-04-18 08:12:13.000000000 -0600 |
| 76 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/type 1969-12-31 17:00:00.000000000 -0700 |
| 77 |
|
|
@@ -1 +0,0 @@ |
| 78 |
|
|
-service |
| 79 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/status |
| 80 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/status 2008-04-18 08:12:14.000000000 -0600 |
| 81 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/status 1969-12-31 17:00:00.000000000 -0700 |
| 82 |
|
|
@@ -1 +0,0 @@ |
| 83 |
|
|
-enabled |
| 84 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/type |
| 85 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/type 2008-04-18 08:12:13.000000000 -0600 |
| 86 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/type 1969-12-31 17:00:00.000000000 -0700 |
| 87 |
|
|
@@ -1 +0,0 @@ |
| 88 |
|
|
-service |
| 89 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status |
| 90 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status 2008-04-18 08:12:14.000000000 -0600 |
| 91 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status 1969-12-31 17:00:00.000000000 -0700 |
| 92 |
|
|
@@ -1 +0,0 @@ |
| 93 |
|
|
-enabled |
| 94 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type |
| 95 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type 2008-04-18 08:12:14.000000000 -0600 |
| 96 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type 1969-12-31 17:00:00.000000000 -0700 |
| 97 |
|
|
@@ -1 +0,0 @@ |
| 98 |
|
|
-service |
| 99 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/hosts.allow/20saned smeserver-sane-0.1/root/etc/e-smith/templates/etc/hosts.allow/20saned |
| 100 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/hosts.allow/20saned 2008-04-13 16:24:37.000000000 -0600 |
| 101 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/templates/etc/hosts.allow/20saned 2008-04-18 08:11:24.000000000 -0600 |
| 102 |
|
|
@@ -1,3 +1,3 @@ |
| 103 |
|
|
{ |
| 104 |
|
|
- $DB->hosts_allow_spec('sane-port','saned'); |
| 105 |
|
|
+ $DB->hosts_allow_spec('saned','saned'); |
| 106 |
|
|
} |
| 107 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/services/20saned-port smeserver-sane-0.1/root/etc/e-smith/templates/etc/services/20saned-port |
| 108 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/services/20saned-port 2008-04-13 16:40:25.000000000 -0600 |
| 109 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/templates/etc/services/20saned-port 2008-04-18 08:11:39.000000000 -0600 |
| 110 |
|
|
@@ -1 +1 @@ |
| 111 |
|
|
-sane-port { ${'sane-port'}{TCPPort} }/tcp # SANE network scanner daemon |
| 112 |
|
|
+saned { ${'saned'}{TCPPort} }/tcp # SANE network scanner daemon |
| 113 |
|
|
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port smeserver-sane-0.1/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port |
| 114 |
|
|
--- smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port 2008-04-13 16:23:43.000000000 -0600 |
| 115 |
|
|
+++ smeserver-sane-0.1/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port 2008-04-18 08:11:34.000000000 -0600 |
| 116 |
|
|
@@ -1,11 +1,10 @@ |
| 117 |
|
|
{ |
| 118 |
|
|
-return "" unless ( (${'xinetd-sane'}{'status'} || "disabled") eq "enabled"); |
| 119 |
|
|
+return "" unless ( (${'saned'}{'status'} || "disabled") eq "enabled"); |
| 120 |
|
|
|
| 121 |
|
|
$OUT = <<HERE; |
| 122 |
|
|
|
| 123 |
|
|
-service sane-port |
| 124 |
|
|
+service saned |
| 125 |
|
|
{ |
| 126 |
|
|
-port = 6566 |
| 127 |
|
|
socket_type = stream |
| 128 |
|
|
protocol = tcp |
| 129 |
|
|
user = root |
Parent Directory
| 
Revision Log
| 
Revision Graph
