Update to krb5-auth-dialog-3.2.0.

This commit is contained in:
ajacoutot 2011-09-27 08:49:39 +00:00
parent aa2d28d62c
commit 21cd8c3815
4 changed files with 20 additions and 27 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.22 2011/09/20 21:10:00 jasper Exp $ # $OpenBSD: Makefile,v 1.23 2011/09/27 08:49:39 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT= monitor kerberos tickets COMMENT= monitor kerberos tickets
GNOME_PROJECT= krb5-auth-dialog GNOME_PROJECT= krb5-auth-dialog
GNOME_VERSION= 3.0.1 GNOME_VERSION= 3.2.0
REVISION= 0
CATEGORIES= security CATEGORIES= security
@ -18,14 +17,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm asn1 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm asn1
WANTLIB += atk-1.0 c cairo cairo-gobject crypto drm expat fontconfig WANTLIB += atk-1.0 c cairo cairo-gobject crypto dbus-1 dbus-glib-1
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += drm expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gnome-control-center gobject-2.0 gssapi gthread-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gssapi gthread-2.0
WANTLIB += gtk-3 krb5 m notify pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += gtk-3 krb5 kvm m notify pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
WANTLIB += xcb-shm z WANTLIB += xcb-shm z
@ -33,7 +30,8 @@ MODULES= devel/gettext \
x11/gnome \ x11/gnome \
devel/gconf2 devel/gconf2
LIB_DEPENDS= x11/gnome/controlcenter LIB_DEPENDS= x11/gtk+3 \
devel/libnotify
MODGCONF2_SCHEMAS_DIR= krb5-auth-dialog MODGCONF2_SCHEMAS_DIR= krb5-auth-dialog
MODGNOME_TOOLS= yelp MODGNOME_TOOLS= yelp

View File

@ -1,5 +1,5 @@
MD5 (gnome/krb5-auth-dialog-3.0.1.tar.bz2) = 7N7zAWATcnNjwSZCuFewdg== MD5 (gnome/krb5-auth-dialog-3.2.0.tar.xz) = g9xUW1u5enW61bBgmtujug==
RMD160 (gnome/krb5-auth-dialog-3.0.1.tar.bz2) = z2Hg2WHFhyqKZToeg7l8mfiAO08= RMD160 (gnome/krb5-auth-dialog-3.2.0.tar.xz) = 1q6UKCQyzdnmtqpvWQUK8TUDaLc=
SHA1 (gnome/krb5-auth-dialog-3.0.1.tar.bz2) = HrAN8xTOJOBituDnqq1qWoZuSuA= SHA1 (gnome/krb5-auth-dialog-3.2.0.tar.xz) = tJU/8vSqxp1o+OswW6nDoPE2tXo=
SHA256 (gnome/krb5-auth-dialog-3.0.1.tar.bz2) = eHE1h/cjYlT7mgNbv3TrKPKj5BgGhPFOWwnJOS7TFgA= SHA256 (gnome/krb5-auth-dialog-3.2.0.tar.xz) = FZiFJVqSOHIe46eUOgHmoXJzjJIKPGxoyGRz9DU95JM=
SIZE (gnome/krb5-auth-dialog-3.0.1.tar.bz2) = 627973 SIZE (gnome/krb5-auth-dialog-3.2.0.tar.xz) = 526120

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_ka-dialog_c,v 1.2 2011/09/12 07:28:53 jasper Exp $ $OpenBSD: patch-src_ka-kerberos_c,v 1.1 2011/09/27 08:49:39 ajacoutot Exp $
XXX these should be handled by configure checks. XXX these should be handled by configure checks.
krb5_get_init_creds_opt_set_pkinit: does not take 11 arguments. krb5_get_init_creds_opt_set_pkinit: does not take 11 arguments.
krb5_get_init_creds_opt_free: the context argument is an MIT extension. krb5_get_init_creds_opt_free: the context argument is an MIT extension.
--- src/ka-dialog.c.orig Fri Apr 22 21:15:57 2011 --- src/ka-kerberos.c.orig Mon Sep 26 22:09:21 2011
+++ src/ka-dialog.c Fri Jul 15 09:29:25 2011 +++ src/ka-kerberos.c Tue Sep 27 10:09:00 2011
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@ -23,7 +23,7 @@ XXX these should be handled by configure checks.
#endif #endif
if (msg == NULL) if (msg == NULL)
msg = g_strdup (_("unknown error")); msg = g_strdup (_("unknown error"));
@@ -595,7 +594,7 @@ ka_auth_heimdal_pkinit (KaApplet *applet, krb5_creds * @@ -593,7 +592,7 @@ ka_auth_heimdal_pkinit (KaApplet *applet, krb5_creds *
goto out; goto out;
ka_set_ticket_options (applet, kcontext, opts, NULL, NULL); ka_set_ticket_options (applet, kcontext, opts, NULL, NULL);
@ -32,7 +32,7 @@ XXX these should be handled by configure checks.
auth_dialog_prompter, applet, /* data */ auth_dialog_prompter, applet, /* data */
NULL); /* passwd */ NULL); /* passwd */
KA_DEBUG ("pkinit returned with %d", retval); KA_DEBUG ("pkinit returned with %d", retval);
@@ -607,7 +606,7 @@ ka_auth_heimdal_pkinit (KaApplet *applet, krb5_creds * @@ -605,7 +604,7 @@ ka_auth_heimdal_pkinit (KaApplet *applet, krb5_creds *
0, NULL, opts); 0, NULL, opts);
out: out:
if (opts) if (opts)
@ -41,7 +41,7 @@ XXX these should be handled by configure checks.
return retval; return retval;
} }
#endif /* ! ENABLE_PKINIT */ #endif /* ! ENABLE_PKINIT */
@@ -628,7 +627,7 @@ ka_auth_password (KaApplet *applet, krb5_creds *creds, @@ -626,7 +625,7 @@ ka_auth_password (KaApplet *applet, krb5_creds *creds,
0, NULL, opts); 0, NULL, opts);
out: out:
if (opts) if (opts)

View File

@ -1,7 +1,5 @@
@comment $OpenBSD: PLIST,v 1.8 2011/09/12 07:28:53 jasper Exp $ @comment $OpenBSD: PLIST,v 1.9 2011/09/27 08:49:39 ajacoutot Exp $
@bin bin/krb5-auth-dialog @bin bin/krb5-auth-dialog
@comment lib/control-center-1/panels/libka.la
lib/control-center-1/panels/libka.so
lib/krb5-auth-dialog/ lib/krb5-auth-dialog/
lib/krb5-auth-dialog/plugins/ lib/krb5-auth-dialog/plugins/
@comment lib/krb5-auth-dialog/plugins/libka-plugin-afs.la @comment lib/krb5-auth-dialog/plugins/libka-plugin-afs.la
@ -9,7 +7,6 @@ lib/krb5-auth-dialog/plugins/libka-plugin-afs.so
@comment lib/krb5-auth-dialog/plugins/libka-plugin-dummy.la @comment lib/krb5-auth-dialog/plugins/libka-plugin-dummy.la
lib/krb5-auth-dialog/plugins/libka-plugin-dummy.so lib/krb5-auth-dialog/plugins/libka-plugin-dummy.so
@man man/man1/krb5-auth-dialog.1 @man man/man1/krb5-auth-dialog.1
share/applications/gnome-ka-panel.desktop
share/applications/krb5-auth-dialog.desktop share/applications/krb5-auth-dialog.desktop
share/dbus-1/services/org.gnome.KrbAuthDialog.service share/dbus-1/services/org.gnome.KrbAuthDialog.service
share/doc/krb5-auth-dialog/ share/doc/krb5-auth-dialog/
@ -21,7 +18,6 @@ share/examples/krb5-auth-dialog/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/ @sample ${SYSCONFDIR}/xdg/autostart/
share/examples/krb5-auth-dialog/xdg/autostart/krb5-auth-dialog.desktop share/examples/krb5-auth-dialog/xdg/autostart/krb5-auth-dialog.desktop
@sample ${SYSCONFDIR}/xdg/autostart/krb5-auth-dialog.desktop @sample ${SYSCONFDIR}/xdg/autostart/krb5-auth-dialog.desktop
share/gnome/help/
share/gnome/help/krb5-auth-dialog/ share/gnome/help/krb5-auth-dialog/
share/gnome/help/krb5-auth-dialog/C/ share/gnome/help/krb5-auth-dialog/C/
share/gnome/help/krb5-auth-dialog/C/figures/ share/gnome/help/krb5-auth-dialog/C/figures/
@ -79,7 +75,6 @@ share/icons/hicolor/scalable/status/krb-expiring-ticket.svg
share/icons/hicolor/scalable/status/krb-no-valid-ticket.svg share/icons/hicolor/scalable/status/krb-no-valid-ticket.svg
share/icons/hicolor/scalable/status/krb-valid-ticket.svg share/icons/hicolor/scalable/status/krb-valid-ticket.svg
share/krb5-auth-dialog/ share/krb5-auth-dialog/
share/krb5-auth-dialog/ka-panel.ui
share/krb5-auth-dialog/krb5-auth-dialog.ui share/krb5-auth-dialog/krb5-auth-dialog.ui
share/locale/cs/LC_MESSAGES/krb5-auth-dialog.mo share/locale/cs/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/da/LC_MESSAGES/krb5-auth-dialog.mo share/locale/da/LC_MESSAGES/krb5-auth-dialog.mo