[csw-devel] SF.net SVN: gar:[8356] csw/mgar/pkg/krb5/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Feb 5 10:57:28 CET 2010
Revision: 8356
http://gar.svn.sourceforge.net/gar/?rev=8356&view=rev
Author: wahwah
Date: 2010-02-05 09:57:28 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
krb5: Fixed the linking against /opt/csw/lib problem, fixed 'isblank' problem, fixed -lintlt problem with kproplog, it builds fine for sparcv8
Modified Paths:
--------------
csw/mgar/pkg/krb5/trunk/Makefile
csw/mgar/pkg/krb5/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch
csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch
csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch
csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch
Removed Paths:
-------------
csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff
Modified: csw/mgar/pkg/krb5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5/trunk/Makefile 2010-02-05 09:28:33 UTC (rev 8355)
+++ csw/mgar/pkg/krb5/trunk/Makefile 2010-02-05 09:57:28 UTC (rev 8356)
@@ -17,7 +17,10 @@
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar
-PATCHFILES = patch-man2html-perl.diff
+PATCHFILES = patch-man2html-perl.patch
+PATCHFILES += 0002-libintl-for-kproplog.patch
+PATCHFILES += 0003-local-libraries-first-when-linking.patch
+PATCHFILES += 0004-libkdb_ldap-isblank-define.patch
BUILD_DEP_PKGS = CSWtcl
Modified: csw/mgar/pkg/krb5/trunk/checksums
===================================================================
--- csw/mgar/pkg/krb5/trunk/checksums 2010-02-05 09:28:33 UTC (rev 8355)
+++ csw/mgar/pkg/krb5/trunk/checksums 2010-02-05 09:57:28 UTC (rev 8356)
@@ -1,2 +1,5 @@
-9f7b3402b4731a7fa543db193bf1b564 download/krb5-1.7-signed.tar
-6c2c7718f024c85f66fdc26398090c23 download/patch-man2html-perl.diff
+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
Added: csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch
===================================================================
--- csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch (rev 0)
+++ csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch 2010-02-05 09:57:28 UTC (rev 8356)
@@ -0,0 +1,25 @@
+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
+
+---
+ 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
+--- 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@
+
+ kproplog: $(LOGOBJS)
+- $(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
++ $(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) -lintl
+
+ install::
+ for f in kprop kpropd kproplog; do \
+--
+1.6.6
+
Added: csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch
===================================================================
--- csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch (rev 0)
+++ csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch 2010-02-05 09:57:28 UTC (rev 8356)
@@ -0,0 +1,25 @@
+From 3dca19491123f37817e84742ff802ec07cde24e7 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 5 Feb 2010 10:32:00 +0100
+Subject: [PATCH 3/4] local libraries first when linking
+
+---
+ src/config/shlib.conf | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/config/shlib.conf b/src/config/shlib.conf
+index 6972ff0..f680210 100644
+--- a/src/config/shlib.conf
++++ b/src/config/shlib.conf
+@@ -373,7 +373,7 @@ mips-*-netbsd*)
+ else
+ PICFLAGS=-KPIC
+ # Solaris cc doesn't default to stuffing the SONAME field...
+- LDCOMBINE='$(CC) $(CFLAGS) -dy -G -z text -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $$initfini'
++ LDCOMBINE='$(CC) $(PROG_LIBPATH) $(CFLAGS) -dy -G -z text -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $$initfini'
+ #
+ case $krb5_cv_host in
+ *-*-solaris2.[1-7] | *-*-solaris2.[1-7].*)
+--
+1.6.6
+
Added: csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch
===================================================================
--- csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch (rev 0)
+++ csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch 2010-02-05 09:57:28 UTC (rev 8356)
@@ -0,0 +1,25 @@
+From 468a5bf5227b847f3975fa1f55d3fa2b7424f819 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 5 Feb 2010 10:34:03 +0100
+Subject: [PATCH 4/4] libkdb_ldap isblank define
+
+---
+ src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
+index 08a87fe..20a4faa 100644
+--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
++++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
+@@ -40,7 +40,7 @@
+ #include <kadm5/admin.h>
+
+ #if defined(NEED_ISBLANK_PROTO) && !defined(isblank)
+-extern int isblank();
++# define isblank(c) ((c) == ' ' || (c) == '\t')
+ #endif
+
+ krb5_error_code
+--
+1.6.6
+
Deleted: csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff
===================================================================
--- csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff 2010-02-05 09:28:33 UTC (rev 8355)
+++ csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff 2010-02-05 09:57:28 UTC (rev 8356)
@@ -1,9 +0,0 @@
---- krb5-1.6.3-orig/doc/man2html 2005-08-26 01:15:24.000000000 +0200
-+++ krb5-1.6.3/doc/man2html 2008-02-26 14:21:08.431774000 +0100
-@@ -1,5 +1,4 @@
--#!/usr/athena/bin/perl
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- ##---------------------------------------------------------------------------##
- ## File:
- ## @(#) man2html 1.2 97/08/12 12:57:30 @(#)
Copied: csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch (from rev 8347, csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff)
===================================================================
--- csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch (rev 0)
+++ csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch 2010-02-05 09:57:28 UTC (rev 8356)
@@ -0,0 +1,9 @@
+--- krb5-1.6.3-orig/doc/man2html 2005-08-26 01:15:24.000000000 +0200
++++ krb5-1.6.3/doc/man2html 2008-02-26 14:21:08.431774000 +0100
+@@ -1,5 +1,4 @@
+-#!/usr/athena/bin/perl
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ ##---------------------------------------------------------------------------##
+ ## File:
+ ## @(#) man2html 1.2 97/08/12 12:57:30 @(#)
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