/[smeserver]/rpms/smeserver-yum/sme8/smeserver-yum-2.2.0-updatetoggle.patch
ViewVC logotype

Annotation of /rpms/smeserver-yum/sme8/smeserver-yum-2.2.0-updatetoggle.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Sat Sep 12 08:29:28 2009 UTC (15 years, 2 months ago) by dungog
Branch: MAIN
CVS Tags: smeserver-yum-2_2_0-9_el5_sme
updatestoggle patch

1 dungog 1.1 diff -urN smeserver-yum-2.2.0/root/etc/e-smith/db/configuration/migrate/yumCheck4updates smeserver-yum-2.2.0.new/root/etc/e-smith/db/configuration/migrate/yumCheck4updates
2     --- smeserver-yum-2.2.0/root/etc/e-smith/db/configuration/migrate/yumCheck4updates 1970-01-01 10:00:00.000000000 +1000
3     +++ smeserver-yum-2.2.0.new/root/etc/e-smith/db/configuration/migrate/yumCheck4updates 2009-09-12 18:01:37.000000000 +1000
4     @@ -0,0 +1,12 @@
5     +{
6     + my $yum = $DB->get("yum");
7     + return if ($yum->prop('check4updates'));
8     + if ($yum->prop('status') eq 'disabled')
9     + {
10     + $yum->set_prop('check4updates', 'disabled');
11     + }
12     + else
13     + {
14     + $yum->set_prop('check4updates', 'daily');
15     + }
16     +}
17     diff -urN smeserver-yum-2.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum smeserver-yum-2.2.0.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
18     --- smeserver-yum-2.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2008-10-08 01:25:45.000000000 +1100
19     +++ smeserver-yum-2.2.0.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2009-09-12 18:04:01.000000000 +1000
20     @@ -13,7 +13,7 @@
21    
22     <entry>
23     <base>LABEL_YUM_STATUS</base>
24     - <trans>Check for updates daily</trans>
25     + <trans>Check for updates</trans>
26     </entry>
27    
28     <entry>
29     @@ -245,4 +245,19 @@
30     </trans>
31     </entry>
32    
33     + <entry>
34     + <base>1DAILY</base>
35     + <trans>Daily</trans>
36     + </entry>
37     +
38     + <entry>
39     + <base>2WEEKLY</base>
40     + <trans>Weekly</trans>
41     + </entry>
42     +
43     + <entry>
44     + <base>3MONTHLY</base>
45     + <trans>Monthly</trans>
46     + </entry>
47     +
48     </lexicon>
49     diff -urN smeserver-yum-2.2.0/root/etc/e-smith/web/functions/yum smeserver-yum-2.2.0.new/root/etc/e-smith/web/functions/yum
50     --- smeserver-yum-2.2.0/root/etc/e-smith/web/functions/yum 2008-10-08 01:25:45.000000000 +1100
51     +++ smeserver-yum-2.2.0.new/root/etc/e-smith/web/functions/yum 2009-09-12 18:06:39.000000000 +1000
52     @@ -221,9 +221,9 @@
53    
54     <field
55     type="select"
56     - id="yum_status"
57     - options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'"
58     - value="get_status('status')">
59     + id="yum_check4updates"
60     + options="'disabled' => 'DISABLED', 'daily' => '1DAILY', 'weekly' => '2WEEKLY', 'monthly' => '3MONTHLY'"
61     + value="get_status('check4updates')">
62     <label>LABEL_YUM_STATUS</label>
63     </field>
64    
65     diff -urN smeserver-yum-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm smeserver-yum-2.2.0.new/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm
66     --- smeserver-yum-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2008-10-08 01:25:45.000000000 +1100
67     +++ smeserver-yum-2.2.0.new/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2009-09-12 18:14:24.000000000 +1000
68     @@ -193,13 +193,20 @@
69     my $q = $fm->{'cgi'};
70    
71     for my $param ( qw(
72     - status
73     PackageFunctions
74     ) )
75     {
76     $db->set_prop('yum', $param, $q->param("yum_$param"));
77     }
78    
79     + my $check4updates = $q->param("yum_check4updates");
80     + my $status = 'disabled';
81     +
82     + if ($check4updates ne 'disabled') { $status = 'enabled'; }
83     +
84     + $db->set_prop('yum', 'check4updates', $check4updates);
85     + $db->set_prop('yum', 'status', $status);
86     +
87     my %selected = map {$_ => 1} $q->param('SelectedRepositories');
88    
89     foreach my $repos (
90     diff -urN smeserver-yum-2.2.0/smeserver-yum-1.1.2-26-filelist smeserver-yum-2.2.0.new/smeserver-yum-1.1.2-26-filelist
91     --- smeserver-yum-2.2.0/smeserver-yum-1.1.2-26-filelist 2006-03-16 17:22:22.000000000 +1100
92     +++ smeserver-yum-2.2.0.new/smeserver-yum-1.1.2-26-filelist 1970-01-01 10:00:00.000000000 +1000
93     @@ -1,219 +0,0 @@
94     -%dir %attr(0755,root,root) /service
95     -%dir %attr(0755,root,root) /service/yum
96     -%dir %attr(0755,root,root) /usr/lib/perl5/site_perl/esmith
97     -%dir %attr(0755,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick
98     -%dir %attr(0755,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick/Panel
99     -%attr(0644,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm.orig
100     -%attr(0644,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm
101     -%dir %attr(0755,root,root) /usr/share/rpm-gpg-keys
102     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-rawhide
103     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY.dag.txt
104     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-beta
105     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY
106     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-fedora-rawhide
107     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY.dries.txt
108     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-fedora-test
109     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-SMEServer7
110     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-CentOS-3
111     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-CentOS-4
112     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-freshrpms
113     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY.atrpms
114     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-fedora
115     -%attr(0700,root,root) /etc/cron.daily/smeserver-yum
116     -%dir %attr(0755,root,root) /etc/e-smith
117     -%dir %attr(0755,root,root) /etc/e-smith/web
118     -%dir %attr(0550,root,admin) /etc/e-smith/web/panels
119     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager
120     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager/cgi-bin
121     -/etc/e-smith/web/panels/manager/cgi-bin/yum
122     -%dir %attr(0550,root,admin) /etc/e-smith/web/functions
123     -%attr(04750,root,admin) /etc/e-smith/web/functions/yum
124     -%dir %attr(0755,root,root) /etc/e-smith/templates
125     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc
126     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/yum.conf
127     -/etc/e-smith/templates/etc/yum.conf/10main_debuglevel
128     -/etc/e-smith/templates/etc/yum.conf/10main_installonlypkgs
129     -/etc/e-smith/templates/etc/yum.conf/10main_cachedir
130     -/etc/e-smith/templates/etc/yum.conf/10main_exactarch
131     -/etc/e-smith/templates/etc/yum.conf/10main_logfile
132     -/etc/e-smith/templates/etc/yum.conf/10main
133     -/etc/e-smith/templates/etc/yum.conf/10main_obsoletes
134     -/etc/e-smith/templates/etc/yum.conf/20repositories
135     -/etc/e-smith/templates/etc/yum.conf/10main_tolerant
136     -%dir %attr(0755,root,root) /etc/e-smith/locale
137     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us
138     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc
139     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc/e-smith
140     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc/e-smith/web
141     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc/e-smith/web/functions
142     -/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
143     -%dir %attr(0755,root,root) /etc/e-smith/db
144     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories
145     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/migrate
146     -/etc/e-smith/db/yum_repositories/migrate/20SMERepos
147     -/etc/e-smith/db/yum_repositories/migrate/00openRW
148     -/etc/e-smith/db/yum_repositories/migrate/10GPG_and_Groups
149     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults
150     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/centosplus
151     -/etc/e-smith/db/yum_repositories/defaults/centosplus/type
152     -/etc/e-smith/db/yum_repositories/defaults/centosplus/BaseURL
153     -/etc/e-smith/db/yum_repositories/defaults/centosplus/status
154     -/etc/e-smith/db/yum_repositories/defaults/centosplus/Name
155     -/etc/e-smith/db/yum_repositories/defaults/centosplus/GPGCheck
156     -/etc/e-smith/db/yum_repositories/defaults/centosplus/EnableGroups
157     -/etc/e-smith/db/yum_repositories/defaults/centosplus/Visible
158     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/extras
159     -/etc/e-smith/db/yum_repositories/defaults/extras/type
160     -/etc/e-smith/db/yum_repositories/defaults/extras/BaseURL
161     -/etc/e-smith/db/yum_repositories/defaults/extras/status
162     -/etc/e-smith/db/yum_repositories/defaults/extras/Name
163     -/etc/e-smith/db/yum_repositories/defaults/extras/GPGCheck
164     -/etc/e-smith/db/yum_repositories/defaults/extras/EnableGroups
165     -/etc/e-smith/db/yum_repositories/defaults/extras/Visible
166     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/base
167     -/etc/e-smith/db/yum_repositories/defaults/base/type
168     -/etc/e-smith/db/yum_repositories/defaults/base/BaseURL
169     -/etc/e-smith/db/yum_repositories/defaults/base/status
170     -/etc/e-smith/db/yum_repositories/defaults/base/Name
171     -/etc/e-smith/db/yum_repositories/defaults/base/GPGCheck
172     -/etc/e-smith/db/yum_repositories/defaults/base/EnableGroups
173     -/etc/e-smith/db/yum_repositories/defaults/base/Visible
174     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeupdates
175     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/type
176     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/BaseURL
177     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/status
178     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/Name
179     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/GPGCheck
180     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/EnableGroups
181     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/Visible
182     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/updates
183     -/etc/e-smith/db/yum_repositories/defaults/updates/type
184     -/etc/e-smith/db/yum_repositories/defaults/updates/BaseURL
185     -/etc/e-smith/db/yum_repositories/defaults/updates/status
186     -/etc/e-smith/db/yum_repositories/defaults/updates/Name
187     -/etc/e-smith/db/yum_repositories/defaults/updates/GPGCheck
188     -/etc/e-smith/db/yum_repositories/defaults/updates/EnableGroups
189     -/etc/e-smith/db/yum_repositories/defaults/updates/Visible
190     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/contrib
191     -/etc/e-smith/db/yum_repositories/defaults/contrib/type
192     -/etc/e-smith/db/yum_repositories/defaults/contrib/BaseURL
193     -/etc/e-smith/db/yum_repositories/defaults/contrib/status
194     -/etc/e-smith/db/yum_repositories/defaults/contrib/Name
195     -/etc/e-smith/db/yum_repositories/defaults/contrib/GPGCheck
196     -/etc/e-smith/db/yum_repositories/defaults/contrib/EnableGroups
197     -/etc/e-smith/db/yum_repositories/defaults/contrib/Visible
198     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/addons
199     -/etc/e-smith/db/yum_repositories/defaults/addons/type
200     -/etc/e-smith/db/yum_repositories/defaults/addons/BaseURL
201     -/etc/e-smith/db/yum_repositories/defaults/addons/status
202     -/etc/e-smith/db/yum_repositories/defaults/addons/Name
203     -/etc/e-smith/db/yum_repositories/defaults/addons/GPGCheck
204     -/etc/e-smith/db/yum_repositories/defaults/addons/EnableGroups
205     -/etc/e-smith/db/yum_repositories/defaults/addons/Visible
206     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeos
207     -/etc/e-smith/db/yum_repositories/defaults/smeos/type
208     -/etc/e-smith/db/yum_repositories/defaults/smeos/BaseURL
209     -/etc/e-smith/db/yum_repositories/defaults/smeos/status
210     -/etc/e-smith/db/yum_repositories/defaults/smeos/Name
211     -/etc/e-smith/db/yum_repositories/defaults/smeos/GPGCheck
212     -/etc/e-smith/db/yum_repositories/defaults/smeos/EnableGroups
213     -/etc/e-smith/db/yum_repositories/defaults/smeos/Visible
214     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeaddons
215     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/type
216     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/BaseURL
217     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/status
218     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/Name
219     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/GPGCheck
220     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/EnableGroups
221     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/Visible
222     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeupdates-testing
223     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/type
224     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/BaseURL
225     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/status
226     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/Name
227     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/GPGCheck
228     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/EnableGroups
229     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/Visible
230     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/testing
231     -/etc/e-smith/db/yum_repositories/defaults/testing/type
232     -/etc/e-smith/db/yum_repositories/defaults/testing/BaseURL
233     -/etc/e-smith/db/yum_repositories/defaults/testing/status
234     -/etc/e-smith/db/yum_repositories/defaults/testing/Name
235     -/etc/e-smith/db/yum_repositories/defaults/testing/GPGCheck
236     -/etc/e-smith/db/yum_repositories/defaults/testing/EnableGroups
237     -/etc/e-smith/db/yum_repositories/defaults/testing/Visible
238     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smetest
239     -/etc/e-smith/db/yum_repositories/defaults/smetest/type
240     -/etc/e-smith/db/yum_repositories/defaults/smetest/BaseURL
241     -/etc/e-smith/db/yum_repositories/defaults/smetest/status
242     -/etc/e-smith/db/yum_repositories/defaults/smetest/Name
243     -/etc/e-smith/db/yum_repositories/defaults/smetest/GPGCheck
244     -/etc/e-smith/db/yum_repositories/defaults/smetest/EnableGroups
245     -/etc/e-smith/db/yum_repositories/defaults/smetest/Visible
246     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smedev
247     -/etc/e-smith/db/yum_repositories/defaults/smedev/type
248     -/etc/e-smith/db/yum_repositories/defaults/smedev/BaseURL
249     -/etc/e-smith/db/yum_repositories/defaults/smedev/status
250     -/etc/e-smith/db/yum_repositories/defaults/smedev/Name
251     -/etc/e-smith/db/yum_repositories/defaults/smedev/GPGCheck
252     -/etc/e-smith/db/yum_repositories/defaults/smedev/EnableGroups
253     -/etc/e-smith/db/yum_repositories/defaults/smedev/Visible
254     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_updates
255     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_available
256     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_installed
257     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration
258     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults
259     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults/yum
260     -/etc/e-smith/db/configuration/defaults/yum/type
261     -/etc/e-smith/db/configuration/defaults/yum/RandomDelay
262     -/etc/e-smith/db/configuration/defaults/yum/status
263     -/etc/e-smith/db/configuration/defaults/yum/GPGCheck
264     -/etc/e-smith/db/configuration/defaults/yum/PackageFunctions
265     -/etc/e-smith/db/configuration/defaults/yum/EnableGroups
266     -/etc/e-smith/db/configuration/defaults/yum/AutoInstallUpdates
267     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/force
268     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/force/yum
269     -/etc/e-smith/db/configuration/force/yum/AutoInstallUpdates
270     -%dir %attr(0755,root,root) /etc/e-smith/events
271     -%dir %attr(0755,root,root) /etc/e-smith/events/actions
272     -%attr(0554,root,root) /etc/e-smith/events/actions/yum-import-keys
273     -%attr(0554,root,root) /etc/e-smith/events/actions/yum-update-dbs
274     -%attr(0554,root,root) /etc/e-smith/events/actions/yum-action
275     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-remove
276     -/etc/e-smith/events/yum-remove/S50initialize-default-databases
277     -/etc/e-smith/events/yum-remove/S20yum-action
278     -/etc/e-smith/events/yum-remove/S90yum-update-dbs
279     -/etc/e-smith/events/yum-remove/S80navigation-conf
280     -%dir %attr(0755,root,root) /etc/e-smith/events/local
281     -/etc/e-smith/events/local/S90yum-update-dbs
282     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save
283     -/etc/e-smith/events/bootstrap-console-save/S10yum-import-keys
284     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand
285     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc
286     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/yum.conf
287     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-modify
288     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-modify/templates2expand
289     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-modify/templates2expand/etc
290     -/etc/e-smith/events/yum-modify/templates2expand/etc/yum.conf
291     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-install
292     -/etc/e-smith/events/yum-install/S50initialize-default-databases
293     -/etc/e-smith/events/yum-install/S20yum-action
294     -/etc/e-smith/events/yum-install/S90yum-update-dbs
295     -/etc/e-smith/events/yum-install/S80navigation-conf
296     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-update
297     -/etc/e-smith/events/yum-update/S50initialize-default-databases
298     -/etc/e-smith/events/yum-update/S20yum-action
299     -/etc/e-smith/events/yum-update/S90yum-update-dbs
300     -/etc/e-smith/events/yum-update/S80navigation-conf
301     -%dir %attr(0755,root,root) /var/service
302     -%dir %attr(0755,root,root) /var/service/yum
303     -%attr(0644,root,root) /var/service/yum/down
304     -%attr(0755,root,root) /var/service/yum/run
305     -%dir %attr(0700,root,root) /var/service/yum/supervise
306     -%dir %attr(0755,root,root) /var/service/yum/log
307     -%attr(0755,root,root) /var/service/yum/log/run
308     -%dir %attr(0700,root,root) /var/service/yum/log/supervise
309     -%dir %attr(2750,smelog,smelog) /var/log/yum
310     -%dir %attr(0755,root,root) /sbin/e-smith
311     -%attr(0755,root,root) /sbin/e-smith/yum
312     -%attr(0700,root,root) /sbin/e-smith/yum_update_dbs

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed