svn commit: r363328 - in head/security: chrootuid/files cops/files fakebo/files fwbuilder/files identify/files keynote/files krb5-appl/files krb5-maint/files krb5/files l0pht-watch/files nessus-lib...
Adam Weinberger
adamw at FreeBSD.org
Tue Jul 29 14:30:16 UTC 2014
Author: adamw
Date: Tue Jul 29 14:30:10 2014
New Revision: 363328
URL: http://svnweb.freebsd.org/changeset/ports/363328
QAT: https://qat.redports.org/buildarchive/r363328/
Log:
Rename security/ patches to reflect the files they modify.
Added:
head/security/chrootuid/files/patch-Makefile
- copied unchanged from r363316, head/security/chrootuid/files/patch-ab
head/security/chrootuid/files/patch-chrootuid.1
- copied unchanged from r363316, head/security/chrootuid/files/patch-aa
head/security/chrootuid/files/patch-chrootuid.c
- copied unchanged from r363316, head/security/chrootuid/files/patch-ac
head/security/cops/files/patch-makefile
- copied unchanged from r363316, head/security/cops/files/patch-ab
head/security/cops/files/patch-perl__cops
- copied unchanged from r363316, head/security/cops/files/patch-aa
head/security/fakebo/files/patch-fakebo.c
- copied unchanged from r363316, head/security/fakebo/files/patch-ab
head/security/fwbuilder/files/patch-qmake.inc.in
- copied unchanged from r363316, head/security/fwbuilder/files/patch-aa
head/security/identify/files/patch-Makefile
- copied unchanged from r363316, head/security/identify/files/patch-aa
head/security/identify/files/patch-identify.c
- copied unchanged from r363316, head/security/identify/files/patch-ab
head/security/keynote/files/patch-Makefile.in
- copied unchanged from r363316, head/security/keynote/files/patch-ac
head/security/keynote/files/patch-configure
- copied unchanged from r363316, head/security/keynote/files/patch-ad
head/security/keynote/files/patch-keynote-ver.y
- copied unchanged from r363316, head/security/keynote/files/patch-ag
head/security/keynote/files/patch-keynote.y
- copied unchanged from r363316, head/security/keynote/files/patch-af
head/security/keynote/files/patch-man__keynote.4
- copied unchanged from r363316, head/security/keynote/files/patch-ae
head/security/krb5-appl/files/patch-appl__bsd__Makefile.in
- copied unchanged from r363316, head/security/krb5-appl/files/patch-appl::bsd::Makefile.in
head/security/krb5-appl/files/patch-appl__bsd__klogind.M
- copied unchanged from r363316, head/security/krb5-appl/files/patch-appl::bsd::klogind.M
head/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h
- copied unchanged from r363316, head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
head/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in
- copied unchanged from r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
head/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8
- copied unchanged from r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
head/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c
- copied unchanged from r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
head/security/krb5-appl/files/patch-bsd__login.c
- copied unchanged from r363316, head/security/krb5-appl/files/patch-ba
head/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c
- copied unchanged from r363316, head/security/krb5-appl/files/patch-ai
head/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c
- copied unchanged from r363316, head/security/krb5-appl/files/patch-aj
head/security/krb5-appl/files/patch-libpty__getpty.c
- copied unchanged from r363316, head/security/krb5-appl/files/patch-ay
head/security/krb5-appl/files/patch-telnet__telnet__Makefile.in
- copied unchanged from r363316, head/security/krb5-appl/files/patch-bb
head/security/krb5-maint/files/patch-clients__ksu__Makefile.in
- copied unchanged from r363316, head/security/krb5-maint/files/patch-av
head/security/krb5-maint/files/patch-config__pre.in
- copied unchanged from r363316, head/security/krb5-maint/files/patch-config::pre.in
head/security/krb5-maint/files/patch-config__shlib.conf
- copied unchanged from r363316, head/security/krb5-maint/files/patch-config::shlib.conf
head/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c
- copied unchanged from r363316, head/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c
head/security/krb5/files/patch-clients__ksu__Makefile.in
- copied unchanged from r363316, head/security/krb5/files/patch-av
head/security/krb5/files/patch-config__pre.in
- copied unchanged from r363316, head/security/krb5/files/patch-config::pre.in
head/security/krb5/files/patch-config__shlib.conf
- copied unchanged from r363316, head/security/krb5/files/patch-config::shlib.conf
head/security/krb5/files/patch-lib__gssapi__krb5__import_name.c
- copied unchanged from r363316, head/security/krb5/files/patch-lib::gssapi::krb5::import_name.c
head/security/l0pht-watch/files/patch-Makefile
- copied unchanged from r363316, head/security/l0pht-watch/files/patch-aa
head/security/l0pht-watch/files/patch-check_tmp.c
- copied unchanged from r363316, head/security/l0pht-watch/files/patch-ab
head/security/l0pht-watch/files/patch-check_tmp.h
- copied unchanged from r363316, head/security/l0pht-watch/files/patch-ac
head/security/l0pht-watch/files/patch-list_utils.c
- copied unchanged from r363316, head/security/l0pht-watch/files/patch-ad
head/security/nessus-libraries/files/patch-Makefile
- copied unchanged from r363316, head/security/nessus-libraries/files/patch-aa
head/security/nessus-libraries/files/patch-libpcap-nessus__configure
- copied unchanged from r363316, head/security/nessus-libraries/files/patch-ac
head/security/nessus/files/patch-nessus-mkcert-client.in
- copied unchanged from r363316, head/security/nessus/files/patch-aa
head/security/nessus/files/patch-nessus-mkcert.in
- copied unchanged from r363316, head/security/nessus/files/patch-ab
head/security/openssl/files/patch-apps__Makefile
- copied unchanged from r363316, head/security/openssl/files/patch-ak
head/security/openssl/files/patch-crypto__md5__md5.c
- copied unchanged from r363316, head/security/openssl/files/patch-ad
head/security/pam_ldap/files/patch-Makefile.in
- copied unchanged from r363316, head/security/pam_ldap/files/patch-aa
head/security/pam_ldap/files/patch-pam_ldap.c
- copied unchanged from r363316, head/security/pam_ldap/files/patch-ab
head/security/pgp/files/patch-makefile
- copied unchanged from r363316, head/security/pgp/files/patch-aa
head/security/pktsuckers/files/patch-Makefile
- copied unchanged from r363316, head/security/pktsuckers/files/patch-aa
head/security/proxycheck/files/patch-proxycheck.1
- copied unchanged from r363316, head/security/proxycheck/files/patch-ac
head/security/proxycheck/files/patch-proxycheck.c
- copied unchanged from r363316, head/security/proxycheck/files/patch-ab
head/security/rdigest/files/patch-Makefile.in
- copied unchanged from r363316, head/security/rdigest/files/patch-aa
head/security/rdigest/files/patch-digest.1
- copied unchanged from r363316, head/security/rdigest/files/patch-ab
head/security/rdigest/files/patch-digest.c
- copied unchanged from r363316, head/security/rdigest/files/patch-ac
head/security/slush/files/patch-Makefile.in
- copied unchanged from r363316, head/security/slush/files/patch-aa
head/security/slush/files/patch-slush.c
- copied unchanged from r363316, head/security/slush/files/patch-ab
head/security/slush/files/patch-slushd.c
- copied unchanged from r363316, head/security/slush/files/patch-ac
head/security/sslwrap/files/patch-Makefile
- copied unchanged from r363316, head/security/sslwrap/files/patch-aa
head/security/steghide/files/patch-Makefile.in
- copied unchanged from r363316, head/security/steghide/files/patch-aa
head/security/strobe/files/patch-Makefile
- copied unchanged from r363316, head/security/strobe/files/patch-aa
head/security/strobe/files/patch-strobe.c
- copied unchanged from r363316, head/security/strobe/files/patch-ab
head/security/super/files/patch-localsys.h_1
- copied unchanged from r363316, head/security/super/files/patch-06
head/security/super/files/patch-localsys.h_2
- copied unchanged from r363316, head/security/super/files/patch-localsys.h
head/security/tripwire-131/files/patch-Makefile
- copied unchanged from r363316, head/security/tripwire-131/files/patch-ab
head/security/tripwire-131/files/patch-include-config.h
- copied unchanged from r363316, head/security/tripwire-131/files/patch-aa
head/security/tripwire-131/files/patch-sigs-sha-sha.c
- copied unchanged from r363316, head/security/tripwire-131/files/patch-ac
head/security/tripwire-131/files/patch-src-Makefile
- copied unchanged from r363316, head/security/tripwire-131/files/patch-ad
head/security/tripwire-131/files/patch-src-config.parse.c
- copied unchanged from r363316, head/security/tripwire-131/files/patch-ba
head/security/tripwire-131/files/patch-src-dbase.build.c
- copied unchanged from r363316, head/security/tripwire-131/files/patch-bb
head/security/tripwire-131/files/patch-src-siggen.c
- copied unchanged from r363316, head/security/tripwire-131/files/patch-bc
head/security/tripwire-131/files/patch-src-utils.c
- copied unchanged from r363316, head/security/tripwire-131/files/patch-bd
head/security/tripwire12/files/patch-Makefile
- copied unchanged from r363316, head/security/tripwire12/files/patch-ab
head/security/tripwire12/files/patch-include-config.h
- copied unchanged from r363316, head/security/tripwire12/files/patch-aa
head/security/tripwire12/files/patch-sigs-sha-sha.c
- copied unchanged from r363316, head/security/tripwire12/files/patch-ac
head/security/vida/files/patch-include.h
- copied unchanged from r363316, head/security/vida/files/patch-aa
head/security/zebedee/files/patch-Makefile
- copied unchanged from r363316, head/security/zebedee/files/patch-aa
Deleted:
head/security/chrootuid/files/patch-aa
head/security/chrootuid/files/patch-ab
head/security/chrootuid/files/patch-ac
head/security/cops/files/patch-aa
head/security/cops/files/patch-ab
head/security/fakebo/files/patch-ab
head/security/fwbuilder/files/patch-aa
head/security/identify/files/patch-aa
head/security/identify/files/patch-ab
head/security/keynote/files/patch-ac
head/security/keynote/files/patch-ad
head/security/keynote/files/patch-ae
head/security/keynote/files/patch-af
head/security/keynote/files/patch-ag
head/security/krb5-appl/files/patch-ai
head/security/krb5-appl/files/patch-aj
head/security/krb5-appl/files/patch-appl::bsd::Makefile.in
head/security/krb5-appl/files/patch-appl::bsd::klogind.M
head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
head/security/krb5-appl/files/patch-ay
head/security/krb5-appl/files/patch-ba
head/security/krb5-appl/files/patch-bb
head/security/krb5-maint/files/patch-av
head/security/krb5-maint/files/patch-config::pre.in
head/security/krb5-maint/files/patch-config::shlib.conf
head/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c
head/security/krb5/files/patch-av
head/security/krb5/files/patch-config::pre.in
head/security/krb5/files/patch-config::shlib.conf
head/security/krb5/files/patch-lib::gssapi::krb5::import_name.c
head/security/l0pht-watch/files/patch-aa
head/security/l0pht-watch/files/patch-ab
head/security/l0pht-watch/files/patch-ac
head/security/l0pht-watch/files/patch-ad
head/security/nessus-libraries/files/patch-aa
head/security/nessus-libraries/files/patch-ac
head/security/nessus/files/patch-aa
head/security/nessus/files/patch-ab
head/security/openssl/files/patch-ad
head/security/openssl/files/patch-ak
head/security/pam_ldap/files/patch-aa
head/security/pam_ldap/files/patch-ab
head/security/pgp/files/patch-aa
head/security/pktsuckers/files/patch-aa
head/security/proxycheck/files/patch-ab
head/security/proxycheck/files/patch-ac
head/security/rdigest/files/patch-aa
head/security/rdigest/files/patch-ab
head/security/rdigest/files/patch-ac
head/security/slush/files/patch-aa
head/security/slush/files/patch-ab
head/security/slush/files/patch-ac
head/security/sslwrap/files/patch-aa
head/security/steghide/files/patch-aa
head/security/strobe/files/patch-aa
head/security/strobe/files/patch-ab
head/security/super/files/patch-06
head/security/super/files/patch-localsys.h
head/security/tripwire-131/files/patch-aa
head/security/tripwire-131/files/patch-ab
head/security/tripwire-131/files/patch-ac
head/security/tripwire-131/files/patch-ad
head/security/tripwire-131/files/patch-ba
head/security/tripwire-131/files/patch-bb
head/security/tripwire-131/files/patch-bc
head/security/tripwire-131/files/patch-bd
head/security/tripwire12/files/patch-aa
head/security/tripwire12/files/patch-ab
head/security/tripwire12/files/patch-ac
head/security/vida/files/patch-aa
head/security/zebedee/files/patch-aa
Modified:
head/security/zebedee/Makefile
head/security/zebedee/pkg-plist
Copied: head/security/chrootuid/files/patch-Makefile (from r363316, head/security/chrootuid/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/chrootuid/files/patch-Makefile Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/chrootuid/files/patch-ab)
@@ -0,0 +1,11 @@
+--- Makefile.orig Thu Aug 12 07:09:31 1993
++++ Makefile Sun Jun 23 15:01:35 2002
+@@ -1,7 +1,7 @@
+ # @(#) Makefile 1.2 93/08/12 16:09:29
+
+ FILES = README Makefile chrootuid.c chrootuid.1
+-CFLAGS = -O
++CFLAGS ?= -O
+
+ all: chrootuid chrootuid.1
+
Copied: head/security/chrootuid/files/patch-chrootuid.1 (from r363316, head/security/chrootuid/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/chrootuid/files/patch-chrootuid.1 Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/chrootuid/files/patch-aa)
@@ -0,0 +1,8 @@
+--- chrootuid.1.orig Wed Jul 25 09:46:59 2001
++++ chrootuid.1 Sun Jun 23 15:01:19 2002
+@@ -1,4 +1,4 @@
+-.TH CHROOTUID 1
++.TH CHROOTUID 8
+ .ad
+ .fi
+ .SH NAME
Copied: head/security/chrootuid/files/patch-chrootuid.c (from r363316, head/security/chrootuid/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/chrootuid/files/patch-chrootuid.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/chrootuid/files/patch-ac)
@@ -0,0 +1,13 @@
+--- chrootuid.c.orig Wed Jul 25 09:47:44 2001
++++ chrootuid.c Sun Jun 23 15:06:10 2002
+@@ -81,6 +81,10 @@
+ syslog(LOG_ERR, "usage: %s path user command", argv[0]);
+ return (0);
+ }
++
++ syslog(LOG_NOTICE, "chrootuid: dir(%s) user(%s) command(%s)",
++ argv[1], argv[2], argv[3]);
++
+ /* Must step into the new subtree. */
+
+ if (chdir(argv[1])) {
Copied: head/security/cops/files/patch-makefile (from r363316, head/security/cops/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/cops/files/patch-makefile Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/cops/files/patch-ab)
@@ -0,0 +1,11 @@
+--- makefile.orig Tue Mar 9 02:19:18 1993
++++ makefile Tue Jul 11 21:44:29 2000
+@@ -23,7 +23,7 @@
+ # C2 = -DC2
+
+ #
+-CFLAGS = -O $(C2)
++CFLAGS+ = $(C2)
+ # sequents need "-lseq" as well... uncomment this if you're running on one:
+ # SEQFLAGS = -lseq
+
Copied: head/security/cops/files/patch-perl__cops (from r363316, head/security/cops/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/cops/files/patch-perl__cops Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/cops/files/patch-aa)
@@ -0,0 +1,32 @@
+--- perl/cops.orig Sat Feb 21 19:20:10 1998
++++ perl/cops Sat Feb 21 19:21:06 1998
+@@ -1,8 +1,4 @@
+-#!/bin/sh -- need to mention perl here to avoid recursion
+-'true' || eval 'exec perl -S $0 $argv:q';
+-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+-& eval 'exec /usr/local/bin/perl -S $0 $argv:q'
+- if 0;
++#!/usr/bin/perl
+
+ #
+ # Usage: cops [-vx] [-c config file] [-s secure_dir] [architecture]
+@@ -83,7 +79,7 @@
+
+ # Read stuff to do from the config file
+ die "$0: Can't trust $CONFIG to reconfig!\n" if &'is_writable($CONFIG);
+-open CONFIG || die "can't open $CONFIG: $!";
++open (CONFIG) || die "can't open $CONFIG: $!";
+
+ &argh unless -s $CONFIG;
+
+@@ -219,8 +215,8 @@
+ }
+ return 1 if (($FILE2 eq "") || (-s $FILE1 != -s $report));
+
+- open FILE1 || die "can't open $FILE1: $!\n";
+- open FILE2 || die "can't open $FILE2: $!\n";
++ open (FILE1) || die "can't open $FILE1: $!\n";
++ open (FILE2) || die "can't open $FILE2: $!\n";
+
+ for (1..5) {
+ $_ = <FILE1>;
Copied: head/security/fakebo/files/patch-fakebo.c (from r363316, head/security/fakebo/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/fakebo/files/patch-fakebo.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/fakebo/files/patch-ab)
@@ -0,0 +1,13 @@
+--- fakebo.c.orig Thu Jun 6 18:13:21 2002
++++ fakebo.c Thu Jun 6 18:13:31 2002
+@@ -457,8 +457,8 @@
+ {
+ static char msg[] = "Warning: SIGHUP received, but config re-read not yet implemented!\n";
+
+- logprintf(TRUE, msg);
+- syslogprintf(msg);
++ logprintf(TRUE, "%s", msg);
++ syslogprintf("%s", msg);
+ }
+
+ #endif
Copied: head/security/fwbuilder/files/patch-qmake.inc.in (from r363316, head/security/fwbuilder/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/fwbuilder/files/patch-qmake.inc.in Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/fwbuilder/files/patch-aa)
@@ -0,0 +1,22 @@
+--- qmake.inc.in.orig 2011-04-20 10:48:53.000000000 -0700
++++ qmake.inc.in 2011-05-08 13:57:57.471497111 -0700
+@@ -17,7 +17,6 @@
+
+ # CONFIG -= nostrip
+ # CONFIG += release
+-CONFIG += debug
+
+ unix {
+ PREFIX = @PREFIX@
+@@ -35,11 +34,6 @@
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+
+- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+-
+ !macx {
+
+ exec_prefix = @EXEC_PREFIX@
Copied: head/security/identify/files/patch-Makefile (from r363316, head/security/identify/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/identify/files/patch-Makefile Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/identify/files/patch-aa)
@@ -0,0 +1,16 @@
+--- Makefile.orig Mon Jul 20 09:01:27 1992
++++ Makefile Fri Apr 2 10:50:40 1999
+@@ -1,2 +1,11 @@
+-identify: identify.c
+- $(CC) -o identify identify.c -lauthuser
++
++CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
++
++all: identify
++
++install: identify
++ install identify ${PREFIX}/libexec
++ install README ${PREFIX}/share/doc/identify
++
++identify: identify.o
++ $(CC) $(CFLAGS) -o identify identify.o -lident
Copied: head/security/identify/files/patch-identify.c (from r363316, head/security/identify/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/identify/files/patch-identify.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/identify/files/patch-ab)
@@ -0,0 +1,141 @@
+--- identify.c.orig Tue Feb 2 01:51:57 1993
++++ identify.c Sun Oct 20 17:53:44 2002
+@@ -11,7 +11,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <syslog.h>
+-#include <authuser.h>
++#include <ident.h>
+ #include <netdb.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+@@ -33,57 +33,43 @@
+ int noidentify = 0;
+ int bits = 0;
+ int reject_flag = 0;
+-unsigned long inlocal;
+-unsigned long inremote;
++struct in_addr inlocal;
++struct in_addr inremote;
+ int timeout = 120;
+-int rtimeout = 30;
+-
+-static char *host_address(ad)
+- unsigned long ad;
+-{
+- int a, b, c, d;
+- static char addr[20];
+-
+- d = ad % 256;
+- ad /= 256;
+- c = ad % 256;
+- ad /= 256;
+- b = ad % 256;
+- a = ad / 256;
+- sprintf(addr, "%d.%d.%d.%d", a, b, c, d);
+-
+- return addr;
+-}
+-
+
+ char *ident_get_identifier(fd, host, len)
+ int fd;
+ char *host;
+ int len;
+ {
+- unsigned short local;
+- unsigned short remote;
+-
++ struct sockaddr_in sa;
++ int l;
+
+- if (auth_fd2(fd, &inlocal, &inremote,
+- &local, &remote) == -1)
++ l=sizeof(sa);
++ if (getsockname(fd,(struct sockaddr *)&sa,&l)<0)
+ {
+ if (debug)
+- perror("auth_fd2");
+-
++ perror("getsockname()");
+ return NULL;
+ }
++ inlocal=sa.sin_addr;
++ if (getpeername(fd,(struct sockaddr *)&sa,&l)<0)
++ {
++ if (debug)
++ perror("getpeername()");
++ return NULL;
++ }
++ inremote=sa.sin_addr;
+
+ if (host)
+ {
+ struct hostent *hp;
+
+-
+- hp = gethostbyaddr(&inremote,sizeof(struct in_addr),AF_INET);
++ hp = gethostbyaddr((const char *)&inremote,sizeof(struct in_addr),AF_INET);
+ if (hp)
+ strncpy(host, hp->h_name, len);
+ else
+- strncpy(host, host_address(inremote), len);
++ strncpy(host, inet_ntoa(inremote), len);
+
+ host[len] = '\0';
+ }
+@@ -91,16 +77,7 @@
+ if (noidentify)
+ return NULL;
+ else
+- if (timeout)
+- {
+- if (rtimeout)
+- return auth_tcpuser4(inlocal, inremote, local, remote, timeout,
+- rtimeout);
+- else
+- return auth_tcpuser3(inlocal, inremote, local, remote, timeout);
+- }
+- else
+- return auth_tcpuser2(inlocal, inremote, local, remote);
++ return ident_id(fd,timeout);
+ }
+
+
+@@ -128,10 +105,6 @@
+ timeout = atoi(argv[i]+2);
+ break;
+
+- case 'T':
+- rtimeout = atoi(argv[i]+2);
+- break;
+-
+ case 'R':
+ if (!argv[i][2])
+ reject_flag = 1;
+@@ -200,7 +173,7 @@
+ {
+ /* In child, let's fork again so we can forget about this child */
+ if (fork())
+- _exit();
++ _exit(0);
+ }
+ else
+ {
+@@ -241,13 +214,13 @@
+ }
+ }
+
+- if ((bits && (inremote >> bits != inlocal >> bits)) ||
++ if ((bits && (htonl(inremote.s_addr) >> bits != htonl(inlocal.s_addr) >> bits)) ||
+ (reject_flag && !id))
+ {
+ if (id)
+- syslog(priority, "Rejecting from %s@%s", id, host_address(inremote));
++ syslog(priority, "Rejecting from %s@%s", id, inet_ntoa(inremote));
+ else
+- syslog(priority, "Rejecting from %s", host_address(inremote));
++ syslog(priority, "Rejecting from %s", inet_ntoa(inremote));
+ exit(1);
+ }
+
Copied: head/security/keynote/files/patch-Makefile.in (from r363316, head/security/keynote/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/keynote/files/patch-Makefile.in Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/keynote/files/patch-ac)
@@ -0,0 +1,23 @@
+--- Makefile.in.orig Mon Nov 29 11:36:21 1999
++++ Makefile.in Fri Mar 24 19:22:32 2000
+@@ -41,7 +41,7 @@
+ YACCFLAGS = -d -p kn -b k
+ LEXFLAGS2 = -Pkv -s -i
+ LEXFLAGS = -Cr -Pkn -s -i
+-CFLAGS = -O2 -Wall # -g
++CFLAGS ?= -O2 -Wall # -g
+ RMFLAGS2 = -rf
+ RMFLAGS = -f
+ NROFFFLAGS = -mandoc
+@@ -87,9 +87,11 @@
+
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ $(YACC) $(YACCFLAGS) keynote.y
++k.tab.h: | k.tab.c
+
+ z.tab.c: keynote-ver.y keynote.h header.h config.h
+ $(YACC) $(YACCFLAGS2) keynote-ver.y
++z.tab.h: | z.tab.c
+
+ lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
+ $(LEX) $(LEXFLAGS) keynote.l
Copied: head/security/keynote/files/patch-configure (from r363316, head/security/keynote/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/keynote/files/patch-configure Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/keynote/files/patch-ad)
@@ -0,0 +1,21 @@
+--- configure.orig Wed Oct 20 22:04:39 1999
++++ configure Fri Mar 24 19:38:46 2000
+@@ -1256,7 +1256,7 @@
+ fi
+
+
+-LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\
++LIBS="-L/usr/lib -L/usr/local/lib -L${OPENSSLLIB} -L/usr/ssl/lib -L/usr/openssl/lib\
+ -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib"
+
+ echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
+@@ -1421,7 +1421,8 @@
+
+
+ CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\
+- -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\
++ -I/usr/local/ssl/include -I${OPENSSLINC}\
++ -I/usr/openssl/include -I/usr/pkg/include\
+ -I/usr/local/openssl/include -I/pkg/include"
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
Copied: head/security/keynote/files/patch-keynote-ver.y (from r363316, head/security/keynote/files/patch-ag)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/keynote/files/patch-keynote-ver.y Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/keynote/files/patch-ag)
@@ -0,0 +1,20 @@
+--- keynote-ver-orig.y Tue Oct 12 00:34:29 1999
++++ keynote-ver.y Wed May 28 14:47:32 2003
+@@ -48,7 +48,7 @@
+ | STRING { if (kn_add_authorizer(sessid, $1) != 0)
+ return keynote_errno;
+ free($1);
+- }
++ };
+
+ expr: VSTRING EQ STRING { int i = kn_add_action(sessid, $1, $3, 0);
+
+@@ -63,7 +63,7 @@
+ return i;
+ free($1);
+ free($3);
+- } expr
++ } expr ;
+ %%
+ void
+ kverror(char *s)
Copied: head/security/keynote/files/patch-keynote.y (from r363316, head/security/keynote/files/patch-af)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/keynote/files/patch-keynote.y Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/keynote/files/patch-af)
@@ -0,0 +1,164 @@
+--- keynote-orig.y Wed Jun 14 08:28:23 2000
++++ keynote.y Wed May 28 14:47:32 2003
+@@ -90,17 +90,17 @@
+ | PRIVATEKEY { keynote_exceptionflag = keynote_donteval = 0; }
+ STRING { keynote_lex_remove($3);
+ keynote_privkey = $3;
+- }
++ };
+
+ keypredicate: /* Nothing */ { keynote_returnvalue = 0;
+ return 0;
+ }
+ | notemptykeypredicate { keynote_returnvalue = $1;
+ return 0;
+- }
++ };
+
+ notemptykeypredicate: key { $$ = $1; }
+- | keyexp { $$ = $1; }
++ | keyexp { $$ = $1; };
+
+ keyexp: notemptykeypredicate AND { if (($1 == 0) && !keynote_justrecord)
+ keynote_donteval = 1;
+@@ -137,7 +137,7 @@
+ $$ = get_kth($1);
+ else
+ $$ = 0;
+- } /* K-th */
++ }; /* K-th */
+
+ keylist: key
+ { /* Don't do anything if we're just recording */
+@@ -154,7 +154,7 @@
+ keynote_kth_array[$1]++;
+
+ keylistcount++;
+- }
++ };
+
+ key: str {
+ if (keynote_donteval)
+@@ -192,10 +192,10 @@
+ break;
+ }
+ }
+- }
++ };
+
+ localinit: /* Nothing */
+- | localconstants
++ | localconstants;
+
+ localconstants: VARIABLE EQQ STRING
+ {
+@@ -264,12 +264,12 @@
+
+ if (i != RESULT_TRUE)
+ return -1;
+- } localconstants
++ } localconstants ;
+
+ program: prog {
+ keynote_returnvalue = $1;
+ return 0;
+- }
++ };
+
+ prog: /* Nada */ { $$ = 0; }
+ | notemptyprog {
+@@ -284,7 +284,7 @@
+ $$ = $1;
+ else
+ $$ = $4;
+- }
++ };
+
+ notemptyprog: expr HINT afterhint
+ {
+@@ -299,7 +299,7 @@
+ $$ = keynote_current_session->ks_values_num - 1;
+ else
+ $$ = 0;
+- }
++ };
+
+ afterhint: str { if (keynote_exceptionflag || keynote_donteval)
+ $$ = 0;
+@@ -314,7 +314,7 @@
+ free($1);
+ }
+ }
+- | OPENBLOCK prog CLOSEBLOCK { $$ = $2; }
++ | OPENBLOCK prog CLOSEBLOCK { $$ = $2; };
+
+
+ expr: OPENPAREN expr CLOSEPAREN { $$ = $2; }
+@@ -333,19 +333,19 @@
+ | floatexp { $$ = $1; }
+ | stringexp { $$ = $1; }
+ | TRUE { $$ = 1; }
+- | FALSE { $$ = 0; }
++ | FALSE { $$ = 0; };
+
+ numexp: numex LT numex { $$ = $1 < $3; }
+ | numex GT numex { $$ = $1 > $3; }
+ | numex EQ numex { $$ = $1 == $3; }
+ | numex LE numex { $$ = $1 <= $3; }
+ | numex GE numex { $$ = $1 >= $3; }
+- | numex NE numex { $$ = $1 != $3; }
++ | numex NE numex { $$ = $1 != $3; };
+
+ floatexp: floatex LT floatex { $$ = $1 < $3; }
+ | floatex GT floatex { $$ = $1 > $3; }
+ | floatex LE floatex { $$ = $1 <= $3; }
+- | floatex GE floatex { $$ = $1 >= $3; }
++ | floatex GE floatex { $$ = $1 >= $3; };
+
+ numex: numex PLUS numex { $$ = $1 + $3; }
+ | numex MINUS numex { $$ = $1 - $3; }
+@@ -383,7 +383,7 @@
+ $$ = (int) floor(atof($2));
+ free($2);
+ }
+- }
++ };
+
+ floatex: floatex PLUS floatex { $$ = ($1 + $3); }
+ | floatex MINUS floatex { $$ = ($1 - $3); }
+@@ -417,7 +417,7 @@
+ $$ = atof($2);
+ free($2);
+ }
+- }
++ };
+
+ stringexp: str EQ str {
+ if (keynote_exceptionflag || keynote_donteval)
+@@ -578,7 +578,7 @@
+ free($1);
+ }
+ }
+- }
++ };
+
+ str: str DOTT str { if (keynote_exceptionflag || keynote_donteval)
+ $$ = (char *) NULL;
+@@ -604,7 +604,7 @@
+ return -1;
+ }
+ }
+- | strnotconcat { $$ = $1; }
++ | strnotconcat { $$ = $1; };
+
+ strnotconcat: STRING { $$ = $1; }
+ | OPENPAREN str CLOSEPAREN { $$ = $2; }
+@@ -659,7 +659,7 @@
+ if (keynote_lex_add($$, LEXTYPE_CHAR) == -1)
+ return -1;
+ }
+- }
++ };
+ %%
+
+ /*
Copied: head/security/keynote/files/patch-man__keynote.4 (from r363316, head/security/keynote/files/patch-ae)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/keynote/files/patch-man__keynote.4 Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/keynote/files/patch-ae)
@@ -0,0 +1,11 @@
+--- man/keynote.4.orig Tue Sep 26 16:16:32 2000
++++ man/keynote.4 Sat Dec 1 01:52:33 2001
+@@ -20,7 +20,7 @@
+ .\" PURPOSE.
+ .\"
+ .Dd May 22, 1999
+-.Dt KEYNOTE 4
++.Dt KEYNOTE 5
+ .\" .TH KeyNote 4 local
+ .Os
+ .Sh NAME
Copied: head/security/krb5-appl/files/patch-appl__bsd__Makefile.in (from r363316, head/security/krb5-appl/files/patch-appl::bsd::Makefile.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-appl__bsd__Makefile.in Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-appl::bsd::Makefile.in)
@@ -0,0 +1,12 @@
+--- bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001
++++ bsd/Makefile.in Mon Dec 31 21:52:45 2001
+@@ -31,8 +31,8 @@
+ -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
+
+ 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)
+
Copied: head/security/krb5-appl/files/patch-appl__bsd__klogind.M (from r363316, head/security/krb5-appl/files/patch-appl::bsd::klogind.M)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-appl__bsd__klogind.M Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-appl::bsd::klogind.M)
@@ -0,0 +1,26 @@
+--- bsd/klogind.M.orig 2008-12-15 12:29:01.000000000 -0800
++++ bsd/klogind.M 2009-08-28 13:13:28.000000000 -0700
+@@ -13,7 +13,7 @@
+ .B \-rcpPef
+ ]
+ [[ \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
+@@ -136,11 +136,9 @@
+ .IP \fB\-M\ realm\fP
+ Set the Kerberos realm to use.
+
+-.IP \fB\-L\ login\fP
+-Set the login program to use. This option only has an effect if
+-DO_NOT_USE_K_LOGIN was not defined when
+-.I klogind
+-was compiled.
++.IP \fB\-L\ loginpath\fP
++Specify pathname to an alternative login program. Default: /usr/bin/login.
++KRB5_HOME/sbin/login.krb5 may be specified.
+
+ .IP \fB\-D\ port\fP
+ Run in standalone mode, listening on \fBport\fP. The daemon will exit
Copied: head/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h (from r363316, head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h)
@@ -0,0 +1,23 @@
+--- gssftp/ftp/ftp_var.h.orig Tue Jun 17 02:37:40 2003
++++ gssftp/ftp/ftp_var.h Sat Aug 30 05:30:44 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>
+@@ -57,9 +61,7 @@
+ typedef void (*sig_t)(int);
+ typedef void sigtype;
+ #else
+-#define sig_t my_sig_t
+ #define sigtype krb5_sigtype
+-typedef sigtype (*sig_t)();
+ #endif
+
+ /*
Copied: head/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in (from r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in)
@@ -0,0 +1,11 @@
+--- telnet/telnetd/Makefile.in.orig Wed Feb 28 14:06:51 2001
++++ telnet/telnetd/Makefile.in Mon Dec 31 21:51:19 2001
+@@ -24,7 +24,7 @@
+ # @(#)Makefile.generic 5.5 (Berkeley) 3/1/91
+ #
+
+-AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\"
++AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
+ OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
+ LOCALINCLUDES=-I.. -I$(srcdir)/..
+ DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF) $(OTHERDEFS)
Copied: head/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8 (from r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8 Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8)
@@ -0,0 +1,22 @@
+--- telnet/telnetd/telnetd.8.orig Wed Feb 28 14:06:51 2001
++++ telnet/telnetd/telnetd.8 Mon Dec 31 21:16:55 2001
+@@ -43,7 +43,7 @@
+ [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
+ [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
+ [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]]
+-[\fB\-debug\fP [\fIport\fP]]
++[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP]
+ .SH DESCRIPTION
+ The
+ .B telnetd
+@@ -221,6 +221,10 @@
+ in response to a
+ .SM DO TIMING-MARK)
+ for kludge linemode support.
++.TP
++\fB\-L\fP \fIloginpath\fP
++Specify pathname to an alternative login program. Default: /usr/bin/login.
++KRB5_HOME/sbin/login.krb5 may be specified.
+ .TP
+ .B \-l
+ Specifies line mode. Tries to force clients to use line-at-a-time
Copied: head/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c (from r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c)
@@ -0,0 +1,38 @@
+--- telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002
++++ telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002
+@@ -408,18 +408,25 @@
+ int
+ netwrite(const char *buf, size_t len)
+ {
+- size_t remain;
++ int remaining, copied;
++
++ remaining = BUFSIZ - (nfrontp - netobuf);
++ while (len > 0) {
++ /* Free up enough space if the room is too low*/
++ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
++ netflush();
++ remaining = BUFSIZ - (nfrontp - netobuf);
++ }
+
+- remain = sizeof(netobuf) - (nfrontp - netobuf);
+- if (remain < len) {
+- netflush();
+- remain = sizeof(netobuf) - (nfrontp - netobuf);
++ /* Copy out as much as will fit */
++ copied = remaining > len ? len : remaining;
++ memmove(nfrontp, buf, copied);
++ nfrontp += copied;
++ len -= copied;
++ remaining -= copied;
++ buf += copied;
+ }
+- if (remain < len)
+- return 0;
+- memcpy(nfrontp, buf, len);
+- nfrontp += len;
+- return len;
++ return copied;
+ }
+
+ /*
Copied: head/security/krb5-appl/files/patch-bsd__login.c (from r363316, head/security/krb5-appl/files/patch-ba)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-bsd__login.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-ba)
@@ -0,0 +1,120 @@
+--- bsd/login.c.orig 2009-11-21 12:29:19.000000000 -0800
++++ bsd/login.c 2011-08-31 21:56:02.581035877 -0700
+@@ -86,7 +86,12 @@
+ #include <netdb.h>
+
+ #include <time.h>
++#ifdef HAVE_UTMP_H
+ #include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
+ #include <signal.h>
+
+ #include <assert.h>
+@@ -225,8 +230,13 @@
+ #endif
+ #ifndef UT_NAMESIZE
+ /* linux defines it directly in <utmp.h> */
++#ifdef HAVE_UTMP_H
+ #define UT_NAMESIZE sizeof(((struct utmp *)0)->ut_name)
+ #endif
++#ifdef HAVE_UTMPX_H
++#define UT_NAMESIZE sizeof(((struct utmpx *)0)->ut_user)
++#endif
++#endif
+
+ #ifndef HAVE_SETPRIORITY
+ /* if we don't have it, punt it cleanly */
+@@ -964,19 +974,6 @@
+ setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
+ }
+
+- /* Policy: If local password is good, user is good.
+- We really can't trust the Kerberos password,
+- because somebody on the net could spoof the
+- Kerberos server (not easy, but possible).
+- Some sites might want to use it anyways, in
+- which case they should change this line
+- to:
+- if (kpass_ok)
+- */
+-
+- if (lpass_ok)
+- break;
+-
+ if (got_v5_tickets) {
+ retval = krb5_verify_init_creds(kcontext, &my_creds, NULL,
+ NULL, &xtra_creds,
+@@ -993,6 +990,9 @@
+ }
+ }
+
++ if (lpass_ok)
++ break;
++
+ bad_login:
+ setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
+
+@@ -1250,21 +1250,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))) {
++ 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))) {
+- com_err(argv[0], retval, "when initializing cache");
+- } 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 {
++ 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))
++ 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");
++ krb5_cc_destroy(kcontext, xtra_creds);
++ }
++ }
++ }
+ }
+-
+- if (xtra_creds)
+- krb5_cc_destroy(kcontext, xtra_creds);
+ } else if (forwarded_v5_tickets && rewrite_ccache) {
+ if ((retval = krb5_cc_initialize (kcontext, ccache, me))) {
+ syslog(LOG_ERR,
+@@ -1322,6 +1324,7 @@
+
+ if (ccname)
+ setenv("KRB5CCNAME", ccname, 1);
++ krb5_cc_set_default_name(kcontext, ccname);
+
+ setenv("HOME", pwd->pw_dir, 1);
+ setenv("PATH", LPATH, 0);
+@@ -1652,6 +1655,7 @@
+ int quiet;
+ char *tty;
+ {
++#if !(defined(__FreeBSD_version)) || (defined(__FreeBSD_version) && (__FreeBSD_version <= 900007))
+ #if defined(HAVE_LASTLOG_H) || (defined(BSD) && (BSD >= 199103))
+ struct lastlog ll;
+ time_t lltime;
+@@ -1692,6 +1696,7 @@
+ (void)close(fd);
+ }
+ #endif
++#endif
+ }
+
+ #undef UNKNOWN
Copied: head/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c (from r363316, head/security/krb5-appl/files/patch-ai)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-ai)
@@ -0,0 +1,17 @@
+--- gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002
++++ gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002
+@@ -487,7 +487,13 @@
+ #ifndef LOG_DAEMON
+ #define LOG_DAEMON 0
+ #endif
+- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
++
++#ifndef LOG_FTP
++#define FACILITY LOG_DAEMON
++#else
++#define FACILITY LOG_FTP
++#endif
++ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
+
+ addrlen = sizeof (his_addr);
+ if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
Copied: head/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c (from r363316, head/security/krb5-appl/files/patch-aj)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-aj)
@@ -0,0 +1,19 @@
+*** gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998
+--- gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998
+***************
+*** 66,72 ****
+ struct stat buf;
+ time_t time();
+
+! if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
+ return;
+ if (fstat(fd, &buf) == 0) {
+ (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
+--- 66,72 ----
+ struct stat buf;
+ time_t time();
+
+! if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0)
+ return;
+ if (fstat(fd, &buf) == 0) {
+ (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
Copied: head/security/krb5-appl/files/patch-libpty__getpty.c (from r363316, head/security/krb5-appl/files/patch-ay)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-libpty__getpty.c Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-ay)
@@ -0,0 +1,50 @@
+--- libpty/getpty.c.orig 2009-11-05 12:15:06.000000000 -0800
++++ libpty/getpty.c 2010-04-21 21:36:45.637180364 -0700
+@@ -23,13 +23,26 @@
+ #include "pty-int.h"
+ #include <k5-platform.h>
+
++#ifdef __FreeBSD__
++#define PTYCHARS1 "pqrsPQRS"
++#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv"
++#endif
++
++#ifndef PTYCHARS1
++#define PTYCHARS1 "pqrstuvwxyzPQRST"
++#endif
++
++#ifndef PTYCHARS2
++#define PTYCHARS2 "0123456789abcdef"
++#endif
++
+ long
+ ptyint_getpty_ext(int *fd, char *slave, size_t slavelength, int do_grantpt)
+ {
++ int ptynum;
++ char *cp1, *cp2;
+ #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
+- char *cp;
+ char *p;
+- int i,ptynum;
+ struct stat stb;
+ char slavebuf[1024];
+ #endif
+@@ -112,14 +125,14 @@
+ strncpy(slave, slavebuf, slavelength);
+ return 0;
+ } else {
+- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
++ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
+ snprintf(slavebuf,sizeof(slavebuf),"/dev/ptyXX");
+- slavebuf[sizeof("/dev/pty") - 1] = *cp;
++ slavebuf[sizeof("/dev/pty") - 1] = *cp1;
+ slavebuf[sizeof("/dev/ptyp") - 1] = '0';
+ if (stat(slavebuf, &stb) < 0)
+ break;
+- for (i = 0; i < 16; i++) {
+- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
++ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
++ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
+ *fd = open(slavebuf, O_RDWR);
+ if (*fd < 0) continue;
+
Copied: head/security/krb5-appl/files/patch-telnet__telnet__Makefile.in (from r363316, head/security/krb5-appl/files/patch-bb)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-appl/files/patch-telnet__telnet__Makefile.in Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-appl/files/patch-bb)
@@ -0,0 +1,10 @@
+--- telnet/telnet/Makefile.in.orig Sat Dec 18 10:47:05 1999
++++ telnet/telnet/Makefile.in Sat Dec 18 10:47:13 1999
+@@ -58,7 +58,6 @@
+ $(INSTALL_DATA) $(srcdir)/$$f.1 \
+ ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+ done
+- $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
+
+ authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
+ commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
Copied: head/security/krb5-maint/files/patch-clients__ksu__Makefile.in (from r363316, head/security/krb5-maint/files/patch-av)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-maint/files/patch-clients__ksu__Makefile.in Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-maint/files/patch-av)
@@ -0,0 +1,18 @@
+--- clients/ksu/Makefile.in.orig 2014-01-21 14:11:14.000000000 -0800
++++ clients/ksu/Makefile.in 2014-05-05 20:55:07.343860783 -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
+ DEFS=
+
+ PROG_LIBPATH=-L$(TOPLIBD)
+@@ -34,6 +34,6 @@
+
+ install::
+ -for f in ksu; do \
+- $(INSTALL_SETUID) $$f \
++ $(INSTALL_PROGRAM) $$f \
+ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+ done
Copied: head/security/krb5-maint/files/patch-config__pre.in (from r363316, head/security/krb5-maint/files/patch-config::pre.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-maint/files/patch-config__pre.in Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-maint/files/patch-config::pre.in)
@@ -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
Copied: head/security/krb5-maint/files/patch-config__shlib.conf (from r363316, head/security/krb5-maint/files/patch-config::shlib.conf)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-maint/files/patch-config__shlib.conf Tue Jul 29 14:30:10 2014 (r363328, copy of r363316, head/security/krb5-maint/files/patch-config::shlib.conf)
@@ -0,0 +1,33 @@
+--- config/shlib.conf.orig 2012-08-08 15:27:55.000000000 -0700
++++ config/shlib.conf 2012-11-02 17:49:31.140500618 -0700
+@@ -306,24 +306,18 @@
+ ;;
+
+ *-*-freebsd*)
+- if test -x /usr/bin/objformat ; then
+- objformat=`/usr/bin/objformat`
+- else
+- objformat="elf"
+- 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)'
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list