Skip to content

Commit

Permalink
1.5.100418
Browse files Browse the repository at this point in the history
  • Loading branch information
@dtouzeau
dtouzeau committed Oct 4, 2011
1 parent 40f6fb0 commit 4bb8a3c
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 49 deletions.
Binary file modified bin/artica-compile
View file
Binary file not shown.
82 changes: 41 additions & 41 deletions bin/src/artica-compile/artica_compile.lpi
View file
Expand Up @@ -188,8 +188,8 @@
<Filename Value="compile.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="compile"/>
<CursorPos X="63" Y="1595"/>
<TopLine Value="1578"/>
<CursorPos X="38" Y="105"/>
<TopLine Value="59"/>
<EditorIndex Value="2"/>
<UsageCount Value="152"/>
<Loaded Value="True"/>
Expand Down Expand Up @@ -251,123 +251,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="compile.pas"/>
<Caret Line="99" Column="47" TopLine="45"/>
<Caret Line="1516" Column="41" TopLine="1482"/>
</Position1>
<Position2>
<Filename Value="compile.pas"/>
<Caret Line="1522" Column="25" TopLine="1242"/>
<Caret Line="1545" Column="21" TopLine="1511"/>
</Position2>
<Position3>
<Filename Value="compile.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Caret Line="1551" Column="147" TopLine="1517"/>
</Position3>
<Position4>
<Filename Value="compile.pas"/>
<Caret Line="94" Column="1" TopLine="63"/>
<Caret Line="1552" Column="111" TopLine="1518"/>
</Position4>
<Position5>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Filename Value="compile.pas"/>
<Caret Line="1551" Column="1" TopLine="1514"/>
</Position5>
<Position6>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="4375" Column="45" TopLine="4341"/>
<Filename Value="compile.pas"/>
<Caret Line="50" Column="26" TopLine="1"/>
</Position6>
<Position7>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Filename Value="compile.pas"/>
<Caret Line="1558" Column="25" TopLine="1524"/>
</Position7>
<Position8>
<Filename Value="compile.pas"/>
<Caret Line="1549" Column="57" TopLine="1502"/>
<Caret Line="1564" Column="24" TopLine="1531"/>
</Position8>
<Position9>
<Filename Value="compile.pas"/>
<Caret Line="94" Column="1" TopLine="60"/>
<Caret Line="1591" Column="45" TopLine="1558"/>
</Position9>
<Position10>
<Filename Value="compile.pas"/>
<Caret Line="97" Column="41" TopLine="63"/>
<Caret Line="1597" Column="38" TopLine="1563"/>
</Position10>
<Position11>
<Filename Value="compile.pas"/>
<Caret Line="1516" Column="41" TopLine="1482"/>
<Caret Line="1599" Column="60" TopLine="1566"/>
</Position11>
<Position12>
<Filename Value="compile.pas"/>
<Caret Line="1545" Column="21" TopLine="1511"/>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="2082" Column="23" TopLine="2048"/>
</Position12>
<Position13>
<Filename Value="compile.pas"/>
<Caret Line="1551" Column="147" TopLine="1517"/>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position13>
<Position14>
<Filename Value="compile.pas"/>
<Caret Line="1552" Column="111" TopLine="1518"/>
<Caret Line="1616" Column="86" TopLine="1564"/>
</Position14>
<Position15>
<Filename Value="compile.pas"/>
<Caret Line="1551" Column="1" TopLine="1514"/>
<Caret Line="1561" Column="10" TopLine="1527"/>
</Position15>
<Position16>
<Filename Value="compile.pas"/>
<Caret Line="50" Column="26" TopLine="1"/>
<Caret Line="1612" Column="1" TopLine="1578"/>
</Position16>
<Position17>
<Filename Value="compile.pas"/>
<Caret Line="1558" Column="25" TopLine="1524"/>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="733" Column="25" TopLine="699"/>
</Position17>
<Position18>
<Filename Value="compile.pas"/>
<Caret Line="1564" Column="24" TopLine="1531"/>
<Caret Line="1613" Column="31" TopLine="1579"/>
</Position18>
<Position19>
<Filename Value="compile.pas"/>
<Caret Line="1591" Column="45" TopLine="1558"/>
<Caret Line="49" Column="100" TopLine="1"/>
</Position19>
<Position20>
<Filename Value="compile.pas"/>
<Caret Line="1597" Column="38" TopLine="1563"/>
<Caret Line="1612" Column="106" TopLine="1567"/>
</Position20>
<Position21>
<Filename Value="compile.pas"/>
<Caret Line="1599" Column="60" TopLine="1566"/>
<Caret Line="1595" Column="63" TopLine="1578"/>
</Position21>
<Position22>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="2082" Column="23" TopLine="2048"/>
<Filename Value="compile.pas"/>
<Caret Line="1097" Column="72" TopLine="1072"/>
</Position22>
<Position23>
<Filename Value="../artica-install/global_conf.pas"/>
<Filename Value="compile.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position23>
<Position24>
<Filename Value="compile.pas"/>
<Caret Line="1616" Column="86" TopLine="1564"/>
<Caret Line="16" Column="13" TopLine="1"/>
</Position24>
<Position25>
<Filename Value="compile.pas"/>
<Caret Line="1561" Column="10" TopLine="1527"/>
<Caret Line="37" Column="33" TopLine="1"/>
</Position25>
<Position26>
<Filename Value="compile.pas"/>
<Caret Line="1612" Column="1" TopLine="1578"/>
<Caret Line="73" Column="74" TopLine="52"/>
</Position26>
<Position27>
<Filename Value="../artica-install/global_conf.pas"/>
<Caret Line="733" Column="25" TopLine="699"/>
<Filename Value="compile.pas"/>
<Caret Line="1648" Column="100" TopLine="1586"/>
</Position27>
<Position28>
<Filename Value="compile.pas"/>
<Caret Line="1613" Column="31" TopLine="1579"/>
<Caret Line="92" Column="38" TopLine="52"/>
</Position28>
<Position29>
<Filename Value="compile.pas"/>
<Caret Line="49" Column="100" TopLine="1"/>
<Caret Line="37" Column="33" TopLine="8"/>
</Position29>
<Position30>
<Filename Value="compile.pas"/>
<Caret Line="1612" Column="106" TopLine="1567"/>
<Caret Line="63" Column="29" TopLine="42"/>
</Position30>
</JumpHistory>
</ProjectOptions>
Expand Down Expand Up @@ -403,7 +403,7 @@
</Item4>
<Item5>
<Source Value="compile.pas"/>
<Line Value="367"/>
<Line Value="369"/>
</Item5>
</BreakPoints>
<Exceptions Count="2">
Expand Down
7 changes: 6 additions & 1 deletion bin/src/artica-compile/compile.pas
View file
Expand Up @@ -70,6 +70,7 @@ constructor TCompile.Create;
writeln('Backup to..............: ',BackupPath);
writeln('Current user...........: ',CurrentUser);

fpsystem('/bin/rm -f /usr/share/artica-postfix/ressources/settings.inc');
languages_bases:=Tstringlist.Create;
languages_bases.Add('fr');
languages_bases.add('it');
Expand Down Expand Up @@ -101,6 +102,7 @@ function TCompile.COMPILE_GEN_VERSION():string;
J.LoadFromFile(dir+'/date.txt');
txt:=trim(J.Strings[0]);
result:='1.5.'+txt;
fpsystem('/bin/rm '+dir+'/date.txt');

end;
//##############################################################################
Expand Down Expand Up @@ -1569,7 +1571,7 @@ procedure TCompile.createPatch();
exit;
end;
dirorg:=dir;
version:=trim(logs.ReadFromFile('/usr/share/artica-postfix/VERSION'));
version:=COMPILE_GEN_VERSION();
l:=Tstringlist.Create;
l.LoadFromFile(targetfile);
RegExpr:=TRegExpr.Create;
Expand Down Expand Up @@ -1603,6 +1605,9 @@ procedure TCompile.createPatch();
RegExpr.Expression:='bin\/artica-compile';
if RegExpr.Exec(ll.Strings[i]) then continue;

RegExpr.Expression:='ressources\/settings';
if RegExpr.Exec(ll.Strings[i]) then continue;

RegExpr.Expression:='bin\/artica-install';
if RegExpr.Exec(ll.Strings[i]) then fpsystem('strip -s /usr/share/artica-postfix/bin/artica-install');

Expand Down
3 changes: 2 additions & 1 deletion freeweb.edit.php
View file
Expand Up @@ -1353,7 +1353,8 @@ function SaveFreeWebMain(){
}
if(mysql_database.length>16){
alert('$error_field_max_length: 16');
alert('mysql_database:$error_field_max_length: 16');
document.getElementById('mysql_database').disabled=false;
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ressources/VERSION
View file
@@ -1 +1 @@
1.5.100416
1.5.100418
1 change: 0 additions & 1 deletion ressources/class.squid.inc
View file
Expand Up @@ -1742,7 +1742,6 @@ function BuildSquidConf(){
$conf=$conf."cache_log /var/log/squid/cache.log\n";
$conf=$conf."pid_filename /var/run/squid.pid\n";


if(($this->IS_30) && (!$this->IS_32)){
$conf=$conf."cache_store_log /var/log/squid/store.log\n";
$conf=$conf."access_log none manager\n";
Expand Down
8 changes: 4 additions & 4 deletions ressources/settings.new.inc
View file
Expand Up @@ -43,8 +43,8 @@ $_GLOBAL["SNORT_INSTALLED"]=False;
$_GLOBAL["APP_EYEOS_INSTALLED"]=False;
$_GLOBAL["EYEOS_VERSION"]="";
$_GLOBAL["AS_VPS_CLIENT"]=False;
$_GLOBAL["disks_size"]="sda1,141,83,52,62;sdb1,147,128,12,92;";
$_GLOBAL["disks_inodes"]="sda1:9,0M:574K:8,4M:7;sdb1:9,4M:1,2M:8,3M:12;";
$_GLOBAL["disks_size"]="sda1,141,83,52,62;sdb1,147,129,12,93;sdc1,299,147,152,50;";
$_GLOBAL["disks_inodes"]="sda1:9,0M:574K:8,4M:7;sdb1:9,4M:1,2M:8,3M:12;sdc1:152M:15K:152M:1;";
$_GLOBAL["LOCATE_AUTHLOG_PATH"]="/var/log/auth.log";
$_GLOBAL["RACOON_INSTALLED"]=False;
$_GLOBAL["PPTPD_INSTALLED"]=False;
Expand Down Expand Up @@ -114,7 +114,7 @@ $_GLOBAL["crossroads_installed"]=False;
$_GLOBAL["DB_RECOVER_INSTALLED"]=False;
$_GLOBAL["BACKUPPC_INSTALLED"]=False;
$_GLOBAL["CPU_NUMBER"]="2";
$_GLOBAL["LOAD_AVERAGE"]="0.45";
$_GLOBAL["LOAD_AVERAGE"]="0.47";
$_GLOBAL["WPA_SUPPLIANT_INSTALLED"]=True;
$_GLOBAL["HOSTAPD_INSTALLED"]=False;
$_GLOBAL["SMARTMONTOOLS_INSTALLED"]=True;
Expand Down Expand Up @@ -209,7 +209,7 @@ $_GLOBAL["ChangeAutoInterface"]="";
$_GLOBAL["POSTFIX_STATUS"]="0;.;";
$_GLOBAL["KAS_STATUS"]="-0;-0;-0;-0";
$_GLOBAL["ARTICA_FILTER_QUEUE_PATH"]="/var/spool/artica-filter";
$_GLOBAL["ARTICA_VERSION"]="1.5.100416";
$_GLOBAL["ARTICA_VERSION"]="1.5.100418";
$_GLOBAL["POSTFIX_VERSION"]=".";
$_GLOBAL["POSTFIX_MAILDROP_PATH"]="";
$_GLOBAL["LIGHTTPD_LDAP_AUTH"]=True;
Expand Down

0 comments on commit 4bb8a3c

Please sign in to comment.