summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/FREEBSD-upgrade
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-09-23 20:35:54 +0000
committerdes <des@FreeBSD.org>2013-09-23 20:35:54 +0000
commit476b7e3d43eadb9adc07587cb47ade03d7fc6f22 (patch)
tree204a4783390b9e2cd41aa93420dec26e049d2dba /crypto/openssh/FREEBSD-upgrade
parent6d86a0080bfdac11278fa40273e50920072f74df (diff)
downloadFreeBSD-src-476b7e3d43eadb9adc07587cb47ade03d7fc6f22.zip
FreeBSD-src-476b7e3d43eadb9adc07587cb47ade03d7fc6f22.tar.gz
Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a
repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
Diffstat (limited to 'crypto/openssh/FREEBSD-upgrade')
-rw-r--r--crypto/openssh/FREEBSD-upgrade10
1 files changed, 8 insertions, 2 deletions
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 03b7dbf..2a3dc7f 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -3,7 +3,13 @@
FreeBSD maintainer's guide to OpenSSH-portable
==============================================
-[needs rewriting for svn]
+XXX
+XXX this needs a complete rewrite
+XXX svn merge from vendor branch, resolve conflicts manually
+XXX (see FREEBSD-tricks for tips on how to reduce conflicts)
+XXX run freebsd-configure.sh to generate config.h and krb5_config.h
+XXX svn diff Makefile.in to see if the Makefiles need adjusting
+XXX
0) Make sure your mail spool has plenty of free space. It'll fill up
pretty fast once you're done with this checklist.
@@ -116,7 +122,7 @@ B) Re-commit everything on repoman (you *did* use a test repo for
This port was brought to you by (in no particular order) DARPA, NAI
-Labs, ThinkSec, Nescafé, the Aberlour Glenlivet Distillery Co.,
+Labs, ThinkSec, Nescafé, the Aberlour Glenlivet Distillery Co.,
Suzanne Vega, and a Sanford's #69 Deluxe Marker.
-- des@FreeBSD.org
OpenPOWER on IntegriCloud