[Midnightbsd-cvs] mports [17709] trunk/security/krb5: krb5 1.12.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Oct 9 08:28:32 EDT 2014
Revision: 17709
http://svnweb.midnightbsd.org/mports/?rev=17709
Author: laffer1
Date: 2014-10-09 08:28:31 -0400 (Thu, 09 Oct 2014)
Log Message:
-----------
krb5 1.12.2
Modified Paths:
--------------
trunk/security/krb5/Makefile
trunk/security/krb5/distinfo
trunk/security/krb5/pkg-plist
Added Paths:
-----------
trunk/security/krb5/files/kpropd.in
trunk/security/krb5/files/patch-clients__ksu__Makefile.in
trunk/security/krb5/files/patch-config__pre.in
trunk/security/krb5/files/patch-config__shlib.conf
trunk/security/krb5/files/patch-lib-apputils-net-server.c
trunk/security/krb5/files/patch-lib__gssapi__krb5__import_name.c
Removed Paths:
-------------
trunk/security/krb5/files/patch-ac
trunk/security/krb5/files/patch-ad
trunk/security/krb5/files/patch-ae
trunk/security/krb5/files/patch-as
trunk/security/krb5/files/patch-av
trunk/security/krb5/files/patch-ax
trunk/security/krb5/files/patch-config::pre.in
trunk/security/krb5/files/patch-config::shlib.conf
trunk/security/krb5/files/patch-lib::gssapi::krb5::import_name.c
Modified: trunk/security/krb5/Makefile
===================================================================
--- trunk/security/krb5/Makefile 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/Makefile 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,63 +1,80 @@
+# Created by: nectar at FreeBSD.org
+# $FreeBSD: head/security/krb5/Makefile 364798 2014-08-13 18:32:02Z cy $
# $MidnightBSD$
-# $FreeBSD: ports/security/krb5/Makefile,v 1.155 2011/12/14 04:33:23 cy Exp $
PORTNAME= krb5
-PORTVERSION= 1.9.2
+PORTVERSION= 1.12.2
CATEGORIES= security
MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
-PATCH_SITES= http://web.mit.edu/kerberos/advisories/
DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
EXTRACT_SUFX= .tar
-PATCHFILES= 2011-007-patch.txt
+PATCH_SITES= http://web.mit.edu/kerberos/advisories/
+PATCH_DIST_STRIP= -p2
+
MAINTAINER= ports at MidnightBSD.org
-COMMENT= An authentication system developed at MIT, successor to Kerberos IV
+COMMENT= Authentication system developed at MIT, successor to Kerberos IV
+
LICENSE= mit
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-CONFLICTS= heimdal-[0-9]* srp-[0-9]*
+CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-maint-[0-9]*
LATEST_LINK= ${PORTNAME}-19
KERBEROSV_URL= http://web.mit.edu/kerberos/
-USE_OPENSSL= yes
-USE_GMAKE= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS?= --enable-shared
+USE_CSTD= gnu99
+GNU_CONFIGURE= yes
+USES= gettext gmake perl5 libtool:build
+CONFIGURE_ARGS?= --enable-shared --without-system-verto
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}"
MAKE_ARGS= INSTALL="${INSTALL}"
-PATCH_DIST_STRIP= -p2
-OPTIONS= KRB5_DOC "Build and install krb5 documentation" on \
- WANT_HTML "Want HTML documentation too" on \
- DNS_FOR_REALM "enable DNS lookups of Kerberos realm names" off
+OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE
+OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML
+KRB5_PDF_DESC= Install krb5 PDF documentation
+KRB5_HTML_DESC= Install krb5 HTML documentation
+DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names
+LDAP= Enable LDAP support
.if defined(KRB5_HOME)
PREFIX= ${KRB5_HOME}
-CFLAGS+= -rpath=${KRB5_HOME}/lib
-LDFLAGS+= -rpath=${KRB5_HOME}/lib
+CFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib
+LDFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib
.endif
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
+USE_OPENSSL= yes
+USE_RC_SUBR= kpropd
+
.include <bsd.port.pre.mk>
-.if defined(WITH_DNS_FOR_REALM)
+
+.if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE}
+BROKEN= LIB_DEPENDS when using KRB5_HOME is broken
+.endif
+
+.if ${PORT_OPTIONS:MDNS_FOR_REALM}
CONFIGURE_ARGS+= --enable-dns-for-realm
.endif
-.if defined(WITH_KRB5_DOC)
-BUILD_DEPENDS+= texi2dvi:${PORTSDIR}/print/texinfo \
- dvips:${PORTSDIR}/print/dvipsk-tetex
-INFO= krb5-admin krb5-install krb5-user
+.if ${PORT_OPTIONS:MLDAP}
+USE_OPENLDAP= yes
+CONFIGURE_ARGS+= --with-ldap
+PLIST_SUB+= LDAP=""
+.else
+PLIST_SUB+= LDAP="@comment "
.endif
-MAN1= k5srvutil.1 kadmin.1 krb5-send-pr.1 krb5-config.1 \
- kpasswd.1 klist.1 kinit.1 kdestroy.1 ksu.1 ktutil.1 \
- sclient.1 kerberos.1 kvno.1 compile_et.1
-MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8= krb5kdc.8 kadmin.local.8 kdb5_util.8 kadmind.8 \
- kprop.8 kpropd.8 kproplog.8 sserver.8
+.if ${PORT_OPTIONS:MREADLINE}
+USES+= readline:port
+CONFIGURE_ARGS+= --with-readline
+.endif
+EXTENSIONS+= openssl
+
.if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != ""
CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}"
.endif
@@ -64,13 +81,10 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
-HTML_DOCS= ftp.html kdestroy.html kinit.html klist.html \
- kpasswd.html krb5-admin.html \
- krb5-install.html krb5-user.html ksu.html \
- rcp.html rlogin.html rsh.html telnet.html
+HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html
+PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
-CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
+CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include"
post-extract:
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
@@ -82,33 +96,42 @@
fi
.endif
-post-patch:
- @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \
- ${WRKSRC}/../doc/man2html
-
-post-build:
-.if defined(WITH_KRB5_DOC)
- @cd ${WRKSRC}/../doc && \
- ${MAKE} all
-.endif
-
post-install:
@${MKDIR} ${PREFIX}/share/doc/krb5
# html documentation
-.if defined(WITH_KRB5_DOC) && defined(WITH_WANT_HTML)
- for html in ${HTML_DOC_DIR}/*.html; do \
- ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \
- ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \
+.if ${PORT_OPTIONS:MKRB5_PDF}
+ pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d`
+ pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d`
+ for i in $${pdf_dirs}; do \
+ ${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \
+ done; \
+ for i in $${pdf_files}; do \
+ ${INSTALL_MAN} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \
+ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
done
.endif
+.if ${PORT_OPTIONS:MKRB5_HTML}
+ html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources`
+ html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources`
+ for i in $${html_dirs}; do \
+ ${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \
+ done; \
+ for i in $${html_files}; do \
+ ${INSTALL_MAN} $${i} ${PREFIX}/share/doc/krb5/$${i}; \
+ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
+ done
+.endif
+.if ${PORT_OPTIONS:MKRB5_PDF}
+ for i in $${pdf_dirs}; do \
+ ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \
+ done | ${TAIL} -r >> ${TMPPLIST}
+.endif
+.if ${PORT_OPTIONS:MKRB5_HTML}
+ for i in $${html_dirs}; do \
+ ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \
+ done | ${TAIL} -r >> ${TMPPLIST}
+.endif
${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
-# handle info files
-.if defined(WITH_KRB5_DOC)
-.for info in ${INFO}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
-.endfor
-.endif
-
@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.MidnightBSD > ${PREFIX}/share/doc/krb5/README.MidnightBSD
@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.MidnightBSD
@${ECHO} "------------------------------------------------------"
Modified: trunk/security/krb5/distinfo
===================================================================
--- trunk/security/krb5/distinfo 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/distinfo 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,6 +1,2 @@
-SHA256 (krb5-1.9.2-signed.tar) = 96b213345b02862b5fef61ef1dd26f643f07e4207496c35179cea35ddb7ae68c
-RMD160 (krb5-1.9.2-signed.tar) = 4129e76f6725c18fb3c24b5dd1c5b41f6ee94b5f
-SIZE (krb5-1.9.2-signed.tar) = 12185600
-SHA256 (2011-007-patch.txt) = 0b0413e175e81b5fb7497f3351341066644431d72663bb1cba9d59b715669486
-RMD160 (2011-007-patch.txt) = c72c99b40c5f230ca430fde33460616c7634b037
-SIZE (2011-007-patch.txt) = 1417
+SHA256 (krb5-1.12.2-signed.tar) = 09bd180107b5c2b3b7378c57c023fb02a103d4cac39d6f2dd600275d7a4f3744
+SIZE (krb5-1.12.2-signed.tar) = 11991040
Added: trunk/security/krb5/files/kpropd.in
===================================================================
--- trunk/security/krb5/files/kpropd.in (rev 0)
+++ trunk/security/krb5/files/kpropd.in 2014-10-09 12:28:31 UTC (rev 17709)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# $MidnightBSD$
+# $FreeBSD: head/security/krb5/files/kpropd.in 351689 2014-04-21 15:55:07Z brd $
+#
+# PROVIDE: kpropd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# kpropd_enable (bool): Set to NO by default.
+# Set it to YES to enable kpropd.
+# kpropd_flags (str): Set to "" by default.
+
+. /etc/rc.subr
+
+name=kpropd
+rcvar=kpropd_enable
+
+load_rc_config $name
+
+: ${kpropd_enable:="NO"}
+: ${kpropd_flags=""}
+
+command=%%PREFIX%%/sbin/${name}
+
+run_rc_command "$1"
Property changes on: trunk/security/krb5/files/kpropd.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/security/krb5/files/patch-ac
===================================================================
--- trunk/security/krb5/files/patch-ac 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-ac 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo Fri Feb 6 21:40:56 1998
-+++ admin.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+ at dircategory Kerberos V5
-+ at direntry
-+* Admin Guide: (krb5-admin). Kerberos V5 System Admin's Guide
-+ at end direntry
- @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
Deleted: trunk/security/krb5/files/patch-ad
===================================================================
--- trunk/security/krb5/files/patch-ad 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-ad 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo Fri Feb 6 21:40:58 1998
-+++ user-guide.texinfo Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+ at dircategory Kerberos V5
-+ at direntry
-+* User's Guide: (krb5-user). Kerberos V5 UNIX User's Guide
-+ at end direntry
- @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
Deleted: trunk/security/krb5/files/patch-ae
===================================================================
--- trunk/security/krb5/files/patch-ae 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-ae 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo Fri Feb 6 21:40:56 1998
-+++ install.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+ at dircategory Kerberos V5
-+ at direntry
-+* Installation Guide: (krb5-install). Kerberos V5 Installation Guide
-+ at end direntry
- @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
Deleted: trunk/security/krb5/files/patch-as
===================================================================
--- trunk/security/krb5/files/patch-as 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-as 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,192 +0,0 @@
---- clients/ksu/main.c.orig 2009-11-02 19:27:56.000000000 -0800
-+++ clients/ksu/main.c 2010-04-19 12:27:09.090190157 -0700
-@@ -33,6 +33,10 @@
- #include <signal.h>
- #include <grp.h>
-
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;
-@@ -62,7 +66,7 @@
- ill specified arguments to commands */
-
- void usage (){
-- 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 ... */
-@@ -78,6 +82,7 @@
- int argc;
- char ** argv;
- {
-+ int asme = 0;
- int hp =0;
- int some_rest_copy = 0;
- int all_rest_copy = 0;
-@@ -92,6 +97,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;
-@@ -119,6 +125,11 @@
- krb5_boolean zero_password;
- char * dir_of_cc_target;
-
-+#ifdef LOGIN_CAP
-+ login_cap_t *lc;
-+ int setwhat;
-+#endif
-+
- options.opt = KRB5_DEFAULT_OPTIONS;
- options.lifetime = KRB5_DEFAULT_TKT_LIFE;
- options.rlife =0;
-@@ -182,7 +193,8 @@
- com_err (prog_name, errno, "while setting euid to source user");
- exit (1);
- }
-- while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+ while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
-+
- switch (option) {
- case 'r':
- options.opt |= KDC_OPT_RENEWABLE;
-@@ -228,6 +240,9 @@
- errflg++;
- }
- break;
-+ case 'm':
-+ asme = 1;
-+ break;
- case 'n':
- if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- com_err(prog_name, retval, "when parsing name %s", optarg);
-@@ -342,6 +357,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;
-
-@@ -673,43 +689,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;
-+ }
-+ } 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);
-+ }
- }
- #endif /* HAVE_GETUSERSHELL */
-
-- if (target_pwd->pw_uid){
-+ 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("USER", target_pwd->pw_name)){
-+ 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);
-+#endif
-
- /* set the cc env name to target */
-
-@@ -720,6 +757,19 @@
- exit(1);
- }
-
-+#ifdef LOGIN_CAP
-+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORIT
-+
-+ 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");
-@@ -760,6 +810,7 @@
- sweep_up(ksu_context, cc_target);
- exit(1);
- }
-+#endif /* LOGIN_CAP */
-
- if (access( cc_target_tag_tmp, R_OK | W_OK )){
- com_err(prog_name, errno,
Deleted: trunk/security/krb5/files/patch-av
===================================================================
--- trunk/security/krb5/files/patch-av 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-av 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998
---- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998
-***************
-*** 3,7 ****
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
---- 3,7 ----
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
Deleted: trunk/security/krb5/files/patch-ax
===================================================================
--- trunk/security/krb5/files/patch-ax 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-ax 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,12 +0,0 @@
---- ../doc/Makefile.orig 2007-09-17 20:36:09.000000000 -0700
-+++ ../doc/Makefile 2007-10-25 14:04:48.000000000 -0700
-@@ -1,8 +1,8 @@
- SRCDIR=../src
- DVI=texi2dvi
- DVIPS=dvips -o "$@"
- PSPDF=ps2pdf
--INFO=makeinfo
-+INFO=makeinfo --no-validate --no-split
- HTML=makeinfo --html --no-split
- RM=rm -f
- TAR=tar -chvf
Added: trunk/security/krb5/files/patch-clients__ksu__Makefile.in
===================================================================
--- trunk/security/krb5/files/patch-clients__ksu__Makefile.in (rev 0)
+++ trunk/security/krb5/files/patch-clients__ksu__Makefile.in 2014-10-09 12:28:31 UTC (rev 17709)
@@ -0,0 +1,18 @@
+--- clients/ksu/Makefile.in.orig 2014-01-15 16:44:15.000000000 -0800
++++ clients/ksu/Makefile.in 2014-05-05 20:51:51.925985974 -0700
+@@ -1,6 +1,6 @@
+ mydir=clients$(S)ksu
+ BUILDTOP=$(REL)..$(S)..
+-DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
++DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG
+
+ KSU_LIBS=@KSU_LIBS@
+
+@@ -30,6 +30,6 @@
+
+ install::
+ -for f in ksu; do \
+- $(INSTALL_SETUID) $$f \
++ $(INSTALL_PROGRAM) $$f \
+ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+ done
Property changes on: trunk/security/krb5/files/patch-clients__ksu__Makefile.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/security/krb5/files/patch-config::pre.in
===================================================================
--- trunk/security/krb5/files/patch-config::pre.in 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-config::pre.in 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,11 +0,0 @@
---- config/pre.in.orig Fri Nov 19 13:47:51 2004
-+++ config/pre.in Thu Jan 27 17:43:12 2005
-@@ -177,7 +177,7 @@
- INSTALL=@INSTALL@
- INSTALL_STRIP=
- INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
--INSTALL_SCRIPT=@INSTALL_PROGRAM@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_SHLIB=@INSTALL_SHLIB@
- INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
Deleted: trunk/security/krb5/files/patch-config::shlib.conf
===================================================================
--- trunk/security/krb5/files/patch-config::shlib.conf 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-config::shlib.conf 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,32 +0,0 @@
---- config/shlib.conf.orig 2008-12-08 14:33:07.000000000 -0800
-+++ config/shlib.conf 2009-08-28 13:27:39.000000000 -0700
-@@ -299,24 +299,17 @@
- ;;
-
- *-*-freebsd*)
-- if test -x /usr/bin/objformat ; then
-- objformat=`/usr/bin/objformat`
-- else
-- objformat="aout"
-- fi
-- PICFLAGS=-fpic
-- if test "x$objformat" = "xelf" ; then
-+ case $krb5_cv_host in
-+ sparc64-*) PICFLAGS=-fPIC;;
-+ *) PICFLAGS=-fpic;;
-+ esac
- SHLIBVEXT='.so.$(LIBMAJOR)'
-+ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared"
- RPATH_FLAG='-Wl,-rpath -Wl,'
-- else
-- RPATH_FLAG=-R
-- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
-- fi
- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
- CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
- SHLIBEXT=.so
-- LDCOMBINE='ld -Bshareable'
- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
- SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
- CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
Added: trunk/security/krb5/files/patch-config__pre.in
===================================================================
--- trunk/security/krb5/files/patch-config__pre.in (rev 0)
+++ trunk/security/krb5/files/patch-config__pre.in 2014-10-09 12:28:31 UTC (rev 17709)
@@ -0,0 +1,11 @@
+--- config/pre.in.orig Fri Nov 19 13:47:51 2004
++++ config/pre.in Thu Jan 27 17:43:12 2005
+@@ -177,7 +177,7 @@
+ INSTALL=@INSTALL@
+ INSTALL_STRIP=
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
+-INSTALL_SCRIPT=@INSTALL_PROGRAM@
++INSTALL_SCRIPT=@INSTALL_SCRIPT@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_SHLIB=@INSTALL_SHLIB@
+ INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
Property changes on: trunk/security/krb5/files/patch-config__pre.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/security/krb5/files/patch-config__shlib.conf
===================================================================
--- trunk/security/krb5/files/patch-config__shlib.conf (rev 0)
+++ trunk/security/krb5/files/patch-config__shlib.conf 2014-10-09 12:28:31 UTC (rev 17709)
@@ -0,0 +1,19 @@
+--- config/shlib.conf.orig 2013-12-10 14:49:15.000000000 -0800
++++ config/shlib.conf 2013-12-11 12:58:51.983110392 -0800
+@@ -315,13 +315,13 @@
+ ;;
+ esac
+ SHLIBVEXT='.so.$(LIBMAJOR)'
+- RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
++ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared"
++ RPATH_FLAG='-Wl,-rpath -Wl,'
+ PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+ SHLIBEXT=.so
+- LDCOMBINE='ld -Bshareable'
+- SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)'
++ SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
Property changes on: trunk/security/krb5/files/patch-config__shlib.conf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/security/krb5/files/patch-lib-apputils-net-server.c
===================================================================
--- trunk/security/krb5/files/patch-lib-apputils-net-server.c (rev 0)
+++ trunk/security/krb5/files/patch-lib-apputils-net-server.c 2014-10-09 12:28:31 UTC (rev 17709)
@@ -0,0 +1,15 @@
+--- lib/apputils/net-server.c.orig 2014-08-11 15:46:27.000000000 -0700
++++ lib/apputils/net-server.c 2014-08-13 05:33:48.913580280 -0700
+@@ -992,8 +992,12 @@
+ case RTM_NEWADDR: return "RTM_NEWADDR";
+ case RTM_DELADDR: return "RTM_DELADDR";
+ case RTM_IFINFO: return "RTM_IFINFO";
++#ifdef RTM_OLDADD
+ case RTM_OLDADD: return "RTM_OLDADD";
++#endif
++#ifdef RTM_OLDDEL
+ case RTM_OLDDEL: return "RTM_OLDDEL";
++#endif
+ case RTM_RESOLVE: return "RTM_RESOLVE";
+ #ifdef RTM_NEWMADDR
+ case RTM_NEWMADDR: return "RTM_NEWMADDR";
Property changes on: trunk/security/krb5/files/patch-lib-apputils-net-server.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/security/krb5/files/patch-lib::gssapi::krb5::import_name.c
===================================================================
--- trunk/security/krb5/files/patch-lib::gssapi::krb5::import_name.c 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/files/patch-lib::gssapi::krb5::import_name.c 2014-10-09 12:28:31 UTC (rev 17709)
@@ -1,14 +0,0 @@
---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005
-+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005
-@@ -33,6 +33,11 @@
- #endif
- #endif
-
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500100
-+#include <stdio.h>
-+#endif
-+
- #ifdef HAVE_STRING_H
- #include <string.h>
- #else
Added: trunk/security/krb5/files/patch-lib__gssapi__krb5__import_name.c
===================================================================
--- trunk/security/krb5/files/patch-lib__gssapi__krb5__import_name.c (rev 0)
+++ trunk/security/krb5/files/patch-lib__gssapi__krb5__import_name.c 2014-10-09 12:28:31 UTC (rev 17709)
@@ -0,0 +1,14 @@
+--- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005
++++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005
+@@ -33,6 +33,11 @@
+ #endif
+ #endif
+
++#include <sys/param.h>
++#if __FreeBSD_version < 500100
++#include <stdio.h>
++#endif
++
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #else
Property changes on: trunk/security/krb5/files/patch-lib__gssapi__krb5__import_name.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/security/krb5/pkg-plist
===================================================================
--- trunk/security/krb5/pkg-plist 2014-10-09 03:04:12 UTC (rev 17708)
+++ trunk/security/krb5/pkg-plist 2014-10-09 12:28:31 UTC (rev 17709)
@@ -7,7 +7,14 @@
bin/klist
bin/kpasswd
bin/krb5-config
+ at mode 04755
+ at owner root
+ at group wheel
bin/ksu
+ at mode
+ at owner root
+ at group wheel
+bin/kswitch
bin/ktutil
bin/kvno
bin/sclient
@@ -36,8 +43,14 @@
include/gssrpc/svc_auth.h
include/gssrpc/types.h
include/gssrpc/xdr.h
+include/krad.h
include/krb5.h
+include/krb5/ccselect_plugin.h
+include/krb5/clpreauth_plugin.h
+include/krb5/hostrealm_plugin.h
include/krb5/kadm5_hook_plugin.h
+include/krb5/kdcpreauth_plugin.h
+include/krb5/localauth_plugin.h
include/krb5/krb5.h
include/krb5/locate_plugin.h
include/krb5/plugin.h
@@ -46,7 +59,10 @@
include/kadm5/chpass_util_strings.h
include/kadm5/kadm_err.h
include/kdb.h
+include/krb5/preauth_plugin.h
include/profile.h
+include/verto-module.h
+include/verto.h
lib/libcom_err.so
lib/libcom_err.so.3
lib/libgssapi_krb5.so
@@ -57,22 +73,68 @@
lib/libk5crypto.so.3
lib/libkadm5clnt.so
lib/libkadm5clnt_mit.so
-lib/libkadm5clnt_mit.so.8
+lib/libkadm5clnt_mit.so.9
lib/libkadm5srv.so
lib/libkadm5srv_mit.so
-lib/libkadm5srv_mit.so.8
+lib/libkadm5srv_mit.so.9
lib/libkdb5.so
-lib/libkdb5.so.5
+lib/libkdb5.so.7
lib/libkrb5.so
lib/libkrb5.so.3
lib/libkrb5support.so
lib/libkrb5support.so.0
lib/krb5/plugins/kdb/db2.so
-lib/krb5/plugins/preauth/encrypted_challenge.so
+%%LDAP%%lib/krb5/plugins/kdb/kldap.so
+lib/krb5/plugins/preauth/otp.so
lib/krb5/plugins/preauth/pkinit.so
+%%LDAP%%lib/libkdb_ldap.so
+%%LDAP%%lib/libkdb_ldap.so.1
+lib/libkrad.so
+lib/libkrad.so.0
+lib/libverto.so.0
+lib/libverto.so
+lib/pkgconfig/gssrpc.pc
+lib/pkgconfig/kadm-client.pc
+lib/pkgconfig/kadm-server.pc
+lib/pkgconfig/kdb.pc
+lib/pkgconfig/krb5-gssapi.pc
+lib/pkgconfig/krb5.pc
+lib/pkgconfig/mit-krb5-gssapi.pc
+lib/pkgconfig/mit-krb5.pc
+man/man1/k5srvutil.1.gz
+man/man1/kadmin.1.gz
+man/man1/krb5-config.1.gz
+man/man1/krb5-send-pr.1.gz
+man/man1/kpasswd.1.gz
+man/man1/klist.1.gz
+man/man1/kinit.1.gz
+man/man1/kdestroy.1.gz
+man/man1/kswitch.1.gz
+man/man1/ksu.1.gz
+man/man1/ktutil.1.gz
+man/man1/sclient.1.gz
+man/man1/kvno.1.gz
+man/man1/compile_et.1.gz
+man/man5/kadm5.acl.5.gz
+man/man5/kdc.conf.5.gz
+man/man5/krb5.conf.5.gz
+man/man5/.k5identity.5.gz
+man/man5/.k5login.5.gz
+man/man5/k5identity.5.gz
+man/man5/k5login.5.gz
+man/man8/krb5kdc.8.gz
+man/man8/kadmin.local.8.gz
+man/man8/kdb5_ldap_util.8.gz
+man/man8/kdb5_util.8.gz
+man/man8/kadmind.8.gz
+man/man8/kprop.8.gz
+man/man8/kpropd.8.gz
+man/man8/kproplog.8.gz
+man/man8/sserver.8.gz
sbin/gss-server
sbin/kadmin.local
sbin/kadmind
+%%LDAP%%sbin/kdb5_ldap_util
sbin/kdb5_util
sbin/kprop
sbin/kpropd
@@ -89,6 +151,13 @@
share/examples/krb5/krb5.conf
share/examples/krb5/services.append
share/gnats/mit
+share/locale/en_US/LC_MESSAGES/mit-krb5.mo
+ at exec mkdir -p %D/var/krb5kdc
+ at dirrmtry var/krb5kdc
+ at dirrmtry var
+ at dirrmtry share/locale/en_US/LC_MESSAGES
+ at dirrmtry share/locale/en_US
+ at dirrm lib/pkgconfig
@dirrm lib/krb5/plugins/preauth
@dirrm lib/krb5/plugins/libkrb5
@dirrm lib/krb5/plugins/kdb
More information about the Midnightbsd-cvs
mailing list