Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 48087b049fa7bbdbb1d17550e1158ef498fd759e..260b5371d9dc85a712114c5587bf9d9e9e3b9510 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -219,7 +219,6 @@
 * mtools-3.9.10
 * mysql-5.0.24a
 * nagios-3.0.5
-* nano-1.2.5
 * nano-2.0.9
 * nasm-0.98.39
 * ncftp-3.2.1-src
@@ -271,7 +270,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.4
 * rtorrent-0.8.4
-* samba-3.3.3
+* samba-3.3.4
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
@@ -289,7 +288,6 @@
 * squashfs3.4
 * squid-2.7.STABLE6
 * squidGuard-1.4
-* squidclamav-3.9
 * squidclamav-4.0
 * sshfs-fuse-2.2
 * sslh-1.6g

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 8d32b72fcbbe427f056b44700a3371a65b8e8e3f..3ded61140708dba3ab13fe31f3b2919257801354 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -315,7 +315,7 @@ END
 close FILE;
        }
 
-       if ($sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' )
+       if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' )
        {
        open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!";
        flock (FILE, 2);
@@ -334,12 +334,12 @@ END
 
 if ( -e "/var/ipfire/cups/enable")
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
        else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
        }
 else
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
        else{system("/usr/local/bin/sambactrl smbsafeconf");}
        }
 
@@ -1206,18 +1206,17 @@ close FILE;
 
 if ( -e "/var/ipfire/cups/enable")
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
        else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
        }
 else
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
        else{system("/usr/local/bin/sambactrl smbsafeconf");}
        }
 
 system("/usr/local/bin/sambactrl smbreload");
 refreshpage();
-}
 
 sub isrunning
        {

diff --git a/lfs/perl-gettext b/lfs/perl-gettext
index a72ca8d6a015762e971bf0e165c515460e7947cd..3869b4c9d06556ebcb3a69b035808bd2d407ea3b 100644 (file)
--- a/lfs/perl-gettext
+++ b/lfs/perl-gettext
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-gettext
 DEPS       = ""
-VER        = "2"
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/samba b/lfs/samba
index 00211b1a8fc73871a1fd8bd6044e12b60d80cd7c..c3608500f73a5dbe5a4d2b699a29a4020ec70236 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.3
+VER        = 3.3.4
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4d5835817416d1ffa30783af45c5a9ed
+$(DL_FILE)_MD5 = 1443165edb7cb3f56f1e77aec1ee3266
 
 install : $(TARGET)