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

config/guardian/guardian.conf

@@ -21,12 +21,12 @@ LogFile         /var/log/guardian/guardian.log
 AlertFile       /var/log/snort/alert
 
 # The list of ip addresses to ignore
-IgnoreFile      /var/ipfire/guardian.ignore
+IgnoreFile      /var/ipfire/guardian/guardian.ignore
 
 # This is a list of IP addresses on the current host, in case there is more
 # than one. If this file doesn't exist, then it will assume you want to run
 # with the default setup (machine's ip address, and broadcast/network). 
-TargetFile      /var/ipfire/guardian.target
+TargetFile      /var/ipfire/guardian/guardian.target
 
 # The time in seconds to keep a host blocked. If undefined, it defaults to 
 # 99999999, which basicly disables the feature. 

config/rootfiles/core/25/files

@@ -0,0 +1 @@
+srv/web/ipfire/cgi-bin/ids.cgi

config/rootfiles/core/25/meta

@@ -0,0 +1 @@
+DEPS=""

config/rootfiles/core/25/update.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+extract_files
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

config/rootfiles/packages/ipfireseeder

@@ -1,4 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
-var/ipfire/seeder
+#var/ipfire/seeder
 var/ipfire/seeder/ipfire-2.3.i586-full.iso.torrent
-var/log/seeder
+#var/log/seeder
+var/log/seeder/info

config/rootfiles/packages/samba

@@ -1,15 +1,14 @@
-etc/rc.d/init.d/samba
-etc/rc.d/init.d/winbind
-srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
-var/ipfire/menu.d/EX-samba.menu
-usr/local/bin/sambactrl
 lib/libnss_winbind.so
 lib/libnss_winbind.so.2
 lib/libnss_wins.so
 lib/libnss_wins.so.2
 usr/bin/eventlogadm
 usr/bin/findsmb
+usr/bin/ldbadd
+usr/bin/ldbdel
+usr/bin/ldbedit
+usr/bin/ldbmodify
+usr/bin/ldbsearch
 usr/bin/net
 usr/bin/nmblookup
 usr/bin/ntlm_auth
@@ -32,33 +31,42 @@ usr/bin/tdbtool
 usr/bin/testparm
 usr/bin/wbinfo
 #usr/include/libsmbclient.h
+#usr/include/netapi.h
+#usr/include/smb_share_modes.h
+#usr/include/talloc.h
+#usr/include/tdb.h
+#usr/include/wbclient.h
+usr/lib/libsmbclient.so
+usr/lib/libsmbclient.so.0
 usr/lib/libtalloc.so
 usr/lib/libtalloc.so.1
 usr/lib/libtdb.so
 usr/lib/libtdb.so.1
-usr/lib/libsmbclient.so
-usr/lib/libsmbclient.so.0
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
-usr/lib/samba/libsmbclient.so.0
-usr/lib/samba/libtalloc.so.1
-usr/lib/samba/libtdb.so.1
-usr/lib/samba/libwbclient.so.0
 #usr/lib/samba
 #usr/lib/samba/auth
 usr/lib/samba/auth/script.so
 #usr/lib/samba/charset
 usr/lib/samba/charset/CP437.so
 usr/lib/samba/charset/CP850.so
+usr/lib/samba/idmap
+usr/lib/samba/libnetapi.so
+usr/lib/samba/libnetapi.so.0
 usr/lib/samba/libsmbclient.so
+usr/lib/samba/libsmbclient.so.0
 usr/lib/samba/libsmbsharemodes.so
+usr/lib/samba/libsmbsharemodes.so.0
+usr/lib/samba/libtalloc.so
+usr/lib/samba/libtalloc.so.1
+usr/lib/samba/libtdb.so
+usr/lib/samba/libtdb.so.1
+usr/lib/samba/libwbclient.so
+usr/lib/samba/libwbclient.so.0
 usr/lib/samba/lowcase.dat
-#usr/lib/samba/nl.msg
 usr/lib/samba/nss_info
 usr/lib/samba/pdb
-#usr/lib/samba/pl.msg
 usr/lib/samba/rpc
-#usr/lib/samba/tr.msg
 usr/lib/samba/upcase.dat
 usr/lib/samba/valid.dat
 #usr/lib/samba/vfs
@@ -68,19 +76,30 @@ usr/lib/samba/vfs/default_quota.so
 usr/lib/samba/vfs/expand_msdfs.so
 usr/lib/samba/vfs/extd_audit.so
 usr/lib/samba/vfs/fake_perms.so
+usr/lib/samba/vfs/fileid.so
 usr/lib/samba/vfs/full_audit.so
 usr/lib/samba/vfs/netatalk.so
 usr/lib/samba/vfs/readahead.so
 usr/lib/samba/vfs/readonly.so
 usr/lib/samba/vfs/recycle.so
 usr/lib/samba/vfs/shadow_copy.so
+usr/lib/samba/vfs/shadow_copy2.so
+usr/lib/samba/vfs/smb_traffic_analyzer.so
+usr/lib/samba/vfs/streams_depot.so
+usr/lib/samba/vfs/streams_xattr.so
+usr/lib/samba/vfs/syncops.so
+usr/lib/samba/vfs/xattr_tdb.so
 usr/sbin/mount.cifs
 usr/sbin/nmbd
 usr/sbin/smbd
-#usr/sbin/swat
 usr/sbin/umount.cifs
 usr/sbin/winbindd
 #usr/share/man/man1/findsmb.1
+#usr/share/man/man1/ldbadd.1
+#usr/share/man/man1/ldbdel.1
+#usr/share/man/man1/ldbedit.1
+#usr/share/man/man1/ldbmodify.1
+#usr/share/man/man1/ldbsearch.1
 #usr/share/man/man1/log2pcap.1
 #usr/share/man/man1/nmblookup.1
 #usr/share/man/man1/ntlm_auth.1
@@ -104,6 +123,7 @@ usr/sbin/winbindd
 #usr/share/man/man7/libsmbclient.7
 #usr/share/man/man7/pam_winbind.7
 #usr/share/man/man7/samba.7
+#usr/share/man/man8/cifs.upcall.8
 #usr/share/man/man8/eventlogadm.8
 #usr/share/man/man8/idmap_ad.8
 #usr/share/man/man8/idmap_ldap.8
@@ -115,11 +135,8 @@ usr/sbin/winbindd
 #usr/share/man/man8/nmbd.8
 #usr/share/man/man8/pdbedit.8
 #usr/share/man/man8/smbd.8
-#usr/share/man/man8/smbmnt.8
-#usr/share/man/man8/smbmount.8
 #usr/share/man/man8/smbpasswd.8
 #usr/share/man/man8/smbspool.8
-#usr/share/man/man8/smbumount.8
 #usr/share/man/man8/swat.8
 #usr/share/man/man8/tdbbackup.8
 #usr/share/man/man8/tdbdump.8
@@ -142,324 +159,11 @@ usr/sbin/winbindd
 #usr/share/man/man8/vfs_readonly.8
 #usr/share/man/man8/vfs_recycle.8
 #usr/share/man/man8/vfs_shadow_copy.8
+#usr/share/man/man8/vfs_smb_traffic_analyzer.8
+#usr/share/man/man8/vfs_streams_depot.8
+#usr/share/man/man8/vfs_streams_xattr.8
 #usr/share/man/man8/vfs_xattr_tdb.8
 #usr/share/man/man8/winbindd.8
-#usr/share/samba
-#usr/share/samba/swat
-#usr/share/samba/swat/help
-#usr/share/samba/swat/help/Samba3-ByExample
-#usr/share/samba/swat/help/Samba3-ByExample/2000users.html
-#usr/share/samba/swat/help/Samba3-ByExample/Big500users.html
-#usr/share/samba/swat/help/Samba3-ByExample/DMSMig.html
-#usr/share/samba/swat/help/Samba3-ByExample/DomApps.html
-#usr/share/samba/swat/help/Samba3-ByExample/ExNetworks.html
-#usr/share/samba/swat/help/Samba3-ByExample/HA.html
-#usr/share/samba/swat/help/Samba3-ByExample/RefSection.html
-#usr/share/samba/swat/help/Samba3-ByExample/apa.html
-#usr/share/samba/swat/help/Samba3-ByExample/appendix.html
-#usr/share/samba/swat/help/Samba3-ByExample/ch14.html
-#usr/share/samba/swat/help/Samba3-ByExample/go01.html
-#usr/share/samba/swat/help/Samba3-ByExample/happy.html
-#usr/share/samba/swat/help/Samba3-ByExample/images
-#usr/share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/acct2net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-config.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-login.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-users.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/openmag.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
-#usr/share/samba/swat/help/Samba3-ByExample/index.html
-#usr/share/samba/swat/help/Samba3-ByExample/ix01.html
-#usr/share/samba/swat/help/Samba3-ByExample/kerberos.html
-#usr/share/samba/swat/help/Samba3-ByExample/ntmigration.html
-#usr/share/samba/swat/help/Samba3-ByExample/nw4migration.html
-#usr/share/samba/swat/help/Samba3-ByExample/pr01.html
-#usr/share/samba/swat/help/Samba3-ByExample/pr02.html
-#usr/share/samba/swat/help/Samba3-ByExample/pr03.html
-#usr/share/samba/swat/help/Samba3-ByExample/preface.html
-#usr/share/samba/swat/help/Samba3-ByExample/primer.html
-#usr/share/samba/swat/help/Samba3-ByExample/secure.html
-#usr/share/samba/swat/help/Samba3-ByExample/simple.html
-#usr/share/samba/swat/help/Samba3-ByExample/small.html
-#usr/share/samba/swat/help/Samba3-ByExample/unixclients.html
-#usr/share/samba/swat/help/Samba3-ByExample/upgrades.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide
-#usr/share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/Packaging.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/architecture.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/contributing.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/debug.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/devprinting.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/index.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/internals.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/modules.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/parsing.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pr01.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt01.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt02.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt03.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt04.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt05.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/tracing.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/vfs.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/wins.html
-#usr/share/samba/swat/help/Samba3-HOWTO
-#usr/share/samba/swat/help/Samba3-HOWTO/AccessControls.html
-#usr/share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Appendix.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Backup.html
-#usr/share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ClientConfig.html
-#usr/share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html
-#usr/share/samba/swat/help/Samba3-HOWTO/FastStart.html
-#usr/share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html
-#usr/share/samba/swat/help/Samba3-HOWTO/IntroSMB.html
-#usr/share/samba/swat/help/Samba3-HOWTO/NT4Migration.html
-#usr/share/samba/swat/help/Samba3-HOWTO/NetCommand.html
-#usr/share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Other-Clients.html
-#usr/share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Portability.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html
-#usr/share/samba/swat/help/Samba3-HOWTO/SWAT.html
-#usr/share/samba/swat/help/Samba3-HOWTO/SambaHA.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ServerType.html
-#usr/share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html
-#usr/share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html
-#usr/share/samba/swat/help/Samba3-HOWTO/VFS.html
-#usr/share/samba/swat/help/Samba3-HOWTO/apa.html
-#usr/share/samba/swat/help/Samba3-HOWTO/bugreport.html
-#usr/share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ch47.html
-#usr/share/samba/swat/help/Samba3-HOWTO/classicalprinting.html
-#usr/share/samba/swat/help/Samba3-HOWTO/compiling.html
-#usr/share/samba/swat/help/Samba3-HOWTO/diagnosis.html
-#usr/share/samba/swat/help/Samba3-HOWTO/domain-member.html
-#usr/share/samba/swat/help/Samba3-HOWTO/go01.html
-#usr/share/samba/swat/help/Samba3-HOWTO/groupmapping.html
-#usr/share/samba/swat/help/Samba3-HOWTO/idmapper.html
-#usr/share/samba/swat/help/Samba3-HOWTO/images
-#usr/share/samba/swat/help/Samba3-HOWTO/images/10small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/11small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/12small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/13small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/14small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/1small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/2small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/3small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/4small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/5small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/6small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/7small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/8small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/9small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME001.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME002.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME003.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME005.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME009.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME010.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME013.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME014.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/a_small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/access1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/cups1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/cups2.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/domain.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
-#usr/share/samba/swat/help/Samba3-HOWTO/index.html
-#usr/share/samba/swat/help/Samba3-HOWTO/install.html
-#usr/share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
-#usr/share/samba/swat/help/Samba3-HOWTO/introduction.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ix01.html
-#usr/share/samba/swat/help/Samba3-HOWTO/largefile.html
-#usr/share/samba/swat/help/Samba3-HOWTO/locking.html
-#usr/share/samba/swat/help/Samba3-HOWTO/migration.html
-#usr/share/samba/swat/help/Samba3-HOWTO/msdfs.html
-#usr/share/samba/swat/help/Samba3-HOWTO/optional.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pam.html
-#usr/share/samba/swat/help/Samba3-HOWTO/passdb.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pr01.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pr02.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pr03.html
-#usr/share/samba/swat/help/Samba3-HOWTO/problems.html
-#usr/share/samba/swat/help/Samba3-HOWTO/rights.html
-#usr/share/samba/swat/help/Samba3-HOWTO/samba-bdc.html
-#usr/share/samba/swat/help/Samba3-HOWTO/samba-pdc.html
-#usr/share/samba/swat/help/Samba3-HOWTO/securing-samba.html
-#usr/share/samba/swat/help/Samba3-HOWTO/speed.html
-#usr/share/samba/swat/help/Samba3-HOWTO/troubleshooting.html
-#usr/share/samba/swat/help/Samba3-HOWTO/type.html
-#usr/share/samba/swat/help/Samba3-HOWTO/unicode.html
-#usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
-#usr/share/samba/swat/help/Samba3-HOWTO/winbind.html
-#usr/share/samba/swat/help/manpages
-#usr/share/samba/swat/help/manpages/eventlogadm.8.html
-#usr/share/samba/swat/help/manpages/findsmb.1.html
-#usr/share/samba/swat/help/manpages/idmap_ad.8.html
-#usr/share/samba/swat/help/manpages/idmap_ldap.8.html
-#usr/share/samba/swat/help/manpages/idmap_nss.8.html
-#usr/share/samba/swat/help/manpages/idmap_rid.8.html
-#usr/share/samba/swat/help/manpages/idmap_tdb.8.html
-#usr/share/samba/swat/help/manpages/index.html
-#usr/share/samba/swat/help/manpages/libsmbclient.7.html
-#usr/share/samba/swat/help/manpages/lmhosts.5.html
-#usr/share/samba/swat/help/manpages/log2pcap.1.html
-#usr/share/samba/swat/help/manpages/mount.cifs.8.html
-#usr/share/samba/swat/help/manpages/net.8.html
-#usr/share/samba/swat/help/manpages/nmbd.8.html
-#usr/share/samba/swat/help/manpages/nmblookup.1.html
-#usr/share/samba/swat/help/manpages/ntlm_auth.1.html
-#usr/share/samba/swat/help/manpages/pam_winbind.7.html
-#usr/share/samba/swat/help/manpages/pdbedit.8.html
-#usr/share/samba/swat/help/manpages/profiles.1.html
-#usr/share/samba/swat/help/manpages/rpcclient.1.html
-#usr/share/samba/swat/help/manpages/samba.7.html
-#usr/share/samba/swat/help/manpages/smb.conf.5.html
-#usr/share/samba/swat/help/manpages/smbcacls.1.html
-#usr/share/samba/swat/help/manpages/smbclient.1.html
-#usr/share/samba/swat/help/manpages/smbcontrol.1.html
-#usr/share/samba/swat/help/manpages/smbcquotas.1.html
-#usr/share/samba/swat/help/manpages/smbd.8.html
-#usr/share/samba/swat/help/manpages/smbget.1.html
-#usr/share/samba/swat/help/manpages/smbgetrc.5.html
-#usr/share/samba/swat/help/manpages/smbmnt.8.html
-#usr/share/samba/swat/help/manpages/smbmount.8.html
-#usr/share/samba/swat/help/manpages/smbpasswd.5.html
-#usr/share/samba/swat/help/manpages/smbpasswd.8.html
-#usr/share/samba/swat/help/manpages/smbspool.8.html
-#usr/share/samba/swat/help/manpages/smbstatus.1.html
-#usr/share/samba/swat/help/manpages/smbtar.1.html
-#usr/share/samba/swat/help/manpages/smbtree.1.html
-#usr/share/samba/swat/help/manpages/smbumount.8.html
-#usr/share/samba/swat/help/manpages/swat.8.html
-#usr/share/samba/swat/help/manpages/tdbbackup.8.html
-#usr/share/samba/swat/help/manpages/tdbdump.8.html
-#usr/share/samba/swat/help/manpages/tdbtool.8.html
-#usr/share/samba/swat/help/manpages/testparm.1.html
-#usr/share/samba/swat/help/manpages/umount.cifs.8.html
-#usr/share/samba/swat/help/manpages/vfs_audit.8.html
-#usr/share/samba/swat/help/manpages/vfs_cacheprime.8.html
-#usr/share/samba/swat/help/manpages/vfs_cap.8.html
-#usr/share/samba/swat/help/manpages/vfs_catia.8.html
-#usr/share/samba/swat/help/manpages/vfs_commit.8.html
-#usr/share/samba/swat/help/manpages/vfs_default_quota.8.html
-#usr/share/samba/swat/help/manpages/vfs_extd_audit.8.html
-#usr/share/samba/swat/help/manpages/vfs_fake_perms.8.html
-#usr/share/samba/swat/help/manpages/vfs_full_audit.8.html
-#usr/share/samba/swat/help/manpages/vfs_gpfs.8.html
-#usr/share/samba/swat/help/manpages/vfs_netatalk.8.html
-#usr/share/samba/swat/help/manpages/vfs_notify_fam.8.html
-#usr/share/samba/swat/help/manpages/vfs_prealloc.8.html
-#usr/share/samba/swat/help/manpages/vfs_readahead.8.html
-#usr/share/samba/swat/help/manpages/vfs_readonly.8.html
-#usr/share/samba/swat/help/manpages/vfs_recycle.8.html
-#usr/share/samba/swat/help/manpages/vfs_shadow_copy.8.html
-#usr/share/samba/swat/help/manpages/vfs_xattr_tdb.8.html
-#usr/share/samba/swat/help/manpages/vfstest.1.html
-#usr/share/samba/swat/help/manpages/wbinfo.1.html
-#usr/share/samba/swat/help/manpages/winbindd.8.html
-#usr/share/samba/swat/help/welcome-no-samba-doc.html
-#usr/share/samba/swat/help/welcome.html
-#usr/share/samba/swat/images
-#usr/share/samba/swat/images/globals.gif
-#usr/share/samba/swat/images/home.gif
-#usr/share/samba/swat/images/passwd.gif
-#usr/share/samba/swat/images/printers.gif
-#usr/share/samba/swat/images/samba.gif
-#usr/share/samba/swat/images/shares.gif
-#usr/share/samba/swat/images/status.gif
-#usr/share/samba/swat/images/viewconfig.gif
-#usr/share/samba/swat/images/wizard.gif
-#usr/share/samba/swat/include
-#usr/share/samba/swat/include/footer.html
-#usr/share/samba/swat/include/header.html
-#usr/share/samba/swat/js
-#usr/share/samba/swat/lang
-#usr/share/samba/swat/lang/ja
-#usr/share/samba/swat/lang/ja/help
-#usr/share/samba/swat/lang/ja/help/welcome.html
-#usr/share/samba/swat/lang/ja/images
-#usr/share/samba/swat/lang/ja/include
-#usr/share/samba/swat/lang/ja/js
-#usr/share/samba/swat/lang/tr
-#usr/share/samba/swat/lang/tr/help
-#usr/share/samba/swat/lang/tr/help/welcome.html
-#usr/share/samba/swat/lang/tr/images
-#usr/share/samba/swat/lang/tr/images/globals.gif
-#usr/share/samba/swat/lang/tr/images/home.gif
-#usr/share/samba/swat/lang/tr/images/passwd.gif
-#usr/share/samba/swat/lang/tr/images/printers.gif
-#usr/share/samba/swat/lang/tr/images/samba.gif
-#usr/share/samba/swat/lang/tr/images/shares.gif
-#usr/share/samba/swat/lang/tr/images/status.gif
-#usr/share/samba/swat/lang/tr/images/viewconfig.gif
-#usr/share/samba/swat/lang/tr/include
-#usr/share/samba/swat/lang/tr/js
 var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
 var/ipfire/samba/default.global
@@ -479,33 +183,9 @@ var/ipfire/samba/smb.conf
 var/ipfire/samba/smb.conf.default
 var/lib/samba
 var/log/samba
-usr/bin/ldbadd
-usr/bin/ldbdel
-usr/bin/ldbedit
-usr/bin/ldbmodify
-usr/bin/ldbsearch
-#usr/include/netapi.h
-#usr/include/smb_share_modes.h
-#usr/include/talloc.h
-#usr/include/tdb.h
-#usr/include/wbclient.h
-usr/lib/samba/idmap
-usr/lib/samba/libnetapi.so
-usr/lib/samba/libnetapi.so.0
-usr/lib/samba/libsmbsharemodes.so.0
-usr/lib/samba/libtalloc.so
-usr/lib/samba/libtdb.so
-usr/lib/samba/libwbclient.so
-usr/lib/samba/vfs/fileid.so
-usr/lib/samba/vfs/shadow_copy2.so
-usr/lib/samba/vfs/streams_xattr.so
-usr/lib/samba/vfs/syncops.so
-usr/lib/samba/vfs/xattr_tdb.so
-#usr/share/man/man1/ldbadd.1
-#usr/share/man/man1/ldbdel.1
-#usr/share/man/man1/ldbedit.1
-#usr/share/man/man1/ldbmodify.1
-#usr/share/man/man1/ldbsearch.1
-#usr/share/man/man8/cifs.upcall.8
-#usr/share/man/man8/vfs_streams_depot.8
-#usr/share/man/man8/vfs_streams_xattr.8
+etc/rc.d/init.d/samba
+etc/rc.d/init.d/winbind
+srv/web/ipfire/cgi-bin/samba.cgi
+srv/web/ipfire/cgi-bin/sambahlp.cgi
+var/ipfire/menu.d/EX-samba.menu
+usr/local/bin/sambactrl

doc/packages-list.txt

@@ -253,7 +253,7 @@
 * rssdler-0.4.0a
 * rsync-2.6.9
 * rtorrent-0.7.9
-* samba-3.2.5
+* samba-3.2.6
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01

html/cgi-bin/ids.cgi

@@ -528,7 +528,12 @@ print <<END
 <tr><td align='left' width='40%'>$Lang::tr{'guardian timelimit'}</td><td align='left'><input type='text' name='TIMELIMIT' value='$snortsettings{'GUARDIAN_TIMELIMIT'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'guardian logfile'}</td><td align='left'><input type='text' name='LOGFILE' value='$snortsettings{'GUARDIAN_LOGFILE'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'guardian alertfile'}</td><td align='left'><input type='text' name='ALERTFILE' value='$snortsettings{'GUARDIAN_ALERTFILE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'></textarea></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'>
+END
+;
+	print `cat /var/ipfire/guardian/guardian.ignore`;
+print <<END
+</textarea></td></tr>
 <tr><td align='center' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
 </table>
 </form>

html/cgi-bin/proxy.cgi

@@ -3031,7 +3031,7 @@ cache_effective_group squid
 umask 022
 
 pid_filename /var/run/squid.pid
-max_filedescriptors 4096
+max_filedescriptors 1024
 
 cache_mem $proxysettings{'CACHE_MEM'} MB
 END

html/html/themes/ipfire/include/functions.pl

@@ -179,61 +179,48 @@ END
 ;
 if ($settings{'SPEED'} ne 'off') {
 print <<END
-                <script type="text/javascript" language="javascript">
-                 
-                    var http_request = false;
-                 
-                    function LoadInetInfo(url) {
-                 
-                        http_request = false;
-                 
-                        if (window.XMLHttpRequest) { // Mozilla, Safari,...
-                            http_request = new XMLHttpRequest();
-                            if (http_request.overrideMimeType) {
-                                http_request.overrideMimeType('text/xml');
-                                // zu dieser Zeile siehe weiter unten
-                            }
-                        } else if (window.ActiveXObject) { // IE
-                            try {
-                                http_request = new ActiveXObject("Msxml2.XMLHTTP");
-                            } catch (e) {
-                                try {
-                                    http_request = new ActiveXObject("Microsoft.XMLHTTP");
-                                } catch (e) {}
-                            }
+    <script type="text/javascript" src="/include/jquery-1.2.6.min.js"></script>
+    <script type="text/javascript">
+        var t_current;
+        var t_last;
+        var rxb_current;
+        var rxb_last;
+        var txb_current;
+        var txb_last;
+	function refreshInetInfo() {
+		\$.ajax({
+                	url: '/cgi-bin/speed.cgi',
+                        success: function(xml){
+                        t_current = new Date();
+                        var t_diff = t_current - t_last;
+                        t_last = t_current;
+
+                        rxb_current = \$("rxb",xml).text();
+                        var rxb_diff = rxb_current - rxb_last;
+                        rxb_last = rxb_current;
+
+                        var rx_kbs = rxb_diff/t_diff;
+                        rx_kbs = Math.round(rx_kbs*10)/10;
+
+                        txb_current = \$("txb",xml).text();
+                        var txb_diff = txb_current - txb_last;
+                        txb_last = txb_current;
+
+                        var tx_kbs = txb_diff/t_diff;
+                        tx_kbs = Math.round(tx_kbs*10)/10;
+
+                        \$("#rx_kbs").text(rx_kbs + ' kb/s');
+                        \$("#tx_kbs").text(tx_kbs + ' kb/s');
                         }
-                 
-                        if (!http_request) {
-                            alert('Ende :( Kann keine XMLHTTP-Instanz erzeugen');
-                            return false;
-                        }
-                        http_request.onreadystatechange = DisplayInetInfo;
-                        http_request.open('GET', url, true);
-                        http_request.send(null);
-                 
-                    }
-                 
-                    function DisplayInetInfo() {
-                        if (http_request.readyState == 4) {
-                             var xmldoc = http_request.responseXML;
-                             var root1_node = xmldoc.getElementsByTagName('rx_kbs').item(0);
-                             var root2_node = xmldoc.getElementsByTagName('tx_kbs').item(0);
-                             var root3_node = xmldoc.getElementsByTagName('rxb').item(0);
-                             var root4_node = xmldoc.getElementsByTagName('txb').item(0);
-                
-                             document.forms['speed'].txkb.value  = root1_node.firstChild.data;
-                             document.forms['speed'].rxkb.value  = root2_node.firstChild.data;
-                
-                                        // document.getElementsByTagName("input")[0].style.color = "#00FF00";
-                                        url    = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
-                
-                              window.setTimeout("LoadInetInfo(url)", 3000);
-                        }
-                 
-                    }
-                </script>
+        	});
+                window.setTimeout("refreshInetInfo()", 3000);
+	}
+	\$(document).ready(function(){
+		refreshInetInfo();
+	});
+    </script>
   </head>
-  <body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')">
+  <body>
 END
 ;
 }
@@ -375,10 +362,9 @@ END
 if ($settings{'SPEED'} ne 'off') {
 print <<END                        
                         <br />
-                        <form name='speed'>
-                                <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: none; padding: 0; background-color: #FFFFFF;vertical-align: middle" />
-                                $Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: none; padding: 0; background-color: #FFFFFF;vertical-align: middle"/>
-                        </form>
+                                <b>$Lang::tr{'bandwidth usage'}:</b>
+				$Lang::tr{'incoming'}: <span id="rx_kbs"></span>
+                                $Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
 END
 ;
 }

lfs/guardian

@@ -30,7 +30,7 @@ THISAPP    = guardian-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 

lfs/ipfireseeder

@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = "rtorrent"
 
@@ -78,4 +78,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	-mkdir -p /var/log/seeder /var/ipfire/seeder
 	cp -vf $(DIR_DL)/$(DL_FILE) /var/ipfire/seeder
+	echo "Folder for IPFireseeder data" > /var/log/seeder/info
 	@$(POSTBUILD)

lfs/samba

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.5
+VER        = 3.2.6
 
 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    = 10
+PAK_VER    = 11
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f7539e09803ae60a2912e70adf1c747
+$(DL_FILE)_MD5 = 0cd27c7afbb8211616eea4010f32271c
 
 install : $(TARGET)
 

src/initscripts/init.d/ipfireseeder

@@ -20,12 +20,14 @@ case "${1}" in
 	start)
 		boot_mesg "Starting IPFire Seeder..."
 		cd /var/log/seeder
-		loadproc screen -dmS seeder /usr/bin/rtorrent -o port_range=35700-35700 \
+		# loadproc 
+		screen -dmS seeder /usr/bin/rtorrent -o port_range=35700-35700 \
 			-o download_rate=180 -o upload_rate=15 \
 			-o min_peers=10 -o max_peers=30 \
 			-o min_peers_seed=1 -o max_peers_seed=5 \
 			-o max_uploads=3 \
-			/var/ipfire/seeder/*.torrent
+			/var/ipfire/seeder/*.torrent &
+		evaluate_retval
 		if ! grep -q "35700:35700" /var/ipfire/xtaccess/config ; then
 			echo "tcp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config
 			/usr/local/bin/setxtaccess

src/paks/ipfireseeder/uninstall.sh

@@ -23,4 +23,12 @@
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+
+#prevent erasing the downloaded data at uninstall/update
+cat /opt/pakfire/db/rootfiles/ipfireseeder | \
+    grep -v "var/ipfire/seeder" | \
+    grep -v "var/log/seeder" > /opt/pakfire/db/rootfiles/ipfireseeder.tmp
+mv /opt/pakfire/db/rootfiles/ipfireseeder.tmp \
+    /opt/pakfire/db/rootfiles/ipfireseeder
+
 remove_files