r22568 - in /desktop/unstable/gnome-keyring/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Dec 13 23:07:03 UTC 2009
Author: pochu
Date: Sun Dec 13 23:07:02 2009
New Revision: 22568
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22568
Log:
* Switch to quilt, refresh patches.
* debian/patches/04_maxpathlen_hurd.patch:
- New patch, switch to dynamic allocation to avoid using
MAXPATHLEN. Fixes FTBFS on GNU/Hurd.
Added:
desktop/unstable/gnome-keyring/debian/patches/04_maxpathlen_hurd.patch
desktop/unstable/gnome-keyring/debian/patches/series
Modified:
desktop/unstable/gnome-keyring/debian/changelog
desktop/unstable/gnome-keyring/debian/control
desktop/unstable/gnome-keyring/debian/control.in
desktop/unstable/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch
desktop/unstable/gnome-keyring/debian/patches/02_uidir_relocate.patch
desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch
desktop/unstable/gnome-keyring/debian/patches/10_whitelist_system.patch
desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch
desktop/unstable/gnome-keyring/debian/rules
Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,7 +1,14 @@
gnome-keyring (2.28.1-3) UNRELEASED; urgency=low
+ [ Josselin Mouette ]
* 03_kfreebsd.patch: patch from Emmanuel Bouthenot to add kFreeBSD
support. Closes: #558406.
+
+ [ Emilio Pozuelo Monfort ]
+ * Switch to quilt, refresh patches.
+ * debian/patches/04_maxpathlen_hurd.patch:
+ - New patch, switch to dynamic allocation to avoid using
+ MAXPATHLEN. Fixes FTBFS on GNU/Hurd.
-- Josselin Mouette <joss at debian.org> Sat, 28 Nov 2009 23:00:07 +0100
Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,9 +1,16 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: gnome-keyring
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 5),
+ cdbs,
+ quilt,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
libgtk2.0-dev (>= 2.6.0),
@@ -11,7 +18,6 @@
libgconf2-dev (>= 2.8.0),
libtasn1-3-dev (>= 0.3.4),
libtasn1-3-bin,
- cdbs,
gtk-doc-tools (>= 1.9),
docbook-xml,
libdbus-1-dev (>= 1.0),
Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in [utf-8] Sun Dec 13 23:07:02 2009
@@ -4,6 +4,8 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
+ cdbs,
+ quilt,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
libgtk2.0-dev (>= 2.6.0),
@@ -11,7 +13,6 @@
libgconf2-dev (>= 2.8.0),
libtasn1-3-dev (>= 0.3.4),
libtasn1-3-bin,
- cdbs,
gtk-doc-tools (>= 1.9),
docbook-xml,
libdbus-1-dev (>= 1.0),
Modified: desktop/unstable/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,8 +1,6 @@
-Index: gnome-keyring-2.24.1/pam/gkr-pam-module.c
-===================================================================
---- gnome-keyring-2.24.1.orig/pam/gkr-pam-module.c 2008-09-16 23:45:07.000000000 +0200
-+++ gnome-keyring-2.24.1/pam/gkr-pam-module.c 2008-11-22 11:14:00.707526445 +0100
-@@ -769,7 +769,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
+--- a/pam/gkr-pam-module.c
++++ b/pam/gkr-pam-module.c
+@@ -861,7 +861,7 @@
pwd = getpwnam (user);
if (!pwd) {
Modified: desktop/unstable/gnome-keyring/debian/patches/02_uidir_relocate.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/02_uidir_relocate.patch?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/02_uidir_relocate.patch [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/02_uidir_relocate.patch [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,5 +1,5 @@
---- a/gcr/Makefile.am~ 2009-03-02 12:43:35.000000000 -0300
-+++ b/gcr/Makefile.am 2009-03-28 17:11:45.000000000 -0300
+--- a/gcr/Makefile.am
++++ b/gcr/Makefile.am
@@ -2,7 +2,7 @@
# UI BUILDER
#
@@ -9,10 +9,10 @@
ui_DATA = \
gcr-certificate-basics-widget.ui \
---- a/gcr/Makefile.in~ 2009-03-14 15:57:48.000000000 -0300
-+++ b/gcr/Makefile.in 2009-03-28 17:12:44.000000000 -0300
-@@ -302,7 +302,7 @@
- target_alias = @target_alias@
+--- a/gcr/Makefile.in
++++ b/gcr/Makefile.in
+@@ -345,7 +345,7 @@
+ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-uidir = $(datadir)/gcr/ui/
Modified: desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,5 +1,5 @@
---- gnome-keyring-2.28.1/egg/egg-unix-credentials.c 2009-11-28 16:35:59.000000000 +0100
-+++ gnome-keyring-2.28.1.new/egg/egg-unix-credentials.c 2009-11-28 16:37:59.000000000 +0100
+--- a/egg/egg-unix-credentials.c
++++ b/egg/egg-unix-credentials.c
@@ -45,7 +45,7 @@
char buf;
int ret;
Added: desktop/unstable/gnome-keyring/debian/patches/04_maxpathlen_hurd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/04_maxpathlen_hurd.patch?rev=22568&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/04_maxpathlen_hurd.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/04_maxpathlen_hurd.patch [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,0 +1,140 @@
+--- a/pkcs11/rpc-layer/gck-rpc-dispatch.c
++++ b/pkcs11/rpc-layer/gck-rpc-dispatch.c
+@@ -2178,7 +2178,7 @@
+ static int pkcs11_socket = -1;
+
+ /* The unix socket path, that we listen on */
+-static char pkcs11_socket_path[MAXPATHLEN] = { 0, };
++static char *pkcs11_socket_path = NULL;
+
+ /* A linked list of dispatcher threads */
+ static DispatchState *pkcs11_dispatchers = NULL;
+@@ -2258,9 +2258,11 @@
+ pkcs11_socket = -1;
+
+ /* Delete our unix socket */
+- if(pkcs11_socket_path[0])
++ if(pkcs11_socket_path) {
+ unlink (pkcs11_socket_path);
+- pkcs11_socket_path[0] = 0;
++ free (pkcs11_socket_path);
++ pkcs11_socket_path = NULL;
++ }
+
+ /* Stop all of the dispatch threads */
+ for (ds = pkcs11_dispatchers; ds; ds = next) {
+@@ -2295,8 +2297,12 @@
+ assert (pkcs11_socket == -1);
+ assert (pkcs11_dispatchers == NULL);
+
+- snprintf (pkcs11_socket_path, sizeof (pkcs11_socket_path),
+- "%s/socket.pkcs11", prefix);
++ if (pkcs11_socket_path)
++ free (pkcs11_socket_path);
++
++ if ((pkcs11_socket_path = malloc (strlen (prefix) + strlen ("/socket.pkcs11") + 1)) == NULL)
++ return -1;
++ sprintf (pkcs11_socket_path, "%s/socket.pkcs11", prefix);
+
+ sock = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (sock < 0) {
+@@ -2337,9 +2343,11 @@
+ pkcs11_socket = -1;
+
+ /* Delete our unix socket */
+- if(pkcs11_socket_path[0])
++ if(pkcs11_socket_path) {
+ unlink (pkcs11_socket_path);
+- pkcs11_socket_path[0] = 0;
++ free (pkcs11_socket_path);
++ pkcs11_socket_path = NULL;
++ }
+
+ /* Stop all of the dispatch threads */
+ for (ds = pkcs11_dispatchers; ds; ds = next) {
+--- a/pkcs11/rpc-layer/gck-rpc-module.c
++++ b/pkcs11/rpc-layer/gck-rpc-module.c
+@@ -59,7 +59,7 @@
+ static pid_t pkcs11_initialized_pid = 0;
+
+ /* The socket to connect to */
+-static char pkcs11_socket_path[MAXPATHLEN] = { 0, };
++static char *pkcs11_socket_path = NULL;
+
+ /* The error used by us when parsing of rpc message fails */
+ #define PARSE_ERROR CKR_DEVICE_ERROR
+@@ -100,10 +100,13 @@
+ *(value++) = 0;
+
+ /* Setup the socket path from the arguments */
+- if (strcmp (arg, "socket") == 0)
+- snprintf (pkcs11_socket_path, sizeof (pkcs11_socket_path), "%s", value);
+- else
++ if (strcmp (arg, "socket") == 0) {
++ if (pkcs11_socket_path)
++ free (pkcs11_socket_path);
++ pkcs11_socket_path = strdup (value);
++ } else {
+ warning (("unrecognized argument: %s", arg));
++ }
+ }
+
+ static void
+@@ -225,7 +228,10 @@
+ assert (cs);
+ assert (cs->socket == -1);
+ assert (cs->call_status == CALL_INVALID);
+-
++
++ if (!pkcs11_socket_path)
++ return CKR_FUNCTION_FAILED;
++
+ debug (("connecting to: %s", pkcs11_socket_path));
+
+ addr.sun_family = AF_UNIX;
+@@ -1177,12 +1183,15 @@
+ }
+
+ /* Lookup the socket path, append '.pkcs11' */
+- if (pkcs11_socket_path[0] == 0) {
+- pkcs11_socket_path[0] = 0;
++ if (pkcs11_socket_path == NULL) {
+ path = getenv ("GNOME_KEYRING_SOCKET");
+ if (path && path[0]) {
+- snprintf (pkcs11_socket_path, sizeof (pkcs11_socket_path), "%s.pkcs11", path);
+- pkcs11_socket_path[sizeof (pkcs11_socket_path) - 1] = 0;
++ if ((pkcs11_socket_path = malloc (strlen (path) + strlen (".pkcs11") + 1)) == NULL) {
++ warning (("can't malloc memory"));
++ ret = CKR_HOST_MEMORY;
++ goto done;
++ }
++ sprintf (pkcs11_socket_path, "%s.pkcs11", path);
+ }
+ }
+
+@@ -1206,7 +1215,10 @@
+ } else if (ret != CKR_CRYPTOKI_ALREADY_INITIALIZED) {
+ pkcs11_initialized = 0;
+ pkcs11_initialized_pid = 0;
+- pkcs11_socket_path[0] = 0;
++ if (pkcs11_socket_path) {
++ free (pkcs11_socket_path);
++ pkcs11_socket_path = NULL;
++ }
+ }
+
+ pthread_mutex_unlock (&init_mutex);
+@@ -1242,8 +1254,11 @@
+ /* This should stop all other calls in */
+ pkcs11_initialized = 0;
+ pkcs11_initialized_pid = 0;
+- pkcs11_socket_path[0] = 0;
+-
++ if (pkcs11_socket_path) {
++ free (pkcs11_socket_path);
++ pkcs11_socket_path = NULL;
++ }
++
+ pthread_mutex_unlock (&init_mutex);
+
+ debug (("C_Finalize: %d", CKR_OK));
Modified: desktop/unstable/gnome-keyring/debian/patches/10_whitelist_system.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/10_whitelist_system.patch?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/10_whitelist_system.patch [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/10_whitelist_system.patch [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,5 +1,5 @@
---- daemon/gkr-daemon-ops.c.orig 2009-11-20 17:52:12.459466388 +0100
-+++ daemon/gkr-daemon-ops.c 2009-11-20 18:03:48.779465649 +0100
+--- a/daemon/gkr-daemon-ops.c
++++ b/daemon/gkr-daemon-ops.c
@@ -129,6 +129,27 @@
return FALSE;
}
Modified: desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,6 +1,6 @@
---- ltmain.sh.orig 2008-10-19 10:32:18.000000000 +0200
-+++ ltmain.sh 2008-11-22 11:52:34.555029690 +0100
-@@ -4189,6 +4189,11 @@
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -4716,6 +4716,11 @@
arg=$func_stripname_result
;;
@@ -12,7 +12,7 @@
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
-@@ -4543,6 +4548,15 @@
+@@ -5070,6 +5075,15 @@
lib=
found=no
case $deplib in
Added: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=22568&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series (added)
+++ desktop/unstable/gnome-keyring/debian/patches/series [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,0 +1,6 @@
+01_pam-logging-less-verbose.patch
+02_uidir_relocate.patch
+03_kfreebsd.patch
+04_maxpathlen_hurd.patch
+10_whitelist_system.patch
+99_ltmain_as-needed.patch
Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=22568&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules [utf-8] Sun Dec 13 23:07:02 2009
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
More information about the pkg-gnome-commits
mailing list