Merge remote branch 'lesibel/master'

9 files changed, 51 insertions, 44 deletions

diff --git a/extra/gparted/.footprint b/extra/gparted/.footprint
index 4cf985955..a3f7e17ff 100644
--- a/extra/gparted/.footprint
+++ b/extra/gparted/.footprint
@@ -16,6 +16,10 @@ drwxr-xr-x	root/root	usr/share/gnome/help/gparted/C/
 drwxr-xr-x	root/root	usr/share/gnome/help/gparted/C/figures/
 -rw-r--r--	root/root	usr/share/gnome/help/gparted/C/figures/gparted_window.png
 -rw-r--r--	root/root	usr/share/gnome/help/gparted/C/gparted.xml
+drwxr-xr-x	root/root	usr/share/gnome/help/gparted/cs/
+drwxr-xr-x	root/root	usr/share/gnome/help/gparted/cs/figures/
+-rw-r--r--	root/root	usr/share/gnome/help/gparted/cs/figures/gparted_window.png
+-rw-r--r--	root/root	usr/share/gnome/help/gparted/cs/gparted.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/gparted/de/
 drwxr-xr-x	root/root	usr/share/gnome/help/gparted/de/figures/
 -rw-r--r--	root/root	usr/share/gnome/help/gparted/de/figures/gparted_window.png
@@ -74,6 +78,7 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 drwxr-xr-x	root/root	usr/share/omf/
 drwxr-xr-x	root/root	usr/share/omf/gparted/
 -rw-r--r--	root/root	usr/share/omf/gparted/gparted-C.omf
+-rw-r--r--	root/root	usr/share/omf/gparted/gparted-cs.omf
 -rw-r--r--	root/root	usr/share/omf/gparted/gparted-de.omf
 -rw-r--r--	root/root	usr/share/omf/gparted/gparted-es.omf
 -rw-r--r--	root/root	usr/share/omf/gparted/gparted-fr.omf
diff --git a/extra/gparted/.md5sum b/extra/gparted/.md5sum
index 70fc7ccca..ce9619868 100644
--- a/extra/gparted/.md5sum
+++ b/extra/gparted/.md5sum
@@ -1,2 +1,2 @@
-9bb9c24b8197d48a74c247071b6db881  gparted-0.5.0.tar.bz2
+9c7e6853851d1d23aef40d9edc315a6b  gparted-0.5.1.tar.bz2
 bdd3ab0b5322e244fe61b0d4cdc37c06  gparted.desktop
diff --git a/extra/gparted/Pkgfile b/extra/gparted/Pkgfile
index eb86e4aeb..6cec55450 100755
--- a/extra/gparted/Pkgfile
+++ b/extra/gparted/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: gtk, parted, gtkmm, libsigc++, ntfsprogs, ktsuss, gnome-doc-utils
 
 name=gparted
-version=0.5.0
+version=0.5.1
 release=1
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2\
 	gparted.desktop)
diff --git a/extra/nmap/.footprint b/extra/nmap/.footprint
index 19ea0072a..0fb55debe 100644
--- a/extra/nmap/.footprint
+++ b/extra/nmap/.footprint
@@ -81,7 +81,7 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/radialnet/util/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/radialnet/util/integration.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/radialnet/util/misc.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/radialnet/util/misc.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/zenmap-5.20-py2.6.egg-info
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/zenmap-5.21-py2.6.egg-info
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/zenmapCore/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/zenmapCore/BasePaths.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/zenmapCore/BasePaths.pyc
@@ -296,9 +296,11 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/oracle-sids
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/passwords.lst
 drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/README
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/backdoor.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/default.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/drives.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/encoder.c
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/examples.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/experimental.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/network.lua
diff --git a/extra/nmap/.md5sum b/extra/nmap/.md5sum
index bbc819e3c..b7660b694 100644
--- a/extra/nmap/.md5sum
+++ b/extra/nmap/.md5sum
@@ -1 +1 @@
-07e74592beaea0b5946a6cf06f9157de  nmap-5.20.tar.bz2
+f77fa51d89ab27d35e5cd87bb086b858  nmap-5.21.tar.bz2
diff --git a/extra/nmap/Pkgfile b/extra/nmap/Pkgfile
index 4c1114f49..bb4ec9649 100755
--- a/extra/nmap/Pkgfile
+++ b/extra/nmap/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: python
 
 name=nmap
-version=5.20
+version=5.21
 #4.85BETA9
 release=1
 source=(http://nmap.org/dist/$name-$version.tar.bz2)
diff --git a/extra/wireshark/.footprint b/extra/wireshark/.footprint
index cd2811ed2..a0fc13b41 100644
--- a/extra/wireshark/.footprint
+++ b/extra/wireshark/.footprint
@@ -26,43 +26,43 @@ lrwxrwxrwx	root/root	usr/lib/libwsutil.so.0 -> libwsutil.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libwsutil.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/wireshark/
 drwxr-xr-x	root/root	usr/lib/wireshark/plugins/
-drwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/asn1.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/asn1.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/coseventcomm.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/coseventcomm.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/cosnaming.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/cosnaming.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/docsis.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/docsis.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/ethercat.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/ethercat.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/gryphon.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/gryphon.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/irda.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/irda.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/m2m.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/m2m.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/mate.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/mate.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/opcua.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/opcua.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/parlay.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/parlay.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/profinet.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/profinet.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/sercosiii.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/sercosiii.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/stats_tree.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/stats_tree.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/tango.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/tango.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/unistim.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/unistim.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/wimax.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/wimax.so
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/wimaxasncp.la
--rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.3/wimaxasncp.so
+drwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/asn1.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/asn1.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/coseventcomm.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/coseventcomm.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/cosnaming.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/cosnaming.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/docsis.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/docsis.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/ethercat.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/ethercat.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/gryphon.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/gryphon.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/irda.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/irda.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/m2m.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/m2m.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/mate.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/mate.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/opcua.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/opcua.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/parlay.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/parlay.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/profinet.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/profinet.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/sercosiii.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/sercosiii.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/stats_tree.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/stats_tree.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/tango.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/tango.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/unistim.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/unistim.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/wimax.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/wimax.so
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/wimaxasncp.la
+-rwxr-xr-x	root/root	usr/lib/wireshark/plugins/1.2.6/wimaxasncp.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/wireshark.desktop
diff --git a/extra/wireshark/.md5sum b/extra/wireshark/.md5sum
index 79d01447c..6719878e7 100644
--- a/extra/wireshark/.md5sum
+++ b/extra/wireshark/.md5sum
@@ -1,2 +1,2 @@
-38010265a76f25553498304dcf15a92c  wireshark-1.2.5.tar.bz2
+f3e0917ed393366bbf96c53b58cb0931  wireshark-1.2.6.tar.bz2
 031b1d52ccf31cde9f8c813ab1e1000b  wireshark.desktop
diff --git a/extra/wireshark/Pkgfile b/extra/wireshark/Pkgfile
index 8363837a6..b7fdc992c 100644
--- a/extra/wireshark/Pkgfile
+++ b/extra/wireshark/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: gnutls, gtk, libcap, libpcap, pcre
 
 name=wireshark
-version=1.2.5
+version=1.2.6
 release=1
 source=(http://media-2.cacetech.com/wireshark/src/wireshark-$version.tar.bz2 \
 	$name.desktop)