Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/dist/heimdal Update script to modify include file pat...



details:   https://anonhg.NetBSD.org/src/rev/60a73a4615f2
branches:  trunk
changeset: 542327:60a73a4615f2
user:      elric <elric%NetBSD.org@localhost>
date:      Sun Jan 26 20:51:58 2003 +0000

description:
Update script to modify include file paths to start the process of
deprecating the need to -I/usr/include/krb5.

diffstat:

 crypto/dist/heimdal/heimdal2netbsd |  28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 2b5a612b7707 -r 60a73a4615f2 crypto/dist/heimdal/heimdal2netbsd
--- a/crypto/dist/heimdal/heimdal2netbsd        Sun Jan 26 19:35:52 2003 +0000
+++ b/crypto/dist/heimdal/heimdal2netbsd        Sun Jan 26 20:51:58 2003 +0000
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# $Id: heimdal2netbsd,v 1.3 2002/09/12 14:12:18 joda Exp $
+# $Heimdal: heimdal2netbsd,v 1.3 2002/09/12 14:12:18 joda Exp $
+# $NetBSD: heimdal2netbsd,v 1.4 2003/01/26 20:51:58 elric Exp $
 
 if [ \! -f kuser/kinit.c ]; then 
        echo "`basename $0`: should be run in top src directory" 1>&2
@@ -20,7 +21,7 @@
 echo 'Fixing .Os in man pages.'
 perl -i~ -p -e 's/\.Os HEIMDAL/.Os/' `find . -name '*.[1358]'`
 
-echo 'Changing $Id: heimdal2netbsd,v 1.3 2002/09/12 14:12:18 joda Exp $ to $Heimdal$.'
+echo 'Changing $Id: heimdal2netbsd,v 1.4 2003/01/26 20:51:58 elric Exp $ to $Heimdal$.'
 ## Ugh!
 set -- 'RCSID\("'      '"\)'   '__RCSID("'     '"\n        "\$NetBSD\$")' \
        '/\* '          ' \*/'  '/* '           '\n   \$NetBSD\$ */'       \
@@ -40,6 +41,29 @@
 echo 'Inlining <krb5-types.h> in krb5.h and gssapi.h.'
 perl -i~ -p -e 's,#include <krb5-types.h>,#include <sys/types.h>\n#include <inttypes.h>\n#include <sys/socket.h>\ntypedef socklen_t krb5_socklen_t;\ntypedef ssize_t krb5_ssize_t;,' 
lib/gssapi/gssapi.h lib/krb5/krb5.h
 
+echo 'Fixing up include paths:'
+
+update_inc() {
+       echo " fixing $1 leaving old file in $1~"
+       mv $1 $1~
+       < $1~ > $1 \
+       sed -e 's,#include <asn1_err.h>,#include <krb5/asn1_err.h>,'          \
+           -e 's,#include <krb5_err.h>,#include <krb5/krb5_err.h>,'          \
+           -e 's,#include <heim_err.h>,#include <krb5/heim_err.h>,'          \
+           -e 's,#include <k524_err.h>,#include <krb5/k524_err.h>,'          \
+           -e 's,#include <krb5_asn1.h>,#include <krb5/krb5_asn1.h>,'        \
+           -e 's,#include <hdb_asn1.h>,#include <krb5/hdb_asn1.h>,'          \
+           -e 's,#include <hdb_err.h>,#include <krb5/hdb_err.h>,'            \
+           -e 's,#include <hdb-protos.h>,#include <krb5/hdb-protos.h>,'      \
+           -e 's,#include <roken-common.h>,#include <krb5/roken-common.h>,'  \
+           -e 's,#include <sl.h>,#include <krb5/sl.h>,'
+}
+
+update_inc lib/krb5/krb5.h
+update_inc lib/hdb/hdb.h
+update_inc lib/roken/roken.h.in
+update_inc lib/sl/ss.h
+
 echo 'Remember to update files in basesrc/include/heimdal/.'
 
 exit 0



Home | Main Index | Thread Index | Old Index