From b61cacae0a6ff52cbd03ffa6ab6f638f1bf2e727 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Wed, 29 Sep 2010 17:41:09 +0200 Subject: Drop AFS plugin patches - fixed upstream --- debian/patches/0001-Add-simple-AFS-plugin.patch | 222 --------------------- ...tartup-not-only-with-a-valid-ticket-cache.patch | 23 +++ debian/patches/0002-Rerun-autoreconf.patch | 118 ----------- ...tartup-not-only-with-a-valid-ticket-cache.patch | 23 --- debian/patches/series | 4 +- 5 files changed, 24 insertions(+), 366 deletions(-) delete mode 100644 debian/patches/0001-Add-simple-AFS-plugin.patch create mode 100644 debian/patches/0001-Always-startup-not-only-with-a-valid-ticket-cache.patch delete mode 100644 debian/patches/0002-Rerun-autoreconf.patch delete mode 100644 debian/patches/0003-Always-startup-not-only-with-a-valid-ticket-cache.patch (limited to 'debian/patches') diff --git a/debian/patches/0001-Add-simple-AFS-plugin.patch b/debian/patches/0001-Add-simple-AFS-plugin.patch deleted file mode 100644 index f7cad68..0000000 --- a/debian/patches/0001-Add-simple-AFS-plugin.patch +++ /dev/null @@ -1,222 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Wed, 7 Jul 2010 17:31:57 +0200 -Subject: [PATCH] Add simple AFS plugin - -that calls aklog or afslog if available. ---- - plugins/Makefile.am | 17 +++++++ - plugins/ka-plugin-afs.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ - plugins/ka-plugin-afs.h | 50 ++++++++++++++++++++ - 3 files changed, 181 insertions(+), 0 deletions(-) - create mode 100644 plugins/ka-plugin-afs.c - create mode 100644 plugins/ka-plugin-afs.h - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 8fecd5c..cf69e7b 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -11,6 +11,7 @@ endif - pkglib_LTLIBRARIES = \ - libka-plugin-dummy.la \ - $(PAM_PLUGIN) \ -+ libka-plugin-afs.la \ - $(NULL) - - # Dummy example plugin -@@ -47,3 +48,19 @@ libka_plugin_pam_la_LDFLAGS = \ - $(PAM_LIBS) \ - $(NULL) - endif -+ -+# AFS plugin -+libka_plugin_afs_la_SOURCES = \ -+ ka-plugin-afs.c \ -+ ka-plugin-afs.h \ -+ $(NULL) -+ -+libka_plugin_afs_la_CPPFLAGS = \ -+ $(GTK_CFLAGS) \ -+ -I$(top_srcdir)/src \ -+ $(NULL) -+ -+libka_plugin_afs_la_LDFLAGS = \ -+ -module \ -+ -avoid-version \ -+ $(NULL) -diff --git a/plugins/ka-plugin-afs.c b/plugins/ka-plugin-afs.c -new file mode 100644 -index 0000000..57daed0 ---- /dev/null -+++ b/plugins/ka-plugin-afs.c -@@ -0,0 +1,114 @@ -+/* -+ * Copyright (C) 2010 Guido Guenther -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ */ -+ -+#include "ka-plugin-afs.h" -+#include -+ -+G_DEFINE_TYPE (KaPluginAfs, ka_plugin_afs, KA_TYPE_PLUGIN) -+#define GET_PRIVATE(o) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_AFS, KaPluginAfsPrivate)) -+ -+int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION; -+int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION; -+ -+G_MODULE_EXPORT KaPlugin * -+ka_plugin_create (void) -+{ -+ return KA_PLUGIN (ka_plugin_afs_new ()); -+} -+ -+typedef struct _KaPluginAfsPrivate KaPluginAfsPrivate; -+ -+struct _KaPluginAfsPrivate { -+ gulong handlers[2]; -+}; -+ -+static void -+event_cb (gpointer *applet, gchar *princ, guint when, gpointer user_data) -+{ -+ GError *err = NULL; -+ gboolean ret; -+ int i; -+ const char *afslog_cmds[] = { "aklog", "afslog" }; -+ -+ for (i = 0; i < G_N_ELEMENTS (afslog_cmds); i++) { -+ ret = g_spawn_command_line_async (afslog_cmds[i], &err); -+ if (!ret) { -+ if (G_SPAWN_ERROR_NOENT != err->code) -+ g_warning ("%s", err->message); -+ } else -+ break; -+ g_clear_error (&err); -+ } -+ -+ if (!ret) -+ g_warning ("Couldn't run any afslog command"); -+} -+ -+static void -+ka_plugin_afs_finalize (GObject *object) -+{ -+ G_OBJECT_CLASS (ka_plugin_afs_parent_class)->finalize (object); -+} -+ -+static void -+ka_plugin_afs_activate (KaPlugin *self, KaApplet *applet) -+{ -+ KaPluginAfsPrivate *priv = GET_PRIVATE (self); -+ -+ priv->handlers[0] = g_signal_connect (applet, -+ "krb-tgt-acquired", -+ G_CALLBACK (event_cb), "Acquired"); -+ priv->handlers[1] = g_signal_connect (applet, -+ "krb-tgt-renewed", -+ G_CALLBACK (event_cb), "Renewed"); -+} -+ -+static void -+ka_plugin_afs_deactivate (KaPlugin *self, KaApplet *applet) -+{ -+ int i; -+ KaPluginAfsPrivate *priv = GET_PRIVATE (self); -+ -+ for (i = 0; i < G_N_ELEMENTS (priv->handlers); i++) -+ g_signal_handler_disconnect (applet, priv->handlers[i]); -+} -+ -+static void -+ka_plugin_afs_class_init (KaPluginAfsClass *klass) -+{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); -+ -+ g_type_class_add_private (klass, sizeof (KaPluginAfsPrivate)); -+ -+ plugin_class->activate = ka_plugin_afs_activate; -+ plugin_class->deactivate = ka_plugin_afs_deactivate; -+ object_class->finalize = ka_plugin_afs_finalize; -+} -+ -+static void -+ka_plugin_afs_init (KaPluginAfs *self) -+{ -+} -+ -+KaPluginAfs * -+ka_plugin_afs_new (void) -+{ -+ return g_object_new (KA_TYPE_PLUGIN_AFS, KA_PLUGIN_PROP_NAME, "afs", NULL); -+} -diff --git a/plugins/ka-plugin-afs.h b/plugins/ka-plugin-afs.h -new file mode 100644 -index 0000000..c4fb71d ---- /dev/null -+++ b/plugins/ka-plugin-afs.h -@@ -0,0 +1,50 @@ -+/* -+ * Copyright (C) 2010 Guido Guenther -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef _KA_PLUGIN_DUMMY -+#define _KA_PLUGIN_DUMMY -+ -+#include "ka-plugin.h" -+ -+G_BEGIN_DECLS -+#define KA_TYPE_PLUGIN_AFS ka_plugin_afs_get_type() -+#define KA_PLUGIN_AFS(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_AFS, KaPluginAfs)) -+#define KA_PLUGIN_AFS_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_AFS, KaPluginAfsClass)) -+#define KA_IS_PLUGIN_AFS(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_AFS)) -+#define KA_IS_PLUGIN_AFS_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_AFS)) -+#define KA_PLUGIN_AFS_GET_CLASS(obj) \ -+ (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_AFS, KaPluginAfsClass)) -+ -+typedef struct { -+ KaPlugin parent; -+} KaPluginAfs; -+ -+typedef struct { -+ KaPluginClass parent_class; -+} KaPluginAfsClass; -+ -+GType ka_plugin_afs_get_type (void); -+ -+KaPluginAfs *ka_plugin_afs_new (void); -+ -+G_END_DECLS -+#endif /* _KA_PLUGIN_AFS */ --- diff --git a/debian/patches/0001-Always-startup-not-only-with-a-valid-ticket-cache.patch b/debian/patches/0001-Always-startup-not-only-with-a-valid-ticket-cache.patch new file mode 100644 index 0000000..8e9249d --- /dev/null +++ b/debian/patches/0001-Always-startup-not-only-with-a-valid-ticket-cache.patch @@ -0,0 +1,23 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Thu, 19 Aug 2010 14:26:30 +0200 +Subject: [PATCH] Always startup, not only with a valid ticket cache + +Closes: #582497 +--- + src/krb5-auth-dialog.desktop.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in +index 6c83b31..ed21e6e 100644 +--- a/src/krb5-auth-dialog.desktop.in ++++ b/src/krb5-auth-dialog.desktop.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Network Authentication + _Comment=Kerberos Network Authentication Dialog +-Exec=krb5-auth-dialog ++Exec=krb5-auth-dialog -A + Terminal=false + Type=Application + X-GNOME-Bugzilla-Bugzilla=GNOME +-- diff --git a/debian/patches/0002-Rerun-autoreconf.patch b/debian/patches/0002-Rerun-autoreconf.patch deleted file mode 100644 index babebe9..0000000 --- a/debian/patches/0002-Rerun-autoreconf.patch +++ /dev/null @@ -1,118 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Wed, 7 Jul 2010 20:11:58 +0200 -Subject: [PATCH] Rerun autoreconf - ---- - plugins/Makefile.in | 51 +++++++++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 45 insertions(+), 6 deletions(-) - -diff --git a/plugins/Makefile.in b/plugins/Makefile.in -index 34ec198..160e623 100644 ---- a/plugins/Makefile.in -+++ b/plugins/Makefile.in -@@ -68,14 +68,22 @@ am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) --libka_plugin_dummy_la_LIBADD = -+libka_plugin_afs_la_LIBADD = - am__objects_1 = --am_libka_plugin_dummy_la_OBJECTS = \ -- libka_plugin_dummy_la-ka-plugin-dummy.lo $(am__objects_1) --libka_plugin_dummy_la_OBJECTS = $(am_libka_plugin_dummy_la_OBJECTS) -+am_libka_plugin_afs_la_OBJECTS = libka_plugin_afs_la-ka-plugin-afs.lo \ -+ $(am__objects_1) -+libka_plugin_afs_la_OBJECTS = $(am_libka_plugin_afs_la_OBJECTS) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent -+libka_plugin_afs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libka_plugin_afs_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+libka_plugin_dummy_la_LIBADD = -+am_libka_plugin_dummy_la_OBJECTS = \ -+ libka_plugin_dummy_la-ka-plugin-dummy.lo $(am__objects_1) -+libka_plugin_dummy_la_OBJECTS = $(am_libka_plugin_dummy_la_OBJECTS) - libka_plugin_dummy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libka_plugin_dummy_la_LDFLAGS) \ -@@ -118,9 +126,11 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_GEN = $(am__v_GEN_$(V)) - am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --SOURCES = $(libka_plugin_dummy_la_SOURCES) \ -+SOURCES = $(libka_plugin_afs_la_SOURCES) \ -+ $(libka_plugin_dummy_la_SOURCES) \ - $(libka_plugin_pam_la_SOURCES) --DIST_SOURCES = $(libka_plugin_dummy_la_SOURCES) \ -+DIST_SOURCES = $(libka_plugin_afs_la_SOURCES) \ -+ $(libka_plugin_dummy_la_SOURCES) \ - $(am__libka_plugin_pam_la_SOURCES_DIST) - ETAGS = etags - CTAGS = ctags -@@ -312,6 +322,7 @@ NULL = - pkglib_LTLIBRARIES = \ - libka-plugin-dummy.la \ - $(PAM_PLUGIN) \ -+ libka-plugin-afs.la \ - $(NULL) - - -@@ -349,6 +360,23 @@ libka_plugin_dummy_la_LDFLAGS = \ - @ENABLE_PAM_PLUGIN_TRUE@ $(PAM_LIBS) \ - @ENABLE_PAM_PLUGIN_TRUE@ $(NULL) - -+ -+# AFS plugin -+libka_plugin_afs_la_SOURCES = \ -+ ka-plugin-afs.c \ -+ ka-plugin-afs.h \ -+ $(NULL) -+ -+libka_plugin_afs_la_CPPFLAGS = \ -+ $(GTK_CFLAGS) \ -+ -I$(top_srcdir)/src \ -+ $(NULL) -+ -+libka_plugin_afs_la_LDFLAGS = \ -+ -module \ -+ -avoid-version \ -+ $(NULL) -+ - all: all-am - - .SUFFIXES: -@@ -414,6 +442,8 @@ clean-pkglibLTLIBRARIES: - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -+libka-plugin-afs.la: $(libka_plugin_afs_la_OBJECTS) $(libka_plugin_afs_la_DEPENDENCIES) -+ $(AM_V_CCLD)$(libka_plugin_afs_la_LINK) -rpath $(pkglibdir) $(libka_plugin_afs_la_OBJECTS) $(libka_plugin_afs_la_LIBADD) $(LIBS) - libka-plugin-dummy.la: $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_DEPENDENCIES) - $(AM_V_CCLD)$(libka_plugin_dummy_la_LINK) -rpath $(pkglibdir) $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_LIBADD) $(LIBS) - libka-plugin-pam.la: $(libka_plugin_pam_la_OBJECTS) $(libka_plugin_pam_la_DEPENDENCIES) -@@ -425,6 +455,7 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Plo@am__quote@ - -@@ -452,6 +483,14 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -+libka_plugin_afs_la-ka-plugin-afs.lo: ka-plugin-afs.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_afs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_afs_la-ka-plugin-afs.lo -MD -MP -MF $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Tpo -c -o libka_plugin_afs_la-ka-plugin-afs.lo `test -f 'ka-plugin-afs.c' || echo '$(srcdir)/'`ka-plugin-afs.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Tpo $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Plo -+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin-afs.c' object='libka_plugin_afs_la-ka-plugin-afs.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_afs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_afs_la-ka-plugin-afs.lo `test -f 'ka-plugin-afs.c' || echo '$(srcdir)/'`ka-plugin-afs.c -+ - libka_plugin_dummy_la-ka-plugin-dummy.lo: ka-plugin-dummy.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_dummy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_dummy_la-ka-plugin-dummy.lo -MD -MP -MF $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo -c -o libka_plugin_dummy_la-ka-plugin-dummy.lo `test -f 'ka-plugin-dummy.c' || echo '$(srcdir)/'`ka-plugin-dummy.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Plo --- diff --git a/debian/patches/0003-Always-startup-not-only-with-a-valid-ticket-cache.patch b/debian/patches/0003-Always-startup-not-only-with-a-valid-ticket-cache.patch deleted file mode 100644 index 8e9249d..0000000 --- a/debian/patches/0003-Always-startup-not-only-with-a-valid-ticket-cache.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Thu, 19 Aug 2010 14:26:30 +0200 -Subject: [PATCH] Always startup, not only with a valid ticket cache - -Closes: #582497 ---- - src/krb5-auth-dialog.desktop.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in -index 6c83b31..ed21e6e 100644 ---- a/src/krb5-auth-dialog.desktop.in -+++ b/src/krb5-auth-dialog.desktop.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=Network Authentication - _Comment=Kerberos Network Authentication Dialog --Exec=krb5-auth-dialog -+Exec=krb5-auth-dialog -A - Terminal=false - Type=Application - X-GNOME-Bugzilla-Bugzilla=GNOME --- diff --git a/debian/patches/series b/debian/patches/series index 79a2aca..7f4e7f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -0001-Add-simple-AFS-plugin.patch -0002-Rerun-autoreconf.patch -0003-Always-startup-not-only-with-a-valid-ticket-cache.patch +0001-Always-startup-not-only-with-a-valid-ticket-cache.patch -- cgit