Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

author: orchidman <lesibel@free.fr> 2011-10-23 16:39:52 +0200
committer: orchidman <lesibel@free.fr> 2011-10-23 16:39:52 +0200
commit: ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd (patch)
tree: b3d17a3209b895df7ba009719aad2e7e76f052ec
parent: 31572a7cccc8878a1af05ecc38a776ab7093a285 (diff)
parent: 49dcf0d8496decf4c72963f80b2b8895806c783a (diff)
download: nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.tar.gz
nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.tar.bz2
nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.tar.xz
nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.zip
48 files changed, 239 insertions, 1098 deletions
diff --git a/extra/bind-utils/.footprint.i686 b/extra/bind-utils/.footprint.i686
index 0e8b27a81..44186c6c7 100644
--- a/extra/bind-utils/.footprint.i686
+++ b/extra/bind-utils/.footprint.i686
@@ -3,9 +3,12 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/dig
 -rwxr-xr-x	root/root	usr/bin/host
 -rwxr-xr-x	root/root	usr/bin/nslookup
+-rwxr-xr-x	root/root	usr/bin/query-loc
+-rwxr-xr-x	root/root	usr/bin/queryperf
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/dig.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/host.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nslookup.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/query-loc.1.gz
diff --git a/extra/bind-utils/.footprint.x86_64 b/extra/bind-utils/.footprint.x86_64
index 0e8b27a81..44186c6c7 100644
--- a/extra/bind-utils/.footprint.x86_64
+++ b/extra/bind-utils/.footprint.x86_64
@@ -3,9 +3,12 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/dig
 -rwxr-xr-x	root/root	usr/bin/host
 -rwxr-xr-x	root/root	usr/bin/nslookup
+-rwxr-xr-x	root/root	usr/bin/query-loc
+-rwxr-xr-x	root/root	usr/bin/queryperf
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/dig.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/host.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nslookup.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/query-loc.1.gz
diff --git a/extra/bind-utils/.md5sum.i686 b/extra/bind-utils/.md5sum.i686
index 629b3a714..3da7ec8ef 100644
--- a/extra/bind-utils/.md5sum.i686
+++ b/extra/bind-utils/.md5sum.i686
@@ -1 +1 @@
-207477c4cf95f2db5be0ded8a22669e0  bind-9.7.3.tar.gz
+cf31117c5d35af34d4c0702970ad9fb7  bind-9.8.1.tar.gz
diff --git a/extra/bind-utils/.md5sum.x86_64 b/extra/bind-utils/.md5sum.x86_64
index 629b3a714..3da7ec8ef 100644
--- a/extra/bind-utils/.md5sum.x86_64
+++ b/extra/bind-utils/.md5sum.x86_64
@@ -1 +1 @@
-207477c4cf95f2db5be0ded8a22669e0  bind-9.7.3.tar.gz
+cf31117c5d35af34d4c0702970ad9fb7  bind-9.8.1.tar.gz
diff --git a/extra/bind-utils/Pkgfile b/extra/bind-utils/Pkgfile
index 8ef9af0cd..f02b8ae98 100644
--- a/extra/bind-utils/Pkgfile
+++ b/extra/bind-utils/Pkgfile
@@ -4,14 +4,28 @@
 # Packager: fredjo
 
 name=bind-utils
-version=9.7.3
+version=9.8.1
 release=1
 source=(http://ftp.isc.org/isc/bind9/$version/bind-$version.tar.gz)
 
 build(){
 	cd bind-$version
+
+	cd contrib/queryperf
+		./configure
+		make CFLAGS="$CFLAGS"
+	cd ../..
+
+	cd contrib/query-loc-*
+		sed "s|-lnsl|-lnsl -lresolv|g" -i configure*
+		rm configure && autoconf
+		./configure
+		make CFLAGS="$CFLAGS"
+	cd ../..
+
 	./configure --prefix=/usr \
-		    --mandir=/usr/share/man 
+		--mandir=/usr/share/man 
+
 	make -C lib/dns
 	make -C lib/isc
 	make -C lib/bind9
@@ -20,5 +34,7 @@ build(){
 	make -C bin/dig
 	make -C bin/dig DESTDIR=$PKG install
 
-
+	install -m0755 contrib/queryperf/queryperf $PKG/usr/bin
+	install -m0755 contrib/query-loc-*/query-loc $PKG/usr/bin
+	install -m0644 contrib/query-loc-*/query-loc.1 $PKG/usr/share/man/man1
 }
diff --git a/extra/cmake/.footprint.i686 b/extra/cmake/.footprint.i686
index 2c216068a..add1b037e 100644
--- a/extra/cmake/.footprint.i686
+++ b/extra/cmake/.footprint.i686
@@ -5,10 +5,15 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cpack
 -rwxr-xr-x	root/root	usr/bin/ctest
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/aclocal/
+-rw-r--r--	root/root	usr/share/aclocal/cmake.m4
 drwxr-xr-x	root/root	usr/share/cmake-2.8/
 drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/.NoDartCoverage
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/AddFileDependencies.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/AutomocInfo.cmake.in
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/BundleUtilities.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeASM-ATTInformation.cmake
@@ -47,11 +52,13 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeDetermineSystem.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeDetermineVSServicePack.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeExportBuildSettings.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindBinUtils.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindCodeBlocks.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindEclipseCDT4.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindFrameworks.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindKDevelop3.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindPackageMode.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindWMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindXCode.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeForceCompiler.cmake
@@ -71,6 +78,7 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeParseImplicitLinkInfo.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakePlatformId.h.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakePrintSystemInformation.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakePushCheckState.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeRCCompiler.cmake.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeRCInformation.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeSystem.cmake.in
@@ -88,8 +96,10 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestJavaCompiler.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestNMakeCLVersion.c
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestRCCompiler.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestWatcomVersion.c
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeUnixFindMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS10FindMake.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS11FindMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS6BackwardCompatibility.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS6FindMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS71FindMake.cmake
@@ -126,6 +136,7 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXCompilerFlag.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXSourceCompiles.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXSourceRuns.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXSymbolExists.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckForPthreads.c
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckFortranFunctionExists.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckFunctionExists.c
@@ -361,9 +372,14 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/FortranCInterface/Verify/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/FortranCInterface/mysub.f
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/FortranCInterface/symbol.c.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/GNUInstallDirs.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/GenerateExportHeader.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/GetPrerequisites.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/ITKCompatibility.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/InstallRequiredSystemLibraries.cmake
+drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/CMakeLists.txt
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/detect.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/hello.f (EMPTY)
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/KDE3Macros.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/MacOSXBundleInfo.plist.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/MacOSXFrameworkInfo.plist.in
@@ -377,6 +393,7 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/Platform/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-GNU.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-C.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-CXX.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-Fortran.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-XL-ASM.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-XL-C.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-XL-CXX.cmake
@@ -540,6 +557,9 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/Platform/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/TestForSTDNamespace.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/TestForSTDNamespace.cxx
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseEcos.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseJava.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseJavaClassFilelist.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseJavaSymlinks.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UsePkgConfig.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseQt4.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseSWIG.cmake
@@ -549,7 +569,9 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/Platform/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Use_wxWindows.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UsewxWidgets.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/VTKCompatibility.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/WriteBasicConfigVersionFile.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/ecos_clean.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/exportheader.cmake.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/kde3init_dummy.cpp.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/kde3uic.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/readme.txt
diff --git a/extra/cmake/.footprint.x86_64 b/extra/cmake/.footprint.x86_64
index 2c216068a..add1b037e 100644
--- a/extra/cmake/.footprint.x86_64
+++ b/extra/cmake/.footprint.x86_64
@@ -5,10 +5,15 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cpack
 -rwxr-xr-x	root/root	usr/bin/ctest
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/aclocal/
+-rw-r--r--	root/root	usr/share/aclocal/cmake.m4
 drwxr-xr-x	root/root	usr/share/cmake-2.8/
 drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/.NoDartCoverage
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/AddFileDependencies.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/AutomocInfo.cmake.in
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/BundleUtilities.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeASM-ATTInformation.cmake
@@ -47,11 +52,13 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeDetermineSystem.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeDetermineVSServicePack.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeExportBuildSettings.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindBinUtils.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindCodeBlocks.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindEclipseCDT4.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindFrameworks.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindKDevelop3.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindPackageMode.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindWMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeFindXCode.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeForceCompiler.cmake
@@ -71,6 +78,7 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeParseImplicitLinkInfo.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakePlatformId.h.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakePrintSystemInformation.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakePushCheckState.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeRCCompiler.cmake.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeRCInformation.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeSystem.cmake.in
@@ -88,8 +96,10 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestJavaCompiler.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestNMakeCLVersion.c
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestRCCompiler.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeTestWatcomVersion.c
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeUnixFindMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS10FindMake.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS11FindMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS6BackwardCompatibility.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS6FindMake.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CMakeVS71FindMake.cmake
@@ -126,6 +136,7 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXCompilerFlag.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXSourceCompiles.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXSourceRuns.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckCXXSymbolExists.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckForPthreads.c
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckFortranFunctionExists.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/CheckFunctionExists.c
@@ -361,9 +372,14 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/FortranCInterface/Verify/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/FortranCInterface/mysub.f
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/FortranCInterface/symbol.c.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/GNUInstallDirs.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/GenerateExportHeader.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/GetPrerequisites.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/ITKCompatibility.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/InstallRequiredSystemLibraries.cmake
+drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/CMakeLists.txt
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/detect.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/IntelVSImplicitPath/hello.f (EMPTY)
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/KDE3Macros.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/MacOSXBundleInfo.plist.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/MacOSXFrameworkInfo.plist.in
@@ -377,6 +393,7 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/Platform/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-GNU.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-C.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-CXX.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-Fortran.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-XL-ASM.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-XL-C.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Platform/AIX-XL-CXX.cmake
@@ -540,6 +557,9 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/Platform/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/TestForSTDNamespace.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/TestForSTDNamespace.cxx
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseEcos.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseJava.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseJavaClassFilelist.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseJavaSymlinks.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UsePkgConfig.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseQt4.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UseSWIG.cmake
@@ -549,7 +569,9 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/Platform/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/Use_wxWindows.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/UsewxWidgets.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/VTKCompatibility.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/WriteBasicConfigVersionFile.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/ecos_clean.cmake
+-rw-r--r--	root/root	usr/share/cmake-2.8/Modules/exportheader.cmake.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/kde3init_dummy.cpp.in
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/kde3uic.cmake
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/readme.txt
diff --git a/extra/cmake/.md5sum.i686 b/extra/cmake/.md5sum.i686
index 7f281e55c..6996b92b4 100644
--- a/extra/cmake/.md5sum.i686
+++ b/extra/cmake/.md5sum.i686
@@ -1 +1 @@
-3c5d32cec0f4c2dc45f4c2e84f4a20c5  cmake-2.8.5.tar.gz
+2147da452fd9212bb9b4542a9eee9d5b  cmake-2.8.6.tar.gz
diff --git a/extra/cmake/.md5sum.x86_64 b/extra/cmake/.md5sum.x86_64
index 7f281e55c..6996b92b4 100644
--- a/extra/cmake/.md5sum.x86_64
+++ b/extra/cmake/.md5sum.x86_64
@@ -1 +1 @@
-3c5d32cec0f4c2dc45f4c2e84f4a20c5  cmake-2.8.5.tar.gz
+2147da452fd9212bb9b4542a9eee9d5b  cmake-2.8.6.tar.gz
diff --git a/extra/cmake/Pkgfile b/extra/cmake/Pkgfile
index ca4bd3b45..840711938 100755
--- a/extra/cmake/Pkgfile
+++ b/extra/cmake/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: curl,shared-mime-info,libldap,cyrus-sasl
 
 name=cmake
-version=2.8.5
+version=2.8.6
 release=1
 source=(http://www.cmake.org/files/v2.8/$name-$version.tar.gz)
 
diff --git a/extra/debianutils/.md5sum.i686 b/extra/debianutils/.md5sum.i686
index 74dd4c377..7f034830c 100644
--- a/extra/debianutils/.md5sum.i686
+++ b/extra/debianutils/.md5sum.i686
@@ -1 +1 @@
-bb96bc981174c97ad825816ed118d297  debianutils_4.0.2.tar.gz
+550d87571f9a467e4b281c5a1546e9f9  debianutils_4.0.4.tar.gz
diff --git a/extra/debianutils/.md5sum.x86_64 b/extra/debianutils/.md5sum.x86_64
index 74dd4c377..7f034830c 100644
--- a/extra/debianutils/.md5sum.x86_64
+++ b/extra/debianutils/.md5sum.x86_64
@@ -1 +1 @@
-bb96bc981174c97ad825816ed118d297  debianutils_4.0.2.tar.gz
+550d87571f9a467e4b281c5a1546e9f9  debianutils_4.0.4.tar.gz
diff --git a/extra/debianutils/Pkgfile b/extra/debianutils/Pkgfile
index ac1504ee7..b246bed8b 100755
--- a/extra/debianutils/Pkgfile
+++ b/extra/debianutils/Pkgfile
@@ -6,7 +6,7 @@
 # Run on:
 
 name=debianutils
-version=4.0.2
+version=4.0.4
 release=1
 
 source=(http://ftp.de.debian.org/debian/pool/main/d/$name/${name}_$version.tar.gz )
diff --git a/extra/intltool/.md5sum.i686 b/extra/intltool/.md5sum.i686
index 0b472eece..ac04b34d9 100644
--- a/extra/intltool/.md5sum.i686
+++ b/extra/intltool/.md5sum.i686
@@ -1 +1 @@
-d6c91bf06681919ccfdf3624035b75dc  intltool-0.41.1.tar.gz
+0da9847a60391ca653df35123b1f7cc0  intltool-0.50.0.tar.gz
diff --git a/extra/intltool/.md5sum.x86_64 b/extra/intltool/.md5sum.x86_64
index 0b472eece..ac04b34d9 100644
--- a/extra/intltool/.md5sum.x86_64
+++ b/extra/intltool/.md5sum.x86_64
@@ -1 +1 @@
-d6c91bf06681919ccfdf3624035b75dc  intltool-0.41.1.tar.gz
+0da9847a60391ca653df35123b1f7cc0  intltool-0.50.0.tar.gz
diff --git a/extra/intltool/Pkgfile b/extra/intltool/Pkgfile
index 1888c075f..f8aff7190 100755
--- a/extra/intltool/Pkgfile
+++ b/extra/intltool/Pkgfile
@@ -6,15 +6,13 @@
 # Run on: p5-xml-parser
 
 name=intltool
-version=0.41.1
+version=0.50.0
 release=1
 source=(http://edge.launchpad.net/intltool/trunk/$version/+download/intltool-$version.tar.gz)
 
 build() {
-cd $name-$version
-	./configure --prefix=/usr \
+	cd $name-$version
+	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
 }
-
-  
diff --git a/extra/kerberos/.md5sum.i686 b/extra/kerberos/.md5sum.i686
index dd5b3ddfd..b75f1cc6d 100644
--- a/extra/kerberos/.md5sum.i686
+++ b/extra/kerberos/.md5sum.i686
@@ -1 +1 @@
-220c3dbb05a1bae1e6ad0bec4a6ac331  krb5-1.9-signed.tar
+b9f237015fbb83f75d17941588b12b7d  krb5-1.9.1-signed.tar
diff --git a/extra/kerberos/.md5sum.x86_64 b/extra/kerberos/.md5sum.x86_64
index dd5b3ddfd..b75f1cc6d 100644
--- a/extra/kerberos/.md5sum.x86_64
+++ b/extra/kerberos/.md5sum.x86_64
@@ -1 +1 @@
-220c3dbb05a1bae1e6ad0bec4a6ac331  krb5-1.9-signed.tar
+b9f237015fbb83f75d17941588b12b7d  krb5-1.9.1-signed.tar
diff --git a/extra/kerberos/Pkgfile b/extra/kerberos/Pkgfile
index a9c676062..42959f3ee 100644
--- a/extra/kerberos/Pkgfile
+++ b/extra/kerberos/Pkgfile
@@ -4,7 +4,7 @@
 # Maintainer: thierryn1 at hispeed
 
 name=kerberos
-version=1.9
+version=1.9.1
 release=1
 source=(http://web.mit.edu/$name/www/dist/krb5/1.9/krb5-$version-signed.tar)
 build()  {
diff --git a/extra/polkit/.footprint.i686 b/extra/polkit/.footprint.i686
index dd6821290..d9880950f 100644
--- a/extra/polkit/.footprint.i686
+++ b/extra/polkit/.footprint.i686
@@ -3,8 +3,7 @@ drwxr-xr-x	root/root	etc/dbus-1/
 drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
 drwxr-xr-x	root/root	etc/pam.d/
-drwxr-xr-x	root/root	etc/pam.d/polkit-1/
--rw-r--r--	root/root	etc/pam.d/polkit-1/polkit.pam
+-rw-r--r--	root/root	etc/pam.d/polkit-1
 drwxr-xr-x	root/root	etc/polkit-1/
 drwxr-xr-x	root/root	etc/polkit-1/localauthority.conf.d/
 -rw-r--r--	root/root	etc/polkit-1/localauthority.conf.d/50-localauthority.conf
@@ -64,14 +63,17 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Polkit-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/PolkitAgent-1.0.typelib
+-rw-r--r--	root/root	usr/lib/libpolkit-agent-1.a
 -rwxr-xr-x	root/root	usr/lib/libpolkit-agent-1.la
 lrwxrwxrwx	root/root	usr/lib/libpolkit-agent-1.so -> libpolkit-agent-1.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libpolkit-agent-1.so.0 -> libpolkit-agent-1.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libpolkit-agent-1.so.0.0.0
+-rw-r--r--	root/root	usr/lib/libpolkit-backend-1.a
 -rwxr-xr-x	root/root	usr/lib/libpolkit-backend-1.la
 lrwxrwxrwx	root/root	usr/lib/libpolkit-backend-1.so -> libpolkit-backend-1.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libpolkit-backend-1.so.0 -> libpolkit-backend-1.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libpolkit-backend-1.so.0.0.0
+-rw-r--r--	root/root	usr/lib/libpolkit-gobject-1.a
 -rwxr-xr-x	root/root	usr/lib/libpolkit-gobject-1.la
 lrwxrwxrwx	root/root	usr/lib/libpolkit-gobject-1.so -> libpolkit-gobject-1.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libpolkit-gobject-1.so.0 -> libpolkit-gobject-1.so.0.0.0
@@ -82,6 +84,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/polkit-gobject-1.pc
 drwxr-xr-x	root/root	usr/lib/polkit-1/
 drwxr-xr-x	root/root	usr/lib/polkit-1/extensions/
+-rw-r--r--	root/root	usr/lib/polkit-1/extensions/libnullbackend.a
 -rwxr-xr-x	root/root	usr/lib/polkit-1/extensions/libnullbackend.la
 -rwxr-xr-x	root/root	usr/lib/polkit-1/extensions/libnullbackend.so
 -rwsr-xr-x	root/root	usr/lib/polkit-1/polkit-agent-helper-1
diff --git a/extra/polkit/.footprint.x86_64 b/extra/polkit/.footprint.x86_64
index dd6821290..d9880950f 100644
--- a/extra/polkit/.footprint.x86_64
+++ b/extra/polkit/.footprint.x86_64
@@ -3,8 +3,7 @@ drwxr-xr-x	root/root	etc/dbus-1/
 drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
 drwxr-xr-x	root/root	etc/pam.d/
-drwxr-xr-x	root/root	etc/pam.d/polkit-1/
--rw-r--r--	root/root	etc/pam.d/polkit-1/polkit.pam
+-rw-r--r--	root/root	etc/pam.d/polkit-1
 drwxr-xr-x	root/root	etc/polkit-1/
 drwxr-xr-x	root/root	etc/polkit-1/localauthority.conf.d/
 -rw-r--r--	root/root	etc/polkit-1/localauthority.conf.d/50-localauthority.conf
@@ -64,14 +63,17 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Polkit-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/PolkitAgent-1.0.typelib
+-rw-r--r--	root/root	usr/lib/libpolkit-agent-1.a
 -rwxr-xr-x	root/root	usr/lib/libpolkit-agent-1.la
 lrwxrwxrwx	root/root	usr/lib/libpolkit-agent-1.so -> libpolkit-agent-1.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libpolkit-agent-1.so.0 -> libpolkit-agent-1.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libpolkit-agent-1.so.0.0.0
+-rw-r--r--	root/root	usr/lib/libpolkit-backend-1.a
 -rwxr-xr-x	root/root	usr/lib/libpolkit-backend-1.la
 lrwxrwxrwx	root/root	usr/lib/libpolkit-backend-1.so -> libpolkit-backend-1.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libpolkit-backend-1.so.0 -> libpolkit-backend-1.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libpolkit-backend-1.so.0.0.0
+-rw-r--r--	root/root	usr/lib/libpolkit-gobject-1.a
 -rwxr-xr-x	root/root	usr/lib/libpolkit-gobject-1.la
 lrwxrwxrwx	root/root	usr/lib/libpolkit-gobject-1.so -> libpolkit-gobject-1.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libpolkit-gobject-1.so.0 -> libpolkit-gobject-1.so.0.0.0
@@ -82,6 +84,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/polkit-gobject-1.pc
 drwxr-xr-x	root/root	usr/lib/polkit-1/
 drwxr-xr-x	root/root	usr/lib/polkit-1/extensions/
+-rw-r--r--	root/root	usr/lib/polkit-1/extensions/libnullbackend.a
 -rwxr-xr-x	root/root	usr/lib/polkit-1/extensions/libnullbackend.la
 -rwxr-xr-x	root/root	usr/lib/polkit-1/extensions/libnullbackend.so
 -rwsr-xr-x	root/root	usr/lib/polkit-1/polkit-agent-helper-1
diff --git a/extra/polkit/.md5sum.i686 b/extra/polkit/.md5sum.i686
index bc220ff2b..44ea70452 100644
--- a/extra/polkit/.md5sum.i686
+++ b/extra/polkit/.md5sum.i686
@@ -1,3 +1,2 @@
-f925ac93aba3c072977370c1e27feb7f  polkit-0.101.tar.gz
-b2a4e882223701ebb7e96ed511ab92b6  polkit-101-CVE-2011-1485.patch
+a3726bdb9728c103e58f62131e26693a  polkit-0.102.tar.gz
 6564f95878297b954f0572bc1610dd15  polkit.pam
diff --git a/extra/polkit/.md5sum.x86_64 b/extra/polkit/.md5sum.x86_64
index bc220ff2b..44ea70452 100644
--- a/extra/polkit/.md5sum.x86_64
+++ b/extra/polkit/.md5sum.x86_64
@@ -1,3 +1,2 @@
-f925ac93aba3c072977370c1e27feb7f  polkit-0.101.tar.gz
-b2a4e882223701ebb7e96ed511ab92b6  polkit-101-CVE-2011-1485.patch
+a3726bdb9728c103e58f62131e26693a  polkit-0.102.tar.gz
 6564f95878297b954f0572bc1610dd15  polkit.pam
diff --git a/extra/polkit/Pkgfile b/extra/polkit/Pkgfile
index da48cdefc..088ca7ced 100755
--- a/extra/polkit/Pkgfile
+++ b/extra/polkit/Pkgfile
@@ -2,35 +2,25 @@
 # URL: http://hal.freedesktop.org/docs/polkit
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: expat, gobject-introspection, linux-pam, intltool
-# Run on: dbus-glib,expat,eggdbus,linux-pam,intltool
+# Depends on: glib, expat, linux-pam, gobject-introspection, intltool
+# Run on: glib,expat,linux-pam
 
 name=polkit
-version=0.101
-release=2
+version=0.102
+release=1
 source=(http://hal.freedesktop.org/releases/$name-$version.tar.gz 
-	polkit.pam 
-	polkit-101-CVE-2011-1485.patch)
-	
+	polkit.pam)
 
 build() {
-        cd $name-$version
-	patch -Np1 -i ../polkit-101-CVE-2011-1485.patch
-        PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+	cd $name-$version
+	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
 		--sysconfdir=/etc \
-            	--libexecdir=/usr/lib/polkit-1 \
-		--with-authfw=pam \
-		--with-authfw=shadow \
-            	--mandir=/usr/share/man \
-                --localstatedir=/var \
-      		--disable-static \
-		--enable-nls \
-		--with-os-type=lfs
-        make
-        make DESTDIR=$PKG install
-	mkdir -p $PKG/etc/pam.d/polkit-1
+		--libexecdir=/usr/lib/polkit-1 \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--with-os-type=NuTyX
+	make
+	make DESTDIR=$PKG install
+	mkdir -p $PKG/var/{lib,run}/polkit-1
 	install -m644 $SRC/polkit.pam $PKG/etc/pam.d/polkit-1
-	mkdir -p $PKG/var/run/polkit-1
-	mkdir -p $PKG/var/lib/polkit-1
 }
-  
diff --git a/extra/polkit/polkit-101-CVE-2011-1485.patch b/extra/polkit/polkit-101-CVE-2011-1485.patch
deleted file mode 100644
index 8d0f81781..000000000
--- a/extra/polkit/polkit-101-CVE-2011-1485.patch
+++ /dev/null
@@ -1,909 +0,0 @@
-From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Thu, 31 Mar 2011 16:59:09 +0000
-Subject: PolkitUnixProcess: Clarify that the real uid is returned, not the effective one
-
-On Linux, also switch to parsing /proc/<pid>/status instead of relying
-on the st_uid returned by stat(2) to be the uid we want.
-
-This was pointed out by Neel Mehta <nmehta@google.com>. Thanks!
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index d95a1d4..876da69 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -24,9 +24,7 @@
- #endif
- 
- #include <sys/types.h>
--#ifndef HAVE_FREEBSD
--#include <sys/stat.h>
--#else
-+#ifdef HAVE_FREEBSD
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <sys/user.h>
-@@ -34,6 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdio.h>
- 
- #include "polkitunixprocess.h"
- #include "polkitsubject.h"
-@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process)
-  *
-  * Gets the uid of the owner of @process.
-  *
-+ * Note that this returns the real user-id (not the effective user-id) of @process.
-+ *
-  * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-  **/
- gint
-@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-                                GError            **error)
- {
-   gint result;
-+  gchar *contents;
-+  gchar **lines;
- #ifdef HAVE_FREEBSD
-   struct kinfo_proc p;
- #else
--  struct stat statbuf;
--  char procbuf[32];
-+  gchar filename[64];
-+  guint n;
- #endif
- 
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-   g_return_val_if_fail (error == NULL || *error == NULL, 0);
- 
-   result = 0;
-+  lines = NULL;
-+  contents = NULL;
- 
- #ifdef HAVE_FREEBSD
-   if (get_kinfo_proc (process->pid, &p) == 0)
-@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
- 
-   result = p.ki_uid;
- #else
--  g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid);
--  if (stat (procbuf, &statbuf) != 0)
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-     {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "stat() failed for /proc/%d: %s",
--                   process->pid,
--                   g_strerror (errno));
-       goto out;
-     }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
- 
--  result = statbuf.st_uid;
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
- #endif
- 
-- out:
--
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-   return result;
- }
- 
---
-cgit v0.8.3-6-g21f6
-From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:09:45 +0000
-Subject: Make PolkitUnixProcess also record the uid of the process
-
-This is needed to avoid possible TOCTTOU issues since a process can
-change both its real uid and effective uid.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt
-index 12141e3..9f4fcf8 100644
---- a/docs/polkit/polkit-1-sections.txt
-+++ b/docs/polkit/polkit-1-sections.txt
-@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS
- PolkitUnixProcess
- polkit_unix_process_new
- polkit_unix_process_new_full
-+polkit_unix_process_new_for_owner
-+polkit_unix_process_set_pid
- polkit_unix_process_get_pid
-+polkit_unix_process_set_start_time
- polkit_unix_process_get_start_time
--polkit_unix_process_set_pid
--polkit_unix_process_get_owner
-+polkit_unix_process_set_uid
-+polkit_unix_process_get_uid
- <SUBSECTION Standard>
- PolkitUnixProcessClass
- POLKIT_UNIX_PROCESS
-diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
-index 577afec..d2c4c20 100644
---- a/src/polkit/polkitsubject.c
-+++ b/src/polkit/polkitsubject.c
-@@ -238,13 +238,18 @@ polkit_subject_from_string  (const gchar   *str,
-     {
-       gint scanned_pid;
-       guint64 scanned_starttime;
--      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-+      gint scanned_uid;
-+      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3)
-+        {
-+          subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid);
-+        }
-+      else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-         {
-           subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime);
-         }
-       else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1)
-         {
--          subject = polkit_unix_process_new_full (scanned_pid, 0);
-+          subject = polkit_unix_process_new (scanned_pid);
-           if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0)
-             {
-               g_object_unref (subject);
-@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject)
-                              g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))));
-       g_variant_builder_add (&builder, "{sv}", "start-time",
-                              g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject))));
-+      g_variant_builder_add (&builder, "{sv}", "uid",
-+                             g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject))));
-     }
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
-@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       GVariant *v;
-       guint32 pid;
-       guint64 start_time;
-+      gint32 uid;
- 
-       v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error);
-       if (v == NULL)
-@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       start_time = g_variant_get_uint64 (v);
-       g_variant_unref (v);
- 
--      ret = polkit_unix_process_new_full (pid, start_time);
-+      v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error);
-+      if (v != NULL)
-+        {
-+          uid = g_variant_get_int32 (v);
-+          g_variant_unref (v);
-+        }
-+      else
-+        {
-+          uid = -1;
-+        }
-+
-+      ret = polkit_unix_process_new_for_owner (pid, start_time, uid);
-     }
-   else if (g_strcmp0 (kind, "unix-session") == 0)
-     {
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index 876da69..913be3a 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -62,6 +62,7 @@ struct _PolkitUnixProcess
- 
-   gint pid;
-   guint64 start_time;
-+  gint uid;
- };
- 
- struct _PolkitUnixProcessClass
-@@ -74,6 +75,7 @@ enum
-   PROP_0,
-   PROP_PID,
-   PROP_START_TIME,
-+  PROP_UID
- };
- 
- static void subject_iface_init (PolkitSubjectIface *subject_iface);
-@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface);
- static guint64 get_start_time_for_pid (gint    pid,
-                                        GError **error);
- 
-+static gint _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                            GError            **error);
-+
- #ifdef HAVE_FREEBSD
- static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p);
- #endif
-@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT,
- static void
- polkit_unix_process_init (PolkitUnixProcess *unix_process)
- {
-+  unix_process->uid = -1;
- }
- 
- static void
-@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject    *object,
-       g_value_set_int (value, unix_process->pid);
-       break;
- 
-+    case PROP_UID:
-+      g_value_set_int (value, unix_process->uid);
-+      break;
-+
-     case PROP_START_TIME:
-       g_value_set_uint64 (value, unix_process->start_time);
-       break;
-@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject      *object,
-       polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
-       break;
- 
-+    case PROP_UID:
-+      polkit_unix_process_set_uid (unix_process, g_value_get_int (value));
-+      break;
-+
-+    case PROP_START_TIME:
-+      polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value));
-+      break;
-+
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-       break;
-@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject      *object,
- }
- 
- static void
-+polkit_unix_process_constructed (GObject *object)
-+{
-+  PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object);
-+
-+  /* sets start_time and uid in case they are unset */
-+
-+  if (process->start_time == 0)
-+    process->start_time = get_start_time_for_pid (process->pid, NULL);
-+
-+  if (process->uid == -1)
-+    {
-+      GError *error;
-+      error = NULL;
-+      process->uid = _polkit_unix_process_get_owner (process, &error);
-+      if (error != NULL)
-+        {
-+          process->uid = -1;
-+          g_error_free (error);
-+        }
-+    }
-+
-+  if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL)
-+    G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object);
-+}
-+
-+static void
- polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- {
-   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- 
-   gobject_class->get_property = polkit_unix_process_get_property;
-   gobject_class->set_property = polkit_unix_process_set_property;
-+  gobject_class->constructed =  polkit_unix_process_constructed;
- 
-   /**
-    * PolkitUnixProcess:pid:
-@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                    g_param_spec_int ("pid",
-                                                      "Process ID",
-                                                      "The UNIX process ID",
--                                                     -1,
-+                                                     0,
-                                                      G_MAXINT,
-                                                      0,
-                                                      G_PARAM_CONSTRUCT |
-@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                      G_PARAM_STATIC_NICK));
- 
-   /**
-+   * PolkitUnixProcess:uid:
-+   *
-+   * The UNIX user id of the process or -1 if unknown.
-+   *
-+   * Note that this is the real user-id, not the effective user-id.
-+   */
-+  g_object_class_install_property (gobject_class,
-+                                   PROP_UID,
-+                                   g_param_spec_int ("uid",
-+                                                     "User ID",
-+                                                     "The UNIX user ID",
-+                                                     -1,
-+                                                     G_MAXINT,
-+                                                     -1,
-+                                                     G_PARAM_CONSTRUCT |
-+                                                     G_PARAM_READWRITE |
-+                                                     G_PARAM_STATIC_NAME |
-+                                                     G_PARAM_STATIC_BLURB |
-+                                                     G_PARAM_STATIC_NICK));
-+
-+  /**
-    * PolkitUnixProcess:start-time:
-    *
-    * The start time of the process.
-@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                         0,
-                                                         G_MAXUINT64,
-                                                         0,
--                                                        G_PARAM_READABLE |
-+                                                        G_PARAM_CONSTRUCT |
-+                                                        G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_BLURB |
-                                                         G_PARAM_STATIC_NICK));
-@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- }
- 
- /**
-- * polkit_unix_process_get_pid:
-+ * polkit_unix_process_get_uid:
-  * @process: A #PolkitUnixProcess.
-  *
-- * Gets the process id for @process.
-+ * Gets the user id for @process. Note that this is the real user-id,
-+ * not the effective user-id.
-  *
-- * Returns: The process id for @process.
-+ * Returns: The user id for @process or -1 if unknown.
-  */
- gint
--polkit_unix_process_get_pid (PolkitUnixProcess *process)
-+polkit_unix_process_get_uid (PolkitUnixProcess *process)
- {
--  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  return process->pid;
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1);
-+  return process->uid;
- }
- 
- /**
-- * polkit_unix_process_get_owner:
-+ * polkit_unix_process_set_uid:
-  * @process: A #PolkitUnixProcess.
-- * @error: (allow-none): Return location for error or %NULL.
-+ * @uid: The user id to set for @process or -1 to unset it.
-  *
-- * Gets the uid of the owner of @process.
-+ * Sets the (real, not effective) user id for @process.
-+ */
-+void
-+polkit_unix_process_set_uid (PolkitUnixProcess *process,
-+                             gint               uid)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  g_return_if_fail (uid >= -1);
-+  process->uid = uid;
-+}
-+
-+/**
-+ * polkit_unix_process_get_pid:
-+ * @process: A #PolkitUnixProcess.
-  *
-- * Note that this returns the real user-id (not the effective user-id) of @process.
-+ * Gets the process id for @process.
-  *
-- * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-- **/
-+ * Returns: The process id for @process.
-+ */
- gint
--polkit_unix_process_get_owner (PolkitUnixProcess  *process,
--                               GError            **error)
-+polkit_unix_process_get_pid (PolkitUnixProcess *process)
- {
--  gint result;
--  gchar *contents;
--  gchar **lines;
--#ifdef HAVE_FREEBSD
--  struct kinfo_proc p;
--#else
--  gchar filename[64];
--  guint n;
--#endif
--
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  g_return_val_if_fail (error == NULL || *error == NULL, 0);
--
--  result = 0;
--  lines = NULL;
--  contents = NULL;
--
--#ifdef HAVE_FREEBSD
--  if (get_kinfo_proc (process->pid, &p) == 0)
--    {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "get_kinfo_proc() failed for pid %d: %s",
--                   process->pid,
--                   g_strerror (errno));
--      goto out;
--    }
--
--  result = p.ki_uid;
--#else
--
--  /* see 'man proc' for layout of the status file
--   *
--   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
--   */
--  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
--  if (!g_file_get_contents (filename,
--                            &contents,
--                            NULL,
--                            error))
--    {
--      goto out;
--    }
--  lines = g_strsplit (contents, "\n", -1);
--  for (n = 0; lines != NULL && lines[n] != NULL; n++)
--    {
--      gint real_uid, effective_uid;
--      if (!g_str_has_prefix (lines[n], "Uid:"))
--        continue;
--      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Unexpected line `%s' in file %s",
--                       lines[n],
--                       filename);
--          goto out;
--        }
--      else
--        {
--          result = real_uid;
--          goto out;
--        }
--    }
--
--  g_set_error (error,
--               POLKIT_ERROR,
--               POLKIT_ERROR_FAILED,
--               "Didn't find any line starting with `Uid:' in file %s",
--               filename);
--#endif
--
--out:
--  g_strfreev (lines);
--  g_free (contents);
--  return result;
-+  return process->pid;
- }
- 
- /**
-@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process)
- }
- 
- /**
-+ * polkit_unix_process_set_start_time:
-+ * @process: A #PolkitUnixProcess.
-+ * @start_time: The start time for @pid.
-+ *
-+ * Set the start time of @process.
-+ */
-+void
-+polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                    guint64            start_time)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  process->start_time = start_time;
-+}
-+
-+/**
-  * polkit_unix_process_set_pid:
-  * @process: A #PolkitUnixProcess.
-  * @pid: A process id.
-@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process,
- {
-   g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-   process->pid = pid;
--  if (pid != (gint) -1)
--    process->start_time = get_start_time_for_pid (pid, NULL);
- }
- 
- /**
-  * polkit_unix_process_new:
-  * @pid: The process id.
-  *
-- * Creates a new #PolkitUnixProcess for @pid. The start time of the
-- * process will be looked up in using e.g. the
-- * <filename>/proc</filename> filesystem depending on the platform in
-- * use.
-+ * Creates a new #PolkitUnixProcess for @pid.
-+ *
-+ * The uid and start time of the process will be looked up in using
-+ * e.g. the <filename>/proc</filename> filesystem depending on the
-+ * platform in use.
-  *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
-@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid)
-  *
-  * Creates a new #PolkitUnixProcess object for @pid and @start_time.
-  *
-+ * The uid of the process will be looked up in using e.g. the
-+ * <filename>/proc</filename> filesystem depending on the platform in
-+ * use.
-+ *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
- PolkitSubject *
- polkit_unix_process_new_full (gint pid,
-                               guint64 start_time)
- {
--  PolkitUnixProcess *process;
--
--  process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1));
--  process->pid = pid;
--  if (start_time != 0)
--    process->start_time = start_time;
--  else
--    process->start_time = get_start_time_for_pid (pid, NULL);
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       NULL));
-+}
- 
--  return POLKIT_SUBJECT (process);
-+/**
-+ * polkit_unix_process_new_for_owner:
-+ * @pid: The process id.
-+ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>.
-+ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>.
-+ *
-+ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid.
-+ *
-+ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-+ */
-+PolkitSubject *
-+polkit_unix_process_new_for_owner (gint    pid,
-+                                   guint64 start_time,
-+                                   gint    uid)
-+{
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       "uid", uid,
-+                                       NULL));
- }
- 
- static guint
-@@ -616,3 +654,95 @@ out:
- 
-   return start_time;
- }
-+
-+static gint
-+_polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                GError            **error)
-+{
-+  gint result;
-+  gchar *contents;
-+  gchar **lines;
-+#ifdef HAVE_FREEBSD
-+  struct kinfo_proc p;
-+#else
-+  gchar filename[64];
-+  guint n;
-+#endif
-+
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-+  g_return_val_if_fail (error == NULL || *error == NULL, 0);
-+
-+  result = 0;
-+  lines = NULL;
-+  contents = NULL;
-+
-+#ifdef HAVE_FREEBSD
-+  if (get_kinfo_proc (process->pid, &p) == 0)
-+    {
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "get_kinfo_proc() failed for pid %d: %s",
-+                   process->pid,
-+                   g_strerror (errno));
-+      goto out;
-+    }
-+
-+  result = p.ki_uid;
-+#else
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-+    {
-+      goto out;
-+    }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
-+
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
-+#endif
-+
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-+  return result;
-+}
-+
-+/* deprecated public method */
-+gint
-+polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                               GError            **error)
-+{
-+  return _polkit_unix_process_get_owner (process, error);
-+}
-diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h
-index b88cd03..531a57d 100644
---- a/src/polkit/polkitunixprocess.h
-+++ b/src/polkit/polkitunixprocess.h
-@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess;
- typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass;
- 
- GType           polkit_unix_process_get_type       (void) G_GNUC_CONST;
--PolkitSubject  *polkit_unix_process_new            (gint pid);
--PolkitSubject  *polkit_unix_process_new_full       (gint pid,
--                                                    guint64 start_time);
--
-+PolkitSubject  *polkit_unix_process_new            (gint               pid);
-+PolkitSubject  *polkit_unix_process_new_full       (gint               pid,
-+                                                    guint64            start_time);
-+PolkitSubject  *polkit_unix_process_new_for_owner  (gint               pid,
-+                                                    guint64            start_time,
-+                                                    gint               uid);
- gint            polkit_unix_process_get_pid        (PolkitUnixProcess *process);
- guint64         polkit_unix_process_get_start_time (PolkitUnixProcess *process);
-+gint            polkit_unix_process_get_uid        (PolkitUnixProcess *process);
- void            polkit_unix_process_set_pid        (PolkitUnixProcess *process,
-                                                     gint               pid);
-+void            polkit_unix_process_set_uid        (PolkitUnixProcess *process,
-+                                                    gint               uid);
-+void            polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                                    guint64            start_time);
-+
- gint            polkit_unix_process_get_owner      (PolkitUnixProcess  *process,
--                                                    GError            **error);
-+                                                    GError            **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid);
- 
- G_END_DECLS
- 
---
-cgit v0.8.3-6-g21f6
-From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:12:27 +0000
-Subject: Use polkit_unix_process_get_uid() to get the owner of a process
-
-This avoids a TOCTTOU problem.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
-index 495f752..9c331b6 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor.c
-@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      local_error = NULL;
--      uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error);
--      if (local_error != NULL)
-+      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
-+      if ((gint) uid == -1)
-         {
--          g_propagate_prefixed_error (error, local_error, "Error getting user for process: ");
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unix process subject does not have uid set");
-           goto out;
-         }
--
-       ret = polkit_unix_user_new (uid);
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
---
-cgit v0.8.3-6-g21f6
-From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:13:15 +0000
-Subject: pkexec: Avoid TOCTTOU problems with parent process
-
-In a nutshell, the parent process may change its uid (either real- or
-effective uid) after launching pkexec. It can do this by exec()'ing
-e.g. a setuid root program.
-
-To avoid this problem, just use the uid the parent process had when it
-executed pkexec. This happens to be the same uid of the pkexec process
-itself.
-
-Additionally, remove some dubious code that allowed pkexec to continue
-when the parent process died as there is no reason to support
-something like that. Also ensure that the pkexec process is killed if
-the parent process dies.
-
-This problem was pointed out by Neel Mehta <nmehta@google.com>.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 9217954..3e656be 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -35,6 +35,10 @@
- #include <pwd.h>
- #include <errno.h>
- 
-+#ifdef __linux__
-+#include <sys/prctl.h>
-+#endif
-+
- #include <glib/gi18n.h>
- 
- #ifdef POLKIT_AUTHFW_PAM
-@@ -423,7 +427,6 @@ main (int argc, char *argv[])
-   GPtrArray *saved_env;
-   gchar *opt_user;
-   pid_t pid_of_caller;
--  uid_t uid_of_caller;
-   gpointer local_agent_handle;
- 
-   ret = 127;
-@@ -598,40 +601,49 @@ main (int argc, char *argv[])
-    */
-   g_type_init ();
- 
--  /* now check if the program that invoked us is authorized */
-+  /* make sure we are nuked if the parent process dies */
-+#ifdef __linux__
-+  if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
-+    {
-+      g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno));
-+      goto out;
-+    }
-+#else
-+#warning "Please add OS specific code to catch when the parent dies"
-+#endif
-+
-+  /* Figure out the parent process */
-   pid_of_caller = getppid ();
-   if (pid_of_caller == 1)
-     {
-       /* getppid() can return 1 if the parent died (meaning that we are reaped
--       * by /sbin/init); get process group leader instead - for example, this
--       * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit').
-+       * by /sbin/init); In that case we simpy bail.
-        */
--      pid_of_caller = getpgrp ();
--    }
--
--  subject = polkit_unix_process_new (pid_of_caller);
--  if (subject == NULL)
--    {
--      g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
-+      g_printerr ("Refusing to render service to dead parents.\n");
-       goto out;
-     }
- 
--  /* paranoia: check that the uid of pid_of_caller matches getuid() */
--  error = NULL;
--  uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject),
--                                                 &error);
--  if (error != NULL)
--    {
--      g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
--      goto out;
--    }
--  if (uid_of_caller != getuid ())
--    {
--      g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ());
--      goto out;
--    }
-+  /* This process we want to check an authorization for is the process
-+   * that launched us - our parent process.
-+   *
-+   * At the time the parent process fork()'ed and exec()'ed us, the
-+   * process had the same real-uid that we have now. So we use this
-+   * real-uid instead of of looking it up to avoid TOCTTOU issues
-+   * (consider the parent process exec()'ing a setuid helper).
-+   *
-+   * On the other hand, the monotonic process start-time is guaranteed
-+   * to never change so it's safe to look that up given only the PID
-+   * since we are guaranteed to be nuked if the parent goes away
-+   * (cf. the prctl(2) call above).
-+   */
-+  subject = polkit_unix_process_new_for_owner (pid_of_caller,
-+                                               0, /* 0 means "look up start-time in /proc" */
-+                                               getuid ());
-+  /* really double-check the invariants guaranteed by the PolkitUnixProcess class */
-+  g_assert (subject != NULL);
-+  g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller);
-+  g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0);
-+  g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0);
- 
-   error = NULL;
-   authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error);
---
-cgit v0.8.3-6-g21f6
-
diff --git a/extra/sshfs/.md5sum.i686 b/extra/sshfs/.md5sum.i686
index 4828412dc..233d91c45 100755
--- a/extra/sshfs/.md5sum.i686
+++ b/extra/sshfs/.md5sum.i686
@@ -1 +1 @@
-26e9206eb5169e87e6f95f54bc005a4f  sshfs-fuse-2.2.tar.gz
+f72f12fda186dbd92382f70d25662ed3  sshfs-fuse-2.3.tar.gz
diff --git a/extra/sshfs/.md5sum.x86_64 b/extra/sshfs/.md5sum.x86_64
index 4828412dc..233d91c45 100755
--- a/extra/sshfs/.md5sum.x86_64
+++ b/extra/sshfs/.md5sum.x86_64
@@ -1 +1 @@
-26e9206eb5169e87e6f95f54bc005a4f  sshfs-fuse-2.2.tar.gz
+f72f12fda186dbd92382f70d25662ed3  sshfs-fuse-2.3.tar.gz
diff --git a/extra/sshfs/Pkgfile b/extra/sshfs/Pkgfile
index 85a839047..8d6959eda 100755
--- a/extra/sshfs/Pkgfile
+++ b/extra/sshfs/Pkgfile
@@ -6,12 +6,12 @@
 # Run on: fuse
 
 name=sshfs
-version=2.2
+version=2.3
 release=1
 source=(http://surfnet.dl.sourceforge.net/sourceforge/fuse/$name-fuse-$version.tar.gz)
 
 build() {
-cd $name-fuse-$version
+	cd $name-fuse-$version
 	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
diff --git a/extra/telepathy-glib/.footprint.i686 b/extra/telepathy-glib/.footprint.i686
index 32d6feb5b..b64162fb8 100644
--- a/extra/telepathy-glib/.footprint.i686
+++ b/extra/telepathy-glib/.footprint.i686
@@ -51,6 +51,7 @@ drwxr-xr-x	root/root	usr/include/telepathy-1.0/telepathy-glib/_gen/
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-contact-list.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-password-channel.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-protocol.h
+-rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-room-config.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/basic-proxy-factory.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/capabilities.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h
@@ -139,9 +140,9 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/TelepathyGLib-0.12.typelib
 -rw-r--r--	root/root	usr/lib/libtelepathy-glib.a
 -rwxr-xr-x	root/root	usr/lib/libtelepathy-glib.la
-lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so -> libtelepathy-glib.so.0.62.0
-lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so.0 -> libtelepathy-glib.so.0.62.0
--rwxr-xr-x	root/root	usr/lib/libtelepathy-glib.so.0.62.0
+lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so -> libtelepathy-glib.so.0.63.2
+lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so.0 -> libtelepathy-glib.so.0.63.2
+-rwxr-xr-x	root/root	usr/lib/libtelepathy-glib.so.0.63.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/telepathy-glib.pc
 drwxr-xr-x	root/root	usr/lib/telepathy/
@@ -156,6 +157,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/telepathy-glib/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseChannel.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseConnection.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseRoomConfig.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpCMMessage.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpChannelIface.html
@@ -210,6 +212,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/telepathy-glib/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-group.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-media.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-request.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-room.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-roomlist.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html
@@ -283,6 +286,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/telepathy-glib/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-group.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-media.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-request.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-room.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-roomlist.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-securable.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-text.html
diff --git a/extra/telepathy-glib/.footprint.x86_64 b/extra/telepathy-glib/.footprint.x86_64
index 32d6feb5b..b64162fb8 100644
--- a/extra/telepathy-glib/.footprint.x86_64
+++ b/extra/telepathy-glib/.footprint.x86_64
@@ -51,6 +51,7 @@ drwxr-xr-x	root/root	usr/include/telepathy-1.0/telepathy-glib/_gen/
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-contact-list.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-password-channel.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-protocol.h
+-rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/base-room-config.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/basic-proxy-factory.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/capabilities.h
 -rw-r--r--	root/root	usr/include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h
@@ -139,9 +140,9 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/TelepathyGLib-0.12.typelib
 -rw-r--r--	root/root	usr/lib/libtelepathy-glib.a
 -rwxr-xr-x	root/root	usr/lib/libtelepathy-glib.la
-lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so -> libtelepathy-glib.so.0.62.0
-lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so.0 -> libtelepathy-glib.so.0.62.0
--rwxr-xr-x	root/root	usr/lib/libtelepathy-glib.so.0.62.0
+lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so -> libtelepathy-glib.so.0.63.2
+lrwxrwxrwx	root/root	usr/lib/libtelepathy-glib.so.0 -> libtelepathy-glib.so.0.63.2
+-rwxr-xr-x	root/root	usr/lib/libtelepathy-glib.so.0.63.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/telepathy-glib.pc
 drwxr-xr-x	root/root	usr/lib/telepathy/
@@ -156,6 +157,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/telepathy-glib/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseChannel.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseConnection.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpBaseRoomConfig.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpCMMessage.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/TpChannelIface.html
@@ -210,6 +212,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/telepathy-glib/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-group.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-media.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-request.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-room.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-roomlist.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html
@@ -283,6 +286,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/telepathy-glib/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-group.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-media.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-request.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-room.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-roomlist.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-securable.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-text.html
diff --git a/extra/telepathy-glib/.md5sum.i686 b/extra/telepathy-glib/.md5sum.i686
index 6f1eb9792..b13b2c5dc 100644
--- a/extra/telepathy-glib/.md5sum.i686
+++ b/extra/telepathy-glib/.md5sum.i686
@@ -1 +1 @@
-1ddf36edbfcecb9c8ad473d113ce087f  telepathy-glib-0.15.7.tar.gz
+071ed1b34ace45109188df73933609e4  telepathy-glib-0.16.0.tar.gz
diff --git a/extra/telepathy-glib/.md5sum.x86_64 b/extra/telepathy-glib/.md5sum.x86_64
index 6f1eb9792..b13b2c5dc 100644
--- a/extra/telepathy-glib/.md5sum.x86_64
+++ b/extra/telepathy-glib/.md5sum.x86_64
@@ -1 +1 @@
-1ddf36edbfcecb9c8ad473d113ce087f  telepathy-glib-0.15.7.tar.gz
+071ed1b34ace45109188df73933609e4  telepathy-glib-0.16.0.tar.gz
diff --git a/extra/telepathy-glib/Pkgfile b/extra/telepathy-glib/Pkgfile
index f55dfe9f0..a5b31f7c7 100755
--- a/extra/telepathy-glib/Pkgfile
+++ b/extra/telepathy-glib/Pkgfile
@@ -6,9 +6,10 @@
 # Run on: dbus-glib
 
 name=telepathy-glib
-version=0.15.7
+version=0.16.0
 release=1
 source=(http://${name%-*}.freedesktop.org/releases/$name/$name-$version.tar.gz)
+
 build() {
         cd $name-$version
 	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
diff --git a/extra/vlc/.footprint.i686 b/extra/vlc/.footprint.i686
index 946cbd7a9..de7739c9c 100644
--- a/extra/vlc/.footprint.i686
+++ b/extra/vlc/.footprint.i686
@@ -96,10 +96,6 @@ lrwxrwxrwx	root/root	usr/lib/libvlc.so.5 -> libvlc.so.5.2.1
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so -> libvlccore.so.4.0.3
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so.4 -> libvlccore.so.4.0.3
 -rwxr-xr-x	root/root	usr/lib/libvlccore.so.4.0.3
-drwxr-xr-x	root/root	usr/lib/mozilla/
-drwxr-xr-x	root/root	usr/lib/mozilla/plugins/
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.la
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libvlc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/vlc-plugin.pc
@@ -179,6 +175,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_fake_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_imem_plugin.la
@@ -334,6 +332,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libpng_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspudec_plugin.la
@@ -359,6 +359,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/control/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libdbus_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libmotion_plugin.la
@@ -550,6 +552,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.la
@@ -745,12 +749,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/visualization/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/vlc.desktop
-drwxr-xr-x	root/root	usr/share/apps/
-drwxr-xr-x	root/root	usr/share/apps/solid/
-drwxr-xr-x	root/root	usr/share/apps/solid/actions/
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opencda.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opendvd.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/doc/vlc/
 -rw-r--r--	root/root	usr/share/doc/vlc/bugreport-howto.txt
@@ -778,6 +776,13 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc.png
+drwxr-xr-x	root/root	usr/share/kde4/
+drwxr-xr-x	root/root	usr/share/kde4/apps/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/actions/
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opencda.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opendvd.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
@@ -927,19 +932,6 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/requests/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/style.css
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm.html
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm_export.html
-drwxr-xr-x	root/root	usr/share/vlc/mozilla/
--rw-r--r--	root/root	usr/share/vlc/mozilla/fullscreen.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/pause.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/play.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_next.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_previous.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/stop.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_icon.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_line.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_knob.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_max.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_mute.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_slider_bar.xpm
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/
 -rw-r--r--	root/root	usr/share/vlc/osdmenu/default.cfg
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/default/
diff --git a/extra/vlc/.footprint.x86_64 b/extra/vlc/.footprint.x86_64
index 946cbd7a9..de7739c9c 100644
--- a/extra/vlc/.footprint.x86_64
+++ b/extra/vlc/.footprint.x86_64
@@ -96,10 +96,6 @@ lrwxrwxrwx	root/root	usr/lib/libvlc.so.5 -> libvlc.so.5.2.1
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so -> libvlccore.so.4.0.3
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so.4 -> libvlccore.so.4.0.3
 -rwxr-xr-x	root/root	usr/lib/libvlccore.so.4.0.3
-drwxr-xr-x	root/root	usr/lib/mozilla/
-drwxr-xr-x	root/root	usr/lib/mozilla/plugins/
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.la
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libvlc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/vlc-plugin.pc
@@ -179,6 +175,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_fake_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_imem_plugin.la
@@ -334,6 +332,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libpng_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspudec_plugin.la
@@ -359,6 +359,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/control/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libdbus_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libmotion_plugin.la
@@ -550,6 +552,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.la
@@ -745,12 +749,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/visualization/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/vlc.desktop
-drwxr-xr-x	root/root	usr/share/apps/
-drwxr-xr-x	root/root	usr/share/apps/solid/
-drwxr-xr-x	root/root	usr/share/apps/solid/actions/
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opencda.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opendvd.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/doc/vlc/
 -rw-r--r--	root/root	usr/share/doc/vlc/bugreport-howto.txt
@@ -778,6 +776,13 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc.png
+drwxr-xr-x	root/root	usr/share/kde4/
+drwxr-xr-x	root/root	usr/share/kde4/apps/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/actions/
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opencda.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opendvd.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
@@ -927,19 +932,6 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/requests/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/style.css
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm.html
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm_export.html
-drwxr-xr-x	root/root	usr/share/vlc/mozilla/
--rw-r--r--	root/root	usr/share/vlc/mozilla/fullscreen.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/pause.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/play.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_next.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_previous.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/stop.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_icon.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_line.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_knob.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_max.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_mute.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_slider_bar.xpm
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/
 -rw-r--r--	root/root	usr/share/vlc/osdmenu/default.cfg
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/default/
diff --git a/extra/vlc/.md5sum.i686 b/extra/vlc/.md5sum.i686
index 3af0ce44d..7d334d4bf 100644
--- a/extra/vlc/.md5sum.i686
+++ b/extra/vlc/.md5sum.i686
@@ -1 +1 @@
-91de1ad308c947e35380f9d747ff5713  vlc-1.1.12.tar.bz2
+56cb9975725a12da8c84882bc00fdce0  vlc-1.1.12.tar.xz
diff --git a/extra/vlc/.md5sum.x86_64 b/extra/vlc/.md5sum.x86_64
index 3af0ce44d..7d334d4bf 100644
--- a/extra/vlc/.md5sum.x86_64
+++ b/extra/vlc/.md5sum.x86_64
@@ -1 +1 @@
-91de1ad308c947e35380f9d747ff5713  vlc-1.1.12.tar.bz2
+56cb9975725a12da8c84882bc00fdce0  vlc-1.1.12.tar.xz
diff --git a/extra/vlc/Pkgfile b/extra/vlc/Pkgfile
index 06dd93c06..cc1c0729a 100644
--- a/extra/vlc/Pkgfile
+++ b/extra/vlc/Pkgfile
@@ -2,66 +2,66 @@
 # URL: http://www.videolan.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libshout, lua, ffmpeg, flac, freetype, fribidi, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, qt, libnotify, libmpcdec, librsvg, libraw1394, libavc1394, samba3, taglib, gnutls, pulseaudio, xulrunner
-# Run on: libshout,lua,ffmpeg,flac,freetype,fribidi,lame,libcdio,libdvbpsi,libdvdcss,libdvdread,libdvdnav,libebml,libiconv,libid3tag,libmad,libmatroska,libogg,libpng,speex,libtheora,libvorbis,libxml2,libmpeg2,openslp,portaudio,lame,vcdimager,x264,aalib,libcaca,libmpeg2,libopendaap,libmp4v2,live,libdca,sdl_image,qt,libnotify,libmpcdec,librsvg,libraw1394,libavc1394,samba3,taglib,gnutls,pulseaudio
+# Depends on: libshout, lua, ffmpeg, flac, freetype, fribidi, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, qt, libnotify, libmpcdec, librsvg, libraw1394, libavc1394, samba3, taglib, gnutls, pulseaudio, gnome-vfs, vdpau-video
+# Run on: libshout,lua,ffmpeg,flac,freetype,fribidi,lame,libcdio,libdvbpsi,libdvdcss,libdvdread,libdvdnav,libebml,libiconv,libid3tag,libmad,libmatroska,libogg,libpng,speex,libtheora,libvorbis,libxml2,libmpeg2,openslp,portaudio,lame,vcdimager,x264,aalib,libcaca,libmpeg2,libopendaap,libmp4v2,live,libdca,sdl_image,qt,libnotify,libmpcdec,librsvg,libraw1394,libavc1394,samba3,taglib,gnutls,pulseaudio,gnome-vfs,vdpau-video
 
 name=vlc
 version=1.1.12
-release=1
-
-source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2 )
+release=2
+source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz)
 
 build() {
 	cd vlc-$version
 
-	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
+	sed -i -e 's|truetype/freefont/FreeSerifBold.ttf|TTF/DejaVuSerif-Bold.ttf|' modules/misc/freetype.c
 
-  	[ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader"
-  	[ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install"
+	if [ "${CARCH}" = "i686" ]; then EXTRAFEATURES="--enable-loader"; fi
+	if [ "${CARCH}" = "x86_64" ]; then EXTRAFEATURES="--enable-fast-install"; fi
 
 	./configure --prefix=/usr \
-              --enable-libass \
-              --enable-dvdread \
-              --enable-dvdnav \
-              --disable-rpath \
-	      --disable-zvbi \
-              --enable-qt4 \
-              --enable-faad \
-              --enable-alsa \
-              --enable-skins2 \
-              --enable-dvb \
-              --enable-v4l \
-              --enable-theora \
-              --enable-flac \
-              --enable-snapshot \
-              --enable-dbus \
-              --enable-ogg \
-              --enable-dbus-control \
-              --enable-shared \
-              --enable-nls \
-              --enable-lirc \
-              --enable-shout \
-              --enable-pvr \
-              --enable-mozilla \
-              --enable-vlc \
-	      --program-suffix= \
-	      --enable-x264 \
-	      --enable-gnutls \
-	      --enable-live555 \
-	      --enable-pulse \
-	      --with-live555-tree=/usr/lib/live \
-	      --enable-realrtsp \
-              ${EXTRAFEATURES}
+		--disable-rpath \
+		--disable-zvbi \
+		--disable-mozilla \
+		--enable-gnomevfs \
+		--enable-libass \
+		--enable-dvdread \
+		--enable-dvdnav \
+		--enable-qt4 \
+		--enable-faad \
+		--enable-alsa \
+		--enable-skins2 \
+		--enable-dvb \
+		--enable-v4l \
+		--enable-theora \
+		--enable-flac \
+		--enable-snapshot \
+		--enable-dbus \
+		--enable-ogg \
+		--enable-dbus-control \
+		--enable-shared \
+		--enable-nls \
+		--enable-lirc \
+		--enable-shout \
+		--enable-pvr \
+		--enable-vlc \
+		--enable-x264 \
+		--enable-libva \
+		--enable-gnutls \
+		--enable-pulse \
+		--enable-bonjour \
+		--enable-realrtsp \
+		--enable-live555 \
+		--with-live555-tree=/usr/lib/live \
+		--with-kde-solid=/usr/share/kde4/apps/solid/actions/ \
+		--program-suffix= \
+		${EXTRAFEATURES}
 
-	export CFLAGS="-fPIC"
+	export CFLAGS="${CFLAGS} -fPIC"
 
 	make
-	make DESTDIR=$PKG/ install
-	
+	make DESTDIR=$PKG install
+
 	for res in 16 32 48 128; do
-    	    install -D -m644 $SRC/vlc-$version/share/icons/${res}x${res}/vlc.png \
-        		     $PKG/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png
-  	done
+		install -D -m644 $SRC/vlc-$version/share/icons/${res}x${res}/vlc.png $PKG/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png
+	done
 }
-
-  
diff --git a/extra/x264/.footprint.i686 b/extra/x264/.footprint.i686
index cd2f1babe..2559d9b61 100644
--- a/extra/x264/.footprint.i686
+++ b/extra/x264/.footprint.i686
@@ -5,7 +5,8 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/x264.h
 -rw-r--r--	root/root	usr/include/x264_config.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.118
--rw-r--r--	root/root	usr/lib/libx264.so.118
+-rw-r--r--	root/root	usr/lib/libx264.a
+lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.119
+-rw-r--r--	root/root	usr/lib/libx264.so.119
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/x264.pc
diff --git a/extra/x264/.footprint.x86_64 b/extra/x264/.footprint.x86_64
index cd2f1babe..2559d9b61 100644
--- a/extra/x264/.footprint.x86_64
+++ b/extra/x264/.footprint.x86_64
@@ -5,7 +5,8 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/x264.h
 -rw-r--r--	root/root	usr/include/x264_config.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.118
--rw-r--r--	root/root	usr/lib/libx264.so.118
+-rw-r--r--	root/root	usr/lib/libx264.a
+lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.119
+-rw-r--r--	root/root	usr/lib/libx264.so.119
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/x264.pc
diff --git a/extra/x264/.md5sum.i686 b/extra/x264/.md5sum.i686
index aae0684d0..e81da98ca 100644
--- a/extra/x264/.md5sum.i686
+++ b/extra/x264/.md5sum.i686
@@ -1 +1 @@
-dd67dca96ac79e7cb963bfcbf68e017b  x264-snapshot-20111001-2245.tar.bz2
+1df32a215f0f13271a83290ea16e9299  x264-snapshot-20111022-2245.tar.bz2
diff --git a/extra/x264/.md5sum.x86_64 b/extra/x264/.md5sum.x86_64
index aae0684d0..e81da98ca 100644
--- a/extra/x264/.md5sum.x86_64
+++ b/extra/x264/.md5sum.x86_64
@@ -1 +1 @@
-dd67dca96ac79e7cb963bfcbf68e017b  x264-snapshot-20111001-2245.tar.bz2
+1df32a215f0f13271a83290ea16e9299  x264-snapshot-20111022-2245.tar.bz2
diff --git a/extra/x264/Pkgfile b/extra/x264/Pkgfile
index ff22039cb..02cbc9d4c 100644
--- a/extra/x264/Pkgfile
+++ b/extra/x264/Pkgfile
@@ -6,22 +6,19 @@
 # Run on: yasm
 
 name=x264
-version=20111001
+version=20111022
 release=1
 source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$version-2245.tar.bz2)
 
 build() {
 	cd x264-snapshot-$version-2245
 
-	sed -i \
-		-e 's/-O4/-O3/' \
-		-e 's|-I/usr/X11R6/include|-I/usr/X11/include|' configure
-
 	./configure \
 		--prefix=/usr \
 		--enable-pic \
-		--enable-shared
-
+		--enable-shared \
+		--enable-static \
+		--enable-visualize
 	make
 	make DESTDIR=$PKG install
 	chmod a-x $PKG/usr/lib/*.so
diff --git a/extra/xvid/.footprint.i686 b/extra/xvid/.footprint.i686
index 98d4f0029..8295d8adb 100644
--- a/extra/xvid/.footprint.i686
+++ b/extra/xvid/.footprint.i686
@@ -3,6 +3,6 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/xvid.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libxvidcore.a
-lrwxrwxrwx	root/root	usr/lib/libxvidcore.so -> libxvidcore.so.4
-lrwxrwxrwx	root/root	usr/lib/libxvidcore.so.4 -> libxvidcore.so.4.2
+lrwxrwxrwx	root/root	usr/lib/libxvidcore.so -> libxvidcore.so.4.3
+lrwxrwxrwx	root/root	usr/lib/libxvidcore.so.4 -> libxvidcore.so.4.3
 -rwxr-xr-x	root/root	usr/lib/libxvidcore.so.4.3
diff --git a/extra/xvid/.footprint.x86_64 b/extra/xvid/.footprint.x86_64
index 98d4f0029..8295d8adb 100644
--- a/extra/xvid/.footprint.x86_64
+++ b/extra/xvid/.footprint.x86_64
@@ -3,6 +3,6 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/xvid.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libxvidcore.a
-lrwxrwxrwx	root/root	usr/lib/libxvidcore.so -> libxvidcore.so.4
-lrwxrwxrwx	root/root	usr/lib/libxvidcore.so.4 -> libxvidcore.so.4.2
+lrwxrwxrwx	root/root	usr/lib/libxvidcore.so -> libxvidcore.so.4.3
+lrwxrwxrwx	root/root	usr/lib/libxvidcore.so.4 -> libxvidcore.so.4.3
 -rwxr-xr-x	root/root	usr/lib/libxvidcore.so.4.3
diff --git a/extra/xvid/.md5sum.i686 b/extra/xvid/.md5sum.i686
index 0eb5f809c..9bd9d467e 100644
--- a/extra/xvid/.md5sum.i686
+++ b/extra/xvid/.md5sum.i686
@@ -1 +1 @@
-22621243c4a588dcee599e77736309c2  xvidcore-1.3.0.tar.bz2
+34389e980d4f849688f8b1e168f4e2f9  xvidcore-1.3.2.tar.bz2
diff --git a/extra/xvid/.md5sum.x86_64 b/extra/xvid/.md5sum.x86_64
index 0eb5f809c..9bd9d467e 100644
--- a/extra/xvid/.md5sum.x86_64
+++ b/extra/xvid/.md5sum.x86_64
@@ -1 +1 @@
-22621243c4a588dcee599e77736309c2  xvidcore-1.3.0.tar.bz2
+34389e980d4f849688f8b1e168f4e2f9  xvidcore-1.3.2.tar.bz2
diff --git a/extra/xvid/Pkgfile b/extra/xvid/Pkgfile
index 0216b783c..de90a7a30 100755
--- a/extra/xvid/Pkgfile
+++ b/extra/xvid/Pkgfile
@@ -6,20 +6,20 @@
 # Run on: nasm
 
 name=xvid
-version=1.3.0
+version=1.3.2
 release=1
 source=(http://downloads.xvid.org/downloads/xvidcore-$version.tar.bz2)
 
 
 build() {
 	cd xvidcore/build/generic
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
-	chmod -v 755 $PKG/usr/lib/libxvidcore.so.*
-	ln -v -sf libxvidcore.so.4.2 $PKG/usr/lib/libxvidcore.so.4
-	ln -v -sf libxvidcore.so.4   $PKG/usr/lib/libxvidcore.so
+
+	cd $PKG/usr/lib
+	lib=$(basename libxvidcore.so.*)
+	ln -sf $lib libxvidcore.so.4
+	ln -sf $lib libxvidcore.so
+	chmod -v 755 libxvidcore.so*
 }
-
author	orchidman <lesibel@free.fr>	2011-10-23 16:39:52 +0200
committer	orchidman <lesibel@free.fr>	2011-10-23 16:39:52 +0200
commit	ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd (patch)
tree	b3d17a3209b895df7ba009719aad2e7e76f052ec
parent	31572a7cccc8878a1af05ecc38a776ab7093a285 (diff)
parent	49dcf0d8496decf4c72963f80b2b8895806c783a (diff)
download	nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.tar.gz nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.tar.bz2 nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.tar.xz nutyx-pakxe-ed68fde14a6fbd7ecf5785697ae8ed5d4cb12bcd.zip