[csw-devel] SF.net SVN: gar:[13008] csw/mgar/pkg/krb5/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13008
          http://gar.svn.sourceforge.net/gar/?rev=13008&view=rev
Author:   dmichelsen
Date:     2011-01-19 14:02:44 +0000 (Wed, 19 Jan 2011)

Log Message:
-----------
krb5: Update to 1.9, some more fixes

Modified Paths:
--------------
    csw/mgar/pkg/krb5/trunk/Makefile
    csw/mgar/pkg/krb5/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/krb5/trunk/files/0006-Fix-check-for-camellia.patch

Modified: csw/mgar/pkg/krb5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5/trunk/Makefile	2011-01-19 10:08:58 UTC (rev 13007)
+++ csw/mgar/pkg/krb5/trunk/Makefile	2011-01-19 14:02:44 UTC (rev 13008)
@@ -1,5 +1,5 @@
 NAME = krb5
-VERSION = 1.8.3
+VERSION = 1.9
 CATEGORIES = server
 
 DESCRIPTION = MIT Kerberos 5
@@ -11,7 +11,7 @@
   Kerberos is available in many commercial products as well.
 endef
 
-MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.8/
+MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(GARVERSION) | awk -F. '{print $$1"."$$2}')/
 MASTER_SITES += http://web.mit.edu/kerberos/dist/krb5-appl/1.0/
 DISTFILES  = $(NAME)-$(VERSION)-signed.tar
 # DISTFILES += krb5-appl-1.0.1-signed.tar
@@ -24,6 +24,9 @@
 #PATCHFILES += 0003-local-libraries-first-when-linking.patch
 PATCHFILES += 0004-libkdb_ldap-isblank-define.patch
 PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch
+# Add fix for failing test until this is fixed:
+#   http://krbdev.mit.edu/rt/Ticket/Display.html?id=6847
+PATCHFILES += 0006-Fix-check-for-camellia.patch
 
 BUILD_DEP_PKGS = CSWtcl
 
@@ -57,6 +60,8 @@
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
+sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
 CONFIGURE_ARGS  = $(DIRPATHS)
 ifeq ($(ISA),i386)
 CONFIGURE_ARGS += --with-tcl=$(prefix)

Modified: csw/mgar/pkg/krb5/trunk/checksums
===================================================================
--- csw/mgar/pkg/krb5/trunk/checksums	2011-01-19 10:08:58 UTC (rev 13007)
+++ csw/mgar/pkg/krb5/trunk/checksums	2011-01-19 14:02:44 UTC (rev 13008)
@@ -1,5 +1 @@
-50aadae110cba9faba35db3edaa43677  0002-libintl-for-kproplog.patch
-f0bec7c3f02810838559e1dd764b111e  0004-libkdb_ldap-isblank-define.patch
-fb6826ccfffde6e51a8c5ac73ed2266a  0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch
-7c5f38e31ee744cb538eed2301096b93  krb5-1.8.3-signed.tar
-6c2c7718f024c85f66fdc26398090c23  patch-man2html-perl.patch
+220c3dbb05a1bae1e6ad0bec4a6ac331  krb5-1.9-signed.tar

Added: csw/mgar/pkg/krb5/trunk/files/0006-Fix-check-for-camellia.patch
===================================================================
--- csw/mgar/pkg/krb5/trunk/files/0006-Fix-check-for-camellia.patch	                        (rev 0)
+++ csw/mgar/pkg/krb5/trunk/files/0006-Fix-check-for-camellia.patch	2011-01-19 14:02:44 UTC (rev 13008)
@@ -0,0 +1,25 @@
+From 1c59e0d1f0c1092daea7551722ef65aa6237cb23 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 19 Jan 2011 13:12:22 +0100
+Subject: [PATCH] Fix check for camellia
+
+---
+ src/lib/crypto/builtin/camellia/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in
+index e6c86bc..b7dcd88 100644
+--- a/src/lib/crypto/builtin/camellia/Makefile.in
++++ b/src/lib/crypto/builtin/camellia/Makefile.in
+@@ -34,7 +34,7 @@ includes:: depend
+ depend:: $(SRCS)
+ 
+ camellia-gen: camellia-gen.o $(GEN_OBJS)
+-	$(CC_LINK) -I../../../../include $(LOCALINCLUDES) -o camellia-gen camellia-gen.o $(GEN_OBJS)
++	$(CC_LINK) -I../../../../include $(LOCALINCLUDES) -lkrb5support -o camellia-gen camellia-gen.o $(GEN_OBJS)
+ 
+ run-camellia-gen: camellia-gen
+ 	./camellia-gen > kresults.out
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.