Update to krb5-auth-dialog-0.14

This commit is contained in:
ajacoutot 2009-11-07 09:01:43 +00:00
parent 6aeeb059ac
commit 66311b2655
4 changed files with 28 additions and 16 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2009/08/11 08:39:38 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.4 2009/11/07 09:01:43 ajacoutot Exp $
COMMENT= monitor kerberos tickets COMMENT= monitor kerberos tickets
GNOME_PROJECT= krb5-auth-dialog GNOME_PROJECT= krb5-auth-dialog
GNOME_VERSION= 0.12 GNOME_VERSION= 0.14
PKGNAME= ${DISTNAME}p0
CATEGORIES= security CATEGORIES= security

View File

@ -1,5 +1,5 @@
MD5 (gnome/krb5-auth-dialog-0.12.tar.bz2) = h57LbL1ZsTvzcbi4SXl6Jg== MD5 (gnome/krb5-auth-dialog-0.14.tar.bz2) = hYYROxv/8m+VLUKiuas3tA==
RMD160 (gnome/krb5-auth-dialog-0.12.tar.bz2) = WZA/5x7m0o5Ht6OTlX9D4Um2dHM= RMD160 (gnome/krb5-auth-dialog-0.14.tar.bz2) = R+zkhSYmg92zEsSXGrxQ5zY21bA=
SHA1 (gnome/krb5-auth-dialog-0.12.tar.bz2) = 04QgjTEO0dxGOdOCcBY2H8U+/Ys= SHA1 (gnome/krb5-auth-dialog-0.14.tar.bz2) = FkQH/BgZByZMY/itByuXXiDZvi8=
SHA256 (gnome/krb5-auth-dialog-0.12.tar.bz2) = s2IztQJq7ISvYfUM1C1iWIIXEDZdYN1aP3fO/6lM93U= SHA256 (gnome/krb5-auth-dialog-0.14.tar.bz2) = y00l0tpcSHMVNGz6+MnJ3vgou6P3LF+9JN0tn8A/3t8=
SIZE (gnome/krb5-auth-dialog-0.12.tar.bz2) = 572999 SIZE (gnome/krb5-auth-dialog-0.14.tar.bz2) = 600922

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_krb5-auth-dialog_c,v 1.2 2009/07/16 20:14:20 ajacoutot Exp $ $OpenBSD: patch-src_krb5-auth-dialog_c,v 1.3 2009/11/07 09:01:43 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/krb5-auth-dialog.c.orig Thu Jul 2 15:04:35 2009 --- src/krb5-auth-dialog.c.orig Tue Sep 29 13:37:14 2009
+++ src/krb5-auth-dialog.c Wed Jul 15 14:34:40 2009 +++ src/krb5-auth-dialog.c Sat Nov 7 09:54:39 2009
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@ -14,7 +14,16 @@ XXX these should be handled by configure checks.
#include <stdio.h> #include <stdio.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <string.h> #include <string.h>
@@ -483,8 +484,6 @@ ka_auth_heimdal_pkinit(KaApplet* applet, krb5_creds* c @@ -165,8 +166,6 @@ ka_get_error_message(krb5_context context, krb5_error_
krberr = krb5_get_error_message(context, err);
msg = g_strdup(krberr);
ka_krb5_free_error_message(context, krberr);
-#else
-# error No detailed error message information
#endif
if (msg == NULL)
msg = g_strdup(_("unknown error"));
@@ -619,8 +618,6 @@ ka_auth_heimdal_pkinit(KaApplet* applet, krb5_creds* c
kprincipal, kprincipal,
pk_userid, pk_userid,
pkinit_anchors, pkinit_anchors,
@ -23,7 +32,7 @@ XXX these should be handled by configure checks.
0, /* pk_use_enc_key */ 0, /* pk_use_enc_key */
auth_dialog_prompter, auth_dialog_prompter,
applet, /* data */ applet, /* data */
@@ -498,7 +497,7 @@ ka_auth_heimdal_pkinit(KaApplet* applet, krb5_creds* c @@ -634,7 +631,7 @@ ka_auth_heimdal_pkinit(KaApplet* applet, krb5_creds* c
0, NULL, opts); 0, NULL, opts);
out: out:
if (opts) if (opts)
@ -32,7 +41,7 @@ XXX these should be handled by configure checks.
return retval; return retval;
} }
#endif /* ! ENABLE_PKINIT */ #endif /* ! ENABLE_PKINIT */
@@ -520,7 +519,7 @@ ka_auth_password(KaApplet* applet, krb5_creds* creds, @@ -656,7 +653,7 @@ ka_auth_password(KaApplet* applet, krb5_creds* creds,
0, NULL, opts); 0, NULL, opts);
out: out:
if (opts) if (opts)

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2009/07/16 20:14:20 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.3 2009/11/07 09:01:43 ajacoutot Exp $
@bin bin/krb5-auth-dialog @bin bin/krb5-auth-dialog
@bin bin/krb5-auth-dialog-preferences @bin bin/krb5-auth-dialog-preferences
@man man/man1/krb5-auth-dialog-preferences.1
@man man/man1/krb5-auth-dialog.1 @man man/man1/krb5-auth-dialog.1
share/applications/krb5-auth-dialog-preferences.desktop share/applications/krb5-auth-dialog-preferences.desktop
share/dbus-1/services/org.gnome.KrbAuthDialog.service share/dbus-1/services/org.gnome.KrbAuthDialog.service
@ -72,16 +73,19 @@ share/krb5-auth-dialog/krb5-auth-dialog.xml
share/locale/de/LC_MESSAGES/krb5-auth-dialog.mo share/locale/de/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/es/LC_MESSAGES/krb5-auth-dialog.mo share/locale/es/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/fr/LC_MESSAGES/krb5-auth-dialog.mo share/locale/fr/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/gl/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/nb/LC_MESSAGES/krb5-auth-dialog.mo share/locale/nb/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/pa/LC_MESSAGES/krb5-auth-dialog.mo share/locale/pa/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/sv/LC_MESSAGES/krb5-auth-dialog.mo share/locale/sv/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/uk/LC_MESSAGES/krb5-auth-dialog.mo share/locale/uk/LC_MESSAGES/krb5-auth-dialog.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null share/locale/zh_HK/LC_MESSAGES/krb5-auth-dialog.mo
share/locale/zh_TW/LC_MESSAGES/krb5-auth-dialog.mo
share/omf/krb5-auth-dialog/ share/omf/krb5-auth-dialog/
share/omf/krb5-auth-dialog/krb5-auth-dialog-C.omf share/omf/krb5-auth-dialog/krb5-auth-dialog-C.omf
share/omf/krb5-auth-dialog/krb5-auth-dialog-de.omf share/omf/krb5-auth-dialog/krb5-auth-dialog-de.omf
share/omf/krb5-auth-dialog/krb5-auth-dialog-es.omf share/omf/krb5-auth-dialog/krb5-auth-dialog-es.omf
share/omf/krb5-auth-dialog/krb5-auth-dialog-sv.omf share/omf/krb5-auth-dialog/krb5-auth-dialog-sv.omf
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/ ${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/krb5-auth-dialog.schemas ${SCHEMAS_INSTDIR}/krb5-auth-dialog.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null