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

14 files changed, 35 insertions, 71 deletions

diff --git a/gnome-keyring/.footprint.i686 b/gnome-keyring/.footprint.i686
index f72f531..9de01be 100644
--- a/gnome-keyring/.footprint.i686
+++ b/gnome-keyring/.footprint.i686
@@ -17,7 +17,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gcr-viewer
 lrwxrwxrwx	root/root	usr/bin/gnome-keyring -> gnome-keyring-3
 -rwxr-xr-x	root/root	usr/bin/gnome-keyring-3
--rwsr-xr-x	root/root	usr/bin/gnome-keyring-daemon
+-rwxr-xr-x	root/root	usr/bin/gnome-keyring-daemon
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/gck-1/
 drwxr-xr-x	root/root	usr/include/gck-1/gck/
diff --git a/gnome-keyring/.footprint.x86_64 b/gnome-keyring/.footprint.x86_64
index f72f531..9de01be 100644
--- a/gnome-keyring/.footprint.x86_64
+++ b/gnome-keyring/.footprint.x86_64
@@ -17,7 +17,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gcr-viewer
 lrwxrwxrwx	root/root	usr/bin/gnome-keyring -> gnome-keyring-3
 -rwxr-xr-x	root/root	usr/bin/gnome-keyring-3
--rwsr-xr-x	root/root	usr/bin/gnome-keyring-daemon
+-rwxr-xr-x	root/root	usr/bin/gnome-keyring-daemon
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/gck-1/
 drwxr-xr-x	root/root	usr/include/gck-1/gck/
diff --git a/gnome-keyring/.md5sum.i686 b/gnome-keyring/.md5sum.i686
index b862c74..b25945b 100644
--- a/gnome-keyring/.md5sum.i686
+++ b/gnome-keyring/.md5sum.i686
@@ -1 +1,2 @@
-e6a122836570af7339c0a64a8468b043  gnome-keyring-3.1.92.tar.xz
+0f0922c66d6a412ddaa5171b5b8a2175  gnome-keyring-3.2.0.tar.xz
+9098f5b8d52353cd3a05823b7e7662f7  nopass.patch
diff --git a/gnome-keyring/.md5sum.x86_64 b/gnome-keyring/.md5sum.x86_64
index b862c74..b25945b 100644
--- a/gnome-keyring/.md5sum.x86_64
+++ b/gnome-keyring/.md5sum.x86_64
@@ -1 +1,2 @@
-e6a122836570af7339c0a64a8468b043  gnome-keyring-3.1.92.tar.xz
+0f0922c66d6a412ddaa5171b5b8a2175  gnome-keyring-3.2.0.tar.xz
+9098f5b8d52353cd3a05823b7e7662f7  nopass.patch
diff --git a/gnome-keyring/Pkgfile b/gnome-keyring/Pkgfile
index 61ba988..b212ee7 100644
--- a/gnome-keyring/Pkgfile
+++ b/gnome-keyring/Pkgfile
@@ -6,12 +6,14 @@
 # Run on: libtasn1,dconf,gtk3,libgcrypt,p11-kit
 
 name=gnome-keyring
-version=3.1.92
+version=3.2.0
 release=1
-source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz)
+source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz
+	nopass.patch)
 
 build() {
         cd $name-$version
+	patch -p1 < ../nopass.patch
         ./configure --prefix=/usr \
 		--libexecdir=/usr/lib/gnome-keyring \
 		--sysconfdir=/etc \
diff --git a/gnome-keyring/nopass.patch b/gnome-keyring/nopass.patch
new file mode 100644
index 0000000..1e42a0b
--- /dev/null
+++ b/gnome-keyring/nopass.patch
@@ -0,0 +1,22 @@
+diff -up gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass gnome-keyring-2.28.1/pam/gkr-pam-module.c
+--- gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass	2009-09-25 21:55:50.000000000 -0400
++++ gnome-keyring-2.28.1/pam/gkr-pam-module.c	2009-10-19 11:27:34.000000000 -0400
+@@ -866,6 +866,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
+ 
+ 	started_daemon = 0;
+ 
++
+ 	/* Should we start the daemon? */
+ 	if (args & ARG_AUTO_START) {
+ 		ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
+@@ -932,8 +933,9 @@ pam_sm_open_session (pam_handle_t *ph, i
+ 		 * different PAM callbacks from different processes.
+ 		 * 
+ 		 * No use complaining
++		 * Do not start gnome-keyring, dbus will start it on login.
+ 		 */
+-		password = NULL;
++		return PAM_SUCCESS;
+ 	}
+ 	
+ 	started_daemon = 0;
diff --git a/gnome-screensaver/.md5sum.i686 b/gnome-screensaver/.md5sum.i686
index 73a83cd..6728331 100644
--- a/gnome-screensaver/.md5sum.i686
+++ b/gnome-screensaver/.md5sum.i686
@@ -1,2 +1,2 @@
-e2515c98d955d82909cce7806ef5a0d8  gnome-screensaver-3.1.92.tar.xz
+53fdcff388fadbc788571724874d5ab6  gnome-screensaver-3.2.0.tar.xz
 4b4d2672a787e0d2ed792b4c308ccf8d  gnome-screensaver.pam
diff --git a/gnome-screensaver/.md5sum.x86_64 b/gnome-screensaver/.md5sum.x86_64
index 73a83cd..6728331 100644
--- a/gnome-screensaver/.md5sum.x86_64
+++ b/gnome-screensaver/.md5sum.x86_64
@@ -1,2 +1,2 @@
-e2515c98d955d82909cce7806ef5a0d8  gnome-screensaver-3.1.92.tar.xz
+53fdcff388fadbc788571724874d5ab6  gnome-screensaver-3.2.0.tar.xz
 4b4d2672a787e0d2ed792b4c308ccf8d  gnome-screensaver.pam
diff --git a/gnome-screensaver/Pkgfile b/gnome-screensaver/Pkgfile
index 7bd3dec..e6590c5 100644
--- a/gnome-screensaver/Pkgfile
+++ b/gnome-screensaver/Pkgfile
@@ -6,7 +6,7 @@
 
 
 name=gnome-screensaver
-version=3.1.92
+version=3.2.0
 release=1
 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz
 	gnome-screensaver.pam)
diff --git a/json-c/.footprint.i686 b/json-c/.footprint.i686
deleted file mode 100755
index 6f14f3a..0000000
--- a/json-c/.footprint.i686
+++ /dev/null
@@ -1,21 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/json/
--rw-r--r--	root/root	usr/include/json/arraylist.h
--rw-r--r--	root/root	usr/include/json/bits.h
--rw-r--r--	root/root	usr/include/json/debug.h
--rw-r--r--	root/root	usr/include/json/json.h
--rw-r--r--	root/root	usr/include/json/json_object.h
--rw-r--r--	root/root	usr/include/json/json_object_private.h
--rw-r--r--	root/root	usr/include/json/json_tokener.h
--rw-r--r--	root/root	usr/include/json/json_util.h
--rw-r--r--	root/root	usr/include/json/linkhash.h
--rw-r--r--	root/root	usr/include/json/printbuf.h
-drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libjson.a
--rwxr-xr-x	root/root	usr/lib/libjson.la
-lrwxrwxrwx	root/root	usr/lib/libjson.so -> libjson.so.0.0.1
-lrwxrwxrwx	root/root	usr/lib/libjson.so.0 -> libjson.so.0.0.1
--rwxr-xr-x	root/root	usr/lib/libjson.so.0.0.1
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/json.pc
diff --git a/json-c/.footprint.x86_64 b/json-c/.footprint.x86_64
deleted file mode 100755
index 6f14f3a..0000000
--- a/json-c/.footprint.x86_64
+++ /dev/null
@@ -1,21 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/json/
--rw-r--r--	root/root	usr/include/json/arraylist.h
--rw-r--r--	root/root	usr/include/json/bits.h
--rw-r--r--	root/root	usr/include/json/debug.h
--rw-r--r--	root/root	usr/include/json/json.h
--rw-r--r--	root/root	usr/include/json/json_object.h
--rw-r--r--	root/root	usr/include/json/json_object_private.h
--rw-r--r--	root/root	usr/include/json/json_tokener.h
--rw-r--r--	root/root	usr/include/json/json_util.h
--rw-r--r--	root/root	usr/include/json/linkhash.h
--rw-r--r--	root/root	usr/include/json/printbuf.h
-drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libjson.a
--rwxr-xr-x	root/root	usr/lib/libjson.la
-lrwxrwxrwx	root/root	usr/lib/libjson.so -> libjson.so.0.0.1
-lrwxrwxrwx	root/root	usr/lib/libjson.so.0 -> libjson.so.0.0.1
--rwxr-xr-x	root/root	usr/lib/libjson.so.0.0.1
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/json.pc
diff --git a/json-c/.md5sum.i686 b/json-c/.md5sum.i686
deleted file mode 100755
index 28d3e60..0000000
--- a/json-c/.md5sum.i686
+++ /dev/null
@@ -1 +0,0 @@
-3a13d264528dcbaf3931b0cede24abae  json-c-0.9.tar.gz
diff --git a/json-c/.md5sum.x86_64 b/json-c/.md5sum.x86_64
deleted file mode 100755
index 28d3e60..0000000
--- a/json-c/.md5sum.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-3a13d264528dcbaf3931b0cede24abae  json-c-0.9.tar.gz
diff --git a/json-c/Pkgfile b/json-c/Pkgfile
deleted file mode 100755
index cfbfbb1..0000000
--- a/json-c/Pkgfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Description: Implémentation de JSON en C
-# URL: http://oss.metaparadigm.com/json-c/
-# Maintainer: NuTyX Core team
-# Packager: piernov <piernov@piernov.org>
-# Depends on: 
-# Run on: 
-
-name=json-c
-version=0.9
-release=1
-source=(http://oss.metaparadigm.com/$name/$name-$version.tar.gz)
-
-build() {
-	cd $name-$version
-	./configure --prefix=/usr
-	make
-	make DESTDIR=$PKG install
-}