r51418 - in /trunk/libauthen-krb5-admin-perl/debian: changelog control patches/use_1_7_admin_interface.patch

Sun Jan 24 09:34:20 UTC 2010

Author: ansgar-guest
Date: Sun Jan 24 09:34:07 2010
New Revision: 51418

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51418
Log:
Update patch use_1_7_admin_interface.patch for MIT Kerberos 1.8.
(Closes: #566368)

Modified:
    trunk/libauthen-krb5-admin-perl/debian/changelog
    trunk/libauthen-krb5-admin-perl/debian/control
    trunk/libauthen-krb5-admin-perl/debian/patches/use_1_7_admin_interface.patch

Modified: trunk/libauthen-krb5-admin-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-admin-perl/debian/changelog?rev=51418&op=diff
==============================================================================

--- trunk/libauthen-krb5-admin-perl/debian/changelog (original)
+++ trunk/libauthen-krb5-admin-perl/debian/changelog Sun Jan 24 09:34:07 2010
@@ -1,6 +1,11 @@
 libauthen-krb5-admin-perl (0.11-3) UNRELEASED; urgency=low
 
+  [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
+
+  [ Ansgar Burchardt ]
+  * Update patch use_1_7_admin_interface.patch for MIT Kerberos 1.8.
+    (Closes: #566368)
 
  -- Nathan Handler <nhandler at ubuntu.com>  Sat, 06 Jun 2009 01:32:48 +0000
 

Modified: trunk/libauthen-krb5-admin-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-admin-perl/debian/control?rev=51418&op=diff
==============================================================================
--- trunk/libauthen-krb5-admin-perl/debian/control (original)
+++ trunk/libauthen-krb5-admin-perl/debian/control Sun Jan 24 09:34:07 2010
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 7), quilt, perl (>= 5.6.10-12),
- libkrb5-dev (>= 1.7dfsg~beta1)
+ libkrb5-dev (>= 1.8+dfsg~)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at 43-1.org>,
  gregor herrmann <gregoa at debian.org>
@@ -13,7 +13,7 @@
 
 Package: libauthen-krb5-admin-perl
 Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libauthen-krb5-perl (>= 1.2)
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libauthen-krb5-perl (>= 1.9-2)
 Description: Perl extension for MIT Kerberos 5 admin interface
  The Authen::Krb5::Admin Perl module is an object-oriented interface
  to the Kerberos 5 admin server.  Currently only MIT KDCs are

Modified: trunk/libauthen-krb5-admin-perl/debian/patches/use_1_7_admin_interface.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-admin-perl/debian/patches/use_1_7_admin_interface.patch?rev=51418&op=diff
==============================================================================
--- trunk/libauthen-krb5-admin-perl/debian/patches/use_1_7_admin_interface.patch (original)
+++ trunk/libauthen-krb5-admin-perl/debian/patches/use_1_7_admin_interface.patch Sun Jan 24 09:34:07 2010
@@ -1,7 +1,7 @@
 Author: Sam Hartman
 Bug: http://rt.cpan.org/Ticket/Display.html?id=49964
 Bug-Debian: http://bugs.debian.org/527260
-Last-Update: 2010-01-17
+Last-Update: 2010-01-24
 Description: use public admin.h header
 
 Kerberos 1.7 just entered unstable.  Kerberos 1.7 makes the
@@ -9,8 +9,10 @@
 upstream interface rather than an internal header taken from the upstream
 sources.
 
---- a/admin.h
-+++ b/admin.h
+Updated for Kerberos 1.8 by Ansgar Burchardt <ansgar at 43-1.org>.
+
+--- libauthen-krb5-admin-perl.orig/admin.h
++++ libauthen-krb5-admin-perl/admin.h
 @@ -1,339 +1,2 @@
 -/*
 - * Copyright 2001 by the Massachusetts Institute of Technology.
@@ -353,9 +355,77 @@
 -#define KADM5_XDR_FAILURE                        (43787575L)
 +#include <krb5/krb5.h>
 +#include <kadm5/admin.h>
---- a/Admin.xs
-+++ b/Admin.xs
-@@ -1443,10 +1443,6 @@
+--- libauthen-krb5-admin-perl.orig/Admin.xs
++++ libauthen-krb5-admin-perl/Admin.xs
+@@ -30,10 +30,39 @@
+ #include "perl.h"
+ #include "XSUB.h"
+ #include <krb5.h>
++#include <krb5/krb5.h>
++#include <kadm5/admin.h>
+ #include <com_err.h>
+-#include "admin.h"
+ #include "ppport.h"
+ 
++static krb5_context
++context(void)
++{
++    dSP;
++    int count;
++    krb5_context context;
++    SV *sv;
++
++    PUSHMARK(SP);
++
++    count = call_pv("Authen::Krb5::init_context", G_SCALAR);
++    SPAGAIN;
++
++    if (count != 1)
++        croak("Authen::Krb5::init_context returned something unexpected.");
++
++    sv = POPs;
++
++    if (!sv_derived_from(sv, "Authen::Krb5::Context"))
++        croak("Authen::Krb5::init_context did not return a Context object.");
++
++    context = (krb5_context) SvIV(SvRV(sv));
++
++    PUTBACK;
++
++    return context;
++}
++
+ static int
+ not_here(char *s)
+ {
+@@ -1180,7 +1209,7 @@
+     krb5_ui_4                    api_version
+   CODE:
+ #ifdef KRB5_PLUGIN_NO_HANDLE    /* hack to test for 1.5 */
+-    err = kadm5_init_with_creds(client, cc, service, config, struct_version,
++    err = kadm5_init_with_creds(context(), client, cc, service, config, struct_version,
+       api_version, NULL, &RETVAL);
+ #else
+     err = kadm5_init_with_creds(client, cc, service, config, struct_version,
+@@ -1202,7 +1231,7 @@
+     krb5_ui_4                    api_version
+   CODE:
+ #ifdef KRB5_PLUGIN_NO_HANDLE    /* hack to test for 1.5 */
+-    err = kadm5_init_with_password(client, pw, service, config, struct_version,
++    err = kadm5_init_with_password(context(), client, pw, service, config, struct_version,
+       api_version, NULL, &RETVAL);
+ #else
+     err = kadm5_init_with_password(client, pw, service, config, struct_version,
+@@ -1224,7 +1253,7 @@
+     krb5_ui_4                    api_version
+   CODE:
+ #ifdef KRB5_PLUGIN_NO_HANDLE    /* hack to test for 1.5 */
+-    err = kadm5_init_with_skey(client, keytab, service, config, struct_version,
++    err = kadm5_init_with_skey(context(), client, keytab, service, config, struct_version,
+       api_version, NULL, &RETVAL);
+ #else
+     err = kadm5_init_with_skey(client, keytab, service, config, struct_version,
+@@ -1443,10 +1472,6 @@
              Safefree(config->acl_file);
          if (config->realm)
              Safefree(config->realm);
@@ -366,3 +436,13 @@
      }
      Safefree(config);
  
+--- libauthen-krb5-admin-perl.orig/Admin.pm
++++ libauthen-krb5-admin-perl/Admin.pm
+@@ -30,6 +30,7 @@
+ use vars qw($AUTOLOAD $VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
+ 
+ use Carp;
++use Authen::Krb5;
+ 
+ require 5.004;
+ 


