[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c1aa6aafc2efd276fc60c63c5dbd4bfb6b0f4ccb

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c1aa6aafc2efd276fc60c63c5dbd4bfb6b0f4ccb

[git]

[-- Attachment #1: Type: text/plain, Size: 4177 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c1aa6aafc2efd276fc60c63c5dbd4bfb6b0f4ccb (commit)
       via  94ce2cc1b982640f43077584d3911151911e0226 (commit)
      from  cc025d2a3e20b83e83b279170551409deba70070 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c1aa6aafc2efd276fc60c63c5dbd4bfb6b0f4ccb
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date:   Mon Mar 18 22:39:24 2013 +0100

    samba: updated to 3.6.13.

commit 94ce2cc1b982640f43077584d3911151911e0226
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date:   Mon Mar 18 20:26:38 2013 +0100

    samba.cgi: increase network buffers.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/packages/samba | 1 +
 html/cgi-bin/samba.cgi          | 6 +++---
 lfs/samba                       | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba
index fc8cc44..4238ae5 100644
--- a/config/rootfiles/packages/samba
+++ b/config/rootfiles/packages/samba
@@ -114,6 +114,7 @@ usr/sbin/winbindd
 #usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
 #usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
+#usr/share/man/man1/dbwrap_tool.1
 #usr/share/man/man1/findsmb.1
 #usr/share/man/man1/log2pcap.1
 #usr/share/man/man1/nmblookup.1
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index b3da32c..74f10bd 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -99,7 +99,7 @@ $sambasettings{'SYSLOGONLY'} = 'on';
 $sambasettings{'DOSCHARSET'} = 'CP850';
 $sambasettings{'UNIXCHARSET'} = 'UTF8';
 $sambasettings{'DISPLAYCHARSET'} = 'CP850';
-$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE';
+$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
 $sambasettings{'WIDELINKS'} = 'on';
 $sambasettings{'UNIXEXTENSION'} = 'off';
 $sambasettings{'SMB2'} = 'off';
@@ -149,7 +149,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	system("/usr/local/bin/sambactrl smbglobalreset");
 	$sambasettings{'WORKGRP'} = 'homeip.net';
 	$sambasettings{'NETBIOSNAME'} = 'IPFire';
-	$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0';
+	$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
 	$sambasettings{'INTERFACES'} = '';
 	$sambasettings{'SECURITY'} = 'share';
 	$sambasettings{'OSLEVEL'} = '65';
@@ -183,7 +183,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	$sambasettings{'LOCALMASTER'} = 'off';
 	$sambasettings{'DOMAINMASTER'} = 'off';
 	$sambasettings{'PREFERREDMASTER'} = 'off';
-	$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE';
+	$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
 	$sambasettings{'WIDELINKS'} = 'on';
 	$sambasettings{'UNIXEXTENSION'} = 'off';
 	$sambasettings{'SMB2'} = 'off';
diff --git a/lfs/samba b/lfs/samba
index b843dcd..4a7f7cd 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.6.12
+VER        = 3.6.13
 
 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    = 46
+PAK_VER    = 47
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 430fd21a1acd26964d3ccf366df8709a
+$(DL_FILE)_MD5 = b9fe8413cbb6fa4b970a159968db2fb4
 
 install : $(TARGET)
 


hooks/post-receive
--
IPFire 2.x development tree