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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Sep 27 19:00:17 CEST 2010 

Revision: 11060
          http://gar.svn.sourceforge.net/gar/?rev=11060&view=rev
Author:   dmichelsen
Date:     2010-09-27 17:00:17 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
krb5-lib: Update to 1.8.3

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile
    csw/mgar/pkg/krb5-lib/trunk/checksums
    csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch

Added Paths:
-----------
    csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2010-09-27 16:44:12 UTC (rev 11059)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2010-09-27 17:00:17 UTC (rev 11060)
@@ -1,5 +1,5 @@
 GARNAME = krb5
-GARVERSION = 1.7
+GARVERSION = 1.8.3
 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.7/
+MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(GARVERSION) | awk -F. '{print $$1"."$$2}')/
 DISTFILES  = $(GARNAME)-$(GARVERSION)-signed.tar
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -19,8 +19,9 @@
 
 PATCHFILES  = patch-man2html-perl.patch
 PATCHFILES += 0002-libintl-for-kproplog.patch
-PATCHFILES += 0003-local-libraries-first-when-linking.patch
+# 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
 
 BUILD_DEP_PKGS = CSWtcl
 
@@ -38,10 +39,12 @@
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
+NOISAEXEC = 1
+BUILD64 = 1
+
+# We turn off almost everything as we are just interested in the library.
+NODIRPATHS = --docdir
 CONFIGURE_ARGS  = $(DIRPATHS)
-ifeq ($(ISA),i386)
-CONFIGURE_ARGS += --with-tcl=$(prefix)
-endif
 # --enable-ipv6 is deprecated and autodetected
 #CONFIGURE_ARGS += --enable-ipv6
 CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm
@@ -49,7 +52,9 @@
 CONFIGURE_ARGS += --disable-static --disable-profiled
 CONFIGURE_ARGS += --without-ldap
 
-BUILD64 = 1
+CONFIGURE_ARGS-32 += --with-tcl=$(prefix)
+CONFIGURE_ARGS-64 += --without-tcl
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
 BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
 
@@ -76,34 +81,10 @@
 CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__)
 #LDFLAGS := $(strip $(LDFLAGS))
 
-EXTRA_LINKER_FLAGS := $(LD_OPTIONS)
-LD_OPTIONS :=
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 post-extract-modulated:
 	@# TODO: Check signature
 	@cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -)
 	@$(MAKECOOKIE)
-
-post-merge:
-	ginstall -m 755 -d $(PKGROOT)$(datadir)/checkpkg/overrides
-	(echo "CSWkrb5lib: symbol-not-found"; \
-	 echo "CSWkrb5libdev: symbol-not-found sclient"; \
-	) > $(PKGROOT)$(datadir)/checkpkg/overrides/krb5_lib
-	@$(MAKECOOKIE)
-
-# Notes: Potential solutions for the overrides integration in GAR:
-#
-# OVERRIDES_CSWkrb5lib = a_name
-# OVERRIDES_CSWkrb5lib_a_name = symbol-not-found
-#
-# Or:
-#
-# define OVERRIDES_CSWkrb5lib
-# symbol-not-found
-# endef
-#
-# Note: In either case, the result content should be:
-#
-# CSWkrb5lib: symbol-not-found
-#
-# ...placed in /opt/csw/share/checkpkg/overrides/krb5_lib

Modified: csw/mgar/pkg/krb5-lib/trunk/checksums
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/checksums	2010-09-27 16:44:12 UTC (rev 11059)
+++ csw/mgar/pkg/krb5-lib/trunk/checksums	2010-09-27 17:00:17 UTC (rev 11060)
@@ -1,5 +1 @@
-ddcb250250f96a457798b469b3a813e8  0002-libintl-for-kproplog.patch
-2f4671672bce98d1157b49ba7b6846c3  0003-local-libraries-first-when-linking.patch
-f0bec7c3f02810838559e1dd764b111e  0004-libkdb_ldap-isblank-define.patch
-9f7b3402b4731a7fa543db193bf1b564  krb5-1.7-signed.tar
-6c2c7718f024c85f66fdc26398090c23  patch-man2html-perl.patch
+7c5f38e31ee744cb538eed2301096b93  krb5-1.8.3-signed.tar

Modified: csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch	2010-09-27 16:44:12 UTC (rev 11059)
+++ csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch	2010-09-27 17:00:17 UTC (rev 11060)
@@ -1,18 +1,18 @@
-From 7aa639db0238c894c12d8d9728e684b3ddbdc5dc Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Fri, 5 Feb 2010 10:31:20 +0100
-Subject: [PATCH 2/4] libintl for kproplog
+From 94e59f7701fdf0e2b93796f16864aadaaaa14669 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Aug 2010 12:34:41 +0200
+Subject: [PATCH] libintl for kproplog
 
 ---
  src/slave/Makefile.in |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
-index 6ff3c71..31f6844 100644
+index 20bef7c..a9e1988 100644
 --- a/src/slave/Makefile.in
 +++ b/src/slave/Makefile.in
-@@ -27,7 +27,7 @@ kpropd: $(SERVEROBJS) $(KADMCLNT_DEPLIBS) $(KDB5_DEPLIB) $(KRB5_BASE_DEPLIBS) $(
- 	$(CC_LINK) -o kpropd $(SERVEROBJS) $(KADMCLNT_LIBS) $(KDB5_LIB) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@
+@@ -25,7 +25,7 @@ kpropd: $(SERVEROBJS) $(KDB5_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(
+ 	$(CC_LINK) -o kpropd $(SERVEROBJS) $(KDB5_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@
  
  kproplog: $(LOGOBJS)
 -	$(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
@@ -21,5 +21,5 @@
  install::
  	for f in kprop kpropd kproplog; do \
 -- 
-1.6.6
+1.7.1
 

Copied: csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch (from rev 11055, csw/mgar/pkg/krb5/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch)
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch	                        (rev 0)
+++ csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch	2010-09-27 17:00:17 UTC (rev 11060)
@@ -0,0 +1,24 @@
+From 2827729c42021ec00658d7836e981e4b02f837be Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Aug 2010 00:10:24 +0200
+Subject: [PATCH] Add strings.h to setenv.c for strlen and other stuff
+
+---
+ src/clients/ksu/setenv.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/clients/ksu/setenv.c b/src/clients/ksu/setenv.c
+index 6e8710d..9658ee7 100644
+--- a/src/clients/ksu/setenv.c
++++ b/src/clients/ksu/setenv.c
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <strings.h>
+ #include "autoconf.h"
+ 
+ static char *_findenv(char *, int *);
+-- 
+1.7.1
+


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

More information about the devel mailing list