diff options
164 files changed, 1044 insertions, 2880 deletions
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile index 6fac2d71b8a3..df245fee44a4 100644 --- a/security/krb5-16/Makefile +++ b/security/krb5-16/Makefile @@ -6,12 +6,17 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.8 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= security # USE_MIT_TARBALL tells the port that the user has fetched the source # directly from MIT rather than the default crypto-publish.org. -USE_MIT_TARBALL?= NO + +# XXX At the present time crypto-publish.org does not have krb5-1.3. +# XXX We must use the MIT copy instead, requiring the user to manually +# XXX fetch the distfile. As soon as crypto-publish.org distributes +# XXX krb5-1.3, USE_MIT_TARBALL should be changed back to NO. +USE_MIT_TARBALL?= YES + .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" MASTER_SITES= # manual download EXTRACT_SUFX= .tar @@ -29,8 +34,9 @@ KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc +CONFIGURE_ARGS?= --enable-shared +CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ + CFLAGS="${CFLAGS}" MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= NO @@ -66,10 +72,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc -HTML_DOCS= admin.html install_foot.html user-guide.html \ - admin_foot.html install_toc.html user-guide_foot.html \ - admin_toc.html krb425.html user-guide_toc.html \ - install.html krb425_toc.html +HTML_DOCS= admin.html user-guide.html install.html +HTML_OUTDIRS= krb5-admin krb5-install .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" do-fetch: @@ -111,6 +115,10 @@ pre-build: post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.if defined(WANT_HTML) && ${WANT_HTML} == "YES" + @(cd ${WRKSRC}/../doc && \ + ${MAKE} ${HTML_DOCS}) +.endif .include <bsd.port.pre.mk> @@ -118,10 +126,20 @@ post-install: # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @${MKDIR} ${PREFIX}/share/doc/krb5 -.for html in ${HTML_DOCS} - ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 + for html in ${HTML_DOC_DIR}/*.html; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \ + ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done +.for htmldir in ${HTML_OUTDIRS} + @${MKDIR} ${PREFIX}/share/doc/krb5/${htmldir} + for html in ${HTML_DOC_DIR}/${htmldir}/*; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5/${htmldir}; \ + ${ECHO_CMD} share/doc/krb5/${htmldir}/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done + ${ECHO_CMD} @dirrm share/doc/krb5/${htmldir} >> ${TMPPLIST} .endfor .endif + ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo index 24d249c79441..b5265b84e3ee 100644 --- a/security/krb5-16/distinfo +++ b/security/krb5-16/distinfo @@ -1,2 +1,2 @@ -MD5 (krb5-1.2.8.tar) = cbb87396f8a166b6e5dd8b2b0cb3fe29 -MD5 (krb5-1.2.8.tar.gz) = 99b840431ad2926de66d143cdd9307eb +MD5 (krb5-1.3.tar) = efe46a338f74e02796f07d53815273c6 +MD5 (krb5-1.3.tar.gz) = e435813481fc9b4e7f73ebda1537cbd2 diff --git a/security/krb5-16/files/patch-af b/security/krb5-16/files/patch-af index e054b18bbef5..49425d6efceb 100644 --- a/security/krb5-16/files/patch-af +++ b/security/krb5-16/files/patch-af @@ -8,6 +8,6 @@ +@direntry +* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5 +@end direntry - @setchapternewpage odd @c chapter begins on next odd page + @c @setchapternewpage odd @c chapter begins on next odd page @c @setchapternewpage on @c chapter begins on next page @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5-16/files/patch-appl::bsd::Makefile.in b/security/krb5-16/files/patch-appl::bsd::Makefile.in index 603c399a287f..581048933264 100644 --- a/security/krb5-16/files/patch-appl::bsd::Makefile.in +++ b/security/krb5-16/files/patch-appl::bsd::Makefile.in @@ -1,11 +1,12 @@ --- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001 -@@ -28,7 +28,7 @@ +@@ -31,8 +31,8 @@ -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" - DEFINES = $(RSH) $(BSD) $(RPROGS) \ -- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" -+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" + DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ +- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ ++ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ + -DHEIMDAL_FRIENDLY all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP) diff --git a/security/krb5-16/files/patch-appl::bsd::klogind.M b/security/krb5-16/files/patch-appl::bsd::klogind.M index 1523c3d593df..9cddd5fc222d 100644 --- a/security/krb5-16/files/patch-appl::bsd::klogind.M +++ b/security/krb5-16/files/patch-appl::bsd::klogind.M @@ -1,10 +1,11 @@ --- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001 -@@ -14,6 +14,7 @@ +@@ -14,7 +14,7 @@ + .B \-kr54cpPef ] - [ - [ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]] ] -+[\fB\-L\fP \fIloginpath\fP] + [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] +-[ \fB\-D\fP \fIport\fP ] ++[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP] .SH DESCRIPTION .I Klogind is the server for the @@ -29,6 +30,6 @@ -DO_NOT_USE_K_LOGIN was not defined when -.I klogind -was compiled. - .SH DIAGNOSTICS - All diagnostic messages are returned on the connection - associated with the + + .IP \fB\-D\ port\fP + Run in standalone mode, listening on \fBport\fP. The daemon will exit diff --git a/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h new file mode 100644 index 000000000000..2faff676f220 --- /dev/null +++ b/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h @@ -0,0 +1,13 @@ +--- appl/gssftp/ftp/ftp_var.h.orig Mon Jun 16 15:37:40 2003 ++++ appl/gssftp/ftp/ftp_var.h Tue Jul 29 22:14:57 2003 +@@ -33,6 +33,10 @@ + * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90 + */ + ++#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000 ++#undef __BSD_VISIBLE ++#endif ++ + #ifdef _WIN32 + #include <windows.h> + #include <winsock2.h> diff --git a/security/krb5-16/files/patch-as b/security/krb5-16/files/patch-as index 0b26c449fe11..de19886eac08 100644 --- a/security/krb5-16/files/patch-as +++ b/security/krb5-16/files/patch-as @@ -1,8 +1,8 @@ ---- clients/ksu/main.c.orig Wed Feb 28 14:06:55 2001 -+++ clients/ksu/main.c Thu Sep 6 16:21:46 2001 -@@ -31,6 +31,10 @@ - #include <sys/wait.h> +--- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002 ++++ clients/ksu/main.c Tue Jul 29 18:46:00 2003 +@@ -32,6 +32,10 @@ #include <signal.h> + #include <grp.h> +#ifdef LOGIN_CAP +#include <login_cap.h> @@ -11,43 +11,43 @@ /* globals */ char * prog_name; int auth_debug =0; -@@ -60,7 +64,7 @@ +@@ -61,7 +65,7 @@ ill specified arguments to commands */ void usage (){ -- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); -+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); +- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); ++ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); } /* for Ultrix and friends ... */ -@@ -76,6 +80,7 @@ - int argc; - char ** argv; +@@ -77,6 +81,7 @@ + int argc; + char ** argv; { -+int asme = 0; - int hp =0; - int some_rest_copy = 0; - int all_rest_copy = 0; -@@ -90,6 +95,7 @@ - char * cc_target_tag = NULL; - char * target_user = NULL; - char * source_user; -+char * source_shell; - - krb5_ccache cc_source = NULL; - const char * cc_source_tag = NULL; -@@ -118,6 +124,11 @@ - char * dir_of_cc_target; - char * dir_of_cc_source; - ++ int asme = 0; + int hp =0; + int some_rest_copy = 0; + int all_rest_copy = 0; +@@ -91,6 +96,7 @@ + char * cc_target_tag = NULL; + char * target_user = NULL; + char * source_user; ++ char * source_shell; + + krb5_ccache cc_source = NULL; + const char * cc_source_tag = NULL; +@@ -117,6 +123,11 @@ + krb5_principal kdc_server; + krb5_boolean zero_password; + char * dir_of_cc_target; ++ +#ifdef LOGIN_CAP -+login_cap_t *lc; -+int setwhat; ++ login_cap_t *lc; ++ int setwhat; +#endif -+ + options.opt = KRB5_DEFAULT_OPTIONS; options.lifetime = KRB5_DEFAULT_TKT_LIFE; - options.rlife =0; @@ -181,7 +192,7 @@ com_err (prog_name, errno, "while setting euid to source user"); exit (1); @@ -68,132 +68,128 @@ if ((retval = krb5_parse_name(ksu_context, optarg, &client))){ com_err(prog_name, retval, "when parsing name %s", optarg); @@ -341,6 +355,7 @@ - - /* allocate space and copy the usernamane there */ - source_user = xstrdup(pwd->pw_name); -+ source_shell = xstrdup(pwd->pw_shell); - source_uid = pwd->pw_uid; - source_gid = pwd->pw_gid; - -@@ -668,43 +683,64 @@ - /* get the shell of the user, this will be the shell used by su */ - target_pwd = getpwnam(target_user); - -- if (target_pwd->pw_shell) -- shell = xstrdup(target_pwd->pw_shell); -- else { -- shell = _DEF_CSH; /* default is cshell */ -- } -+ if (asme) { -+ if (source_shell && *source_shell) { -+ shell = strdup(source_shell); -+ } else { -+ shell = _DEF_CSH; -+ } + + /* allocate space and copy the usernamane there */ + source_user = xstrdup(pwd->pw_name); ++ source_shell = xstrdup(pwd->pw_shell); + source_uid = pwd->pw_uid; + source_gid = pwd->pw_gid; + +@@ -672,43 +687,64 @@ + /* get the shell of the user, this will be the shell used by su */ + target_pwd = getpwnam(target_user); + +- if (target_pwd->pw_shell) +- shell = xstrdup(target_pwd->pw_shell); +- else { +- shell = _DEF_CSH; /* default is cshell */ ++ if (asme) { ++ if (source_shell && *source_shell) { ++ shell = strdup(source_shell); + } else { -+ if (target_pwd->pw_shell) -+ shell = strdup(target_pwd->pw_shell); -+ else { -+ shell = _DEF_CSH; /* default is cshell */ -+ } ++ shell = _DEF_CSH; + } - ++ } else { ++ if (target_pwd->pw_shell) ++ shell = strdup(target_pwd->pw_shell); ++ else { ++ shell = _DEF_CSH; /* default is cshell */ ++ } + } + #ifdef HAVE_GETUSERSHELL - - /* insist that the target login uses a standard shell (root is omited) */ - -- if (!standard_shell(target_pwd->pw_shell) && source_uid) { -- fprintf(stderr, "ksu: permission denied (shell).\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -+ if (asme) { -+ if (!standard_shell(pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } else { -+ if (!standard_shell(target_pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - } + + /* insist that the target login uses a standard shell (root is omited) */ + +- if (!standard_shell(target_pwd->pw_shell) && source_uid) { +- fprintf(stderr, "ksu: permission denied (shell).\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); ++ if (asme) { ++ if (!standard_shell(pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } else { ++ if (!standard_shell(target_pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } #endif /* HAVE_GETUSERSHELL */ - -- if (target_pwd->pw_uid){ + +- if (target_pwd->pw_uid){ - -- if(set_env_var("USER", target_pwd->pw_name)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -- } -+ if (!asme) { -+ if (target_pwd->pw_uid){ -+ if (set_env_var("USER", target_pwd->pw_name)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } - -- if(set_env_var( "HOME", target_pwd->pw_dir)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "HOME", target_pwd->pw_dir)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - -- if(set_env_var( "SHELL", shell)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "SHELL", shell)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } +- if(set_env_var("USER", target_pwd->pw_name)){ ++ if (!asme) { ++ if (target_pwd->pw_uid){ ++ if (set_env_var("USER", target_pwd->pw_name)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } ++ ++ if (set_env_var( "HOME", target_pwd->pw_dir)){ + fprintf(stderr,"ksu: couldn't set environment variable USER\n"); + sweep_up(ksu_context, cc_target); + exit(1); +- } +- } +- +- if(set_env_var( "HOME", target_pwd->pw_dir)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ } + +- if(set_env_var( "SHELL", shell)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ if (set_env_var( "SHELL", shell)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } + +#ifdef LOGIN_CAP -+ lc = login_getpwclass(pwd); ++ lc = login_getpwclass(pwd); +#endif - - /* set the cc env name to target */ - -@@ -714,7 +750,18 @@ - sweep_up(ksu_context, cc_target); - exit(1); - } -- + + /* set the cc env name to target */ + +@@ -718,7 +754,19 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +- ++ +#ifdef LOGIN_CAP -+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; -+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; -+ /* -+ * Don't touch resource/priority settings if -m has been -+ * used or -l and -c hasn't, and we're not su'ing to root. -+ */ -+ if (target_pwd->pw_uid) -+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); -+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) -+ err(1, "setusercontext"); ++ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; ++ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; ++ /* ++ * Don't touch resource/priority settings if -m has been ++ * used or -l and -c hasn't, and we're not su'ing to root. ++ */ ++ if (target_pwd->pw_uid) ++ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); ++ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) ++ err(1, "setusercontext"); +#else - /* set permissions */ - if (setgid(target_pwd->pw_gid) < 0) { - perror("ksu: setgid"); -@@ -754,7 +801,8 @@ - perror("ksu: setuid"); - sweep_up(ksu_context, cc_target); - exit(1); -- } -+ } + /* set permissions */ + if (setgid(target_pwd->pw_gid) < 0) { + perror("ksu: setgid"); +@@ -759,6 +807,7 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +#endif - - if (access( cc_target_tag_tmp, R_OK | W_OK )){ - com_err(prog_name, errno, + + if (access( cc_target_tag_tmp, R_OK | W_OK )){ + com_err(prog_name, errno, diff --git a/security/krb5-16/files/patch-at b/security/krb5-16/files/patch-at index ef9ea4856f7a..060207ec644a 100644 --- a/security/krb5-16/files/patch-at +++ b/security/krb5-16/files/patch-at @@ -1,5 +1,5 @@ -*** include/sys/syslog.h.ORIG Fri Feb 6 19:42:12 1998 ---- include/sys/syslog.h Tue Jun 30 19:46:02 1998 +*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998 +--- include/syslog.h Tue Jun 30 19:46:02 1998 *************** *** 34,39 **** --- 34,42 ---- diff --git a/security/krb5-16/files/patch-ax b/security/krb5-16/files/patch-ax index 58cfe89d9294..443b321e28db 100644 --- a/security/krb5-16/files/patch-ax +++ b/security/krb5-16/files/patch-ax @@ -1,11 +1,11 @@ ---- ../doc/Makefile.orig Wed Jan 20 21:57:45 1999 -+++ ../doc/Makefile Wed Jan 20 21:59:19 1999 +--- ../doc/Makefile.orig Fri Sep 20 10:35:27 2002 ++++ ../doc/Makefile Tue Jul 29 18:53:08 2003 @@ -1,7 +1,7 @@ SRCDIR=../src DVI=texi2dvi DVIPS=dvips -o "$@" -INFO=makeinfo +INFO=makeinfo --no-validate - HTML=texi2html + HTML=makeinfo --html RM=rm -f TAR=tar -chvf diff --git a/security/krb5-16/files/patch-ba b/security/krb5-16/files/patch-ba index 60d70466eff3..dd0c760df7d2 100644 --- a/security/krb5-16/files/patch-ba +++ b/security/krb5-16/files/patch-ba @@ -1,6 +1,6 @@ ---- appl/bsd/login.c.ORIG Wed Oct 13 12:55:47 1999 -+++ appl/bsd/login.c Wed Oct 13 12:56:29 1999 -@@ -1303,19 +1304,6 @@ +--- appl/bsd/login.c.orig Tue May 27 21:06:25 2003 ++++ appl/bsd/login.c Tue Jul 29 20:52:25 2003 +@@ -1342,19 +1342,6 @@ setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); } @@ -18,9 +18,9 @@ - break; - if (got_v5_tickets) { - if (retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, - NULL, &xtra_creds, -@@ -1338,6 +1326,9 @@ + retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, + NULL, &xtra_creds, +@@ -1378,6 +1365,9 @@ } #endif /* KRB4_GET_TICKETS */ @@ -30,36 +30,32 @@ bad_login: setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); -@@ -1640,20 +1631,28 @@ +@@ -1667,21 +1657,23 @@ /* set up credential cache -- obeying KRB5_ENV_CCNAME set earlier */ /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */ -- if (retval = krb5_cc_default(kcontext, &ccache)) { -+ retval = krb5_cc_default(kcontext, &ccache); -+ if (retval) +- if ((retval = krb5_cc_default(kcontext, &ccache))) { ++ if ((retval = krb5_cc_default(kcontext, &ccache))) com_err(argv[0], retval, "while getting default ccache"); -- } else if (retval = krb5_cc_initialize(kcontext, ccache, me)) { +- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) { - com_err(argv[0], retval, "when initializing cache"); -- } else if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) { +- } else if ((retval = krb5_cc_store_cred(kcontext, ccache, +- &my_creds))) { - com_err(argv[0], retval, "while storing credentials"); - } else if (xtra_creds && - (retval = krb5_cc_copy_creds(kcontext, xtra_creds, - ccache))) { - com_err(argv[0], retval, "while storing credentials"); + else { -+ retval = krb5_cc_initialize(kcontext, ccache, me); -+ if (retval) ++ if (retval = krb5_cc_initialize(kcontext, ccache, me)) + com_err(argv[0], retval, "when initializing cache"); + else { -+ retval = krb5_cc_store_cred(kcontext, ccache, &my_creds); -+ if (retval) ++ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) + com_err(argv[0], retval, "while storing credentials"); + else { -+ if (xtra_creds) { -+ retval = krb5_cc_copy_creds(kcontext, xtra_creds, -+ ccache); -+ if (retval) -+ com_err(argv[0], retval, "while storing credentials"); ++ if (xtra_creds && ++ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) { ++ com_err(argv[0], retval, "while storing credentials"); + krb5_cc_destroy(kcontext, xtra_creds); + } + } @@ -71,7 +67,7 @@ } else if (forwarded_v5_tickets && rewrite_ccache) { if ((retval = krb5_cc_initialize (kcontext, ccache, me))) { syslog(LOG_ERR, -@@ -1727,6 +1727,7 @@ +@@ -1762,6 +1754,7 @@ if (ccname) setenv("KRB5CCNAME", ccname, 1); diff --git a/security/krb5-16/files/patch-clients::configure b/security/krb5-16/files/patch-clients::configure deleted file mode 100644 index f6f91152b216..000000000000 --- a/security/krb5-16/files/patch-clients::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- clients/configure.orig Tue Apr 8 17:11:51 2003 -+++ clients/configure Wed May 7 13:35:57 2003 -@@ -1932,13 +1932,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-config::pre.in b/security/krb5-16/files/patch-config::pre.in new file mode 100644 index 000000000000..fc3ff4c7a047 --- /dev/null +++ b/security/krb5-16/files/patch-config::pre.in @@ -0,0 +1,10 @@ +--- config/pre.in.orig Tue May 27 21:06:28 2003 ++++ config/pre.in Wed Aug 6 11:11:54 2003 +@@ -152,6 +152,7 @@ + INSTALL=@INSTALL@ + INSTALL_STRIP= + INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_SHLIB=@INSTALL_SHLIB@ + INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root diff --git a/security/krb5-16/files/patch-appl::configure b/security/krb5-16/files/patch-config::shlib.conf index 70d4267b1091..48d5e9a51f8b 100644 --- a/security/krb5-16/files/patch-appl::configure +++ b/security/krb5-16/files/patch-config::shlib.conf @@ -1,18 +1,19 @@ ---- appl/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/configure Wed May 7 06:55:53 2003 -@@ -2133,13 +2133,14 @@ +--- config/shlib.conf.orig Sun Mar 2 23:09:45 2003 ++++ config/shlib.conf Tue Jul 29 18:16:43 2003 +@@ -179,14 +179,15 @@ PICFLAGS=-fpic if test "x$objformat" = "xelf" ; then SHLIBVEXT='.so.$(LIBMAJOR)' + LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' + RPATH_FLAG='-Wl,-rpath -Wl,' else + LDCOMBINE='ld -Bshareable' + RPATH_FLAG=-R SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' fi + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-configure b/security/krb5-16/files/patch-configure deleted file mode 100644 index ed80b9bf8ffc..000000000000 --- a/security/krb5-16/files/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.orig Tue Apr 8 17:11:46 2003 -+++ configure Wed May 7 06:53:40 2003 -@@ -1992,13 +1992,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-doc::man2html b/security/krb5-16/files/patch-doc::man2html new file mode 100644 index 000000000000..88f00d594e54 --- /dev/null +++ b/security/krb5-16/files/patch-doc::man2html @@ -0,0 +1,7 @@ +--- ../doc/man2html.orig Wed Jun 26 14:15:11 2002 ++++ ../doc/man2html Wed Jul 30 19:05:54 2003 +@@ -1,4 +1,3 @@ +-#!/usr/athena/bin/perl + #!/usr/local/bin/perl + ##---------------------------------------------------------------------------## + ## File: diff --git a/security/krb5-16/files/patch-include::krb5.hin b/security/krb5-16/files/patch-include::krb5.hin deleted file mode 100644 index 812664fc0b0e..000000000000 --- a/security/krb5-16/files/patch-include::krb5.hin +++ /dev/null @@ -1,16 +0,0 @@ -Index: include/krb5.hin -=================================================================== -RCS file: /cvs/krbdev/krb5/src/include/krb5.hin,v -retrieving revision 1.94.2.5.2.17 -diff -p -u -r1.94.2.5.2.17 krb5.hin ---- include/krb5.hin 2002/04/16 23:47:53 1.94.2.5.2.17 -+++ include/krb5.hin 2003/03/19 00:38:54 -@@ -326,7 +326,7 @@ typedef krb5_const krb5_principal_data F - #define krb5_princ_size(context, princ) (princ)->length - #define krb5_princ_type(context, princ) (princ)->type - #define krb5_princ_name(context, princ) (princ)->data --#define krb5_princ_component(context, princ,i) ((princ)->data + i) -+#define krb5_princ_component(context, princ,i) (i < krb5_princ_size(context, princ) ? ((princ)->data + i) : NULL) - - /* - * end "base-defs.h" diff --git a/security/krb5-16/files/patch-kadmin::cli::Makefile.in b/security/krb5-16/files/patch-kadmin::cli::Makefile.in new file mode 100644 index 000000000000..266deea90231 --- /dev/null +++ b/security/krb5-16/files/patch-kadmin::cli::Makefile.in @@ -0,0 +1,11 @@ +--- kadmin/cli/Makefile.in.orig Fri Feb 7 13:41:20 2003 ++++ kadmin/cli/Makefile.in Tue Aug 5 16:32:02 2003 +@@ -21,7 +21,7 @@ + install:: + $(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local + $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) +- $(INSTALL_PROGRAM) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil ++ $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil + $(INSTALL_DATA) $(srcdir)/k5srvutil.M ${DESTDIR}$(ADMIN_MANDIR)/k5srvutil.8 + $(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8 + $(INSTALL_DATA) $(srcdir)/$(PROG).local.M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).local.8 diff --git a/security/krb5-16/files/patch-kadmin::configure b/security/krb5-16/files/patch-kadmin::configure deleted file mode 100644 index 7e96fdca346f..000000000000 --- a/security/krb5-16/files/patch-kadmin::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kadmin/configure.orig Tue Apr 8 17:11:55 2003 -+++ kadmin/configure Wed May 7 13:38:20 2003 -@@ -3229,13 +3229,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-kdc::configure b/security/krb5-16/files/patch-kdc::configure deleted file mode 100644 index 348327637ad7..000000000000 --- a/security/krb5-16/files/patch-kdc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kdc/configure.orig Tue Apr 8 17:11:51 2003 -+++ kdc/configure Wed May 7 13:35:06 2003 -@@ -2614,13 +2614,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-krb524::configure b/security/krb5-16/files/patch-krb524::configure deleted file mode 100644 index 97b97f7a109b..000000000000 --- a/security/krb5-16/files/patch-krb524::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- krb524/configure.orig Tue Apr 8 17:11:55 2003 -+++ krb524/configure Wed May 7 13:39:07 2003 -@@ -1933,13 +1933,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::crypto::configure b/security/krb5-16/files/patch-lib::crypto::configure deleted file mode 100644 index fccbe4edcc56..000000000000 --- a/security/krb5-16/files/patch-lib::crypto::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/crypto/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/crypto/configure Wed May 7 13:41:20 2003 -@@ -2027,13 +2027,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::des425::configure b/security/krb5-16/files/patch-lib::des425::configure deleted file mode 100644 index 9902d993381d..000000000000 --- a/security/krb5-16/files/patch-lib::des425::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/des425/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/des425/configure Wed May 7 13:43:40 2003 -@@ -2116,13 +2116,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::gssapi::configure b/security/krb5-16/files/patch-lib::gssapi::configure deleted file mode 100644 index 211dab73d33b..000000000000 --- a/security/krb5-16/files/patch-lib::gssapi::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/gssapi/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/gssapi/configure Wed May 7 13:45:34 2003 -@@ -2430,13 +2430,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::kadm5::configure b/security/krb5-16/files/patch-lib::kadm5::configure deleted file mode 100644 index d7051e3198e5..000000000000 --- a/security/krb5-16/files/patch-lib::kadm5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kadm5/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/kadm5/configure Wed May 7 14:02:39 2003 -@@ -3227,13 +3227,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::kdb::configure b/security/krb5-16/files/patch-lib::kdb::configure deleted file mode 100644 index dcb351933336..000000000000 --- a/security/krb5-16/files/patch-lib::kdb::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kdb/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/kdb/configure Wed May 7 13:42:32 2003 -@@ -2203,13 +2203,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::krb4::configure b/security/krb5-16/files/patch-lib::krb4::configure deleted file mode 100644 index 5499de900739..000000000000 --- a/security/krb5-16/files/patch-lib::krb4::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb4/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/krb4/configure Wed May 7 14:20:05 2003 -@@ -2445,13 +2445,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::krb5::configure b/security/krb5-16/files/patch-lib::krb5::configure deleted file mode 100644 index 615eeeabe1fd..000000000000 --- a/security/krb5-16/files/patch-lib::krb5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5/configure Wed May 7 14:04:55 2003 -@@ -2658,13 +2658,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::krb5::keytab::file:ktf_util.c b/security/krb5-16/files/patch-lib::krb5::keytab::file:ktf_util.c deleted file mode 100644 index c97b3a3c85ae..000000000000 --- a/security/krb5-16/files/patch-lib::krb5::keytab::file:ktf_util.c +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c ---- lib/krb5/keytab/file/ktf_util.c 1999-09-24 17:19:01.000000000-0400 -+++ lib/krb5/keytab/file/ktf_util.c 2003-02-03 18:02:25.000000000-0500 -@@ -441,7 +441,7 @@ - return 0; - fail: - -- for (i = 0; i < ret_entry->principal->length; i++) { -+ for (i = 0; i < krb5_princ_size(context, ret_entry->principal); i++) { - princ = krb5_princ_component(context, ret_entry->principal, i); - if (princ->data) - free(princ->data); -@@ -498,9 +498,9 @@ - } - - if (KTVERSION(id) == KRB5_KT_VNO_1) { -- count = (krb5_int16) entry->principal->length + 1; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal) + 1; - } else { -- count = htons((u_short) entry->principal->length); -+ count = htons((u_short) krb5_princ_size(context, entry->principal)); - } - - if (!xfwrite(&count, sizeof(count), 1, KTFILEP(id))) { -@@ -519,7 +519,7 @@ - goto abend; - } - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - for (i = 0; i < count; i++) { - princ = krb5_princ_component(context, entry->principal, i); - size = princ->length; -@@ -620,7 +620,7 @@ - krb5_int32 total_size, i; - krb5_error_code retval = 0; - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - - total_size = sizeof(count); - total_size += krb5_princ_realm(context, entry->principal)->length + (sizeof(krb5_int16)); diff --git a/security/krb5-16/files/patch-lib::krb5util::configure b/security/krb5-16/files/patch-lib::krb5util::configure deleted file mode 100644 index e4be2657a8bc..000000000000 --- a/security/krb5-16/files/patch-lib::krb5util::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5util/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5util/configure Wed May 7 14:05:52 2003 -@@ -2044,13 +2044,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::rpc::configure b/security/krb5-16/files/patch-lib::rpc::configure deleted file mode 100644 index fad09e67cfb5..000000000000 --- a/security/krb5-16/files/patch-lib::rpc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/configure.orig Tue Apr 8 17:12:01 2003 -+++ lib/rpc/configure Wed May 7 14:07:47 2003 -@@ -2524,13 +2524,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-lib::rpc::unit-test::configure b/security/krb5-16/files/patch-lib::rpc::unit-test::configure deleted file mode 100644 index d0583a35c75a..000000000000 --- a/security/krb5-16/files/patch-lib::rpc::unit-test::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/unit-test/configure.orig Tue Apr 8 17:12:00 2003 -+++ lib/rpc/unit-test/configure Wed May 7 14:06:51 2003 -@@ -2700,13 +2700,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-slave::configure b/security/krb5-16/files/patch-slave::configure deleted file mode 100644 index 1864338febe4..000000000000 --- a/security/krb5-16/files/patch-slave::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- slave/configure.orig Tue Apr 8 17:12:01 2003 -+++ slave/configure Wed May 7 14:08:31 2003 -@@ -1975,13 +1975,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-tests::configure b/security/krb5-16/files/patch-tests::configure deleted file mode 100644 index 5bd048bec288..000000000000 --- a/security/krb5-16/files/patch-tests::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- tests/configure.orig Tue Apr 8 17:12:02 2003 -+++ tests/configure Wed May 7 14:09:13 2003 -@@ -1868,13 +1868,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-util::et::configure b/security/krb5-16/files/patch-util::et::configure deleted file mode 100644 index 090e9573bdc9..000000000000 --- a/security/krb5-16/files/patch-util::et::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/et/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/et/configure Wed May 7 14:13:49 2003 -@@ -2607,13 +2607,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-util::profile::configure b/security/krb5-16/files/patch-util::profile::configure deleted file mode 100644 index b89ac6584c7c..000000000000 --- a/security/krb5-16/files/patch-util::profile::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/profile/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/profile/configure Wed May 7 14:14:47 2003 -@@ -2269,13 +2269,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-util::pty::configure b/security/krb5-16/files/patch-util::pty::configure deleted file mode 100644 index 9129f7f78b42..000000000000 --- a/security/krb5-16/files/patch-util::pty::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/pty/configure.orig Tue Apr 8 17:12:05 2003 -+++ util/pty/configure Wed May 7 14:15:42 2003 -@@ -3751,13 +3751,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/files/patch-util::ss::configure b/security/krb5-16/files/patch-util::ss::configure deleted file mode 100644 index 1e3cf80f6978..000000000000 --- a/security/krb5-16/files/patch-util::ss::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/ss/configure.orig Tue Apr 8 17:12:06 2003 -+++ util/ss/configure Wed May 7 14:16:25 2003 -@@ -2677,13 +2677,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist index f6494e183d94..ffc5cf6892a3 100644 --- a/security/krb5-16/pkg-plist +++ b/security/krb5-16/pkg-plist @@ -26,14 +26,11 @@ include/gssapi/gssapi.h include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h include/kerberosIV/des.h -include/kerberosIV/kadm.h +include/kerberosIV/kadm_err.h include/kerberosIV/krb.h include/kerberosIV/krb_err.h include/kerberosIV/mit-copyright.h include/krb5.h -include/libpty.h -include/mit-sipb-copyright.h -include/port-sockets.h include/profile.h info/krb425.info info/krb5-admin.info @@ -50,9 +47,6 @@ lib/libcom_err.so.3 lib/libdes425.a lib/libdes425.so lib/libdes425.so.3 -lib/libdyn.a -lib/libdyn.so -lib/libdyn.so.1 lib/libgssapi_krb5.a lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 @@ -70,18 +64,13 @@ lib/libkadm5srv.so lib/libkadm5srv.so.5 lib/libkdb5.a lib/libkdb5.so -lib/libkdb5.so.3 +lib/libkdb5.so.4 %%KRB4%%lib/libkrb4.a %%KRB4%%lib/libkrb4.so %%KRB4%%lib/libkrb4.so.2 lib/libkrb5.a lib/libkrb5.so lib/libkrb5.so.3 -%%KRB4%%lib/libkrb524.a -lib/libpty.a -lib/libpty.so -lib/libpty.so.1 -lib/libss.a sbin/ftpd sbin/gss-server sbin/kadmin @@ -104,21 +93,9 @@ sbin/telnetd sbin/uuserver sbin/v5passwdd share/doc/krb5/README.FreeBSD -share/doc/krb5/admin.html -share/doc/krb5/admin_foot.html -share/doc/krb5/admin_toc.html -share/doc/krb5/install.html -share/doc/krb5/install_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/krb425_toc.html -share/doc/krb5/user-guide.html -share/doc/krb5/user-guide_foot.html -share/doc/krb5/user-guide_toc.html share/gnats/mit @dirrm include/gssapi @dirrm include/kerberosIV -@dirrm share/doc/krb5 @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile index 6fac2d71b8a3..df245fee44a4 100644 --- a/security/krb5-17/Makefile +++ b/security/krb5-17/Makefile @@ -6,12 +6,17 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.8 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= security # USE_MIT_TARBALL tells the port that the user has fetched the source # directly from MIT rather than the default crypto-publish.org. -USE_MIT_TARBALL?= NO + +# XXX At the present time crypto-publish.org does not have krb5-1.3. +# XXX We must use the MIT copy instead, requiring the user to manually +# XXX fetch the distfile. As soon as crypto-publish.org distributes +# XXX krb5-1.3, USE_MIT_TARBALL should be changed back to NO. +USE_MIT_TARBALL?= YES + .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" MASTER_SITES= # manual download EXTRACT_SUFX= .tar @@ -29,8 +34,9 @@ KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc +CONFIGURE_ARGS?= --enable-shared +CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ + CFLAGS="${CFLAGS}" MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= NO @@ -66,10 +72,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc -HTML_DOCS= admin.html install_foot.html user-guide.html \ - admin_foot.html install_toc.html user-guide_foot.html \ - admin_toc.html krb425.html user-guide_toc.html \ - install.html krb425_toc.html +HTML_DOCS= admin.html user-guide.html install.html +HTML_OUTDIRS= krb5-admin krb5-install .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" do-fetch: @@ -111,6 +115,10 @@ pre-build: post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.if defined(WANT_HTML) && ${WANT_HTML} == "YES" + @(cd ${WRKSRC}/../doc && \ + ${MAKE} ${HTML_DOCS}) +.endif .include <bsd.port.pre.mk> @@ -118,10 +126,20 @@ post-install: # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @${MKDIR} ${PREFIX}/share/doc/krb5 -.for html in ${HTML_DOCS} - ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 + for html in ${HTML_DOC_DIR}/*.html; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \ + ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done +.for htmldir in ${HTML_OUTDIRS} + @${MKDIR} ${PREFIX}/share/doc/krb5/${htmldir} + for html in ${HTML_DOC_DIR}/${htmldir}/*; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5/${htmldir}; \ + ${ECHO_CMD} share/doc/krb5/${htmldir}/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done + ${ECHO_CMD} @dirrm share/doc/krb5/${htmldir} >> ${TMPPLIST} .endfor .endif + ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo index 24d249c79441..b5265b84e3ee 100644 --- a/security/krb5-17/distinfo +++ b/security/krb5-17/distinfo @@ -1,2 +1,2 @@ -MD5 (krb5-1.2.8.tar) = cbb87396f8a166b6e5dd8b2b0cb3fe29 -MD5 (krb5-1.2.8.tar.gz) = 99b840431ad2926de66d143cdd9307eb +MD5 (krb5-1.3.tar) = efe46a338f74e02796f07d53815273c6 +MD5 (krb5-1.3.tar.gz) = e435813481fc9b4e7f73ebda1537cbd2 diff --git a/security/krb5-17/files/patch-af b/security/krb5-17/files/patch-af index e054b18bbef5..49425d6efceb 100644 --- a/security/krb5-17/files/patch-af +++ b/security/krb5-17/files/patch-af @@ -8,6 +8,6 @@ +@direntry +* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5 +@end direntry - @setchapternewpage odd @c chapter begins on next odd page + @c @setchapternewpage odd @c chapter begins on next odd page @c @setchapternewpage on @c chapter begins on next page @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5-17/files/patch-appl::bsd::Makefile.in b/security/krb5-17/files/patch-appl::bsd::Makefile.in index 603c399a287f..581048933264 100644 --- a/security/krb5-17/files/patch-appl::bsd::Makefile.in +++ b/security/krb5-17/files/patch-appl::bsd::Makefile.in @@ -1,11 +1,12 @@ --- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001 -@@ -28,7 +28,7 @@ +@@ -31,8 +31,8 @@ -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" - DEFINES = $(RSH) $(BSD) $(RPROGS) \ -- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" -+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" + DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ +- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ ++ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ + -DHEIMDAL_FRIENDLY all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP) diff --git a/security/krb5-17/files/patch-appl::bsd::klogind.M b/security/krb5-17/files/patch-appl::bsd::klogind.M index 1523c3d593df..9cddd5fc222d 100644 --- a/security/krb5-17/files/patch-appl::bsd::klogind.M +++ b/security/krb5-17/files/patch-appl::bsd::klogind.M @@ -1,10 +1,11 @@ --- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001 -@@ -14,6 +14,7 @@ +@@ -14,7 +14,7 @@ + .B \-kr54cpPef ] - [ - [ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]] ] -+[\fB\-L\fP \fIloginpath\fP] + [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] +-[ \fB\-D\fP \fIport\fP ] ++[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP] .SH DESCRIPTION .I Klogind is the server for the @@ -29,6 +30,6 @@ -DO_NOT_USE_K_LOGIN was not defined when -.I klogind -was compiled. - .SH DIAGNOSTICS - All diagnostic messages are returned on the connection - associated with the + + .IP \fB\-D\ port\fP + Run in standalone mode, listening on \fBport\fP. The daemon will exit diff --git a/security/krb5-17/files/patch-appl::configure b/security/krb5-17/files/patch-appl::configure deleted file mode 100644 index 70d4267b1091..000000000000 --- a/security/krb5-17/files/patch-appl::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/configure Wed May 7 06:55:53 2003 -@@ -2133,13 +2133,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-appl::gssftp::configure b/security/krb5-17/files/patch-appl::gssftp::configure deleted file mode 100644 index b1150768685d..000000000000 --- a/security/krb5-17/files/patch-appl::gssftp::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/gssftp/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/gssftp/configure Wed May 7 06:58:08 2003 -@@ -3990,13 +3990,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-17/files/patch-appl::gssftp::ftp::ftp_var.h new file mode 100644 index 000000000000..2faff676f220 --- /dev/null +++ b/security/krb5-17/files/patch-appl::gssftp::ftp::ftp_var.h @@ -0,0 +1,13 @@ +--- appl/gssftp/ftp/ftp_var.h.orig Mon Jun 16 15:37:40 2003 ++++ appl/gssftp/ftp/ftp_var.h Tue Jul 29 22:14:57 2003 +@@ -33,6 +33,10 @@ + * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90 + */ + ++#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000 ++#undef __BSD_VISIBLE ++#endif ++ + #ifdef _WIN32 + #include <windows.h> + #include <winsock2.h> diff --git a/security/krb5-17/files/patch-appl::telnet::telnet::configure b/security/krb5-17/files/patch-appl::telnet::telnet::configure deleted file mode 100644 index e7febc4ca2fd..000000000000 --- a/security/krb5-17/files/patch-appl::telnet::telnet::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/telnet/telnet/configure.orig Tue Apr 8 17:11:49 2003 -+++ appl/telnet/telnet/configure Wed May 7 13:31:45 2003 -@@ -2774,13 +2774,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-appl::telnet::telnetd::configure b/security/krb5-17/files/patch-appl::telnet::telnetd::configure deleted file mode 100644 index 16fe919a54e8..000000000000 --- a/security/krb5-17/files/patch-appl::telnet::telnetd::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/telnet/telnetd/configure.orig Tue Apr 8 17:11:50 2003 -+++ appl/telnet/telnetd/configure Wed May 7 13:33:34 2003 -@@ -2518,13 +2518,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-as b/security/krb5-17/files/patch-as index 0b26c449fe11..de19886eac08 100644 --- a/security/krb5-17/files/patch-as +++ b/security/krb5-17/files/patch-as @@ -1,8 +1,8 @@ ---- clients/ksu/main.c.orig Wed Feb 28 14:06:55 2001 -+++ clients/ksu/main.c Thu Sep 6 16:21:46 2001 -@@ -31,6 +31,10 @@ - #include <sys/wait.h> +--- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002 ++++ clients/ksu/main.c Tue Jul 29 18:46:00 2003 +@@ -32,6 +32,10 @@ #include <signal.h> + #include <grp.h> +#ifdef LOGIN_CAP +#include <login_cap.h> @@ -11,43 +11,43 @@ /* globals */ char * prog_name; int auth_debug =0; -@@ -60,7 +64,7 @@ +@@ -61,7 +65,7 @@ ill specified arguments to commands */ void usage (){ -- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); -+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); +- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); ++ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); } /* for Ultrix and friends ... */ -@@ -76,6 +80,7 @@ - int argc; - char ** argv; +@@ -77,6 +81,7 @@ + int argc; + char ** argv; { -+int asme = 0; - int hp =0; - int some_rest_copy = 0; - int all_rest_copy = 0; -@@ -90,6 +95,7 @@ - char * cc_target_tag = NULL; - char * target_user = NULL; - char * source_user; -+char * source_shell; - - krb5_ccache cc_source = NULL; - const char * cc_source_tag = NULL; -@@ -118,6 +124,11 @@ - char * dir_of_cc_target; - char * dir_of_cc_source; - ++ int asme = 0; + int hp =0; + int some_rest_copy = 0; + int all_rest_copy = 0; +@@ -91,6 +96,7 @@ + char * cc_target_tag = NULL; + char * target_user = NULL; + char * source_user; ++ char * source_shell; + + krb5_ccache cc_source = NULL; + const char * cc_source_tag = NULL; +@@ -117,6 +123,11 @@ + krb5_principal kdc_server; + krb5_boolean zero_password; + char * dir_of_cc_target; ++ +#ifdef LOGIN_CAP -+login_cap_t *lc; -+int setwhat; ++ login_cap_t *lc; ++ int setwhat; +#endif -+ + options.opt = KRB5_DEFAULT_OPTIONS; options.lifetime = KRB5_DEFAULT_TKT_LIFE; - options.rlife =0; @@ -181,7 +192,7 @@ com_err (prog_name, errno, "while setting euid to source user"); exit (1); @@ -68,132 +68,128 @@ if ((retval = krb5_parse_name(ksu_context, optarg, &client))){ com_err(prog_name, retval, "when parsing name %s", optarg); @@ -341,6 +355,7 @@ - - /* allocate space and copy the usernamane there */ - source_user = xstrdup(pwd->pw_name); -+ source_shell = xstrdup(pwd->pw_shell); - source_uid = pwd->pw_uid; - source_gid = pwd->pw_gid; - -@@ -668,43 +683,64 @@ - /* get the shell of the user, this will be the shell used by su */ - target_pwd = getpwnam(target_user); - -- if (target_pwd->pw_shell) -- shell = xstrdup(target_pwd->pw_shell); -- else { -- shell = _DEF_CSH; /* default is cshell */ -- } -+ if (asme) { -+ if (source_shell && *source_shell) { -+ shell = strdup(source_shell); -+ } else { -+ shell = _DEF_CSH; -+ } + + /* allocate space and copy the usernamane there */ + source_user = xstrdup(pwd->pw_name); ++ source_shell = xstrdup(pwd->pw_shell); + source_uid = pwd->pw_uid; + source_gid = pwd->pw_gid; + +@@ -672,43 +687,64 @@ + /* get the shell of the user, this will be the shell used by su */ + target_pwd = getpwnam(target_user); + +- if (target_pwd->pw_shell) +- shell = xstrdup(target_pwd->pw_shell); +- else { +- shell = _DEF_CSH; /* default is cshell */ ++ if (asme) { ++ if (source_shell && *source_shell) { ++ shell = strdup(source_shell); + } else { -+ if (target_pwd->pw_shell) -+ shell = strdup(target_pwd->pw_shell); -+ else { -+ shell = _DEF_CSH; /* default is cshell */ -+ } ++ shell = _DEF_CSH; + } - ++ } else { ++ if (target_pwd->pw_shell) ++ shell = strdup(target_pwd->pw_shell); ++ else { ++ shell = _DEF_CSH; /* default is cshell */ ++ } + } + #ifdef HAVE_GETUSERSHELL - - /* insist that the target login uses a standard shell (root is omited) */ - -- if (!standard_shell(target_pwd->pw_shell) && source_uid) { -- fprintf(stderr, "ksu: permission denied (shell).\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -+ if (asme) { -+ if (!standard_shell(pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } else { -+ if (!standard_shell(target_pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - } + + /* insist that the target login uses a standard shell (root is omited) */ + +- if (!standard_shell(target_pwd->pw_shell) && source_uid) { +- fprintf(stderr, "ksu: permission denied (shell).\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); ++ if (asme) { ++ if (!standard_shell(pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } else { ++ if (!standard_shell(target_pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } #endif /* HAVE_GETUSERSHELL */ - -- if (target_pwd->pw_uid){ + +- if (target_pwd->pw_uid){ - -- if(set_env_var("USER", target_pwd->pw_name)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -- } -+ if (!asme) { -+ if (target_pwd->pw_uid){ -+ if (set_env_var("USER", target_pwd->pw_name)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } - -- if(set_env_var( "HOME", target_pwd->pw_dir)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "HOME", target_pwd->pw_dir)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - -- if(set_env_var( "SHELL", shell)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "SHELL", shell)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } +- if(set_env_var("USER", target_pwd->pw_name)){ ++ if (!asme) { ++ if (target_pwd->pw_uid){ ++ if (set_env_var("USER", target_pwd->pw_name)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } ++ ++ if (set_env_var( "HOME", target_pwd->pw_dir)){ + fprintf(stderr,"ksu: couldn't set environment variable USER\n"); + sweep_up(ksu_context, cc_target); + exit(1); +- } +- } +- +- if(set_env_var( "HOME", target_pwd->pw_dir)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ } + +- if(set_env_var( "SHELL", shell)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ if (set_env_var( "SHELL", shell)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } + +#ifdef LOGIN_CAP -+ lc = login_getpwclass(pwd); ++ lc = login_getpwclass(pwd); +#endif - - /* set the cc env name to target */ - -@@ -714,7 +750,18 @@ - sweep_up(ksu_context, cc_target); - exit(1); - } -- + + /* set the cc env name to target */ + +@@ -718,7 +754,19 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +- ++ +#ifdef LOGIN_CAP -+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; -+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; -+ /* -+ * Don't touch resource/priority settings if -m has been -+ * used or -l and -c hasn't, and we're not su'ing to root. -+ */ -+ if (target_pwd->pw_uid) -+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); -+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) -+ err(1, "setusercontext"); ++ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; ++ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; ++ /* ++ * Don't touch resource/priority settings if -m has been ++ * used or -l and -c hasn't, and we're not su'ing to root. ++ */ ++ if (target_pwd->pw_uid) ++ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); ++ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) ++ err(1, "setusercontext"); +#else - /* set permissions */ - if (setgid(target_pwd->pw_gid) < 0) { - perror("ksu: setgid"); -@@ -754,7 +801,8 @@ - perror("ksu: setuid"); - sweep_up(ksu_context, cc_target); - exit(1); -- } -+ } + /* set permissions */ + if (setgid(target_pwd->pw_gid) < 0) { + perror("ksu: setgid"); +@@ -759,6 +807,7 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +#endif - - if (access( cc_target_tag_tmp, R_OK | W_OK )){ - com_err(prog_name, errno, + + if (access( cc_target_tag_tmp, R_OK | W_OK )){ + com_err(prog_name, errno, diff --git a/security/krb5-17/files/patch-at b/security/krb5-17/files/patch-at index ef9ea4856f7a..060207ec644a 100644 --- a/security/krb5-17/files/patch-at +++ b/security/krb5-17/files/patch-at @@ -1,5 +1,5 @@ -*** include/sys/syslog.h.ORIG Fri Feb 6 19:42:12 1998 ---- include/sys/syslog.h Tue Jun 30 19:46:02 1998 +*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998 +--- include/syslog.h Tue Jun 30 19:46:02 1998 *************** *** 34,39 **** --- 34,42 ---- diff --git a/security/krb5-17/files/patch-ax b/security/krb5-17/files/patch-ax index 58cfe89d9294..443b321e28db 100644 --- a/security/krb5-17/files/patch-ax +++ b/security/krb5-17/files/patch-ax @@ -1,11 +1,11 @@ ---- ../doc/Makefile.orig Wed Jan 20 21:57:45 1999 -+++ ../doc/Makefile Wed Jan 20 21:59:19 1999 +--- ../doc/Makefile.orig Fri Sep 20 10:35:27 2002 ++++ ../doc/Makefile Tue Jul 29 18:53:08 2003 @@ -1,7 +1,7 @@ SRCDIR=../src DVI=texi2dvi DVIPS=dvips -o "$@" -INFO=makeinfo +INFO=makeinfo --no-validate - HTML=texi2html + HTML=makeinfo --html RM=rm -f TAR=tar -chvf diff --git a/security/krb5-17/files/patch-ba b/security/krb5-17/files/patch-ba index 60d70466eff3..dd0c760df7d2 100644 --- a/security/krb5-17/files/patch-ba +++ b/security/krb5-17/files/patch-ba @@ -1,6 +1,6 @@ ---- appl/bsd/login.c.ORIG Wed Oct 13 12:55:47 1999 -+++ appl/bsd/login.c Wed Oct 13 12:56:29 1999 -@@ -1303,19 +1304,6 @@ +--- appl/bsd/login.c.orig Tue May 27 21:06:25 2003 ++++ appl/bsd/login.c Tue Jul 29 20:52:25 2003 +@@ -1342,19 +1342,6 @@ setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); } @@ -18,9 +18,9 @@ - break; - if (got_v5_tickets) { - if (retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, - NULL, &xtra_creds, -@@ -1338,6 +1326,9 @@ + retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, + NULL, &xtra_creds, +@@ -1378,6 +1365,9 @@ } #endif /* KRB4_GET_TICKETS */ @@ -30,36 +30,32 @@ bad_login: setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); -@@ -1640,20 +1631,28 @@ +@@ -1667,21 +1657,23 @@ /* set up credential cache -- obeying KRB5_ENV_CCNAME set earlier */ /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */ -- if (retval = krb5_cc_default(kcontext, &ccache)) { -+ retval = krb5_cc_default(kcontext, &ccache); -+ if (retval) +- if ((retval = krb5_cc_default(kcontext, &ccache))) { ++ if ((retval = krb5_cc_default(kcontext, &ccache))) com_err(argv[0], retval, "while getting default ccache"); -- } else if (retval = krb5_cc_initialize(kcontext, ccache, me)) { +- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) { - com_err(argv[0], retval, "when initializing cache"); -- } else if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) { +- } else if ((retval = krb5_cc_store_cred(kcontext, ccache, +- &my_creds))) { - com_err(argv[0], retval, "while storing credentials"); - } else if (xtra_creds && - (retval = krb5_cc_copy_creds(kcontext, xtra_creds, - ccache))) { - com_err(argv[0], retval, "while storing credentials"); + else { -+ retval = krb5_cc_initialize(kcontext, ccache, me); -+ if (retval) ++ if (retval = krb5_cc_initialize(kcontext, ccache, me)) + com_err(argv[0], retval, "when initializing cache"); + else { -+ retval = krb5_cc_store_cred(kcontext, ccache, &my_creds); -+ if (retval) ++ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) + com_err(argv[0], retval, "while storing credentials"); + else { -+ if (xtra_creds) { -+ retval = krb5_cc_copy_creds(kcontext, xtra_creds, -+ ccache); -+ if (retval) -+ com_err(argv[0], retval, "while storing credentials"); ++ if (xtra_creds && ++ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) { ++ com_err(argv[0], retval, "while storing credentials"); + krb5_cc_destroy(kcontext, xtra_creds); + } + } @@ -71,7 +67,7 @@ } else if (forwarded_v5_tickets && rewrite_ccache) { if ((retval = krb5_cc_initialize (kcontext, ccache, me))) { syslog(LOG_ERR, -@@ -1727,6 +1727,7 @@ +@@ -1762,6 +1754,7 @@ if (ccname) setenv("KRB5CCNAME", ccname, 1); diff --git a/security/krb5-17/files/patch-clients::configure b/security/krb5-17/files/patch-clients::configure deleted file mode 100644 index f6f91152b216..000000000000 --- a/security/krb5-17/files/patch-clients::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- clients/configure.orig Tue Apr 8 17:11:51 2003 -+++ clients/configure Wed May 7 13:35:57 2003 -@@ -1932,13 +1932,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-config::pre.in b/security/krb5-17/files/patch-config::pre.in new file mode 100644 index 000000000000..fc3ff4c7a047 --- /dev/null +++ b/security/krb5-17/files/patch-config::pre.in @@ -0,0 +1,10 @@ +--- config/pre.in.orig Tue May 27 21:06:28 2003 ++++ config/pre.in Wed Aug 6 11:11:54 2003 +@@ -152,6 +152,7 @@ + INSTALL=@INSTALL@ + INSTALL_STRIP= + INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_SHLIB=@INSTALL_SHLIB@ + INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root diff --git a/security/krb5-16/files/patch-appl::gssftp::configure b/security/krb5-17/files/patch-config::shlib.conf index b1150768685d..48d5e9a51f8b 100644 --- a/security/krb5-16/files/patch-appl::gssftp::configure +++ b/security/krb5-17/files/patch-config::shlib.conf @@ -1,18 +1,19 @@ ---- appl/gssftp/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/gssftp/configure Wed May 7 06:58:08 2003 -@@ -3990,13 +3990,14 @@ +--- config/shlib.conf.orig Sun Mar 2 23:09:45 2003 ++++ config/shlib.conf Tue Jul 29 18:16:43 2003 +@@ -179,14 +179,15 @@ PICFLAGS=-fpic if test "x$objformat" = "xelf" ; then SHLIBVEXT='.so.$(LIBMAJOR)' + LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' + RPATH_FLAG='-Wl,-rpath -Wl,' else + LDCOMBINE='ld -Bshareable' + RPATH_FLAG=-R SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' fi + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-configure b/security/krb5-17/files/patch-configure deleted file mode 100644 index ed80b9bf8ffc..000000000000 --- a/security/krb5-17/files/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.orig Tue Apr 8 17:11:46 2003 -+++ configure Wed May 7 06:53:40 2003 -@@ -1992,13 +1992,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-doc::man2html b/security/krb5-17/files/patch-doc::man2html new file mode 100644 index 000000000000..88f00d594e54 --- /dev/null +++ b/security/krb5-17/files/patch-doc::man2html @@ -0,0 +1,7 @@ +--- ../doc/man2html.orig Wed Jun 26 14:15:11 2002 ++++ ../doc/man2html Wed Jul 30 19:05:54 2003 +@@ -1,4 +1,3 @@ +-#!/usr/athena/bin/perl + #!/usr/local/bin/perl + ##---------------------------------------------------------------------------## + ## File: diff --git a/security/krb5-17/files/patch-include::krb5.hin b/security/krb5-17/files/patch-include::krb5.hin deleted file mode 100644 index 812664fc0b0e..000000000000 --- a/security/krb5-17/files/patch-include::krb5.hin +++ /dev/null @@ -1,16 +0,0 @@ -Index: include/krb5.hin -=================================================================== -RCS file: /cvs/krbdev/krb5/src/include/krb5.hin,v -retrieving revision 1.94.2.5.2.17 -diff -p -u -r1.94.2.5.2.17 krb5.hin ---- include/krb5.hin 2002/04/16 23:47:53 1.94.2.5.2.17 -+++ include/krb5.hin 2003/03/19 00:38:54 -@@ -326,7 +326,7 @@ typedef krb5_const krb5_principal_data F - #define krb5_princ_size(context, princ) (princ)->length - #define krb5_princ_type(context, princ) (princ)->type - #define krb5_princ_name(context, princ) (princ)->data --#define krb5_princ_component(context, princ,i) ((princ)->data + i) -+#define krb5_princ_component(context, princ,i) (i < krb5_princ_size(context, princ) ? ((princ)->data + i) : NULL) - - /* - * end "base-defs.h" diff --git a/security/krb5-17/files/patch-kadmin::cli::Makefile.in b/security/krb5-17/files/patch-kadmin::cli::Makefile.in new file mode 100644 index 000000000000..266deea90231 --- /dev/null +++ b/security/krb5-17/files/patch-kadmin::cli::Makefile.in @@ -0,0 +1,11 @@ +--- kadmin/cli/Makefile.in.orig Fri Feb 7 13:41:20 2003 ++++ kadmin/cli/Makefile.in Tue Aug 5 16:32:02 2003 +@@ -21,7 +21,7 @@ + install:: + $(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local + $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) +- $(INSTALL_PROGRAM) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil ++ $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil + $(INSTALL_DATA) $(srcdir)/k5srvutil.M ${DESTDIR}$(ADMIN_MANDIR)/k5srvutil.8 + $(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8 + $(INSTALL_DATA) $(srcdir)/$(PROG).local.M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).local.8 diff --git a/security/krb5-17/files/patch-kadmin::configure b/security/krb5-17/files/patch-kadmin::configure deleted file mode 100644 index 7e96fdca346f..000000000000 --- a/security/krb5-17/files/patch-kadmin::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kadmin/configure.orig Tue Apr 8 17:11:55 2003 -+++ kadmin/configure Wed May 7 13:38:20 2003 -@@ -3229,13 +3229,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-kdc::configure b/security/krb5-17/files/patch-kdc::configure deleted file mode 100644 index 348327637ad7..000000000000 --- a/security/krb5-17/files/patch-kdc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kdc/configure.orig Tue Apr 8 17:11:51 2003 -+++ kdc/configure Wed May 7 13:35:06 2003 -@@ -2614,13 +2614,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-krb524::configure b/security/krb5-17/files/patch-krb524::configure deleted file mode 100644 index 97b97f7a109b..000000000000 --- a/security/krb5-17/files/patch-krb524::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- krb524/configure.orig Tue Apr 8 17:11:55 2003 -+++ krb524/configure Wed May 7 13:39:07 2003 -@@ -1933,13 +1933,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::crypto::configure b/security/krb5-17/files/patch-lib::crypto::configure deleted file mode 100644 index fccbe4edcc56..000000000000 --- a/security/krb5-17/files/patch-lib::crypto::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/crypto/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/crypto/configure Wed May 7 13:41:20 2003 -@@ -2027,13 +2027,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::des425::configure b/security/krb5-17/files/patch-lib::des425::configure deleted file mode 100644 index 9902d993381d..000000000000 --- a/security/krb5-17/files/patch-lib::des425::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/des425/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/des425/configure Wed May 7 13:43:40 2003 -@@ -2116,13 +2116,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::gssapi::configure b/security/krb5-17/files/patch-lib::gssapi::configure deleted file mode 100644 index 211dab73d33b..000000000000 --- a/security/krb5-17/files/patch-lib::gssapi::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/gssapi/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/gssapi/configure Wed May 7 13:45:34 2003 -@@ -2430,13 +2430,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::kadm5::configure b/security/krb5-17/files/patch-lib::kadm5::configure deleted file mode 100644 index d7051e3198e5..000000000000 --- a/security/krb5-17/files/patch-lib::kadm5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kadm5/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/kadm5/configure Wed May 7 14:02:39 2003 -@@ -3227,13 +3227,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::kdb::configure b/security/krb5-17/files/patch-lib::kdb::configure deleted file mode 100644 index dcb351933336..000000000000 --- a/security/krb5-17/files/patch-lib::kdb::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kdb/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/kdb/configure Wed May 7 13:42:32 2003 -@@ -2203,13 +2203,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::krb4::configure b/security/krb5-17/files/patch-lib::krb4::configure deleted file mode 100644 index 5499de900739..000000000000 --- a/security/krb5-17/files/patch-lib::krb4::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb4/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/krb4/configure Wed May 7 14:20:05 2003 -@@ -2445,13 +2445,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::krb5::configure b/security/krb5-17/files/patch-lib::krb5::configure deleted file mode 100644 index 615eeeabe1fd..000000000000 --- a/security/krb5-17/files/patch-lib::krb5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5/configure Wed May 7 14:04:55 2003 -@@ -2658,13 +2658,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::krb5::keytab::file:ktf_util.c b/security/krb5-17/files/patch-lib::krb5::keytab::file:ktf_util.c deleted file mode 100644 index c97b3a3c85ae..000000000000 --- a/security/krb5-17/files/patch-lib::krb5::keytab::file:ktf_util.c +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c ---- lib/krb5/keytab/file/ktf_util.c 1999-09-24 17:19:01.000000000-0400 -+++ lib/krb5/keytab/file/ktf_util.c 2003-02-03 18:02:25.000000000-0500 -@@ -441,7 +441,7 @@ - return 0; - fail: - -- for (i = 0; i < ret_entry->principal->length; i++) { -+ for (i = 0; i < krb5_princ_size(context, ret_entry->principal); i++) { - princ = krb5_princ_component(context, ret_entry->principal, i); - if (princ->data) - free(princ->data); -@@ -498,9 +498,9 @@ - } - - if (KTVERSION(id) == KRB5_KT_VNO_1) { -- count = (krb5_int16) entry->principal->length + 1; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal) + 1; - } else { -- count = htons((u_short) entry->principal->length); -+ count = htons((u_short) krb5_princ_size(context, entry->principal)); - } - - if (!xfwrite(&count, sizeof(count), 1, KTFILEP(id))) { -@@ -519,7 +519,7 @@ - goto abend; - } - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - for (i = 0; i < count; i++) { - princ = krb5_princ_component(context, entry->principal, i); - size = princ->length; -@@ -620,7 +620,7 @@ - krb5_int32 total_size, i; - krb5_error_code retval = 0; - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - - total_size = sizeof(count); - total_size += krb5_princ_realm(context, entry->principal)->length + (sizeof(krb5_int16)); diff --git a/security/krb5-17/files/patch-lib::krb5util::configure b/security/krb5-17/files/patch-lib::krb5util::configure deleted file mode 100644 index e4be2657a8bc..000000000000 --- a/security/krb5-17/files/patch-lib::krb5util::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5util/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5util/configure Wed May 7 14:05:52 2003 -@@ -2044,13 +2044,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::rpc::configure b/security/krb5-17/files/patch-lib::rpc::configure deleted file mode 100644 index fad09e67cfb5..000000000000 --- a/security/krb5-17/files/patch-lib::rpc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/configure.orig Tue Apr 8 17:12:01 2003 -+++ lib/rpc/configure Wed May 7 14:07:47 2003 -@@ -2524,13 +2524,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-lib::rpc::unit-test::configure b/security/krb5-17/files/patch-lib::rpc::unit-test::configure deleted file mode 100644 index d0583a35c75a..000000000000 --- a/security/krb5-17/files/patch-lib::rpc::unit-test::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/unit-test/configure.orig Tue Apr 8 17:12:00 2003 -+++ lib/rpc/unit-test/configure Wed May 7 14:06:51 2003 -@@ -2700,13 +2700,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-slave::configure b/security/krb5-17/files/patch-slave::configure deleted file mode 100644 index 1864338febe4..000000000000 --- a/security/krb5-17/files/patch-slave::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- slave/configure.orig Tue Apr 8 17:12:01 2003 -+++ slave/configure Wed May 7 14:08:31 2003 -@@ -1975,13 +1975,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-tests::configure b/security/krb5-17/files/patch-tests::configure deleted file mode 100644 index 5bd048bec288..000000000000 --- a/security/krb5-17/files/patch-tests::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- tests/configure.orig Tue Apr 8 17:12:02 2003 -+++ tests/configure Wed May 7 14:09:13 2003 -@@ -1868,13 +1868,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-util::et::configure b/security/krb5-17/files/patch-util::et::configure deleted file mode 100644 index 090e9573bdc9..000000000000 --- a/security/krb5-17/files/patch-util::et::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/et/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/et/configure Wed May 7 14:13:49 2003 -@@ -2607,13 +2607,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-util::profile::configure b/security/krb5-17/files/patch-util::profile::configure deleted file mode 100644 index b89ac6584c7c..000000000000 --- a/security/krb5-17/files/patch-util::profile::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/profile/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/profile/configure Wed May 7 14:14:47 2003 -@@ -2269,13 +2269,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-util::pty::configure b/security/krb5-17/files/patch-util::pty::configure deleted file mode 100644 index 9129f7f78b42..000000000000 --- a/security/krb5-17/files/patch-util::pty::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/pty/configure.orig Tue Apr 8 17:12:05 2003 -+++ util/pty/configure Wed May 7 14:15:42 2003 -@@ -3751,13 +3751,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/files/patch-util::ss::configure b/security/krb5-17/files/patch-util::ss::configure deleted file mode 100644 index 1e3cf80f6978..000000000000 --- a/security/krb5-17/files/patch-util::ss::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/ss/configure.orig Tue Apr 8 17:12:06 2003 -+++ util/ss/configure Wed May 7 14:16:25 2003 -@@ -2677,13 +2677,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist index f6494e183d94..ffc5cf6892a3 100644 --- a/security/krb5-17/pkg-plist +++ b/security/krb5-17/pkg-plist @@ -26,14 +26,11 @@ include/gssapi/gssapi.h include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h include/kerberosIV/des.h -include/kerberosIV/kadm.h +include/kerberosIV/kadm_err.h include/kerberosIV/krb.h include/kerberosIV/krb_err.h include/kerberosIV/mit-copyright.h include/krb5.h -include/libpty.h -include/mit-sipb-copyright.h -include/port-sockets.h include/profile.h info/krb425.info info/krb5-admin.info @@ -50,9 +47,6 @@ lib/libcom_err.so.3 lib/libdes425.a lib/libdes425.so lib/libdes425.so.3 -lib/libdyn.a -lib/libdyn.so -lib/libdyn.so.1 lib/libgssapi_krb5.a lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 @@ -70,18 +64,13 @@ lib/libkadm5srv.so lib/libkadm5srv.so.5 lib/libkdb5.a lib/libkdb5.so -lib/libkdb5.so.3 +lib/libkdb5.so.4 %%KRB4%%lib/libkrb4.a %%KRB4%%lib/libkrb4.so %%KRB4%%lib/libkrb4.so.2 lib/libkrb5.a lib/libkrb5.so lib/libkrb5.so.3 -%%KRB4%%lib/libkrb524.a -lib/libpty.a -lib/libpty.so -lib/libpty.so.1 -lib/libss.a sbin/ftpd sbin/gss-server sbin/kadmin @@ -104,21 +93,9 @@ sbin/telnetd sbin/uuserver sbin/v5passwdd share/doc/krb5/README.FreeBSD -share/doc/krb5/admin.html -share/doc/krb5/admin_foot.html -share/doc/krb5/admin_toc.html -share/doc/krb5/install.html -share/doc/krb5/install_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/krb425_toc.html -share/doc/krb5/user-guide.html -share/doc/krb5/user-guide_foot.html -share/doc/krb5/user-guide_toc.html share/gnats/mit @dirrm include/gssapi @dirrm include/kerberosIV -@dirrm share/doc/krb5 @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index 6fac2d71b8a3..df245fee44a4 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -6,12 +6,17 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.8 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= security # USE_MIT_TARBALL tells the port that the user has fetched the source # directly from MIT rather than the default crypto-publish.org. -USE_MIT_TARBALL?= NO + +# XXX At the present time crypto-publish.org does not have krb5-1.3. +# XXX We must use the MIT copy instead, requiring the user to manually +# XXX fetch the distfile. As soon as crypto-publish.org distributes +# XXX krb5-1.3, USE_MIT_TARBALL should be changed back to NO. +USE_MIT_TARBALL?= YES + .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" MASTER_SITES= # manual download EXTRACT_SUFX= .tar @@ -29,8 +34,9 @@ KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc +CONFIGURE_ARGS?= --enable-shared +CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ + CFLAGS="${CFLAGS}" MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= NO @@ -66,10 +72,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc -HTML_DOCS= admin.html install_foot.html user-guide.html \ - admin_foot.html install_toc.html user-guide_foot.html \ - admin_toc.html krb425.html user-guide_toc.html \ - install.html krb425_toc.html +HTML_DOCS= admin.html user-guide.html install.html +HTML_OUTDIRS= krb5-admin krb5-install .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" do-fetch: @@ -111,6 +115,10 @@ pre-build: post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.if defined(WANT_HTML) && ${WANT_HTML} == "YES" + @(cd ${WRKSRC}/../doc && \ + ${MAKE} ${HTML_DOCS}) +.endif .include <bsd.port.pre.mk> @@ -118,10 +126,20 @@ post-install: # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @${MKDIR} ${PREFIX}/share/doc/krb5 -.for html in ${HTML_DOCS} - ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 + for html in ${HTML_DOC_DIR}/*.html; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \ + ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done +.for htmldir in ${HTML_OUTDIRS} + @${MKDIR} ${PREFIX}/share/doc/krb5/${htmldir} + for html in ${HTML_DOC_DIR}/${htmldir}/*; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5/${htmldir}; \ + ${ECHO_CMD} share/doc/krb5/${htmldir}/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done + ${ECHO_CMD} @dirrm share/doc/krb5/${htmldir} >> ${TMPPLIST} .endfor .endif + ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo index 24d249c79441..b5265b84e3ee 100644 --- a/security/krb5-appl/distinfo +++ b/security/krb5-appl/distinfo @@ -1,2 +1,2 @@ -MD5 (krb5-1.2.8.tar) = cbb87396f8a166b6e5dd8b2b0cb3fe29 -MD5 (krb5-1.2.8.tar.gz) = 99b840431ad2926de66d143cdd9307eb +MD5 (krb5-1.3.tar) = efe46a338f74e02796f07d53815273c6 +MD5 (krb5-1.3.tar.gz) = e435813481fc9b4e7f73ebda1537cbd2 diff --git a/security/krb5-appl/files/patch-af b/security/krb5-appl/files/patch-af index e054b18bbef5..49425d6efceb 100644 --- a/security/krb5-appl/files/patch-af +++ b/security/krb5-appl/files/patch-af @@ -8,6 +8,6 @@ +@direntry +* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5 +@end direntry - @setchapternewpage odd @c chapter begins on next odd page + @c @setchapternewpage odd @c chapter begins on next odd page @c @setchapternewpage on @c chapter begins on next page @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5-appl/files/patch-appl::bsd::Makefile.in b/security/krb5-appl/files/patch-appl::bsd::Makefile.in index 603c399a287f..581048933264 100644 --- a/security/krb5-appl/files/patch-appl::bsd::Makefile.in +++ b/security/krb5-appl/files/patch-appl::bsd::Makefile.in @@ -1,11 +1,12 @@ --- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001 -@@ -28,7 +28,7 @@ +@@ -31,8 +31,8 @@ -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" - DEFINES = $(RSH) $(BSD) $(RPROGS) \ -- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" -+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" + DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ +- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ ++ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ + -DHEIMDAL_FRIENDLY all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP) diff --git a/security/krb5-appl/files/patch-appl::bsd::klogind.M b/security/krb5-appl/files/patch-appl::bsd::klogind.M index 1523c3d593df..9cddd5fc222d 100644 --- a/security/krb5-appl/files/patch-appl::bsd::klogind.M +++ b/security/krb5-appl/files/patch-appl::bsd::klogind.M @@ -1,10 +1,11 @@ --- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001 -@@ -14,6 +14,7 @@ +@@ -14,7 +14,7 @@ + .B \-kr54cpPef ] - [ - [ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]] ] -+[\fB\-L\fP \fIloginpath\fP] + [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] +-[ \fB\-D\fP \fIport\fP ] ++[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP] .SH DESCRIPTION .I Klogind is the server for the @@ -29,6 +30,6 @@ -DO_NOT_USE_K_LOGIN was not defined when -.I klogind -was compiled. - .SH DIAGNOSTICS - All diagnostic messages are returned on the connection - associated with the + + .IP \fB\-D\ port\fP + Run in standalone mode, listening on \fBport\fP. The daemon will exit diff --git a/security/krb5-appl/files/patch-appl::configure b/security/krb5-appl/files/patch-appl::configure deleted file mode 100644 index 70d4267b1091..000000000000 --- a/security/krb5-appl/files/patch-appl::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/configure Wed May 7 06:55:53 2003 -@@ -2133,13 +2133,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-appl::gssftp::configure b/security/krb5-appl/files/patch-appl::gssftp::configure deleted file mode 100644 index b1150768685d..000000000000 --- a/security/krb5-appl/files/patch-appl::gssftp::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/gssftp/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/gssftp/configure Wed May 7 06:58:08 2003 -@@ -3990,13 +3990,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h new file mode 100644 index 000000000000..2faff676f220 --- /dev/null +++ b/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h @@ -0,0 +1,13 @@ +--- appl/gssftp/ftp/ftp_var.h.orig Mon Jun 16 15:37:40 2003 ++++ appl/gssftp/ftp/ftp_var.h Tue Jul 29 22:14:57 2003 +@@ -33,6 +33,10 @@ + * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90 + */ + ++#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000 ++#undef __BSD_VISIBLE ++#endif ++ + #ifdef _WIN32 + #include <windows.h> + #include <winsock2.h> diff --git a/security/krb5-appl/files/patch-appl::telnet::telnet::configure b/security/krb5-appl/files/patch-appl::telnet::telnet::configure deleted file mode 100644 index e7febc4ca2fd..000000000000 --- a/security/krb5-appl/files/patch-appl::telnet::telnet::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/telnet/telnet/configure.orig Tue Apr 8 17:11:49 2003 -+++ appl/telnet/telnet/configure Wed May 7 13:31:45 2003 -@@ -2774,13 +2774,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::configure b/security/krb5-appl/files/patch-appl::telnet::telnetd::configure deleted file mode 100644 index 16fe919a54e8..000000000000 --- a/security/krb5-appl/files/patch-appl::telnet::telnetd::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/telnet/telnetd/configure.orig Tue Apr 8 17:11:50 2003 -+++ appl/telnet/telnetd/configure Wed May 7 13:33:34 2003 -@@ -2518,13 +2518,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-as b/security/krb5-appl/files/patch-as index 0b26c449fe11..de19886eac08 100644 --- a/security/krb5-appl/files/patch-as +++ b/security/krb5-appl/files/patch-as @@ -1,8 +1,8 @@ ---- clients/ksu/main.c.orig Wed Feb 28 14:06:55 2001 -+++ clients/ksu/main.c Thu Sep 6 16:21:46 2001 -@@ -31,6 +31,10 @@ - #include <sys/wait.h> +--- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002 ++++ clients/ksu/main.c Tue Jul 29 18:46:00 2003 +@@ -32,6 +32,10 @@ #include <signal.h> + #include <grp.h> +#ifdef LOGIN_CAP +#include <login_cap.h> @@ -11,43 +11,43 @@ /* globals */ char * prog_name; int auth_debug =0; -@@ -60,7 +64,7 @@ +@@ -61,7 +65,7 @@ ill specified arguments to commands */ void usage (){ -- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); -+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); +- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); ++ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); } /* for Ultrix and friends ... */ -@@ -76,6 +80,7 @@ - int argc; - char ** argv; +@@ -77,6 +81,7 @@ + int argc; + char ** argv; { -+int asme = 0; - int hp =0; - int some_rest_copy = 0; - int all_rest_copy = 0; -@@ -90,6 +95,7 @@ - char * cc_target_tag = NULL; - char * target_user = NULL; - char * source_user; -+char * source_shell; - - krb5_ccache cc_source = NULL; - const char * cc_source_tag = NULL; -@@ -118,6 +124,11 @@ - char * dir_of_cc_target; - char * dir_of_cc_source; - ++ int asme = 0; + int hp =0; + int some_rest_copy = 0; + int all_rest_copy = 0; +@@ -91,6 +96,7 @@ + char * cc_target_tag = NULL; + char * target_user = NULL; + char * source_user; ++ char * source_shell; + + krb5_ccache cc_source = NULL; + const char * cc_source_tag = NULL; +@@ -117,6 +123,11 @@ + krb5_principal kdc_server; + krb5_boolean zero_password; + char * dir_of_cc_target; ++ +#ifdef LOGIN_CAP -+login_cap_t *lc; -+int setwhat; ++ login_cap_t *lc; ++ int setwhat; +#endif -+ + options.opt = KRB5_DEFAULT_OPTIONS; options.lifetime = KRB5_DEFAULT_TKT_LIFE; - options.rlife =0; @@ -181,7 +192,7 @@ com_err (prog_name, errno, "while setting euid to source user"); exit (1); @@ -68,132 +68,128 @@ if ((retval = krb5_parse_name(ksu_context, optarg, &client))){ com_err(prog_name, retval, "when parsing name %s", optarg); @@ -341,6 +355,7 @@ - - /* allocate space and copy the usernamane there */ - source_user = xstrdup(pwd->pw_name); -+ source_shell = xstrdup(pwd->pw_shell); - source_uid = pwd->pw_uid; - source_gid = pwd->pw_gid; - -@@ -668,43 +683,64 @@ - /* get the shell of the user, this will be the shell used by su */ - target_pwd = getpwnam(target_user); - -- if (target_pwd->pw_shell) -- shell = xstrdup(target_pwd->pw_shell); -- else { -- shell = _DEF_CSH; /* default is cshell */ -- } -+ if (asme) { -+ if (source_shell && *source_shell) { -+ shell = strdup(source_shell); -+ } else { -+ shell = _DEF_CSH; -+ } + + /* allocate space and copy the usernamane there */ + source_user = xstrdup(pwd->pw_name); ++ source_shell = xstrdup(pwd->pw_shell); + source_uid = pwd->pw_uid; + source_gid = pwd->pw_gid; + +@@ -672,43 +687,64 @@ + /* get the shell of the user, this will be the shell used by su */ + target_pwd = getpwnam(target_user); + +- if (target_pwd->pw_shell) +- shell = xstrdup(target_pwd->pw_shell); +- else { +- shell = _DEF_CSH; /* default is cshell */ ++ if (asme) { ++ if (source_shell && *source_shell) { ++ shell = strdup(source_shell); + } else { -+ if (target_pwd->pw_shell) -+ shell = strdup(target_pwd->pw_shell); -+ else { -+ shell = _DEF_CSH; /* default is cshell */ -+ } ++ shell = _DEF_CSH; + } - ++ } else { ++ if (target_pwd->pw_shell) ++ shell = strdup(target_pwd->pw_shell); ++ else { ++ shell = _DEF_CSH; /* default is cshell */ ++ } + } + #ifdef HAVE_GETUSERSHELL - - /* insist that the target login uses a standard shell (root is omited) */ - -- if (!standard_shell(target_pwd->pw_shell) && source_uid) { -- fprintf(stderr, "ksu: permission denied (shell).\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -+ if (asme) { -+ if (!standard_shell(pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } else { -+ if (!standard_shell(target_pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - } + + /* insist that the target login uses a standard shell (root is omited) */ + +- if (!standard_shell(target_pwd->pw_shell) && source_uid) { +- fprintf(stderr, "ksu: permission denied (shell).\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); ++ if (asme) { ++ if (!standard_shell(pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } else { ++ if (!standard_shell(target_pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } #endif /* HAVE_GETUSERSHELL */ - -- if (target_pwd->pw_uid){ + +- if (target_pwd->pw_uid){ - -- if(set_env_var("USER", target_pwd->pw_name)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -- } -+ if (!asme) { -+ if (target_pwd->pw_uid){ -+ if (set_env_var("USER", target_pwd->pw_name)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } - -- if(set_env_var( "HOME", target_pwd->pw_dir)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "HOME", target_pwd->pw_dir)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - -- if(set_env_var( "SHELL", shell)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "SHELL", shell)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } +- if(set_env_var("USER", target_pwd->pw_name)){ ++ if (!asme) { ++ if (target_pwd->pw_uid){ ++ if (set_env_var("USER", target_pwd->pw_name)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } ++ ++ if (set_env_var( "HOME", target_pwd->pw_dir)){ + fprintf(stderr,"ksu: couldn't set environment variable USER\n"); + sweep_up(ksu_context, cc_target); + exit(1); +- } +- } +- +- if(set_env_var( "HOME", target_pwd->pw_dir)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ } + +- if(set_env_var( "SHELL", shell)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ if (set_env_var( "SHELL", shell)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } + +#ifdef LOGIN_CAP -+ lc = login_getpwclass(pwd); ++ lc = login_getpwclass(pwd); +#endif - - /* set the cc env name to target */ - -@@ -714,7 +750,18 @@ - sweep_up(ksu_context, cc_target); - exit(1); - } -- + + /* set the cc env name to target */ + +@@ -718,7 +754,19 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +- ++ +#ifdef LOGIN_CAP -+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; -+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; -+ /* -+ * Don't touch resource/priority settings if -m has been -+ * used or -l and -c hasn't, and we're not su'ing to root. -+ */ -+ if (target_pwd->pw_uid) -+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); -+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) -+ err(1, "setusercontext"); ++ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; ++ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; ++ /* ++ * Don't touch resource/priority settings if -m has been ++ * used or -l and -c hasn't, and we're not su'ing to root. ++ */ ++ if (target_pwd->pw_uid) ++ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); ++ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) ++ err(1, "setusercontext"); +#else - /* set permissions */ - if (setgid(target_pwd->pw_gid) < 0) { - perror("ksu: setgid"); -@@ -754,7 +801,8 @@ - perror("ksu: setuid"); - sweep_up(ksu_context, cc_target); - exit(1); -- } -+ } + /* set permissions */ + if (setgid(target_pwd->pw_gid) < 0) { + perror("ksu: setgid"); +@@ -759,6 +807,7 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +#endif - - if (access( cc_target_tag_tmp, R_OK | W_OK )){ - com_err(prog_name, errno, + + if (access( cc_target_tag_tmp, R_OK | W_OK )){ + com_err(prog_name, errno, diff --git a/security/krb5-appl/files/patch-at b/security/krb5-appl/files/patch-at index ef9ea4856f7a..060207ec644a 100644 --- a/security/krb5-appl/files/patch-at +++ b/security/krb5-appl/files/patch-at @@ -1,5 +1,5 @@ -*** include/sys/syslog.h.ORIG Fri Feb 6 19:42:12 1998 ---- include/sys/syslog.h Tue Jun 30 19:46:02 1998 +*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998 +--- include/syslog.h Tue Jun 30 19:46:02 1998 *************** *** 34,39 **** --- 34,42 ---- diff --git a/security/krb5-appl/files/patch-ax b/security/krb5-appl/files/patch-ax index 58cfe89d9294..443b321e28db 100644 --- a/security/krb5-appl/files/patch-ax +++ b/security/krb5-appl/files/patch-ax @@ -1,11 +1,11 @@ ---- ../doc/Makefile.orig Wed Jan 20 21:57:45 1999 -+++ ../doc/Makefile Wed Jan 20 21:59:19 1999 +--- ../doc/Makefile.orig Fri Sep 20 10:35:27 2002 ++++ ../doc/Makefile Tue Jul 29 18:53:08 2003 @@ -1,7 +1,7 @@ SRCDIR=../src DVI=texi2dvi DVIPS=dvips -o "$@" -INFO=makeinfo +INFO=makeinfo --no-validate - HTML=texi2html + HTML=makeinfo --html RM=rm -f TAR=tar -chvf diff --git a/security/krb5-appl/files/patch-ba b/security/krb5-appl/files/patch-ba index 60d70466eff3..dd0c760df7d2 100644 --- a/security/krb5-appl/files/patch-ba +++ b/security/krb5-appl/files/patch-ba @@ -1,6 +1,6 @@ ---- appl/bsd/login.c.ORIG Wed Oct 13 12:55:47 1999 -+++ appl/bsd/login.c Wed Oct 13 12:56:29 1999 -@@ -1303,19 +1304,6 @@ +--- appl/bsd/login.c.orig Tue May 27 21:06:25 2003 ++++ appl/bsd/login.c Tue Jul 29 20:52:25 2003 +@@ -1342,19 +1342,6 @@ setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); } @@ -18,9 +18,9 @@ - break; - if (got_v5_tickets) { - if (retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, - NULL, &xtra_creds, -@@ -1338,6 +1326,9 @@ + retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, + NULL, &xtra_creds, +@@ -1378,6 +1365,9 @@ } #endif /* KRB4_GET_TICKETS */ @@ -30,36 +30,32 @@ bad_login: setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); -@@ -1640,20 +1631,28 @@ +@@ -1667,21 +1657,23 @@ /* set up credential cache -- obeying KRB5_ENV_CCNAME set earlier */ /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */ -- if (retval = krb5_cc_default(kcontext, &ccache)) { -+ retval = krb5_cc_default(kcontext, &ccache); -+ if (retval) +- if ((retval = krb5_cc_default(kcontext, &ccache))) { ++ if ((retval = krb5_cc_default(kcontext, &ccache))) com_err(argv[0], retval, "while getting default ccache"); -- } else if (retval = krb5_cc_initialize(kcontext, ccache, me)) { +- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) { - com_err(argv[0], retval, "when initializing cache"); -- } else if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) { +- } else if ((retval = krb5_cc_store_cred(kcontext, ccache, +- &my_creds))) { - com_err(argv[0], retval, "while storing credentials"); - } else if (xtra_creds && - (retval = krb5_cc_copy_creds(kcontext, xtra_creds, - ccache))) { - com_err(argv[0], retval, "while storing credentials"); + else { -+ retval = krb5_cc_initialize(kcontext, ccache, me); -+ if (retval) ++ if (retval = krb5_cc_initialize(kcontext, ccache, me)) + com_err(argv[0], retval, "when initializing cache"); + else { -+ retval = krb5_cc_store_cred(kcontext, ccache, &my_creds); -+ if (retval) ++ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) + com_err(argv[0], retval, "while storing credentials"); + else { -+ if (xtra_creds) { -+ retval = krb5_cc_copy_creds(kcontext, xtra_creds, -+ ccache); -+ if (retval) -+ com_err(argv[0], retval, "while storing credentials"); ++ if (xtra_creds && ++ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) { ++ com_err(argv[0], retval, "while storing credentials"); + krb5_cc_destroy(kcontext, xtra_creds); + } + } @@ -71,7 +67,7 @@ } else if (forwarded_v5_tickets && rewrite_ccache) { if ((retval = krb5_cc_initialize (kcontext, ccache, me))) { syslog(LOG_ERR, -@@ -1727,6 +1727,7 @@ +@@ -1762,6 +1754,7 @@ if (ccname) setenv("KRB5CCNAME", ccname, 1); diff --git a/security/krb5-appl/files/patch-clients::configure b/security/krb5-appl/files/patch-clients::configure deleted file mode 100644 index f6f91152b216..000000000000 --- a/security/krb5-appl/files/patch-clients::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- clients/configure.orig Tue Apr 8 17:11:51 2003 -+++ clients/configure Wed May 7 13:35:57 2003 -@@ -1932,13 +1932,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-config::pre.in b/security/krb5-appl/files/patch-config::pre.in new file mode 100644 index 000000000000..fc3ff4c7a047 --- /dev/null +++ b/security/krb5-appl/files/patch-config::pre.in @@ -0,0 +1,10 @@ +--- config/pre.in.orig Tue May 27 21:06:28 2003 ++++ config/pre.in Wed Aug 6 11:11:54 2003 +@@ -152,6 +152,7 @@ + INSTALL=@INSTALL@ + INSTALL_STRIP= + INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_SHLIB=@INSTALL_SHLIB@ + INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root diff --git a/security/krb5-16/files/patch-appl::telnet::telnet::configure b/security/krb5-appl/files/patch-config::shlib.conf index e7febc4ca2fd..48d5e9a51f8b 100644 --- a/security/krb5-16/files/patch-appl::telnet::telnet::configure +++ b/security/krb5-appl/files/patch-config::shlib.conf @@ -1,18 +1,19 @@ ---- appl/telnet/telnet/configure.orig Tue Apr 8 17:11:49 2003 -+++ appl/telnet/telnet/configure Wed May 7 13:31:45 2003 -@@ -2774,13 +2774,14 @@ +--- config/shlib.conf.orig Sun Mar 2 23:09:45 2003 ++++ config/shlib.conf Tue Jul 29 18:16:43 2003 +@@ -179,14 +179,15 @@ PICFLAGS=-fpic if test "x$objformat" = "xelf" ; then SHLIBVEXT='.so.$(LIBMAJOR)' + LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' + RPATH_FLAG='-Wl,-rpath -Wl,' else + LDCOMBINE='ld -Bshareable' + RPATH_FLAG=-R SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' fi + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-configure b/security/krb5-appl/files/patch-configure deleted file mode 100644 index ed80b9bf8ffc..000000000000 --- a/security/krb5-appl/files/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.orig Tue Apr 8 17:11:46 2003 -+++ configure Wed May 7 06:53:40 2003 -@@ -1992,13 +1992,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-doc::man2html b/security/krb5-appl/files/patch-doc::man2html new file mode 100644 index 000000000000..88f00d594e54 --- /dev/null +++ b/security/krb5-appl/files/patch-doc::man2html @@ -0,0 +1,7 @@ +--- ../doc/man2html.orig Wed Jun 26 14:15:11 2002 ++++ ../doc/man2html Wed Jul 30 19:05:54 2003 +@@ -1,4 +1,3 @@ +-#!/usr/athena/bin/perl + #!/usr/local/bin/perl + ##---------------------------------------------------------------------------## + ## File: diff --git a/security/krb5-appl/files/patch-include::krb5.hin b/security/krb5-appl/files/patch-include::krb5.hin deleted file mode 100644 index 812664fc0b0e..000000000000 --- a/security/krb5-appl/files/patch-include::krb5.hin +++ /dev/null @@ -1,16 +0,0 @@ -Index: include/krb5.hin -=================================================================== -RCS file: /cvs/krbdev/krb5/src/include/krb5.hin,v -retrieving revision 1.94.2.5.2.17 -diff -p -u -r1.94.2.5.2.17 krb5.hin ---- include/krb5.hin 2002/04/16 23:47:53 1.94.2.5.2.17 -+++ include/krb5.hin 2003/03/19 00:38:54 -@@ -326,7 +326,7 @@ typedef krb5_const krb5_principal_data F - #define krb5_princ_size(context, princ) (princ)->length - #define krb5_princ_type(context, princ) (princ)->type - #define krb5_princ_name(context, princ) (princ)->data --#define krb5_princ_component(context, princ,i) ((princ)->data + i) -+#define krb5_princ_component(context, princ,i) (i < krb5_princ_size(context, princ) ? ((princ)->data + i) : NULL) - - /* - * end "base-defs.h" diff --git a/security/krb5-appl/files/patch-kadmin::cli::Makefile.in b/security/krb5-appl/files/patch-kadmin::cli::Makefile.in new file mode 100644 index 000000000000..266deea90231 --- /dev/null +++ b/security/krb5-appl/files/patch-kadmin::cli::Makefile.in @@ -0,0 +1,11 @@ +--- kadmin/cli/Makefile.in.orig Fri Feb 7 13:41:20 2003 ++++ kadmin/cli/Makefile.in Tue Aug 5 16:32:02 2003 +@@ -21,7 +21,7 @@ + install:: + $(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local + $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) +- $(INSTALL_PROGRAM) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil ++ $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil + $(INSTALL_DATA) $(srcdir)/k5srvutil.M ${DESTDIR}$(ADMIN_MANDIR)/k5srvutil.8 + $(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8 + $(INSTALL_DATA) $(srcdir)/$(PROG).local.M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).local.8 diff --git a/security/krb5-appl/files/patch-kadmin::configure b/security/krb5-appl/files/patch-kadmin::configure deleted file mode 100644 index 7e96fdca346f..000000000000 --- a/security/krb5-appl/files/patch-kadmin::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kadmin/configure.orig Tue Apr 8 17:11:55 2003 -+++ kadmin/configure Wed May 7 13:38:20 2003 -@@ -3229,13 +3229,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-kdc::configure b/security/krb5-appl/files/patch-kdc::configure deleted file mode 100644 index 348327637ad7..000000000000 --- a/security/krb5-appl/files/patch-kdc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kdc/configure.orig Tue Apr 8 17:11:51 2003 -+++ kdc/configure Wed May 7 13:35:06 2003 -@@ -2614,13 +2614,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-krb524::configure b/security/krb5-appl/files/patch-krb524::configure deleted file mode 100644 index 97b97f7a109b..000000000000 --- a/security/krb5-appl/files/patch-krb524::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- krb524/configure.orig Tue Apr 8 17:11:55 2003 -+++ krb524/configure Wed May 7 13:39:07 2003 -@@ -1933,13 +1933,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::crypto::configure b/security/krb5-appl/files/patch-lib::crypto::configure deleted file mode 100644 index fccbe4edcc56..000000000000 --- a/security/krb5-appl/files/patch-lib::crypto::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/crypto/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/crypto/configure Wed May 7 13:41:20 2003 -@@ -2027,13 +2027,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::des425::configure b/security/krb5-appl/files/patch-lib::des425::configure deleted file mode 100644 index 9902d993381d..000000000000 --- a/security/krb5-appl/files/patch-lib::des425::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/des425/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/des425/configure Wed May 7 13:43:40 2003 -@@ -2116,13 +2116,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::gssapi::configure b/security/krb5-appl/files/patch-lib::gssapi::configure deleted file mode 100644 index 211dab73d33b..000000000000 --- a/security/krb5-appl/files/patch-lib::gssapi::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/gssapi/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/gssapi/configure Wed May 7 13:45:34 2003 -@@ -2430,13 +2430,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::kadm5::configure b/security/krb5-appl/files/patch-lib::kadm5::configure deleted file mode 100644 index d7051e3198e5..000000000000 --- a/security/krb5-appl/files/patch-lib::kadm5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kadm5/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/kadm5/configure Wed May 7 14:02:39 2003 -@@ -3227,13 +3227,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::kdb::configure b/security/krb5-appl/files/patch-lib::kdb::configure deleted file mode 100644 index dcb351933336..000000000000 --- a/security/krb5-appl/files/patch-lib::kdb::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kdb/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/kdb/configure Wed May 7 13:42:32 2003 -@@ -2203,13 +2203,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::krb4::configure b/security/krb5-appl/files/patch-lib::krb4::configure deleted file mode 100644 index 5499de900739..000000000000 --- a/security/krb5-appl/files/patch-lib::krb4::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb4/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/krb4/configure Wed May 7 14:20:05 2003 -@@ -2445,13 +2445,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::krb5::configure b/security/krb5-appl/files/patch-lib::krb5::configure deleted file mode 100644 index 615eeeabe1fd..000000000000 --- a/security/krb5-appl/files/patch-lib::krb5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5/configure Wed May 7 14:04:55 2003 -@@ -2658,13 +2658,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::krb5::keytab::file:ktf_util.c b/security/krb5-appl/files/patch-lib::krb5::keytab::file:ktf_util.c deleted file mode 100644 index c97b3a3c85ae..000000000000 --- a/security/krb5-appl/files/patch-lib::krb5::keytab::file:ktf_util.c +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c ---- lib/krb5/keytab/file/ktf_util.c 1999-09-24 17:19:01.000000000-0400 -+++ lib/krb5/keytab/file/ktf_util.c 2003-02-03 18:02:25.000000000-0500 -@@ -441,7 +441,7 @@ - return 0; - fail: - -- for (i = 0; i < ret_entry->principal->length; i++) { -+ for (i = 0; i < krb5_princ_size(context, ret_entry->principal); i++) { - princ = krb5_princ_component(context, ret_entry->principal, i); - if (princ->data) - free(princ->data); -@@ -498,9 +498,9 @@ - } - - if (KTVERSION(id) == KRB5_KT_VNO_1) { -- count = (krb5_int16) entry->principal->length + 1; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal) + 1; - } else { -- count = htons((u_short) entry->principal->length); -+ count = htons((u_short) krb5_princ_size(context, entry->principal)); - } - - if (!xfwrite(&count, sizeof(count), 1, KTFILEP(id))) { -@@ -519,7 +519,7 @@ - goto abend; - } - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - for (i = 0; i < count; i++) { - princ = krb5_princ_component(context, entry->principal, i); - size = princ->length; -@@ -620,7 +620,7 @@ - krb5_int32 total_size, i; - krb5_error_code retval = 0; - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - - total_size = sizeof(count); - total_size += krb5_princ_realm(context, entry->principal)->length + (sizeof(krb5_int16)); diff --git a/security/krb5-appl/files/patch-lib::krb5util::configure b/security/krb5-appl/files/patch-lib::krb5util::configure deleted file mode 100644 index e4be2657a8bc..000000000000 --- a/security/krb5-appl/files/patch-lib::krb5util::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5util/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5util/configure Wed May 7 14:05:52 2003 -@@ -2044,13 +2044,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::rpc::configure b/security/krb5-appl/files/patch-lib::rpc::configure deleted file mode 100644 index fad09e67cfb5..000000000000 --- a/security/krb5-appl/files/patch-lib::rpc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/configure.orig Tue Apr 8 17:12:01 2003 -+++ lib/rpc/configure Wed May 7 14:07:47 2003 -@@ -2524,13 +2524,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib::rpc::unit-test::configure b/security/krb5-appl/files/patch-lib::rpc::unit-test::configure deleted file mode 100644 index d0583a35c75a..000000000000 --- a/security/krb5-appl/files/patch-lib::rpc::unit-test::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/unit-test/configure.orig Tue Apr 8 17:12:00 2003 -+++ lib/rpc/unit-test/configure Wed May 7 14:06:51 2003 -@@ -2700,13 +2700,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-slave::configure b/security/krb5-appl/files/patch-slave::configure deleted file mode 100644 index 1864338febe4..000000000000 --- a/security/krb5-appl/files/patch-slave::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- slave/configure.orig Tue Apr 8 17:12:01 2003 -+++ slave/configure Wed May 7 14:08:31 2003 -@@ -1975,13 +1975,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-tests::configure b/security/krb5-appl/files/patch-tests::configure deleted file mode 100644 index 5bd048bec288..000000000000 --- a/security/krb5-appl/files/patch-tests::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- tests/configure.orig Tue Apr 8 17:12:02 2003 -+++ tests/configure Wed May 7 14:09:13 2003 -@@ -1868,13 +1868,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-util::et::configure b/security/krb5-appl/files/patch-util::et::configure deleted file mode 100644 index 090e9573bdc9..000000000000 --- a/security/krb5-appl/files/patch-util::et::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/et/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/et/configure Wed May 7 14:13:49 2003 -@@ -2607,13 +2607,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-util::profile::configure b/security/krb5-appl/files/patch-util::profile::configure deleted file mode 100644 index b89ac6584c7c..000000000000 --- a/security/krb5-appl/files/patch-util::profile::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/profile/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/profile/configure Wed May 7 14:14:47 2003 -@@ -2269,13 +2269,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-util::pty::configure b/security/krb5-appl/files/patch-util::pty::configure deleted file mode 100644 index 9129f7f78b42..000000000000 --- a/security/krb5-appl/files/patch-util::pty::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/pty/configure.orig Tue Apr 8 17:12:05 2003 -+++ util/pty/configure Wed May 7 14:15:42 2003 -@@ -3751,13 +3751,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-util::ss::configure b/security/krb5-appl/files/patch-util::ss::configure deleted file mode 100644 index 1e3cf80f6978..000000000000 --- a/security/krb5-appl/files/patch-util::ss::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/ss/configure.orig Tue Apr 8 17:12:06 2003 -+++ util/ss/configure Wed May 7 14:16:25 2003 -@@ -2677,13 +2677,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist index f6494e183d94..ffc5cf6892a3 100644 --- a/security/krb5-appl/pkg-plist +++ b/security/krb5-appl/pkg-plist @@ -26,14 +26,11 @@ include/gssapi/gssapi.h include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h include/kerberosIV/des.h -include/kerberosIV/kadm.h +include/kerberosIV/kadm_err.h include/kerberosIV/krb.h include/kerberosIV/krb_err.h include/kerberosIV/mit-copyright.h include/krb5.h -include/libpty.h -include/mit-sipb-copyright.h -include/port-sockets.h include/profile.h info/krb425.info info/krb5-admin.info @@ -50,9 +47,6 @@ lib/libcom_err.so.3 lib/libdes425.a lib/libdes425.so lib/libdes425.so.3 -lib/libdyn.a -lib/libdyn.so -lib/libdyn.so.1 lib/libgssapi_krb5.a lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 @@ -70,18 +64,13 @@ lib/libkadm5srv.so lib/libkadm5srv.so.5 lib/libkdb5.a lib/libkdb5.so -lib/libkdb5.so.3 +lib/libkdb5.so.4 %%KRB4%%lib/libkrb4.a %%KRB4%%lib/libkrb4.so %%KRB4%%lib/libkrb4.so.2 lib/libkrb5.a lib/libkrb5.so lib/libkrb5.so.3 -%%KRB4%%lib/libkrb524.a -lib/libpty.a -lib/libpty.so -lib/libpty.so.1 -lib/libss.a sbin/ftpd sbin/gss-server sbin/kadmin @@ -104,21 +93,9 @@ sbin/telnetd sbin/uuserver sbin/v5passwdd share/doc/krb5/README.FreeBSD -share/doc/krb5/admin.html -share/doc/krb5/admin_foot.html -share/doc/krb5/admin_toc.html -share/doc/krb5/install.html -share/doc/krb5/install_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/krb425_toc.html -share/doc/krb5/user-guide.html -share/doc/krb5/user-guide_foot.html -share/doc/krb5/user-guide_toc.html share/gnats/mit @dirrm include/gssapi @dirrm include/kerberosIV -@dirrm share/doc/krb5 @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 6fac2d71b8a3..df245fee44a4 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -6,12 +6,17 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.8 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= security # USE_MIT_TARBALL tells the port that the user has fetched the source # directly from MIT rather than the default crypto-publish.org. -USE_MIT_TARBALL?= NO + +# XXX At the present time crypto-publish.org does not have krb5-1.3. +# XXX We must use the MIT copy instead, requiring the user to manually +# XXX fetch the distfile. As soon as crypto-publish.org distributes +# XXX krb5-1.3, USE_MIT_TARBALL should be changed back to NO. +USE_MIT_TARBALL?= YES + .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" MASTER_SITES= # manual download EXTRACT_SUFX= .tar @@ -29,8 +34,9 @@ KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc +CONFIGURE_ARGS?= --enable-shared +CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ + CFLAGS="${CFLAGS}" MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= NO @@ -66,10 +72,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc -HTML_DOCS= admin.html install_foot.html user-guide.html \ - admin_foot.html install_toc.html user-guide_foot.html \ - admin_toc.html krb425.html user-guide_toc.html \ - install.html krb425_toc.html +HTML_DOCS= admin.html user-guide.html install.html +HTML_OUTDIRS= krb5-admin krb5-install .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES" do-fetch: @@ -111,6 +115,10 @@ pre-build: post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.if defined(WANT_HTML) && ${WANT_HTML} == "YES" + @(cd ${WRKSRC}/../doc && \ + ${MAKE} ${HTML_DOCS}) +.endif .include <bsd.port.pre.mk> @@ -118,10 +126,20 @@ post-install: # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @${MKDIR} ${PREFIX}/share/doc/krb5 -.for html in ${HTML_DOCS} - ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 + for html in ${HTML_DOC_DIR}/*.html; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \ + ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done +.for htmldir in ${HTML_OUTDIRS} + @${MKDIR} ${PREFIX}/share/doc/krb5/${htmldir} + for html in ${HTML_DOC_DIR}/${htmldir}/*; do \ + ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5/${htmldir}; \ + ${ECHO_CMD} share/doc/krb5/${htmldir}/`${BASENAME} $${html}` >> ${TMPPLIST}; \ + done + ${ECHO_CMD} @dirrm share/doc/krb5/${htmldir} >> ${TMPPLIST} .endfor .endif + ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} diff --git a/security/krb5/distinfo b/security/krb5/distinfo index 24d249c79441..b5265b84e3ee 100644 --- a/security/krb5/distinfo +++ b/security/krb5/distinfo @@ -1,2 +1,2 @@ -MD5 (krb5-1.2.8.tar) = cbb87396f8a166b6e5dd8b2b0cb3fe29 -MD5 (krb5-1.2.8.tar.gz) = 99b840431ad2926de66d143cdd9307eb +MD5 (krb5-1.3.tar) = efe46a338f74e02796f07d53815273c6 +MD5 (krb5-1.3.tar.gz) = e435813481fc9b4e7f73ebda1537cbd2 diff --git a/security/krb5/files/patch-af b/security/krb5/files/patch-af index e054b18bbef5..49425d6efceb 100644 --- a/security/krb5/files/patch-af +++ b/security/krb5/files/patch-af @@ -8,6 +8,6 @@ +@direntry +* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5 +@end direntry - @setchapternewpage odd @c chapter begins on next odd page + @c @setchapternewpage odd @c chapter begins on next odd page @c @setchapternewpage on @c chapter begins on next page @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5/files/patch-appl::bsd::Makefile.in b/security/krb5/files/patch-appl::bsd::Makefile.in index 603c399a287f..581048933264 100644 --- a/security/krb5/files/patch-appl::bsd::Makefile.in +++ b/security/krb5/files/patch-appl::bsd::Makefile.in @@ -1,11 +1,12 @@ --- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001 -@@ -28,7 +28,7 @@ +@@ -31,8 +31,8 @@ -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" - DEFINES = $(RSH) $(BSD) $(RPROGS) \ -- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" -+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" + DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ +- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ ++ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ + -DHEIMDAL_FRIENDLY all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP) diff --git a/security/krb5/files/patch-appl::bsd::klogind.M b/security/krb5/files/patch-appl::bsd::klogind.M index 1523c3d593df..9cddd5fc222d 100644 --- a/security/krb5/files/patch-appl::bsd::klogind.M +++ b/security/krb5/files/patch-appl::bsd::klogind.M @@ -1,10 +1,11 @@ --- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001 +++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001 -@@ -14,6 +14,7 @@ +@@ -14,7 +14,7 @@ + .B \-kr54cpPef ] - [ - [ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]] ] -+[\fB\-L\fP \fIloginpath\fP] + [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] +-[ \fB\-D\fP \fIport\fP ] ++[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP] .SH DESCRIPTION .I Klogind is the server for the @@ -29,6 +30,6 @@ -DO_NOT_USE_K_LOGIN was not defined when -.I klogind -was compiled. - .SH DIAGNOSTICS - All diagnostic messages are returned on the connection - associated with the + + .IP \fB\-D\ port\fP + Run in standalone mode, listening on \fBport\fP. The daemon will exit diff --git a/security/krb5/files/patch-appl::configure b/security/krb5/files/patch-appl::configure deleted file mode 100644 index 70d4267b1091..000000000000 --- a/security/krb5/files/patch-appl::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/configure Wed May 7 06:55:53 2003 -@@ -2133,13 +2133,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-appl::gssftp::configure b/security/krb5/files/patch-appl::gssftp::configure deleted file mode 100644 index b1150768685d..000000000000 --- a/security/krb5/files/patch-appl::gssftp::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/gssftp/configure.orig Tue Apr 8 17:11:48 2003 -+++ appl/gssftp/configure Wed May 7 06:58:08 2003 -@@ -3990,13 +3990,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5/files/patch-appl::gssftp::ftp::ftp_var.h new file mode 100644 index 000000000000..2faff676f220 --- /dev/null +++ b/security/krb5/files/patch-appl::gssftp::ftp::ftp_var.h @@ -0,0 +1,13 @@ +--- appl/gssftp/ftp/ftp_var.h.orig Mon Jun 16 15:37:40 2003 ++++ appl/gssftp/ftp/ftp_var.h Tue Jul 29 22:14:57 2003 +@@ -33,6 +33,10 @@ + * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90 + */ + ++#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000 ++#undef __BSD_VISIBLE ++#endif ++ + #ifdef _WIN32 + #include <windows.h> + #include <winsock2.h> diff --git a/security/krb5/files/patch-appl::telnet::telnet::configure b/security/krb5/files/patch-appl::telnet::telnet::configure deleted file mode 100644 index e7febc4ca2fd..000000000000 --- a/security/krb5/files/patch-appl::telnet::telnet::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/telnet/telnet/configure.orig Tue Apr 8 17:11:49 2003 -+++ appl/telnet/telnet/configure Wed May 7 13:31:45 2003 -@@ -2774,13 +2774,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-appl::telnet::telnetd::configure b/security/krb5/files/patch-appl::telnet::telnetd::configure deleted file mode 100644 index 16fe919a54e8..000000000000 --- a/security/krb5/files/patch-appl::telnet::telnetd::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- appl/telnet/telnetd/configure.orig Tue Apr 8 17:11:50 2003 -+++ appl/telnet/telnetd/configure Wed May 7 13:33:34 2003 -@@ -2518,13 +2518,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-as b/security/krb5/files/patch-as index 0b26c449fe11..de19886eac08 100644 --- a/security/krb5/files/patch-as +++ b/security/krb5/files/patch-as @@ -1,8 +1,8 @@ ---- clients/ksu/main.c.orig Wed Feb 28 14:06:55 2001 -+++ clients/ksu/main.c Thu Sep 6 16:21:46 2001 -@@ -31,6 +31,10 @@ - #include <sys/wait.h> +--- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002 ++++ clients/ksu/main.c Tue Jul 29 18:46:00 2003 +@@ -32,6 +32,10 @@ #include <signal.h> + #include <grp.h> +#ifdef LOGIN_CAP +#include <login_cap.h> @@ -11,43 +11,43 @@ /* globals */ char * prog_name; int auth_debug =0; -@@ -60,7 +64,7 @@ +@@ -61,7 +65,7 @@ ill specified arguments to commands */ void usage (){ -- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); -+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); +- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); ++ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); } /* for Ultrix and friends ... */ -@@ -76,6 +80,7 @@ - int argc; - char ** argv; +@@ -77,6 +81,7 @@ + int argc; + char ** argv; { -+int asme = 0; - int hp =0; - int some_rest_copy = 0; - int all_rest_copy = 0; -@@ -90,6 +95,7 @@ - char * cc_target_tag = NULL; - char * target_user = NULL; - char * source_user; -+char * source_shell; - - krb5_ccache cc_source = NULL; - const char * cc_source_tag = NULL; -@@ -118,6 +124,11 @@ - char * dir_of_cc_target; - char * dir_of_cc_source; - ++ int asme = 0; + int hp =0; + int some_rest_copy = 0; + int all_rest_copy = 0; +@@ -91,6 +96,7 @@ + char * cc_target_tag = NULL; + char * target_user = NULL; + char * source_user; ++ char * source_shell; + + krb5_ccache cc_source = NULL; + const char * cc_source_tag = NULL; +@@ -117,6 +123,11 @@ + krb5_principal kdc_server; + krb5_boolean zero_password; + char * dir_of_cc_target; ++ +#ifdef LOGIN_CAP -+login_cap_t *lc; -+int setwhat; ++ login_cap_t *lc; ++ int setwhat; +#endif -+ + options.opt = KRB5_DEFAULT_OPTIONS; options.lifetime = KRB5_DEFAULT_TKT_LIFE; - options.rlife =0; @@ -181,7 +192,7 @@ com_err (prog_name, errno, "while setting euid to source user"); exit (1); @@ -68,132 +68,128 @@ if ((retval = krb5_parse_name(ksu_context, optarg, &client))){ com_err(prog_name, retval, "when parsing name %s", optarg); @@ -341,6 +355,7 @@ - - /* allocate space and copy the usernamane there */ - source_user = xstrdup(pwd->pw_name); -+ source_shell = xstrdup(pwd->pw_shell); - source_uid = pwd->pw_uid; - source_gid = pwd->pw_gid; - -@@ -668,43 +683,64 @@ - /* get the shell of the user, this will be the shell used by su */ - target_pwd = getpwnam(target_user); - -- if (target_pwd->pw_shell) -- shell = xstrdup(target_pwd->pw_shell); -- else { -- shell = _DEF_CSH; /* default is cshell */ -- } -+ if (asme) { -+ if (source_shell && *source_shell) { -+ shell = strdup(source_shell); -+ } else { -+ shell = _DEF_CSH; -+ } + + /* allocate space and copy the usernamane there */ + source_user = xstrdup(pwd->pw_name); ++ source_shell = xstrdup(pwd->pw_shell); + source_uid = pwd->pw_uid; + source_gid = pwd->pw_gid; + +@@ -672,43 +687,64 @@ + /* get the shell of the user, this will be the shell used by su */ + target_pwd = getpwnam(target_user); + +- if (target_pwd->pw_shell) +- shell = xstrdup(target_pwd->pw_shell); +- else { +- shell = _DEF_CSH; /* default is cshell */ ++ if (asme) { ++ if (source_shell && *source_shell) { ++ shell = strdup(source_shell); + } else { -+ if (target_pwd->pw_shell) -+ shell = strdup(target_pwd->pw_shell); -+ else { -+ shell = _DEF_CSH; /* default is cshell */ -+ } ++ shell = _DEF_CSH; + } - ++ } else { ++ if (target_pwd->pw_shell) ++ shell = strdup(target_pwd->pw_shell); ++ else { ++ shell = _DEF_CSH; /* default is cshell */ ++ } + } + #ifdef HAVE_GETUSERSHELL - - /* insist that the target login uses a standard shell (root is omited) */ - -- if (!standard_shell(target_pwd->pw_shell) && source_uid) { -- fprintf(stderr, "ksu: permission denied (shell).\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -+ if (asme) { -+ if (!standard_shell(pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } else { -+ if (!standard_shell(target_pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - } + + /* insist that the target login uses a standard shell (root is omited) */ + +- if (!standard_shell(target_pwd->pw_shell) && source_uid) { +- fprintf(stderr, "ksu: permission denied (shell).\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); ++ if (asme) { ++ if (!standard_shell(pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } else { ++ if (!standard_shell(target_pwd->pw_shell) && source_uid) { ++ fprintf(stderr, "ksu: permission denied (shell).\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } #endif /* HAVE_GETUSERSHELL */ - -- if (target_pwd->pw_uid){ + +- if (target_pwd->pw_uid){ - -- if(set_env_var("USER", target_pwd->pw_name)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -- } -+ if (!asme) { -+ if (target_pwd->pw_uid){ -+ if (set_env_var("USER", target_pwd->pw_name)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } - -- if(set_env_var( "HOME", target_pwd->pw_dir)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "HOME", target_pwd->pw_dir)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - -- if(set_env_var( "SHELL", shell)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "SHELL", shell)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } +- if(set_env_var("USER", target_pwd->pw_name)){ ++ if (!asme) { ++ if (target_pwd->pw_uid){ ++ if (set_env_var("USER", target_pwd->pw_name)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } + } ++ ++ if (set_env_var( "HOME", target_pwd->pw_dir)){ + fprintf(stderr,"ksu: couldn't set environment variable USER\n"); + sweep_up(ksu_context, cc_target); + exit(1); +- } +- } +- +- if(set_env_var( "HOME", target_pwd->pw_dir)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ } + +- if(set_env_var( "SHELL", shell)){ +- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); +- sweep_up(ksu_context, cc_target); +- exit(1); +- } ++ if (set_env_var( "SHELL", shell)){ ++ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); ++ sweep_up(ksu_context, cc_target); ++ exit(1); ++ } ++ } + +#ifdef LOGIN_CAP -+ lc = login_getpwclass(pwd); ++ lc = login_getpwclass(pwd); +#endif - - /* set the cc env name to target */ - -@@ -714,7 +750,18 @@ - sweep_up(ksu_context, cc_target); - exit(1); - } -- + + /* set the cc env name to target */ + +@@ -718,7 +754,19 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +- ++ +#ifdef LOGIN_CAP -+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; -+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; -+ /* -+ * Don't touch resource/priority settings if -m has been -+ * used or -l and -c hasn't, and we're not su'ing to root. -+ */ -+ if (target_pwd->pw_uid) -+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); -+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) -+ err(1, "setusercontext"); ++ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; ++ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; ++ /* ++ * Don't touch resource/priority settings if -m has been ++ * used or -l and -c hasn't, and we're not su'ing to root. ++ */ ++ if (target_pwd->pw_uid) ++ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); ++ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) ++ err(1, "setusercontext"); +#else - /* set permissions */ - if (setgid(target_pwd->pw_gid) < 0) { - perror("ksu: setgid"); -@@ -754,7 +801,8 @@ - perror("ksu: setuid"); - sweep_up(ksu_context, cc_target); - exit(1); -- } -+ } + /* set permissions */ + if (setgid(target_pwd->pw_gid) < 0) { + perror("ksu: setgid"); +@@ -759,6 +807,7 @@ + sweep_up(ksu_context, cc_target); + exit(1); + } +#endif - - if (access( cc_target_tag_tmp, R_OK | W_OK )){ - com_err(prog_name, errno, + + if (access( cc_target_tag_tmp, R_OK | W_OK )){ + com_err(prog_name, errno, diff --git a/security/krb5/files/patch-at b/security/krb5/files/patch-at index ef9ea4856f7a..060207ec644a 100644 --- a/security/krb5/files/patch-at +++ b/security/krb5/files/patch-at @@ -1,5 +1,5 @@ -*** include/sys/syslog.h.ORIG Fri Feb 6 19:42:12 1998 ---- include/sys/syslog.h Tue Jun 30 19:46:02 1998 +*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998 +--- include/syslog.h Tue Jun 30 19:46:02 1998 *************** *** 34,39 **** --- 34,42 ---- diff --git a/security/krb5/files/patch-ax b/security/krb5/files/patch-ax index 58cfe89d9294..443b321e28db 100644 --- a/security/krb5/files/patch-ax +++ b/security/krb5/files/patch-ax @@ -1,11 +1,11 @@ ---- ../doc/Makefile.orig Wed Jan 20 21:57:45 1999 -+++ ../doc/Makefile Wed Jan 20 21:59:19 1999 +--- ../doc/Makefile.orig Fri Sep 20 10:35:27 2002 ++++ ../doc/Makefile Tue Jul 29 18:53:08 2003 @@ -1,7 +1,7 @@ SRCDIR=../src DVI=texi2dvi DVIPS=dvips -o "$@" -INFO=makeinfo +INFO=makeinfo --no-validate - HTML=texi2html + HTML=makeinfo --html RM=rm -f TAR=tar -chvf diff --git a/security/krb5/files/patch-ba b/security/krb5/files/patch-ba index 60d70466eff3..dd0c760df7d2 100644 --- a/security/krb5/files/patch-ba +++ b/security/krb5/files/patch-ba @@ -1,6 +1,6 @@ ---- appl/bsd/login.c.ORIG Wed Oct 13 12:55:47 1999 -+++ appl/bsd/login.c Wed Oct 13 12:56:29 1999 -@@ -1303,19 +1304,6 @@ +--- appl/bsd/login.c.orig Tue May 27 21:06:25 2003 ++++ appl/bsd/login.c Tue Jul 29 20:52:25 2003 +@@ -1342,19 +1342,6 @@ setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); } @@ -18,9 +18,9 @@ - break; - if (got_v5_tickets) { - if (retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, - NULL, &xtra_creds, -@@ -1338,6 +1326,9 @@ + retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, + NULL, &xtra_creds, +@@ -1378,6 +1365,9 @@ } #endif /* KRB4_GET_TICKETS */ @@ -30,36 +30,32 @@ bad_login: setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); -@@ -1640,20 +1631,28 @@ +@@ -1667,21 +1657,23 @@ /* set up credential cache -- obeying KRB5_ENV_CCNAME set earlier */ /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */ -- if (retval = krb5_cc_default(kcontext, &ccache)) { -+ retval = krb5_cc_default(kcontext, &ccache); -+ if (retval) +- if ((retval = krb5_cc_default(kcontext, &ccache))) { ++ if ((retval = krb5_cc_default(kcontext, &ccache))) com_err(argv[0], retval, "while getting default ccache"); -- } else if (retval = krb5_cc_initialize(kcontext, ccache, me)) { +- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) { - com_err(argv[0], retval, "when initializing cache"); -- } else if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) { +- } else if ((retval = krb5_cc_store_cred(kcontext, ccache, +- &my_creds))) { - com_err(argv[0], retval, "while storing credentials"); - } else if (xtra_creds && - (retval = krb5_cc_copy_creds(kcontext, xtra_creds, - ccache))) { - com_err(argv[0], retval, "while storing credentials"); + else { -+ retval = krb5_cc_initialize(kcontext, ccache, me); -+ if (retval) ++ if (retval = krb5_cc_initialize(kcontext, ccache, me)) + com_err(argv[0], retval, "when initializing cache"); + else { -+ retval = krb5_cc_store_cred(kcontext, ccache, &my_creds); -+ if (retval) ++ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) + com_err(argv[0], retval, "while storing credentials"); + else { -+ if (xtra_creds) { -+ retval = krb5_cc_copy_creds(kcontext, xtra_creds, -+ ccache); -+ if (retval) -+ com_err(argv[0], retval, "while storing credentials"); ++ if (xtra_creds && ++ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) { ++ com_err(argv[0], retval, "while storing credentials"); + krb5_cc_destroy(kcontext, xtra_creds); + } + } @@ -71,7 +67,7 @@ } else if (forwarded_v5_tickets && rewrite_ccache) { if ((retval = krb5_cc_initialize (kcontext, ccache, me))) { syslog(LOG_ERR, -@@ -1727,6 +1727,7 @@ +@@ -1762,6 +1754,7 @@ if (ccname) setenv("KRB5CCNAME", ccname, 1); diff --git a/security/krb5/files/patch-clients::configure b/security/krb5/files/patch-clients::configure deleted file mode 100644 index f6f91152b216..000000000000 --- a/security/krb5/files/patch-clients::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- clients/configure.orig Tue Apr 8 17:11:51 2003 -+++ clients/configure Wed May 7 13:35:57 2003 -@@ -1932,13 +1932,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-config::pre.in b/security/krb5/files/patch-config::pre.in new file mode 100644 index 000000000000..fc3ff4c7a047 --- /dev/null +++ b/security/krb5/files/patch-config::pre.in @@ -0,0 +1,10 @@ +--- config/pre.in.orig Tue May 27 21:06:28 2003 ++++ config/pre.in Wed Aug 6 11:11:54 2003 +@@ -152,6 +152,7 @@ + INSTALL=@INSTALL@ + INSTALL_STRIP= + INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_SHLIB=@INSTALL_SHLIB@ + INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::configure b/security/krb5/files/patch-config::shlib.conf index 16fe919a54e8..48d5e9a51f8b 100644 --- a/security/krb5-16/files/patch-appl::telnet::telnetd::configure +++ b/security/krb5/files/patch-config::shlib.conf @@ -1,18 +1,19 @@ ---- appl/telnet/telnetd/configure.orig Tue Apr 8 17:11:50 2003 -+++ appl/telnet/telnetd/configure Wed May 7 13:33:34 2003 -@@ -2518,13 +2518,14 @@ +--- config/shlib.conf.orig Sun Mar 2 23:09:45 2003 ++++ config/shlib.conf Tue Jul 29 18:16:43 2003 +@@ -179,14 +179,15 @@ PICFLAGS=-fpic if test "x$objformat" = "xelf" ; then SHLIBVEXT='.so.$(LIBMAJOR)' + LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' + RPATH_FLAG='-Wl,-rpath -Wl,' else + LDCOMBINE='ld -Bshareable' + RPATH_FLAG=-R SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' fi + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-configure b/security/krb5/files/patch-configure deleted file mode 100644 index ed80b9bf8ffc..000000000000 --- a/security/krb5/files/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.orig Tue Apr 8 17:11:46 2003 -+++ configure Wed May 7 06:53:40 2003 -@@ -1992,13 +1992,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-doc::man2html b/security/krb5/files/patch-doc::man2html new file mode 100644 index 000000000000..88f00d594e54 --- /dev/null +++ b/security/krb5/files/patch-doc::man2html @@ -0,0 +1,7 @@ +--- ../doc/man2html.orig Wed Jun 26 14:15:11 2002 ++++ ../doc/man2html Wed Jul 30 19:05:54 2003 +@@ -1,4 +1,3 @@ +-#!/usr/athena/bin/perl + #!/usr/local/bin/perl + ##---------------------------------------------------------------------------## + ## File: diff --git a/security/krb5/files/patch-include::krb5.hin b/security/krb5/files/patch-include::krb5.hin deleted file mode 100644 index 812664fc0b0e..000000000000 --- a/security/krb5/files/patch-include::krb5.hin +++ /dev/null @@ -1,16 +0,0 @@ -Index: include/krb5.hin -=================================================================== -RCS file: /cvs/krbdev/krb5/src/include/krb5.hin,v -retrieving revision 1.94.2.5.2.17 -diff -p -u -r1.94.2.5.2.17 krb5.hin ---- include/krb5.hin 2002/04/16 23:47:53 1.94.2.5.2.17 -+++ include/krb5.hin 2003/03/19 00:38:54 -@@ -326,7 +326,7 @@ typedef krb5_const krb5_principal_data F - #define krb5_princ_size(context, princ) (princ)->length - #define krb5_princ_type(context, princ) (princ)->type - #define krb5_princ_name(context, princ) (princ)->data --#define krb5_princ_component(context, princ,i) ((princ)->data + i) -+#define krb5_princ_component(context, princ,i) (i < krb5_princ_size(context, princ) ? ((princ)->data + i) : NULL) - - /* - * end "base-defs.h" diff --git a/security/krb5/files/patch-kadmin::cli::Makefile.in b/security/krb5/files/patch-kadmin::cli::Makefile.in new file mode 100644 index 000000000000..266deea90231 --- /dev/null +++ b/security/krb5/files/patch-kadmin::cli::Makefile.in @@ -0,0 +1,11 @@ +--- kadmin/cli/Makefile.in.orig Fri Feb 7 13:41:20 2003 ++++ kadmin/cli/Makefile.in Tue Aug 5 16:32:02 2003 +@@ -21,7 +21,7 @@ + install:: + $(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local + $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) +- $(INSTALL_PROGRAM) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil ++ $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil + $(INSTALL_DATA) $(srcdir)/k5srvutil.M ${DESTDIR}$(ADMIN_MANDIR)/k5srvutil.8 + $(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8 + $(INSTALL_DATA) $(srcdir)/$(PROG).local.M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).local.8 diff --git a/security/krb5/files/patch-kadmin::configure b/security/krb5/files/patch-kadmin::configure deleted file mode 100644 index 7e96fdca346f..000000000000 --- a/security/krb5/files/patch-kadmin::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kadmin/configure.orig Tue Apr 8 17:11:55 2003 -+++ kadmin/configure Wed May 7 13:38:20 2003 -@@ -3229,13 +3229,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-kdc::configure b/security/krb5/files/patch-kdc::configure deleted file mode 100644 index 348327637ad7..000000000000 --- a/security/krb5/files/patch-kdc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- kdc/configure.orig Tue Apr 8 17:11:51 2003 -+++ kdc/configure Wed May 7 13:35:06 2003 -@@ -2614,13 +2614,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-krb524::configure b/security/krb5/files/patch-krb524::configure deleted file mode 100644 index 97b97f7a109b..000000000000 --- a/security/krb5/files/patch-krb524::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- krb524/configure.orig Tue Apr 8 17:11:55 2003 -+++ krb524/configure Wed May 7 13:39:07 2003 -@@ -1933,13 +1933,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::crypto::configure b/security/krb5/files/patch-lib::crypto::configure deleted file mode 100644 index fccbe4edcc56..000000000000 --- a/security/krb5/files/patch-lib::crypto::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/crypto/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/crypto/configure Wed May 7 13:41:20 2003 -@@ -2027,13 +2027,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::des425::configure b/security/krb5/files/patch-lib::des425::configure deleted file mode 100644 index 9902d993381d..000000000000 --- a/security/krb5/files/patch-lib::des425::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/des425/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/des425/configure Wed May 7 13:43:40 2003 -@@ -2116,13 +2116,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::gssapi::configure b/security/krb5/files/patch-lib::gssapi::configure deleted file mode 100644 index 211dab73d33b..000000000000 --- a/security/krb5/files/patch-lib::gssapi::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/gssapi/configure.orig Tue Apr 8 17:11:57 2003 -+++ lib/gssapi/configure Wed May 7 13:45:34 2003 -@@ -2430,13 +2430,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::kadm5::configure b/security/krb5/files/patch-lib::kadm5::configure deleted file mode 100644 index d7051e3198e5..000000000000 --- a/security/krb5/files/patch-lib::kadm5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kadm5/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/kadm5/configure Wed May 7 14:02:39 2003 -@@ -3227,13 +3227,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::kdb::configure b/security/krb5/files/patch-lib::kdb::configure deleted file mode 100644 index dcb351933336..000000000000 --- a/security/krb5/files/patch-lib::kdb::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/kdb/configure.orig Tue Apr 8 17:11:56 2003 -+++ lib/kdb/configure Wed May 7 13:42:32 2003 -@@ -2203,13 +2203,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::krb4::configure b/security/krb5/files/patch-lib::krb4::configure deleted file mode 100644 index 5499de900739..000000000000 --- a/security/krb5/files/patch-lib::krb4::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb4/configure.orig Tue Apr 8 17:11:58 2003 -+++ lib/krb4/configure Wed May 7 14:20:05 2003 -@@ -2445,13 +2445,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::krb5::configure b/security/krb5/files/patch-lib::krb5::configure deleted file mode 100644 index 615eeeabe1fd..000000000000 --- a/security/krb5/files/patch-lib::krb5::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5/configure Wed May 7 14:04:55 2003 -@@ -2658,13 +2658,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::krb5::keytab::file:ktf_util.c b/security/krb5/files/patch-lib::krb5::keytab::file:ktf_util.c deleted file mode 100644 index c97b3a3c85ae..000000000000 --- a/security/krb5/files/patch-lib::krb5::keytab::file:ktf_util.c +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c krb5-1.2.7/src/lib/krb5/keytab/file/ktf_util.c ---- lib/krb5/keytab/file/ktf_util.c 1999-09-24 17:19:01.000000000-0400 -+++ lib/krb5/keytab/file/ktf_util.c 2003-02-03 18:02:25.000000000-0500 -@@ -441,7 +441,7 @@ - return 0; - fail: - -- for (i = 0; i < ret_entry->principal->length; i++) { -+ for (i = 0; i < krb5_princ_size(context, ret_entry->principal); i++) { - princ = krb5_princ_component(context, ret_entry->principal, i); - if (princ->data) - free(princ->data); -@@ -498,9 +498,9 @@ - } - - if (KTVERSION(id) == KRB5_KT_VNO_1) { -- count = (krb5_int16) entry->principal->length + 1; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal) + 1; - } else { -- count = htons((u_short) entry->principal->length); -+ count = htons((u_short) krb5_princ_size(context, entry->principal)); - } - - if (!xfwrite(&count, sizeof(count), 1, KTFILEP(id))) { -@@ -519,7 +519,7 @@ - goto abend; - } - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - for (i = 0; i < count; i++) { - princ = krb5_princ_component(context, entry->principal, i); - size = princ->length; -@@ -620,7 +620,7 @@ - krb5_int32 total_size, i; - krb5_error_code retval = 0; - -- count = (krb5_int16) entry->principal->length; -+ count = (krb5_int16) krb5_princ_size(context, entry->principal); - - total_size = sizeof(count); - total_size += krb5_princ_realm(context, entry->principal)->length + (sizeof(krb5_int16)); diff --git a/security/krb5/files/patch-lib::krb5util::configure b/security/krb5/files/patch-lib::krb5util::configure deleted file mode 100644 index e4be2657a8bc..000000000000 --- a/security/krb5/files/patch-lib::krb5util::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/krb5util/configure.orig Tue Apr 8 17:11:59 2003 -+++ lib/krb5util/configure Wed May 7 14:05:52 2003 -@@ -2044,13 +2044,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::rpc::configure b/security/krb5/files/patch-lib::rpc::configure deleted file mode 100644 index fad09e67cfb5..000000000000 --- a/security/krb5/files/patch-lib::rpc::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/configure.orig Tue Apr 8 17:12:01 2003 -+++ lib/rpc/configure Wed May 7 14:07:47 2003 -@@ -2524,13 +2524,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-lib::rpc::unit-test::configure b/security/krb5/files/patch-lib::rpc::unit-test::configure deleted file mode 100644 index d0583a35c75a..000000000000 --- a/security/krb5/files/patch-lib::rpc::unit-test::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/rpc/unit-test/configure.orig Tue Apr 8 17:12:00 2003 -+++ lib/rpc/unit-test/configure Wed May 7 14:06:51 2003 -@@ -2700,13 +2700,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-slave::configure b/security/krb5/files/patch-slave::configure deleted file mode 100644 index 1864338febe4..000000000000 --- a/security/krb5/files/patch-slave::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- slave/configure.orig Tue Apr 8 17:12:01 2003 -+++ slave/configure Wed May 7 14:08:31 2003 -@@ -1975,13 +1975,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-tests::configure b/security/krb5/files/patch-tests::configure deleted file mode 100644 index 5bd048bec288..000000000000 --- a/security/krb5/files/patch-tests::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- tests/configure.orig Tue Apr 8 17:12:02 2003 -+++ tests/configure Wed May 7 14:09:13 2003 -@@ -1868,13 +1868,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-util::et::configure b/security/krb5/files/patch-util::et::configure deleted file mode 100644 index 090e9573bdc9..000000000000 --- a/security/krb5/files/patch-util::et::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/et/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/et/configure Wed May 7 14:13:49 2003 -@@ -2607,13 +2607,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-util::profile::configure b/security/krb5/files/patch-util::profile::configure deleted file mode 100644 index b89ac6584c7c..000000000000 --- a/security/krb5/files/patch-util::profile::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/profile/configure.orig Tue Apr 8 17:12:04 2003 -+++ util/profile/configure Wed May 7 14:14:47 2003 -@@ -2269,13 +2269,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-util::pty::configure b/security/krb5/files/patch-util::pty::configure deleted file mode 100644 index 9129f7f78b42..000000000000 --- a/security/krb5/files/patch-util::pty::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/pty/configure.orig Tue Apr 8 17:12:05 2003 -+++ util/pty/configure Wed May 7 14:15:42 2003 -@@ -3751,13 +3751,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/files/patch-util::ss::configure b/security/krb5/files/patch-util::ss::configure deleted file mode 100644 index 1e3cf80f6978..000000000000 --- a/security/krb5/files/patch-util::ss::configure +++ /dev/null @@ -1,18 +0,0 @@ ---- util/ss/configure.orig Tue Apr 8 17:12:06 2003 -+++ util/ss/configure Wed May 7 14:16:25 2003 -@@ -2677,13 +2677,14 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' - else -+ LDCOMBINE='ld -Bshareable' - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' - fi - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist index f6494e183d94..ffc5cf6892a3 100644 --- a/security/krb5/pkg-plist +++ b/security/krb5/pkg-plist @@ -26,14 +26,11 @@ include/gssapi/gssapi.h include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h include/kerberosIV/des.h -include/kerberosIV/kadm.h +include/kerberosIV/kadm_err.h include/kerberosIV/krb.h include/kerberosIV/krb_err.h include/kerberosIV/mit-copyright.h include/krb5.h -include/libpty.h -include/mit-sipb-copyright.h -include/port-sockets.h include/profile.h info/krb425.info info/krb5-admin.info @@ -50,9 +47,6 @@ lib/libcom_err.so.3 lib/libdes425.a lib/libdes425.so lib/libdes425.so.3 -lib/libdyn.a -lib/libdyn.so -lib/libdyn.so.1 lib/libgssapi_krb5.a lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 @@ -70,18 +64,13 @@ lib/libkadm5srv.so lib/libkadm5srv.so.5 lib/libkdb5.a lib/libkdb5.so -lib/libkdb5.so.3 +lib/libkdb5.so.4 %%KRB4%%lib/libkrb4.a %%KRB4%%lib/libkrb4.so %%KRB4%%lib/libkrb4.so.2 lib/libkrb5.a lib/libkrb5.so lib/libkrb5.so.3 -%%KRB4%%lib/libkrb524.a -lib/libpty.a -lib/libpty.so -lib/libpty.so.1 -lib/libss.a sbin/ftpd sbin/gss-server sbin/kadmin @@ -104,21 +93,9 @@ sbin/telnetd sbin/uuserver sbin/v5passwdd share/doc/krb5/README.FreeBSD -share/doc/krb5/admin.html -share/doc/krb5/admin_foot.html -share/doc/krb5/admin_toc.html -share/doc/krb5/install.html -share/doc/krb5/install_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/krb425_toc.html -share/doc/krb5/user-guide.html -share/doc/krb5/user-guide_foot.html -share/doc/krb5/user-guide_toc.html share/gnats/mit @dirrm include/gssapi @dirrm include/kerberosIV -@dirrm share/doc/krb5 @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir |