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 23c6672b8c7c555b1455aebc08b51585770152da (commit) via b27961e905bdf8d7d67a6a30b51b31f1ddabdf91 (commit) via f084117d937b13e819d6dcb742e111a5cf9fc15f (commit) via 38cc2b527d3baf7079b049360abad9ec0a213c2b (commit) via b0cc7ed7c6308d96bae9ecf2997ffb5cd9a2fdcd (commit) via 703a8221076fc406a34b120268675076afaec490 (commit) from 82adcbc03fcd1402c21f554386024f11dee09111 (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 23c6672b8c7c555b1455aebc08b51585770152da Merge: 82adcbc b27961e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 20 15:32:55 2010 +0200
Merge branch 'master' into next
Conflicts: doc/packages-list.txt
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/cups | 148 +++++++++++++++++++++++++++++++- config/rootfiles/packages/ipfireseeder | 2 +- doc/packages-list.txt | 6 +- html/cgi-bin/samba.cgi | 16 ++++ lfs/cups | 6 +- lfs/htop | 6 +- lfs/ipfireseeder | 6 +- lfs/samba | 6 +- 8 files changed, 179 insertions(+), 17 deletions(-)
Difference in files: diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 4ed85c6..b2f0d8c 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -446,6 +446,147 @@ usr/share/cups/templates/header.tmpl usr/share/cups/templates/help-header.tmpl usr/share/cups/templates/help-printable.tmpl usr/share/cups/templates/help-trailer.tmpl +#usr/share/cups/templates/id +#usr/share/cups/templates/id/add-class.tmpl +#usr/share/cups/templates/id/add-printer.tmpl +#usr/share/cups/templates/id/add-rss-subscription.tmpl +#usr/share/cups/templates/id/admin.tmpl +#usr/share/cups/templates/id/choose-device.tmpl +#usr/share/cups/templates/id/choose-make.tmpl +#usr/share/cups/templates/id/choose-model.tmpl +#usr/share/cups/templates/id/choose-serial.tmpl +#usr/share/cups/templates/id/choose-uri.tmpl +#usr/share/cups/templates/id/class-added.tmpl +#usr/share/cups/templates/id/class-confirm.tmpl +#usr/share/cups/templates/id/class-deleted.tmpl +#usr/share/cups/templates/id/class-jobs-header.tmpl +#usr/share/cups/templates/id/class-modified.tmpl +#usr/share/cups/templates/id/class.tmpl +#usr/share/cups/templates/id/classes-header.tmpl +#usr/share/cups/templates/id/classes.tmpl +#usr/share/cups/templates/id/command.tmpl +#usr/share/cups/templates/id/edit-config.tmpl +#usr/share/cups/templates/id/error-op.tmpl +#usr/share/cups/templates/id/error.tmpl +#usr/share/cups/templates/id/header.tmpl +#usr/share/cups/templates/id/help-header.tmpl +#usr/share/cups/templates/id/help-printable.tmpl +#usr/share/cups/templates/id/help-trailer.tmpl +#usr/share/cups/templates/id/job-cancel.tmpl +#usr/share/cups/templates/id/job-hold.tmpl +#usr/share/cups/templates/id/job-move.tmpl +#usr/share/cups/templates/id/job-moved.tmpl +#usr/share/cups/templates/id/job-release.tmpl +#usr/share/cups/templates/id/job-restart.tmpl +#usr/share/cups/templates/id/jobs-header.tmpl +#usr/share/cups/templates/id/jobs.tmpl +#usr/share/cups/templates/id/list-available-printers.tmpl +#usr/share/cups/templates/id/modify-class.tmpl +#usr/share/cups/templates/id/modify-printer.tmpl +#usr/share/cups/templates/id/norestart.tmpl +#usr/share/cups/templates/id/option-boolean.tmpl +#usr/share/cups/templates/id/option-conflict.tmpl +#usr/share/cups/templates/id/option-header.tmpl +#usr/share/cups/templates/id/option-pickmany.tmpl +#usr/share/cups/templates/id/option-pickone.tmpl +#usr/share/cups/templates/id/option-trailer.tmpl +#usr/share/cups/templates/id/pager.tmpl +#usr/share/cups/templates/id/printer-accept.tmpl +#usr/share/cups/templates/id/printer-added.tmpl +#usr/share/cups/templates/id/printer-configured.tmpl +#usr/share/cups/templates/id/printer-confirm.tmpl +#usr/share/cups/templates/id/printer-default.tmpl +#usr/share/cups/templates/id/printer-deleted.tmpl +#usr/share/cups/templates/id/printer-jobs-header.tmpl +#usr/share/cups/templates/id/printer-modified.tmpl +#usr/share/cups/templates/id/printer-purge.tmpl +#usr/share/cups/templates/id/printer-reject.tmpl +#usr/share/cups/templates/id/printer-start.tmpl +#usr/share/cups/templates/id/printer-stop.tmpl +#usr/share/cups/templates/id/printer.tmpl +#usr/share/cups/templates/id/printers-header.tmpl +#usr/share/cups/templates/id/printers.tmpl +#usr/share/cups/templates/id/restart.tmpl +#usr/share/cups/templates/id/samba-export.tmpl +#usr/share/cups/templates/id/samba-exported.tmpl +#usr/share/cups/templates/id/search.tmpl +#usr/share/cups/templates/id/set-printer-options-header.tmpl +#usr/share/cups/templates/id/set-printer-options-trailer.tmpl +#usr/share/cups/templates/id/subscription-added.tmpl +#usr/share/cups/templates/id/subscription-canceled.tmpl +#usr/share/cups/templates/id/test-page.tmpl +#usr/share/cups/templates/id/trailer.tmpl +#usr/share/cups/templates/id/users.tmpl +#usr/share/cups/templates/it +#usr/share/cups/templates/it/add-class.tmpl +#usr/share/cups/templates/it/add-printer.tmpl +#usr/share/cups/templates/it/add-rss-subscription.tmpl +#usr/share/cups/templates/it/admin.tmpl +#usr/share/cups/templates/it/choose-device.tmpl +#usr/share/cups/templates/it/choose-make.tmpl +#usr/share/cups/templates/it/choose-model.tmpl +#usr/share/cups/templates/it/choose-serial.tmpl +#usr/share/cups/templates/it/choose-uri.tmpl +#usr/share/cups/templates/it/class-added.tmpl +#usr/share/cups/templates/it/class-confirm.tmpl +#usr/share/cups/templates/it/class-deleted.tmpl +#usr/share/cups/templates/it/class-jobs-header.tmpl +#usr/share/cups/templates/it/class-modified.tmpl +#usr/share/cups/templates/it/class.tmpl +#usr/share/cups/templates/it/classes-header.tmpl +#usr/share/cups/templates/it/classes.tmpl +#usr/share/cups/templates/it/command.tmpl +#usr/share/cups/templates/it/edit-config.tmpl +#usr/share/cups/templates/it/error-op.tmpl +#usr/share/cups/templates/it/error.tmpl +#usr/share/cups/templates/it/help-header.tmpl +#usr/share/cups/templates/it/help-printable.tmpl +#usr/share/cups/templates/it/help-trailer.tmpl +#usr/share/cups/templates/it/job-cancel.tmpl +#usr/share/cups/templates/it/job-hold.tmpl +#usr/share/cups/templates/it/job-move.tmpl +#usr/share/cups/templates/it/job-moved.tmpl +#usr/share/cups/templates/it/job-release.tmpl +#usr/share/cups/templates/it/job-restart.tmpl +#usr/share/cups/templates/it/jobs-header.tmpl +#usr/share/cups/templates/it/jobs.tmpl +#usr/share/cups/templates/it/list-available-printers.tmpl +#usr/share/cups/templates/it/modify-class.tmpl +#usr/share/cups/templates/it/modify-printer.tmpl +#usr/share/cups/templates/it/norestart.tmpl +#usr/share/cups/templates/it/option-boolean.tmpl +#usr/share/cups/templates/it/option-conflict.tmpl +#usr/share/cups/templates/it/option-header.tmpl +#usr/share/cups/templates/it/option-pickmany.tmpl +#usr/share/cups/templates/it/option-pickone.tmpl +#usr/share/cups/templates/it/option-trailer.tmpl +#usr/share/cups/templates/it/pager.tmpl +#usr/share/cups/templates/it/printer-accept.tmpl +#usr/share/cups/templates/it/printer-added.tmpl +#usr/share/cups/templates/it/printer-configured.tmpl +#usr/share/cups/templates/it/printer-confirm.tmpl +#usr/share/cups/templates/it/printer-default.tmpl +#usr/share/cups/templates/it/printer-deleted.tmpl +#usr/share/cups/templates/it/printer-jobs-header.tmpl +#usr/share/cups/templates/it/printer-modified.tmpl +#usr/share/cups/templates/it/printer-purge.tmpl +#usr/share/cups/templates/it/printer-reject.tmpl +#usr/share/cups/templates/it/printer-start.tmpl +#usr/share/cups/templates/it/printer-stop.tmpl +#usr/share/cups/templates/it/printer.tmpl +#usr/share/cups/templates/it/printers-header.tmpl +#usr/share/cups/templates/it/printers.tmpl +#usr/share/cups/templates/it/restart.tmpl +#usr/share/cups/templates/it/samba-export.tmpl +#usr/share/cups/templates/it/samba-exported.tmpl +#usr/share/cups/templates/it/search.tmpl +#usr/share/cups/templates/it/set-printer-options-header.tmpl +#usr/share/cups/templates/it/set-printer-options-trailer.tmpl +#usr/share/cups/templates/it/subscription-added.tmpl +#usr/share/cups/templates/it/subscription-canceled.tmpl +#usr/share/cups/templates/it/test-page.tmpl +#usr/share/cups/templates/it/trailer.tmpl +#usr/share/cups/templates/it/users.tmpl #usr/share/cups/templates/ja #usr/share/cups/templates/ja/add-class.tmpl #usr/share/cups/templates/ja/add-printer.tmpl @@ -797,6 +938,8 @@ usr/share/doc/cups/help #usr/share/doc/cups/help/standard.html #usr/share/doc/cups/help/translation.html #usr/share/doc/cups/help/whatsnew.html +#usr/share/doc/cups/id +#usr/share/doc/cups/id/index.html usr/share/doc/cups/images #usr/share/doc/cups/images/color-wheel.png #usr/share/doc/cups/images/cups-block-diagram.png @@ -813,6 +956,8 @@ usr/share/doc/cups/images #usr/share/doc/cups/images/unsel.gif #usr/share/doc/cups/images/wait.gif usr/share/doc/cups/index.html +#usr/share/doc/cups/it +#usr/share/doc/cups/it/index.html #usr/share/doc/cups/ja #usr/share/doc/cups/ja/index.html #usr/share/doc/cups/pl @@ -826,6 +971,7 @@ usr/share/doc/cups/robots.txt #usr/share/locale/eu/cups_eu.po #usr/share/locale/fi/cups_fi.po #usr/share/locale/fr/cups_fr.po +#usr/share/locale/id/cups_id.po #usr/share/locale/it/cups_it.po #usr/share/locale/ja/cups_ja.po #usr/share/locale/ko/cups_ko.po @@ -901,4 +1047,4 @@ var/run/cups var/run/cups/certs var/spool/cups var/spool/cups/tmp -etc/rc.d/init.d/cups +etc/rc.d/init.d/cups \ No newline at end of file diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 64898be..bacd4dd 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.7.i586-full-core39.iso.torrent +var/ipfire/seeder/ipfire-2.7.i586-full-core40.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/doc/packages-list.txt b/doc/packages-list.txt index b21bce4..ee2467a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -74,7 +74,7 @@ * cpufrequtils-007 * cryptodev-20091126-kmod-2.6.32.21-ipfire * cryptodev-20091126-kmod-2.6.32.21-ipfire-xen -* cups-1.4.2 +* cups-1.4.4 * curl-7.19.5 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 @@ -140,7 +140,7 @@ * hdparm-8.9 * hostapd-0.7.3 * hplip-2.7.10 -* htop-0.8.1 +* htop-0.8.3 * httpd-2.2.15 * hwdata * iana-etc-2.10 @@ -299,7 +299,7 @@ * rssdler-0.4.0a * rsync-3.0.7 * rtorrent-0.8.6 -* samba-3.5.4 +* samba-3.5.5 * sane-1.0.19 * screen-4.0.3 * sdparm-1.01 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 712f085..3315bbf 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -102,6 +102,7 @@ $sambasettings{'DISPLAYCHARSET'} = 'CP850'; $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; +$sambasettings{'SMB2'} = 'off'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; ### Samba CUPS Variablen @@ -183,6 +184,9 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'DOMAINMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE'; + $sambasettings{'WIDELINKS'} = 'on'; + $sambasettings{'UNIXEXTENSION'} = 'off'; + $sambasettings{'SMB2'} = 'off'; $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; system("/usr/local/bin/sambactrl smbreload"); refreshpage(); @@ -276,7 +280,14 @@ passdb backend = smbpasswd
wide links = $sambasettings{'WIDELINKS'} unix extensions = $sambasettings{'UNIXEXTENSION'} +END +;
+if ($sambasettings{'SMB2'} eq 'on'){ + print FILE "max protocol = smb2\n"; +} + +print FILE <<END keep alive = 30 os level = $sambasettings{'OSLEVEL'} fstype = NTFS @@ -400,6 +411,9 @@ $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; $checked{'UNIXEXTENSION'}{'off'} = ''; $checked{'UNIXEXTENSION'}{'on'} = ''; $checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'"; +$checked{'SMB2'}{'off'} = ''; +$checked{'SMB2'}{'on'} = ''; +$checked{'SMB2'}{$sambasettings{'SMB2'}} = "checked='checked'"; $checked{'GREEN'}{'off'} = ''; $checked{'GREEN'}{'on'} = ''; $checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked'"; @@ -504,6 +518,8 @@ print <<END <input type='radio' name='WIDELINKS' value='off' $checked{'WIDELINKS'}{'off'} /> off</td></tr> <tr><td align='left' width='40%'>Unix extension</td><td align='left'>on <input type='radio' name='UNIXEXTENSION' value='on' $checked{'UNIXEXTENSION'}{'on'} />/ <input type='radio' name='UNIXEXTENSION' value='off' $checked{'UNIXEXTENSION'}{'off'} /> off</td></tr> +<tr><td align='left' width='40%'>SMB2 $Lang::tr{'protocol'}</td><td align='left'>on <input type='radio' name='SMB2' value='on' $checked{'SMB2'}{'on'} />/ + <input type='radio' name='SMB2' value='off' $checked{'SMB2'}{'off'} /> off</td></tr> <tr><td align='left'><br /></td><td></td></tr> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td></tr> <tr><td align='left' width='40%'>$Lang::tr{'security'}</td><td align='left'><select name='SECURITY' style="width: 165px"> diff --git a/lfs/cups b/lfs/cups index 938037b..e8d9cc0 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@
include Config
-VER = 1.4.2 +VER = 1.4.4
THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 5 +PAK_VER = 6
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d95e2d588e3d36e563027a963b117b1b +$(DL_FILE)_MD5 = 8776403ad60fea9e85eab9c04d88560d
install : $(TARGET)
diff --git a/lfs/htop b/lfs/htop index 357b73d..c88995b 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@
include Config
-VER = 0.8.1 +VER = 0.8.3
THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 2 +PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f0b259ca29175656de48bf0fa0a2e619 +$(DL_FILE)_MD5 = 5c9f093f9eaddf6e77aa6d54c2116d0c
install : $(TARGET)
diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index a0921c6..b2a65ca 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00
THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.7.i586-full-core39.iso.torrent +DL_FILE = ipfire-2.7.i586-full-core40.iso.torrent
DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 14 +PAK_VER = 15
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fb86055370d1cd5c0736c47b3e4f68f6 +$(DL_FILE)_MD5 = 6475e2d772a39db73ea869328f98d2f3
install : $(TARGET)
diff --git a/lfs/samba b/lfs/samba index 8a8712e..496a2bf 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@
include Config
-VER = 3.5.4 +VER = 3.5.5
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 = 29 +PAK_VER = 30
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 22c8c977eaa18be50f3878c6d0e0c2f0 +$(DL_FILE)_MD5 = 278728aeeef9db7e27fa6a2ce5b43509
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree