Update to krb5-auth-dialog-0.12.

Enable pkinit support.
This commit is contained in:
ajacoutot 2009-07-16 20:14:20 +00:00
parent cb35b98fe3
commit 4ca19d99dc
5 changed files with 105 additions and 40 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/06/21 11:14:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2009/07/16 20:14:20 ajacoutot Exp $
COMMENT= monitor kerberos tickets
GNOME_PROJECT= krb5-auth-dialog
GNOME_VERSION= 0.8
GNOME_VERSION= 0.12
CATEGORIES= security
@ -21,20 +21,21 @@ WANTLIB += crypto dbus-1 dbus-glib-1 expat fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 gssapi gthread-2.0 gtk-x11-2.0 krb5 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += xml2 z
WANTLIB += z
MODULES= devel/gettext \
x11/gnome \
devel/gconf2
LIB_DEPENDS= notify.>=2::devel/libnotify \
glade-2.0.>=1::devel/libglade2
LIB_DEPENDS= notify.>=2::devel/libnotify
USE_X11= Yes
MODGCONF2_SCHEMAS_DIR= krb5-auth-dialog
MODGNOME_HELP_FILES= Yes
DESKTOP_FILES= Yes
FAKE_FLAGS= autostartdir=${PREFIX}/share/examples/krb5-auth-dialog/xdg/autostart \
schemadir=${PREFIX}/${SCHEMAS_INSTDIR}
smallicondir=${PREFIX}/share/icons/hicolor/22x22/apps
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
@ -42,7 +43,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
KRB5_LIBS="-lgssapi -lkrb5 -lasn1 -lcrypto"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-libnotify \
--disable-pkinit \
--enable-pkinit \
--disable-network-manager
post-install:

View File

@ -1,5 +1,5 @@
MD5 (gnome/krb5-auth-dialog-0.8.tar.bz2) = QR66j2nAn/7VpcK71I/NeA==
RMD160 (gnome/krb5-auth-dialog-0.8.tar.bz2) = Iy3Ne7KUV4y0qDqYepBl+MTIVJw=
SHA1 (gnome/krb5-auth-dialog-0.8.tar.bz2) = wtY3CwSJM3Kmr160TSn++RRmIvk=
SHA256 (gnome/krb5-auth-dialog-0.8.tar.bz2) = dz+SZIKfVBnRoCi/4A+VaMMaTNwPR4s+OmNh2Myd1fI=
SIZE (gnome/krb5-auth-dialog-0.8.tar.bz2) = 374146
MD5 (gnome/krb5-auth-dialog-0.12.tar.bz2) = h57LbL1ZsTvzcbi4SXl6Jg==
RMD160 (gnome/krb5-auth-dialog-0.12.tar.bz2) = WZA/5x7m0o5Ht6OTlX9D4Um2dHM=
SHA1 (gnome/krb5-auth-dialog-0.12.tar.bz2) = 04QgjTEO0dxGOdOCcBY2H8U+/Ys=
SHA256 (gnome/krb5-auth-dialog-0.12.tar.bz2) = s2IztQJq7ISvYfUM1C1iWIIXEDZdYN1aP3fO/6lM93U=
SIZE (gnome/krb5-auth-dialog-0.12.tar.bz2) = 572999

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_krb5-auth-dialog_c,v 1.1.1.1 2009/06/21 11:14:54 ajacoutot Exp $
$OpenBSD: patch-src_krb5-auth-dialog_c,v 1.2 2009/07/16 20:14:20 ajacoutot Exp $
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_free: the context argument is an MIT extension.
--- src/krb5-auth-dialog.c.orig Sun Jan 11 22:46:19 2009
+++ src/krb5-auth-dialog.c Sun Jun 21 12:14:51 2009
@@ -23,6 +23,7 @@
--- src/krb5-auth-dialog.c.orig Thu Jul 2 15:04:35 2009
+++ src/krb5-auth-dialog.c Wed Jul 15 14:34:40 2009
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <time.h>
#include <krb5.h>
@ -14,30 +14,30 @@ XXX these should be handled by configure checks.
#include <stdio.h>
#include <sys/wait.h>
#include <string.h>
@@ -527,8 +528,6 @@ ka_auth_pkinit(Krb5AuthApplet* applet, krb5_creds* cre
@@ -483,8 +484,6 @@ ka_auth_heimdal_pkinit(KaApplet* applet, krb5_creds* c
kprincipal,
applet->pk_userid,
NULL, /* x509 anchors */
pk_userid,
pkinit_anchors,
- NULL,
- NULL,
0, /* pk_use_enc_key */
auth_dialog_prompter,
applet, /* data */
@@ -541,7 +540,7 @@ ka_auth_pkinit(Krb5AuthApplet* applet, krb5_creds* cre
NULL, auth_dialog_prompter, applet,
@@ -498,7 +497,7 @@ ka_auth_heimdal_pkinit(KaApplet* applet, krb5_creds* c
0, NULL, opts);
out:
- krb5_get_init_creds_opt_free(kcontext, opts);
+ krb5_get_init_creds_opt_free(opts);
if (opts)
- krb5_get_init_creds_opt_free(kcontext, opts);
+ krb5_get_init_creds_opt_free(opts);
return retval;
#else /* ENABLE_PKINIT */
return 0;
@@ -617,7 +616,7 @@ grab_credentials (Krb5AuthApplet* applet)
}
#endif /* ! ENABLE_PKINIT */
@@ -520,7 +519,7 @@ ka_auth_password(KaApplet* applet, krb5_creds* creds,
0, NULL, opts);
out:
if (opt)
- krb5_get_init_creds_opt_free(kcontext, opt);
+ krb5_get_init_creds_opt_free(opt);
krb5_free_cred_contents (kcontext, &my_creds);
krb5_cc_close (kcontext, ccache);
if (opts)
- krb5_get_init_creds_opt_free(kcontext, opts);
+ krb5_get_init_creds_opt_free(opts);
return retval;
}

View File

@ -5,3 +5,5 @@ Kerberos tickets.
* renewable tickets are being refreshed automatically
* tickets can be acquired/refreshed at any time by clicking on the tray icon
* the ticket cache can be removed via the context menu
* applications can ask krb5-auth-dialog to acquire a Kerberos ticket via DBus
* supports PKinit (e.g. via SmartCard)

View File

@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/21 11:14:54 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/07/16 20:14:20 ajacoutot Exp $
@bin bin/krb5-auth-dialog
@bin bin/krb5-auth-dialog-preferences
@man man/man1/krb5-auth-dialog.1
share/applications/krb5-auth-dialog-preferences.desktop
share/dbus-1/services/org.gnome.KrbAuthDialog.service
share/doc/krb5-auth-dialog/
share/doc/krb5-auth-dialog/README
share/examples/krb5-auth-dialog/
@ -10,20 +13,79 @@ share/examples/krb5-auth-dialog/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/krb5-auth-dialog/xdg/autostart/krb5-auth-dialog.desktop
@sample ${SYSCONFDIR}/xdg/autostart/krb5-auth-dialog.desktop
share/icons/
share/icons/hicolor/
share/gnome/help/krb5-auth-dialog/
share/gnome/help/krb5-auth-dialog/C/
share/gnome/help/krb5-auth-dialog/C/figures/
share/gnome/help/krb5-auth-dialog/C/figures/ka-expired.png
share/gnome/help/krb5-auth-dialog/C/figures/ka-expiring.png
share/gnome/help/krb5-auth-dialog/C/figures/ka-valid.png
share/gnome/help/krb5-auth-dialog/C/figures/trayicon-expired.png
share/gnome/help/krb5-auth-dialog/C/figures/trayicon-expiring.png
share/gnome/help/krb5-auth-dialog/C/figures/trayicon-valid.png
share/gnome/help/krb5-auth-dialog/C/krb5-auth-dialog.xml
share/gnome/help/krb5-auth-dialog/C/legal.xml
share/gnome/help/krb5-auth-dialog/de/
share/gnome/help/krb5-auth-dialog/de/figures/
share/gnome/help/krb5-auth-dialog/de/figures/ka-expired.png
share/gnome/help/krb5-auth-dialog/de/figures/ka-expiring.png
share/gnome/help/krb5-auth-dialog/de/figures/ka-valid.png
share/gnome/help/krb5-auth-dialog/de/figures/trayicon-expired.png
share/gnome/help/krb5-auth-dialog/de/figures/trayicon-expiring.png
share/gnome/help/krb5-auth-dialog/de/figures/trayicon-valid.png
share/gnome/help/krb5-auth-dialog/de/krb5-auth-dialog.xml
share/gnome/help/krb5-auth-dialog/es/
share/gnome/help/krb5-auth-dialog/es/figures/
share/gnome/help/krb5-auth-dialog/es/figures/ka-expired.png
share/gnome/help/krb5-auth-dialog/es/figures/ka-expiring.png
share/gnome/help/krb5-auth-dialog/es/figures/ka-valid.png
share/gnome/help/krb5-auth-dialog/es/figures/trayicon-expired.png
share/gnome/help/krb5-auth-dialog/es/figures/trayicon-expiring.png
share/gnome/help/krb5-auth-dialog/es/figures/trayicon-valid.png
share/gnome/help/krb5-auth-dialog/es/krb5-auth-dialog.xml
share/gnome/help/krb5-auth-dialog/sv/
share/gnome/help/krb5-auth-dialog/sv/figures/
share/gnome/help/krb5-auth-dialog/sv/figures/ka-expired.png
share/gnome/help/krb5-auth-dialog/sv/figures/ka-expiring.png
share/gnome/help/krb5-auth-dialog/sv/figures/ka-valid.png
share/gnome/help/krb5-auth-dialog/sv/figures/trayicon-expired.png
share/gnome/help/krb5-auth-dialog/sv/figures/trayicon-expiring.png
share/gnome/help/krb5-auth-dialog/sv/figures/trayicon-valid.png
share/gnome/help/krb5-auth-dialog/sv/krb5-auth-dialog.xml
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/krb-expiring-ticket.png
share/icons/hicolor/22x22/apps/krb-no-valid-ticket.png
share/icons/hicolor/22x22/apps/krb-valid-ticket.png
share/icons/hicolor/22x22/status/
share/icons/hicolor/22x22/status/krb-expiring-ticket.png
share/icons/hicolor/22x22/status/krb-no-valid-ticket.png
share/icons/hicolor/22x22/status/krb-valid-ticket.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/status/
share/icons/hicolor/48x48/status/krb-expiring-ticket.png
share/icons/hicolor/48x48/status/krb-no-valid-ticket.png
share/icons/hicolor/48x48/status/krb-valid-ticket.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/status/
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-valid-ticket.svg
share/krb5-auth-dialog/
share/krb5-auth-dialog/krb5-auth-dialog.glade
share/krb5-auth-dialog/krb5-auth-dialog-preferences.xml
share/krb5-auth-dialog/krb5-auth-dialog.xml
share/locale/de/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/nb/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/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/omf/krb5-auth-dialog/
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-es.omf
share/omf/krb5-auth-dialog/krb5-auth-dialog-sv.omf
${SCHEMAS_INSTDIR}/
${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 %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database