Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

config/rootfiles/common/configroot

@@ -35,6 +35,7 @@ var/ipfire/ethernet
 #var/ipfire/ethernet/known_nics
 #var/ipfire/ethernet/scanned_nics
 #var/ipfire/ethernet/settings
+#var/ipfire/ethernet/vlans
 #var/ipfire/extrahd
 #var/ipfire/extrahd/bin
 var/ipfire/extrahd/bin/extrahd.pl
@@ -57,9 +58,9 @@ var/ipfire/langs
 #var/ipfire/langs/en.pl
 #var/ipfire/langs/es.pl
 #var/ipfire/langs/fr.pl
+#var/ipfire/langs/list
 #var/ipfire/langs/pl.pl
 #var/ipfire/langs/ru.pl
-#var/ipfire/langs/list
 var/ipfire/logging
 #var/ipfire/logging/settings
 var/ipfire/mac

config/rootfiles/common/usb_modeswitch_data

@@ -5,6 +5,7 @@ usr/share/usb_modeswitch/03f0:002a
 usr/share/usb_modeswitch/0408:f000
 usr/share/usb_modeswitch/0421:060c
 usr/share/usb_modeswitch/0421:0610
+usr/share/usb_modeswitch/0421:061d
 usr/share/usb_modeswitch/0421:0622
 usr/share/usb_modeswitch/0421:0627
 usr/share/usb_modeswitch/0421:062c
@@ -35,6 +36,7 @@ usr/share/usb_modeswitch/05c7:1000
 usr/share/usb_modeswitch/072f:100d
 usr/share/usb_modeswitch/07d1:a800
 usr/share/usb_modeswitch/07d1:a804
+usr/share/usb_modeswitch/0922:1001
 usr/share/usb_modeswitch/0930:0d46
 usr/share/usb_modeswitch/0ace:2011
 usr/share/usb_modeswitch/0ace:20ff
@@ -77,6 +79,7 @@ usr/share/usb_modeswitch/0af0:8302
 usr/share/usb_modeswitch/0af0:8304
 usr/share/usb_modeswitch/0af0:8400
 usr/share/usb_modeswitch/0af0:8600
+usr/share/usb_modeswitch/0af0:8700
 usr/share/usb_modeswitch/0af0:8800
 usr/share/usb_modeswitch/0af0:8900
 usr/share/usb_modeswitch/0af0:9000
@@ -163,6 +166,7 @@ usr/share/usb_modeswitch/1410:5041
 usr/share/usb_modeswitch/1410:5059
 usr/share/usb_modeswitch/148e:a000
 usr/share/usb_modeswitch/148f:2578
+usr/share/usb_modeswitch/15eb:7153
 usr/share/usb_modeswitch/16d8:6281
 usr/share/usb_modeswitch/16d8:6803
 usr/share/usb_modeswitch/16d8:6804
@@ -184,12 +188,15 @@ usr/share/usb_modeswitch/19d2:0110
 usr/share/usb_modeswitch/19d2:0115
 usr/share/usb_modeswitch/19d2:0146
 usr/share/usb_modeswitch/19d2:0149
+usr/share/usb_modeswitch/19d2:0154
 usr/share/usb_modeswitch/19d2:0166
 usr/share/usb_modeswitch/19d2:0169
+usr/share/usb_modeswitch/19d2:0325
 usr/share/usb_modeswitch/19d2:1001
 usr/share/usb_modeswitch/19d2:1007
 usr/share/usb_modeswitch/19d2:1009
 usr/share/usb_modeswitch/19d2:1013
+usr/share/usb_modeswitch/19d2:1017
 usr/share/usb_modeswitch/19d2:1171
 usr/share/usb_modeswitch/19d2:1175
 usr/share/usb_modeswitch/19d2:1179
@@ -209,7 +216,9 @@ usr/share/usb_modeswitch/1a8d:1000
 usr/share/usb_modeswitch/1a8d:2000
 usr/share/usb_modeswitch/1ab7:5700
 usr/share/usb_modeswitch/1b7d:0700
+usr/share/usb_modeswitch/1bbb:00ca
 usr/share/usb_modeswitch/1bbb:f000
+usr/share/usb_modeswitch/1bbb:f017
 usr/share/usb_modeswitch/1bbb:f052
 usr/share/usb_modeswitch/1c9e:1001
 usr/share/usb_modeswitch/1c9e:6061
@@ -227,6 +236,7 @@ usr/share/usb_modeswitch/1edf:6003
 usr/share/usb_modeswitch/1ee8:0009
 usr/share/usb_modeswitch/1ee8:0013
 usr/share/usb_modeswitch/1ee8:0040
+usr/share/usb_modeswitch/1ee8:004a
 usr/share/usb_modeswitch/1ee8:0060
 usr/share/usb_modeswitch/1f28:0021
 usr/share/usb_modeswitch/1fac:0032
@@ -237,7 +247,10 @@ usr/share/usb_modeswitch/201e:2009
 usr/share/usb_modeswitch/2020:f00e
 usr/share/usb_modeswitch/2077:f000
 usr/share/usb_modeswitch/21f5:1000
+usr/share/usb_modeswitch/22de:6803
 usr/share/usb_modeswitch/22f4:0021
 usr/share/usb_modeswitch/230d:0001
 usr/share/usb_modeswitch/230d:0007
+usr/share/usb_modeswitch/230d:0101
+usr/share/usb_modeswitch/2357:0200
 usr/share/usb_modeswitch/8888:6500

config/rootfiles/core/62/filelists/GeoIP

@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat

config/rootfiles/core/62/filelists/hwdata

@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids

config/rootfiles/core/62/filelists/php

@@ -0,0 +1 @@
+../../../common/php

config/rootfiles/core/62/filelists/usb_modeswitch

@@ -0,0 +1 @@
+../../../common/usb_modeswitch

config/rootfiles/core/62/filelists/usb_modeswitch_data

@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data

config/rootfiles/packages/apcupsd

@@ -12,6 +12,7 @@ etc/apcupsd/onbattery
 etc/rc.d/rc0.d/K35apcupsd
 etc/rc.d/rc3.d/S65apcupsd
 etc/rc.d/rc6.d/K35apcupsd
+#root/.lesshst
 sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
@@ -25,6 +26,10 @@ srv/web/ipfire/cgi-bin/upsstats.cgi
 #usr/share/hal/fdi/policy
 #usr/share/hal/fdi/policy/20thirdparty
 #usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi
+#usr/share/man/man5/apcupsd.conf.5
+#usr/share/man/man8/apcaccess.8
+#usr/share/man/man8/apccontrol.8
+#usr/share/man/man8/apctest.8
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd
 var/ipfire/menu.d/EX-apcupsd.menu

config/rootfiles/packages/nmap

@@ -55,16 +55,25 @@ usr/share/nmap/nmap.xsl
 usr/share/nmap/nse_main.lua
 #usr/share/nmap/nselib
 usr/share/nmap/nselib/afp.lua
+usr/share/nmap/nselib/amqp.lua
 usr/share/nmap/nselib/asn1.lua
 usr/share/nmap/nselib/base64.lua
+usr/share/nmap/nselib/bitcoin.lua
+usr/share/nmap/nselib/bittorrent.lua
 usr/share/nmap/nselib/brute.lua
 usr/share/nmap/nselib/citrixxml.lua
 usr/share/nmap/nselib/comm.lua
+usr/share/nmap/nselib/creds.lua
+usr/share/nmap/nselib/cvs.lua
 #usr/share/nmap/nselib/data
 usr/share/nmap/nselib/data/favicon-db
+usr/share/nmap/nselib/data/http-default-accounts-fingerprints.lua
 usr/share/nmap/nselib/data/http-fingerprints.lua
 usr/share/nmap/nselib/data/http-folders.txt
+usr/share/nmap/nselib/data/mysql-cis.audit
+usr/share/nmap/nselib/data/oracle-default-accounts.lst
 usr/share/nmap/nselib/data/oracle-sids
+usr/share/nmap/nselib/data/packetdecoders.lua
 usr/share/nmap/nselib/data/passwords.lst
 #usr/share/nmap/nselib/data/psexec
 usr/share/nmap/nselib/data/psexec/README
@@ -77,15 +86,26 @@ usr/share/nmap/nselib/data/psexec/network.lua
 usr/share/nmap/nselib/data/psexec/nmap_service.c
 usr/share/nmap/nselib/data/psexec/nmap_service.vcproj
 usr/share/nmap/nselib/data/psexec/pwdump.lua
+usr/share/nmap/nselib/data/rtsp-urls.txt
+usr/share/nmap/nselib/data/snmpcommunities.lst
+usr/share/nmap/nselib/data/ssl-ciphers
+usr/share/nmap/nselib/data/ssl-fingerprints
+usr/share/nmap/nselib/data/tftplist.txt
 usr/share/nmap/nselib/data/usernames.lst
+usr/share/nmap/nselib/data/wp-plugins.lst
 usr/share/nmap/nselib/datafiles.lua
 usr/share/nmap/nselib/dhcp.lua
+usr/share/nmap/nselib/dhcp6.lua
 usr/share/nmap/nselib/dns.lua
+usr/share/nmap/nselib/dnsbl.lua
 usr/share/nmap/nselib/dnssd.lua
 usr/share/nmap/nselib/drda.lua
+usr/share/nmap/nselib/eap.lua
 usr/share/nmap/nselib/ftp.lua
 usr/share/nmap/nselib/giop.lua
 usr/share/nmap/nselib/http.lua
+usr/share/nmap/nselib/httpspider.lua
+usr/share/nmap/nselib/iax2.lua
 usr/share/nmap/nselib/imap.lua
 usr/share/nmap/nselib/informix.lua
 usr/share/nmap/nselib/ipOps.lua
@@ -94,52 +114,105 @@ usr/share/nmap/nselib/json.lua
 usr/share/nmap/nselib/ldap.lua
 usr/share/nmap/nselib/listop.lua
 usr/share/nmap/nselib/match.lua
+usr/share/nmap/nselib/membase.lua
 usr/share/nmap/nselib/mongodb.lua
 usr/share/nmap/nselib/msrpc.lua
 usr/share/nmap/nselib/msrpcperformance.lua
 usr/share/nmap/nselib/msrpctypes.lua
 usr/share/nmap/nselib/mssql.lua
 usr/share/nmap/nselib/mysql.lua
+usr/share/nmap/nselib/natpmp.lua
+usr/share/nmap/nselib/ncp.lua
+usr/share/nmap/nselib/ndmp.lua
 usr/share/nmap/nselib/netbios.lua
 usr/share/nmap/nselib/nrpc.lua
 usr/share/nmap/nselib/nsedebug.lua
+usr/share/nmap/nselib/omp2.lua
 usr/share/nmap/nselib/packet.lua
 usr/share/nmap/nselib/pgsql.lua
 usr/share/nmap/nselib/pop3.lua
+usr/share/nmap/nselib/pppoe.lua
 usr/share/nmap/nselib/proxy.lua
+usr/share/nmap/nselib/redis.lua
 usr/share/nmap/nselib/rmi.lua
 usr/share/nmap/nselib/rpc.lua
+usr/share/nmap/nselib/rpcap.lua
+usr/share/nmap/nselib/rsync.lua
+usr/share/nmap/nselib/rtsp.lua
+usr/share/nmap/nselib/sasl.lua
 usr/share/nmap/nselib/shortport.lua
+usr/share/nmap/nselib/sip.lua
 usr/share/nmap/nselib/smb.lua
 usr/share/nmap/nselib/smbauth.lua
+usr/share/nmap/nselib/smtp.lua
 usr/share/nmap/nselib/snmp.lua
+usr/share/nmap/nselib/socks.lua
+usr/share/nmap/nselib/srvloc.lua
 usr/share/nmap/nselib/ssh1.lua
 usr/share/nmap/nselib/ssh2.lua
+usr/share/nmap/nselib/sslcert.lua
 usr/share/nmap/nselib/stdnse.lua
 usr/share/nmap/nselib/strbuf.lua
 usr/share/nmap/nselib/strict.lua
+usr/share/nmap/nselib/stun.lua
 usr/share/nmap/nselib/tab.lua
 usr/share/nmap/nselib/target.lua
+usr/share/nmap/nselib/tftp.lua
 usr/share/nmap/nselib/tns.lua
 usr/share/nmap/nselib/unpwdb.lua
 usr/share/nmap/nselib/upnp.lua
 usr/share/nmap/nselib/url.lua
+usr/share/nmap/nselib/versant.lua
 usr/share/nmap/nselib/vnc.lua
+usr/share/nmap/nselib/vulns.lua
+usr/share/nmap/nselib/vuzedht.lua
 usr/share/nmap/nselib/wsdd.lua
+usr/share/nmap/nselib/xdmcp.lua
+usr/share/nmap/nselib/xmpp.lua
 #usr/share/nmap/scripts
+usr/share/nmap/scripts/acarsd-info.nse
+usr/share/nmap/scripts/address-info.nse
 usr/share/nmap/scripts/afp-brute.nse
+usr/share/nmap/scripts/afp-ls.nse
 usr/share/nmap/scripts/afp-path-vuln.nse
 usr/share/nmap/scripts/afp-serverinfo.nse
 usr/share/nmap/scripts/afp-showmount.nse
+usr/share/nmap/scripts/amqp-info.nse
 usr/share/nmap/scripts/asn-query.nse
 usr/share/nmap/scripts/auth-owners.nse
 usr/share/nmap/scripts/auth-spoof.nse
+usr/share/nmap/scripts/backorifice-brute.nse
+usr/share/nmap/scripts/backorifice-info.nse
 usr/share/nmap/scripts/banner.nse
+usr/share/nmap/scripts/bitcoin-getaddr.nse
+usr/share/nmap/scripts/bitcoin-info.nse
+usr/share/nmap/scripts/bitcoinrpc-info.nse
+usr/share/nmap/scripts/bittorrent-discovery.nse
+usr/share/nmap/scripts/broadcast-avahi-dos.nse
+usr/share/nmap/scripts/broadcast-db2-discover.nse
+usr/share/nmap/scripts/broadcast-dhcp-discover.nse
+usr/share/nmap/scripts/broadcast-dhcp6-discover.nse
 usr/share/nmap/scripts/broadcast-dns-service-discovery.nse
 usr/share/nmap/scripts/broadcast-dropbox-listener.nse
+usr/share/nmap/scripts/broadcast-listener.nse
 usr/share/nmap/scripts/broadcast-ms-sql-discover.nse
+usr/share/nmap/scripts/broadcast-netbios-master-browser.nse
+usr/share/nmap/scripts/broadcast-networker-discover.nse
+usr/share/nmap/scripts/broadcast-novell-locate.nse
+usr/share/nmap/scripts/broadcast-pc-anywhere.nse
+usr/share/nmap/scripts/broadcast-pc-duo.nse
+usr/share/nmap/scripts/broadcast-ping.nse
+usr/share/nmap/scripts/broadcast-pppoe-discover.nse
+usr/share/nmap/scripts/broadcast-rip-discover.nse
+usr/share/nmap/scripts/broadcast-ripng-discover.nse
+usr/share/nmap/scripts/broadcast-sybase-asa-discover.nse
 usr/share/nmap/scripts/broadcast-upnp-info.nse
+usr/share/nmap/scripts/broadcast-versant-locate.nse
+usr/share/nmap/scripts/broadcast-wake-on-lan.nse
+usr/share/nmap/scripts/broadcast-wpad-discover.nse
 usr/share/nmap/scripts/broadcast-wsdd-discover.nse
+usr/share/nmap/scripts/broadcast-xdmcp-discover.nse
+usr/share/nmap/scripts/cccam-version.nse
 usr/share/nmap/scripts/citrix-brute-xml.nse
 usr/share/nmap/scripts/citrix-enum-apps-xml.nse
 usr/share/nmap/scripts/citrix-enum-apps.nse
@@ -147,24 +220,38 @@ usr/share/nmap/scripts/citrix-enum-servers-xml.nse
 usr/share/nmap/scripts/citrix-enum-servers.nse
 usr/share/nmap/scripts/couchdb-databases.nse
 usr/share/nmap/scripts/couchdb-stats.nse
+usr/share/nmap/scripts/creds-summary.nse
+usr/share/nmap/scripts/cvs-brute-repository.nse
+usr/share/nmap/scripts/cvs-brute.nse
 usr/share/nmap/scripts/daap-get-library.nse
 usr/share/nmap/scripts/daytime.nse
 usr/share/nmap/scripts/db2-das-info.nse
 usr/share/nmap/scripts/db2-discover.nse
 usr/share/nmap/scripts/dhcp-discover.nse
+usr/share/nmap/scripts/dns-blacklist.nse
+usr/share/nmap/scripts/dns-brute.nse
 usr/share/nmap/scripts/dns-cache-snoop.nse
+usr/share/nmap/scripts/dns-client-subnet-scan.nse
 usr/share/nmap/scripts/dns-fuzz.nse
+usr/share/nmap/scripts/dns-nsec-enum.nse
+usr/share/nmap/scripts/dns-nsid.nse
 usr/share/nmap/scripts/dns-random-srcport.nse
 usr/share/nmap/scripts/dns-random-txid.nse
 usr/share/nmap/scripts/dns-recursion.nse
 usr/share/nmap/scripts/dns-service-discovery.nse
+usr/share/nmap/scripts/dns-srv-enum.nse
 usr/share/nmap/scripts/dns-update.nse
+usr/share/nmap/scripts/dns-zeustracker.nse
 usr/share/nmap/scripts/dns-zone-transfer.nse
 usr/share/nmap/scripts/domcon-brute.nse
 usr/share/nmap/scripts/domcon-cmd.nse
 usr/share/nmap/scripts/domino-enum-users.nse
+usr/share/nmap/scripts/dpap-brute.nse
 usr/share/nmap/scripts/drda-brute.nse
 usr/share/nmap/scripts/drda-info.nse
+usr/share/nmap/scripts/duplicates.nse
+usr/share/nmap/scripts/eap-info.nse
+usr/share/nmap/scripts/epmd-info.nse
 usr/share/nmap/scripts/finger.nse
 usr/share/nmap/scripts/firewalk.nse
 usr/share/nmap/scripts/ftp-anon.nse
@@ -172,56 +259,121 @@ usr/share/nmap/scripts/ftp-bounce.nse
 usr/share/nmap/scripts/ftp-brute.nse
 usr/share/nmap/scripts/ftp-libopie.nse
 usr/share/nmap/scripts/ftp-proftpd-backdoor.nse
+usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse
+usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse
+usr/share/nmap/scripts/ganglia-info.nse
 usr/share/nmap/scripts/giop-info.nse
 usr/share/nmap/scripts/gopher-ls.nse
+usr/share/nmap/scripts/hadoop-datanode-info.nse
+usr/share/nmap/scripts/hadoop-jobtracker-info.nse
+usr/share/nmap/scripts/hadoop-namenode-info.nse
+usr/share/nmap/scripts/hadoop-secondary-namenode-info.nse
+usr/share/nmap/scripts/hadoop-tasktracker-info.nse
+usr/share/nmap/scripts/hbase-master-info.nse
+usr/share/nmap/scripts/hbase-region-info.nse
 usr/share/nmap/scripts/hddtemp-info.nse
-usr/share/nmap/scripts/hostmap.nse
+usr/share/nmap/scripts/hostmap-bfk.nse
+usr/share/nmap/scripts/http-affiliate-id.nse
+usr/share/nmap/scripts/http-apache-negotiation.nse
+usr/share/nmap/scripts/http-auth-finder.nse
 usr/share/nmap/scripts/http-auth.nse
+usr/share/nmap/scripts/http-awstatstotals-exec.nse
+usr/share/nmap/scripts/http-axis2-dir-traversal.nse
+usr/share/nmap/scripts/http-backup-finder.nse
+usr/share/nmap/scripts/http-barracuda-dir-traversal.nse
 usr/share/nmap/scripts/http-brute.nse
+usr/share/nmap/scripts/http-cakephp-version.nse
+usr/share/nmap/scripts/http-chrono.nse
+usr/share/nmap/scripts/http-config-backup.nse
+usr/share/nmap/scripts/http-cors.nse
 usr/share/nmap/scripts/http-date.nse
+usr/share/nmap/scripts/http-default-accounts.nse
 usr/share/nmap/scripts/http-domino-enum-passwords.nse
+usr/share/nmap/scripts/http-email-harvest.nse
 usr/share/nmap/scripts/http-enum.nse
 usr/share/nmap/scripts/http-favicon.nse
 usr/share/nmap/scripts/http-form-brute.nse
+usr/share/nmap/scripts/http-generator.nse
+usr/share/nmap/scripts/http-google-malware.nse
+usr/share/nmap/scripts/http-grep.nse
 usr/share/nmap/scripts/http-headers.nse
 usr/share/nmap/scripts/http-iis-webdav-vuln.nse
+usr/share/nmap/scripts/http-joomla-brute.nse
+usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse
+usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse
 usr/share/nmap/scripts/http-malware-host.nse
+usr/share/nmap/scripts/http-method-tamper.nse
 usr/share/nmap/scripts/http-methods.nse
 usr/share/nmap/scripts/http-open-proxy.nse
+usr/share/nmap/scripts/http-open-redirect.nse
 usr/share/nmap/scripts/http-passwd.nse
 usr/share/nmap/scripts/http-php-version.nse
+usr/share/nmap/scripts/http-proxy-brute.nse
+usr/share/nmap/scripts/http-put.nse
+usr/share/nmap/scripts/http-qnap-nas-info.nse
 usr/share/nmap/scripts/http-robots.txt.nse
+usr/share/nmap/scripts/http-robtex-reverse-ip.nse
 usr/share/nmap/scripts/http-title.nse
 usr/share/nmap/scripts/http-trace.nse
+usr/share/nmap/scripts/http-unsafe-output-escaping.nse
 usr/share/nmap/scripts/http-userdir-enum.nse
 usr/share/nmap/scripts/http-vhosts.nse
 usr/share/nmap/scripts/http-vmware-path-vuln.nse
+usr/share/nmap/scripts/http-vuln-cve2009-3960.nse
+usr/share/nmap/scripts/http-vuln-cve2010-2861.nse
+usr/share/nmap/scripts/http-vuln-cve2011-3192.nse
+usr/share/nmap/scripts/http-vuln-cve2011-3368.nse
+usr/share/nmap/scripts/http-vuln-cve2012-1823.nse
+usr/share/nmap/scripts/http-waf-detect.nse
+usr/share/nmap/scripts/http-wordpress-brute.nse
+usr/share/nmap/scripts/http-wordpress-enum.nse
+usr/share/nmap/scripts/http-wordpress-plugins.nse
+usr/share/nmap/scripts/iax2-brute.nse
 usr/share/nmap/scripts/iax2-version.nse
+usr/share/nmap/scripts/imap-brute.nse
 usr/share/nmap/scripts/imap-capabilities.nse
 usr/share/nmap/scripts/informix-brute.nse
 usr/share/nmap/scripts/informix-query.nse
 usr/share/nmap/scripts/informix-tables.nse
+usr/share/nmap/scripts/ip-geolocation-geobytes.nse
+usr/share/nmap/scripts/ip-geolocation-geoplugin.nse
+usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse
+usr/share/nmap/scripts/ip-geolocation-maxmind.nse
 usr/share/nmap/scripts/ipidseq.nse
+usr/share/nmap/scripts/ipv6-node-info.nse
+usr/share/nmap/scripts/irc-botnet-channels.nse
+usr/share/nmap/scripts/irc-brute.nse
 usr/share/nmap/scripts/irc-info.nse
 usr/share/nmap/scripts/irc-unrealircd-backdoor.nse
 usr/share/nmap/scripts/iscsi-brute.nse
 usr/share/nmap/scripts/iscsi-info.nse
 usr/share/nmap/scripts/jdwp-version.nse
+usr/share/nmap/scripts/krb5-enum-users.nse
 usr/share/nmap/scripts/ldap-brute.nse
+usr/share/nmap/scripts/ldap-novell-getpass.nse
 usr/share/nmap/scripts/ldap-rootdse.nse
 usr/share/nmap/scripts/ldap-search.nse
 usr/share/nmap/scripts/lexmark-config.nse
+usr/share/nmap/scripts/lltd-discovery.nse
+usr/share/nmap/scripts/maxdb-info.nse
+usr/share/nmap/scripts/membase-brute.nse
+usr/share/nmap/scripts/membase-http-info.nse
+usr/share/nmap/scripts/memcached-info.nse
+usr/share/nmap/scripts/metasploit-xmlrpc-brute.nse
 usr/share/nmap/scripts/modbus-discover.nse
+usr/share/nmap/scripts/mongodb-brute.nse
 usr/share/nmap/scripts/mongodb-databases.nse
 usr/share/nmap/scripts/mongodb-info.nse
 usr/share/nmap/scripts/ms-sql-brute.nse
 usr/share/nmap/scripts/ms-sql-config.nse
+usr/share/nmap/scripts/ms-sql-dump-hashes.nse
 usr/share/nmap/scripts/ms-sql-empty-password.nse
 usr/share/nmap/scripts/ms-sql-hasdbaccess.nse
 usr/share/nmap/scripts/ms-sql-info.nse
 usr/share/nmap/scripts/ms-sql-query.nse
 usr/share/nmap/scripts/ms-sql-tables.nse
 usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse
+usr/share/nmap/scripts/mysql-audit.nse
 usr/share/nmap/scripts/mysql-brute.nse
 usr/share/nmap/scripts/mysql-databases.nse
 usr/share/nmap/scripts/mysql-empty-password.nse
@@ -229,20 +381,34 @@ usr/share/nmap/scripts/mysql-info.nse
 usr/share/nmap/scripts/mysql-users.nse
 usr/share/nmap/scripts/mysql-variables.nse
 usr/share/nmap/scripts/nat-pmp-info.nse
+usr/share/nmap/scripts/nat-pmp-mapport.nse
 usr/share/nmap/scripts/nbstat.nse
+usr/share/nmap/scripts/ncp-enum-users.nse
+usr/share/nmap/scripts/ncp-serverinfo.nse
+usr/share/nmap/scripts/ndmp-fs-info.nse
+usr/share/nmap/scripts/ndmp-version.nse
+usr/share/nmap/scripts/nessus-brute.nse
+usr/share/nmap/scripts/nessus-xmlrpc-brute.nse
 usr/share/nmap/scripts/netbus-auth-bypass.nse
 usr/share/nmap/scripts/netbus-brute.nse
 usr/share/nmap/scripts/netbus-info.nse
 usr/share/nmap/scripts/netbus-version.nse
+usr/share/nmap/scripts/nexpose-brute.nse
 usr/share/nmap/scripts/nfs-ls.nse
 usr/share/nmap/scripts/nfs-showmount.nse
 usr/share/nmap/scripts/nfs-statfs.nse
+usr/share/nmap/scripts/nping-brute.nse
 usr/share/nmap/scripts/nrpe-enum.nse
 usr/share/nmap/scripts/ntp-info.nse
 usr/share/nmap/scripts/ntp-monlist.nse
+usr/share/nmap/scripts/omp2-brute.nse
+usr/share/nmap/scripts/omp2-enum-targets.nse
+usr/share/nmap/scripts/openlookup-info.nse
+usr/share/nmap/scripts/openvas-otp-brute.nse
 usr/share/nmap/scripts/oracle-brute.nse
 usr/share/nmap/scripts/oracle-enum-users.nse
 usr/share/nmap/scripts/oracle-sid-brute.nse
+usr/share/nmap/scripts/ovs-agent-version.nse
 usr/share/nmap/scripts/p2p-conficker.nse
 usr/share/nmap/scripts/path-mtu.nse
 usr/share/nmap/scripts/pgsql-brute.nse
@@ -251,11 +417,30 @@ usr/share/nmap/scripts/pop3-brute.nse
 usr/share/nmap/scripts/pop3-capabilities.nse
 usr/share/nmap/scripts/pptp-version.nse
 usr/share/nmap/scripts/qscan.nse
+usr/share/nmap/scripts/quake3-info.nse
+usr/share/nmap/scripts/quake3-master-getservers.nse
+usr/share/nmap/scripts/rdp-vuln-ms12-020.nse
 usr/share/nmap/scripts/realvnc-auth-bypass.nse
+usr/share/nmap/scripts/redis-brute.nse
+usr/share/nmap/scripts/redis-info.nse
 usr/share/nmap/scripts/resolveall.nse
+usr/share/nmap/scripts/reverse-index.nse
+usr/share/nmap/scripts/rexec-brute.nse
+usr/share/nmap/scripts/riak-http-info.nse
+usr/share/nmap/scripts/rlogin-brute.nse
 usr/share/nmap/scripts/rmi-dumpregistry.nse
+usr/share/nmap/scripts/rpcap-brute.nse
+usr/share/nmap/scripts/rpcap-info.nse
 usr/share/nmap/scripts/rpcinfo.nse
+usr/share/nmap/scripts/rsync-brute.nse
+usr/share/nmap/scripts/rsync-list-modules.nse
+usr/share/nmap/scripts/rtsp-methods.nse
+usr/share/nmap/scripts/rtsp-url-brute.nse
+usr/share/nmap/scripts/samba-vuln-cve-2012-1182.nse
 usr/share/nmap/scripts/script.db
+usr/share/nmap/scripts/servicetags.nse
+usr/share/nmap/scripts/sip-brute.nse
+usr/share/nmap/scripts/sip-enum-users.nse
 usr/share/nmap/scripts/skypev2-version.nse
 usr/share/nmap/scripts/smb-brute.nse
 usr/share/nmap/scripts/smb-check-vulns.nse
@@ -266,19 +451,25 @@ usr/share/nmap/scripts/smb-enum-sessions.nse
 usr/share/nmap/scripts/smb-enum-shares.nse
 usr/share/nmap/scripts/smb-enum-users.nse
 usr/share/nmap/scripts/smb-flood.nse
+usr/share/nmap/scripts/smb-mbenum.nse
 usr/share/nmap/scripts/smb-os-discovery.nse
 usr/share/nmap/scripts/smb-psexec.nse
 usr/share/nmap/scripts/smb-security-mode.nse
 usr/share/nmap/scripts/smb-server-stats.nse
 usr/share/nmap/scripts/smb-system-info.nse
 usr/share/nmap/scripts/smbv2-enabled.nse
+usr/share/nmap/scripts/smtp-brute.nse
 usr/share/nmap/scripts/smtp-commands.nse
 usr/share/nmap/scripts/smtp-enum-users.nse
 usr/share/nmap/scripts/smtp-open-relay.nse
 usr/share/nmap/scripts/smtp-strangeport.nse
+usr/share/nmap/scripts/smtp-vuln-cve2010-4344.nse
+usr/share/nmap/scripts/smtp-vuln-cve2011-1720.nse
+usr/share/nmap/scripts/smtp-vuln-cve2011-1764.nse
 usr/share/nmap/scripts/sniffer-detect.nse
 usr/share/nmap/scripts/snmp-brute.nse
 usr/share/nmap/scripts/snmp-interfaces.nse
+usr/share/nmap/scripts/snmp-ios-config.nse
 usr/share/nmap/scripts/snmp-netstat.nse
 usr/share/nmap/scripts/snmp-processes.nse
 usr/share/nmap/scripts/snmp-sysdescr.nse
@@ -286,6 +477,8 @@ usr/share/nmap/scripts/snmp-win32-services.nse
 usr/share/nmap/scripts/snmp-win32-shares.nse
 usr/share/nmap/scripts/snmp-win32-software.nse
 usr/share/nmap/scripts/snmp-win32-users.nse
+usr/share/nmap/scripts/socks-auth-info.nse
+usr/share/nmap/scripts/socks-brute.nse
 usr/share/nmap/scripts/socks-open-proxy.nse
 usr/share/nmap/scripts/sql-injection.nse
 usr/share/nmap/scripts/ssh-hostkey.nse
@@ -293,15 +486,36 @@ usr/share/nmap/scripts/ssh2-enum-algos.nse
 usr/share/nmap/scripts/sshv1.nse
 usr/share/nmap/scripts/ssl-cert.nse
 usr/share/nmap/scripts/ssl-enum-ciphers.nse
+usr/share/nmap/scripts/ssl-google-cert-catalog.nse
+usr/share/nmap/scripts/ssl-known-key.nse
 usr/share/nmap/scripts/sslv2.nse
+usr/share/nmap/scripts/stun-info.nse
+usr/share/nmap/scripts/stun-version.nse
 usr/share/nmap/scripts/stuxnet-detect.nse
 usr/share/nmap/scripts/svn-brute.nse
+usr/share/nmap/scripts/targets-asn.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-echo.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-mld.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-slaac.nse
+usr/share/nmap/scripts/targets-sniffer.nse
 usr/share/nmap/scripts/targets-traceroute.nse
 usr/share/nmap/scripts/telnet-brute.nse
+usr/share/nmap/scripts/telnet-encryption.nse
+usr/share/nmap/scripts/tftp-enum.nse
+usr/share/nmap/scripts/unusual-port.nse
 usr/share/nmap/scripts/upnp-info.nse
+usr/share/nmap/scripts/url-snarf.nse
+usr/share/nmap/scripts/versant-info.nse
+usr/share/nmap/scripts/vmauthd-brute.nse
 usr/share/nmap/scripts/vnc-brute.nse
 usr/share/nmap/scripts/vnc-info.nse
+usr/share/nmap/scripts/voldemort-info.nse
+usr/share/nmap/scripts/vuze-dht-info.nse
 usr/share/nmap/scripts/wdb-version.nse
 usr/share/nmap/scripts/whois.nse
 usr/share/nmap/scripts/wsdd-discover.nse
 usr/share/nmap/scripts/x11-access.nse
+usr/share/nmap/scripts/xdmcp-discover.nse
+usr/share/nmap/scripts/xmpp-brute.nse
+usr/share/nmap/scripts/xmpp-info.nse

lfs/GeoIP

@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 04072012
+DATVER     = 05092012
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 1395bec12f8a5f0b1e889581271ed5ce
+GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d
 
 install : $(TARGET)
 

lfs/php

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.14
+VER        = 5.3.16
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
 Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
 
-$(DL_FILE)_MD5 = 7caac4f71e2f21426c11ac153e538392
+$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 

lfs/usb_modeswitch

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.3
+VER        = 1.2.4
 
 THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9b29e8b0d93d7604a9e5efc4696d37a3
+$(DL_FILE)_MD5 = dbd4ce7966d7b4a5a0604a8280f7164d
 
 install : $(TARGET)
 

lfs/usb_modeswitch_data

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20120531
+VER        = 20120815
 
 THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3
+$(DL_FILE)_MD5 = 12d7de3210e45ad6f48791d12bbdbf61
 
 install : $(TARGET)
 

make.sh

@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.11"							# Version number
 CORE="62"							# Core Level (Filename)
-PAKFIRE_CORE="61"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="62"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir