OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Mar-2008 08:11:17 Branch: HEAD Handle: 2008031707111500 Modified files: openpkg-src/perl-kerberos perl-kerberos.patch perl-kerberos.spec Log: modifying package: perl-kerberos-5.10.0 20080103 -> 20080317 Summary: Revision Changes Path 1.3 +28 -13 openpkg-src/perl-kerberos/perl-kerberos.patch 1.7 +6 -4 openpkg-src/perl-kerberos/perl-kerberos.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/perl-kerberos/perl-kerberos.patch ============================================================================ $ cvs diff -u -r1.2 -r1.3 perl-kerberos.patch --- openpkg-src/perl-kerberos/perl-kerberos.patch 3 Jan 2008 18:33:01 -0000 1.2 +++ openpkg-src/perl-kerberos/perl-kerberos.patch 17 Mar 2008 07:11:15 -0000 1.3 @@ -1,16 +1,19 @@ -Index: Authen-Krb5-Admin-0.09/Makefile.PL ---- Authen-Krb5-Admin-0.09/Makefile.PL.orig 2007-01-06 02:00:21 +0100 -+++ Authen-Krb5-Admin-0.09/Makefile.PL 2007-01-20 15:56:08 +0100 -@@ -31,14 +31,14 @@ +Index: Authen-Krb5-Admin-0.11/Makefile.PL +--- Authen-Krb5-Admin-0.11/Makefile.PL.orig 2008-02-25 14:43:46 +0100 ++++ Authen-Krb5-Admin-0.11/Makefile.PL 2008-03-17 08:08:40 +0100 +@@ -31,8 +31,8 @@ # location of Kerberos 5 libraries and header files print 'checking for Kerberos 5 prefix ... '; -my ($PREFIX) = grep { -r "$_/include/krb5.h" } -- qw(/opt/krb5 /usr/local /usr /usr/kerberos) +- qw(/opt/krb5 /usr/local /usr /usr/kerberos); +my ($PREFIX) = grep { -r "$_/include/kerberos/krb5.h" } -+ qw(@l_prefix@) - or die 'Cannot find Kerberos 5'; - print "$PREFIX\n"; ++ qw(@l_prefix@); + if ($PREFIX) { + print "$PREFIX\n"; + } else { +@@ -41,8 +41,8 @@ + } my $KRB5_BINDIR = "$PREFIX/bin" ; -my $KRB5_LIBDIR = "$PREFIX/lib" ; @@ -20,14 +23,14 @@ # any extra libraries or include flags -@@ -134,3 +134,4 @@ +@@ -139,3 +139,4 @@ PREREQ_PM => {'Authen::Krb5' => 1.2}, VERSION_FROM => 'Admin.pm', ); + Index: Authen-Krb5-Easy-0.90/Makefile.PL --- Authen-Krb5-Easy-0.90/Makefile.PL.orig 2002-04-17 01:24:52 +0200 -+++ Authen-Krb5-Easy-0.90/Makefile.PL 2007-01-20 15:57:09 +0100 ++++ Authen-Krb5-Easy-0.90/Makefile.PL 2008-03-17 08:08:40 +0100 @@ -4,10 +4,10 @@ # get some stuff we need to know @@ -41,9 +44,21 @@ chomp($krbincs); WriteMakefile( -Index: Krb5-1.7/Makefile.PL ---- Krb5-1.7/Makefile.PL.orig 2006-06-11 18:37:01 +0200 -+++ Krb5-1.7/Makefile.PL 2007-01-20 15:56:08 +0100 +Index: Authen-Krb5-Simple-0.40/Makefile.PL +--- Authen-Krb5-Simple-0.40/Makefile.PL.orig 2008-02-24 20:19:38 +0100 ++++ Authen-Krb5-Simple-0.40/Makefile.PL 2008-03-17 08:09:02 +0100 +@@ -57,7 +57,7 @@ + # + check_lib_or_exit( + lib => [qw( krb5 k5crypto com_err )], +- libpath => [EMAIL PROTECTED] ++ libpath => [EMAIL PROTECTED] + ); + + # Write out the Makefile +Index: Krb5-1.8/Makefile.PL +--- Krb5-1.8/Makefile.PL.orig 2008-03-16 15:59:50 +0100 ++++ Krb5-1.8/Makefile.PL 2008-03-17 08:08:40 +0100 @@ -37,3 +37,4 @@ 'DEFINE' => '', 'INC' => "-I${KRB5_INCDIR} $KRB5_EXTRAINCS" @@ . patch -p0 <<'@@ .' Index: openpkg-src/perl-kerberos/perl-kerberos.spec ============================================================================ $ cvs diff -u -r1.6 -r1.7 perl-kerberos.spec --- openpkg-src/perl-kerberos/perl-kerberos.spec 3 Jan 2008 18:33:01 -0000 1.6 +++ openpkg-src/perl-kerberos/perl-kerberos.spec 17 Mar 2008 07:11:15 -0000 1.7 @@ -23,9 +23,9 @@ # versions of individual parts %define V_perl 5.10.0 -%define V_authen_krb5 1.7 -%define V_authen_krb5_admin 0.09 -%define V_authen_krb5_simple 0.32 +%define V_authen_krb5 1.8 +%define V_authen_krb5_admin 0.11 +%define V_authen_krb5_simple 0.40 %define V_authen_krb5_easy 0.90 %define V_authen_krb5password 1.03 @@ -40,7 +40,7 @@ Group: Perl License: GPL/Artistic Version: %{V_perl} -Release: 20080103 +Release: 20080317 # list of sources Source0: http://www.cpan.org/authors/id/J/JH/JHORWITZ/Krb5-%{V_authen_krb5}.tar.gz @@ -112,6 +112,8 @@ kerberos_libs="`%{l_prefix}/bin/krb5-config --libs`" ( cd Krb5-%{V_authen_krb5} %{l_shtool} subst \ + -e 's;/usr/include;%{l_prefix}/include/kerberos;g' \ + -e 's;/usr/lib;%{l_prefix}/lib/kerberos;g' \ -e 's;/usr/local/krb5/lib;%{l_prefix}/lib/kerberos;g' \ -e 's;/usr/local/krb5/include;%{l_prefix}/include/kerberos;g' \ -e "s;-lresolv;$kerberos_libs -lresolv;g" \ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org