/[smeserver]/rpms/smeserver-support/sme10/smeserver-support-2.8.0-koozali.patch
ViewVC logotype

Annotation of /rpms/smeserver-support/sme10/smeserver-support-2.8.0-koozali.patch

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

Revision 1.2 - (hide annotations) (download)
Thu Jun 16 03:04:52 2016 UTC (7 years, 11 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-support-2_8_0-8_el7_sme, smeserver-support-2_8_0-9_el7_sme, smeserver-support-2_8_0-10_el7_sme
Changes since 1.1: +0 -9 lines 
* Wed Jun 15 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-8.sme
- reverting partly the changes in last patch [SME: 9598]
- wrong catch of proxy related url with the http to https changes
- thank to Charlie Brady for reporting
1 unnilennium 1.1 diff -Nur smeserver-support-2.8.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/initial.cgi smeserver-support-2.8.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/initial.cgi
2     --- smeserver-support-2.8.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/initial.cgi 2014-03-23 23:28:31.000000000 -0400
3     +++ smeserver-support-2.8.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/initial.cgi 2016-06-15 13:32:27.073000000 -0400
4     @@ -11,7 +11,7 @@
5     <p>
6     Welcome to SME Server, the leading Linux distribution for
7     small and medium enterprises. SME Server is brought to
8     - you by <A HREF="http://www.smeserver.org/" TARGET="_blank">Koozali Foundation, Inc.</A>,
9     + you by <A HREF="https://www.koozali.org/" TARGET="_blank">Koozali Foundation, Inc.</A>,
10     a non-profit corporation that exists to provide marketing and
11     legal support for SME Server.
12     </p>
13     @@ -47,8 +47,8 @@
14     <br>
15    
16     <p>
17     - <a href="http://www.smeserver.org/donate/" target="_blank">
18     - <img src="/server-common/btn_donateCC_LG.gif" alt="http://www.smeserver.org/donate/"
19     + <a href="https://wiki.koozali.org/donate/" target="_blank">
20     + <img src="/server-common/btn_donateCC_LG.gif" alt="https://wiki.koozali.org/donate/"
21     align="middle"></a>
22     </p>
23    
24     diff -Nur smeserver-support-2.8.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/online-manual smeserver-support-2.8.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/online-manual
25     --- smeserver-support-2.8.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/online-manual 2008-10-07 10:45:24.000000000 -0400
26     +++ smeserver-support-2.8.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/online-manual 2016-06-15 13:33:10.651000000 -0400
27     @@ -8,9 +8,9 @@
28     <trans>
29     <![CDATA[
30     <ul>
31     - <li><a target="new" href="http://contribs.org/documentation/manual/">
32     + <li><a target="new" href="https://wiki.koozali.org/documentation/manual/">
33     Online manual</a>
34     - <li><a target="new" href="http://contribs.org/documentation/FAQ/">
35     + <li><a target="new" href="https://wiki.koozali.org/documentation/FAQ/">
36     FAQs</a>
37     </ul>
38     <H2>Support and licensing</H2>
39     diff -Nur smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/90contribs smeserver-support-2.8.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/90contribs
40     --- smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/90contribs 2008-10-07 10:45:24.000000000 -0400
41     +++ smeserver-support-2.8.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_core.css/90contribs 2016-06-15 13:32:27.070000000 -0400
42     @@ -1,6 +1,6 @@
43     {
44     $OUT =<<'HERE';
45     -/* contribs.org styling */
46     +/* koozali.org styling */
47     body.header {
48     background: #bbcbef;
49     }
50     diff -Nur smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/90contribs smeserver-support-2.8.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/90contribs
51     --- smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/90contribs 2013-01-31 14:38:18.000000000 -0500
52     +++ smeserver-support-2.8.0/root/etc/e-smith/templates/etc/e-smith/web/common/css/sme_main.css/90contribs 2016-06-15 13:32:27.070000000 -0400
53     @@ -1,6 +1,6 @@
54     {
55     $OUT =<<'HERE';
56     -/* contribs.org styling */
57     +/* koozali.org styling */
58    
59     /* This special style is actually used only for the button row along the bottom of each page */
60     th.sme-layout {
61     diff -Nur smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/motd/template-begin smeserver-support-2.8.0/root/etc/e-smith/templates/etc/motd/template-begin
62     --- smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/motd/template-begin 2016-02-05 18:21:55.000000000 -0500
63     +++ smeserver-support-2.8.0/root/etc/e-smith/templates/etc/motd/template-begin 2016-06-15 13:32:27.071000000 -0400
64     @@ -5,12 +5,12 @@
65     systems.
66    
67     Please take the time to read the documentation
68     -http://wiki.contribs.org/Main_Page
69     +https://wiki.koozali.org/Main_Page
70    
71     Remember that SME Server is free to download
72     and use, but it is not free to build
73    
74     Please help the project :
75     -http://wiki.contribs.org/Donate
76     +https://wiki.koozali.org/Donate
77    
78     ****************************************************
79     diff -Nur smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/os-release/10base smeserver-support-2.8.0/root/etc/e-smith/templates/etc/os-release/10base
80     --- smeserver-support-2.8.0.old/root/etc/e-smith/templates/etc/os-release/10base 2016-06-15 13:27:01.806000000 -0400
81     +++ smeserver-support-2.8.0/root/etc/e-smith/templates/etc/os-release/10base 2016-06-15 13:32:27.071000000 -0400
82     @@ -5,8 +5,8 @@
83     VERSION_ID="{$sysconfig{ReleaseVersion}}"
84     PRETTY_NAME="Koozali SME Server {$sysconfig{ReleaseVersion}}"
85     ANSI_COLOR="0;31"
86     -HOME_URL="https://contribs.org"
87     -BUG_REPORT_URL="https://bugs.contribs.org/"
88     +HOME_URL="https://koozali.org"
89     +BUG_REPORT_URL="https://bugs.koozali.org/"
90    
91     CENTOS_MANTISBT_PROJECT="CentOS-7"
92     CENTOS_MANTISBT_PROJECT_VERSION="7"
93     Binary files smeserver-support-2.8.0.old/root/etc/e-smith/web/common/btn_donateCC_LG.gif and smeserver-support-2.8.0/root/etc/e-smith/web/common/btn_donateCC_LG.gif differ
94     diff -Nur smeserver-support-2.8.0.old/root/sbin/e-smith/console-menu-items/testInternet.pl smeserver-support-2.8.0/root/sbin/e-smith/console-menu-items/testInternet.pl
95     --- smeserver-support-2.8.0.old/root/sbin/e-smith/console-menu-items/testInternet.pl 2008-10-07 10:45:24.000000000 -0400
96     +++ smeserver-support-2.8.0/root/sbin/e-smith/console-menu-items/testInternet.pl 2016-06-15 13:32:27.070000000 -0400
97     @@ -34,7 +34,7 @@
98     text =>
99     gettext("After your Internet connection is operational and your server has been connected and configured, this test will verify that your server can communicate with the Internet.") .
100     "\n\n" .
101     - gettext("As part of this test, two pieces of information will be sent to contribs.org - the version installed on your server and a string used to differentiate your server from others using this test. This string is generated by a one-way hash function and access to the string does not provide any information about your server.") .
102     + gettext("As part of this test, two pieces of information will be sent to koozali.org - the version installed on your server and a string used to differentiate your server from others using this test. This string is generated by a one-way hash function and access to the string does not provide any information about your server.") .
103     "\n\n" .
104     gettext("We appreciate your assistance in sending this information so we can gain an accurate count of the installed servers.") .
105     "\n\n" .
106     @@ -54,7 +54,7 @@
107     (
108     title => gettext("Internet connection successful"),
109     text =>
110     - gettext("The test was successful! Your server was able to communicate with contribs.org."),
111     + gettext("The test was successful! Your server was able to communicate with koozali.org."),
112     );
113     }
114     else
115     @@ -63,13 +63,13 @@
116     (
117     title => gettext("Internet connection failed"),
118     text =>
119     - gettext("The test failed. Your server was unable to establish contact with contribs.org via the Internet.") .
120     + gettext("The test failed. Your server was unable to establish contact with koozali.org via the Internet.") .
121     "\n\n" .
122     gettext("Please check that your server is correctly configured. A reboot may be required if certain settings are modified and the configuration process will advise you if this is required.") .
123     "\n\n" .
124     gettext("You might also want to check with your Internet provider to make sure that your Internet connection is working properly.") .
125     "\n\n" .
126     - gettext("It is also possible (although unlikely) that there is a technical problem at the contribs.org site. In this case, you should proceed with your installation and run this test again later."),
127     + gettext("It is also possible (although unlikely) that there is a technical problem at the koozali.org site. In this case, you should proceed with your installation and run this test again later."),
128     );
129     }
130     }
131     diff -Nur smeserver-support-2.8.0.old/root/sbin/e-smith/statusreport smeserver-support-2.8.0/root/sbin/e-smith/statusreport
132     --- smeserver-support-2.8.0.old/root/sbin/e-smith/statusreport 2008-10-07 10:45:23.000000000 -0400
133     +++ smeserver-support-2.8.0/root/sbin/e-smith/statusreport 2016-06-15 13:32:27.070000000 -0400
134     @@ -30,7 +30,7 @@
135     use esmith::ConfigDB;
136     my $db = esmith::ConfigDB->open_ro or die "Couldn't open ConfigDB\n";
137    
138     -use constant SERVERTEST => 'http://www.contribs.org/servertest/';
139     +use constant SERVERTEST => 'https://www.koozali.org/servertest/';
140    
141     my $sysid_hash = sha1_hex($db->get_prop('sysconfig','SystemID'));
142    
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed