Commit Graph

257 Commits

Author SHA1 Message Date
Mark Murray
f5eb4a6a5e Try a lot harder to get dependancies right. This involves some ugly
looking ${.OBJDIR} work that has the up-side of actually working
in upgrade and make -jN cases.

This needs to be revisited further, and it is conceivable that
the ${.OBJDIR} stuff can be simplified, but the sheer number of
edge cases and other causes make this Hard(tm). For now, this works.
2003-07-27 13:17:31 +00:00
Mark Murray
069b88eb3a Big fixup of the makefiles. Sort out the dependancies so that "make"
without "make depend" works, "make -j N" works, and lists of source
files are made vertical to reduce future diffs.
2003-07-18 13:21:58 +00:00
Mark Murray
4afa371832 Very big makeover in the way telnet, telnetd and libtelnet are built.
Previously, there were two copies of telnet; a non-crypto version
that lived in the usual places, and a crypto version that lived in
crypto/telnet/. The latter was built in a broken manner somewhat akin
to other "contribified" sources. This meant that there were 4 telnets
competing with each other at build time - KerberosIV, Kerberos5,
plain-old-secure and base. KerberosIV is no longer in the running, but
the other three took it in turns to jump all over each other during a
"make buildworld".

As the crypto issue has been clarified, and crypto _calls_ are not
a problem, crypto/telnet has been repo-copied to contrib/telnet,
and with this commit, all telnets are now "contribified". The contrib
path was chosen to not destroy history in the repository, and differs
from other contrib/ entries in that it may be worked on as "normal"
BSD code. There is no dangerous crypto in these sources, only a
very weak system less strong than enigma(1).

Kerberos5 telnet and Secure telnet are now selected by using the usual
macros in /etc/make.conf, and the build process is unsurprising and
less treacherous.
2003-07-16 20:59:15 +00:00
Ruslan Ermilov
ea51b8e82b Fixed "make checkdpadd".
OK'ed by:	markm
2003-07-02 23:46:39 +00:00
Michael Reifenberger
b39dbb30f3 s/USE_OPENLDAP/WITH_OPENLDAP/ per request from kris. 2003-06-18 14:23:44 +00:00
Michael Reifenberger
bdf5603500 Add (optional, default off) support to kerberos5 for supporting openldap.
Tests with openldap20 where successful whereas openldap21 didn't like
the way hdb-ldap accessed openldap (doesn't like non-bind access).
To activate the support put a USE_OPENLDAP=yes in your make.conf.
The OPENLDAPBASE is also optional and points to /usr/local as default.

Approved by:	markm
MFC after:	2 weeks
2003-06-18 09:11:34 +00:00
Mark Murray
6843449a02 Remove some KRB4 scraps, and allow NOSHARED make worlds to
complete.

OK'ed by:	re(scottl)
2003-05-11 18:49:29 +00:00
Mark Murray
dbf104e68d Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.
2003-05-05 07:58:44 +00:00
Mark Murray
aaa2c2ab24 Trasmute moer "krb5" distibutions into "crypto". 2003-05-01 21:21:15 +00:00
Warner Losh
30aaff1192 Migrate to a new way of dealing with building from old revisions of
FreeBSD.  This method attempts to centralize all the necessary hacks
or work arounds in one of two places in the tree (src/Makefile.inc1
and src/tools/build).  We build a small compatibility library
(libbuild.a) as well as selectively installing necessary include
files.  We then include this directory when building host binaries.

This removes all the past release compatibilty hacks from various
places in the tree.  We still build on tip of stable and current.  I
will work with those that want to support more, although I anticipate
it will just work.

Many thanks to ru@, obrien@ and jhb@ for providing valuable input at
various stage of implementation, as well as for working together to
positively effect a change for the better.
2003-04-05 20:30:30 +00:00
Mark Murray
53056489db Post KerberosIV de-orbit: Clean up Kerberos5. We dont need KerberosIV
compatiblity mode anymore. Rename the k5foo utils to kfoo (after
repo-copy).
2003-03-09 21:56:55 +00:00
Marcel Moolenaar
0ab105eaf2 Don't copy headers from the source tree to the object tree without
making sure the copies in the object tree are writable. When files
in the source tree are not writable (as would be the case for a p4
tree) then a buildworld -DNOCLEAN will try to copy over the existing
non-writable headers. This fails. Instead we cat the headers with
redirection. This is just one of the possibilities.
2003-03-08 08:57:56 +00:00
Jacques Vidrine
81d1ffee08 Unbreak Kerberos 5 authentication in telnet.
(Credential forwarding is still broken.)

PR:	bin/45397
2003-03-06 13:41:53 +00:00
Jacques Vidrine
8e708b24ca Define OPENSSL_DES_LIBDES_COMPATIBILITY so that Heimdal will build with
OpenSSL 0.9.7 when it is imported.  (This currently has no effect.)
2003-01-21 14:08:24 +00:00
Jacques Vidrine
4556abb542 Update version numbers after import of Heimdal 0.5.1.
Approved by:	re
2002-11-24 21:00:51 +00:00
Jacques Vidrine
ed913cabfe Repair buglet introduced with the last import of Heimdal:
`krb5-config --cflags' spewed an erroneous argument.

Reported by:	Gabor@Zahemszky.HU
Approved by:	re (jhb)
2002-11-16 02:23:17 +00:00
Ruslan Ermilov
40c6b893d8 Take __FreeBSD_version into account when BOOTSTRAPPING. 2002-11-13 13:49:29 +00:00
John Baldwin
27072bf00c Correct path in previous commit. libssh lives under src/secure/lib, not
under src/lib.

Reported by:	phk
2002-10-30 20:33:28 +00:00
Dag-Erling Smørgrav
a23add744c Unbreak 'make release' by adding libssh to KPROGS.
Suggested by:	jhay
2002-10-30 14:27:12 +00:00
Assar Westerlund
43106c5234 update version numbers to (consistenly):
krb4 1.0.5 fb1 (including the kadmind fix)
heimdal 0.5 fb1 (including the kadmind fix)
2002-10-23 06:12:21 +00:00
Ruslan Ermilov
890b32ee41 Build kerberized versions of the PAM library, and install them
into corresponding distributions during "make release".  (This
also cleans the "slib" distribution up from the .o files.)

PR:		misc/43825 (inspired by)
2002-10-11 14:17:09 +00:00
Peter Wemm
224af215a6 Zap now-unused SHLIB_MINOR 2002-09-28 00:25:32 +00:00
Mark Murray
2da3b2ad29 Don't lint contrib'ed sources, even if the builder gas asked for it.
Its Just Too Noisy.
2002-09-25 09:59:54 +00:00
Jacques Vidrine
440d1ebc9c Fix k5admind by dropping libkadm5clnt from LDADD. 2002-09-20 17:31:03 +00:00
Jacques Vidrine
db6845e883 Reorder libraries in LDADD in case some wants to statically
link these applications.
2002-09-20 17:09:38 +00:00
Jacques Vidrine
adb5202b1b Make ipropd-slave/ipropd-master actually work. These applications
were being linked against the client Kerberos administration library,
when they must be linked against the server library, resulting in
segfaults early in the game.  I suspect these have never been tested
before :-(
2002-09-20 17:07:59 +00:00
Jacques Vidrine
888371485b This is Heimdal 0.5. 2002-09-19 12:59:18 +00:00
Jacques Vidrine
75019e2096 This is Heimdal 0.5. 2002-09-19 12:12:26 +00:00
Jacques Vidrine
42756860e3 Update build infrastructure after import of Heimdal Kerberos 2002/09/16. 2002-09-16 21:10:29 +00:00
Jacques Vidrine
c9e3816999 = The prefix should be /usr', not /'.
= Correct the Heimdal version number hiding in here.
2002-09-01 14:45:17 +00:00
Jacques Vidrine
797fe7ebb1 Update build infrastructure after import of Heimdal Kerberos 2002/08/29. 2002-08-30 21:33:20 +00:00
Ruslan Ermilov
9645701d92 Bootstrapping aid for pre-getprogname(3) systems.
Spotted by:	Gareth Hopkins <gareth@za.uu.net>
Approved by:	nectar
MFC after:	3 days
2002-08-13 16:52:52 +00:00
Max Khon
dde0b0ee97 Kerberos 5 no longer needs -lmd
Approved by:	nectar
2002-08-04 22:23:48 +00:00
Ruslan Ermilov
81928df848 Heimdal Texinfo manual. 2002-07-05 05:47:13 +00:00
Mark Murray
13ae4922e5 Give k5admin a manpage. 2002-07-03 14:31:52 +00:00
Ruslan Ermilov
9de859c013 Make this -j safe. 2002-05-14 15:27:13 +00:00
Ruslan Ermilov
1e27d2dc60 MAN[1-9] -> MAN. 2002-05-13 12:11:54 +00:00
Ruslan Ermilov
46f8fdc34e Removed now unused INTERNALSTATICLIB.
INTERNALLIB now implies NOPIC and NOPROFILE.
Removed gratuitous NOMAN.
2002-05-13 11:09:07 +00:00
Ruslan Ermilov
c7b111cba8 Added new bsd.incs.mk which handles installing of header files
via INCS.  Implemented INCSLINKS (equivalent to SYMLINKS) to
handle symlinking include files.  Allow for multiple groups of
include files to be installed, with the powerful INCSGROUPS knob.
Documentation to follow.

Added standard `includes' and `incsinstall' targets, use them
in Makefile.inc1.  Headers from the following makefiles were
not installed before (during `includes' in Makefile.inc1):

	kerberos5/lib/libtelnet/Makefile
	lib/libbz2/Makefile
	lib/libdevinfo/Makefile
	lib/libform/Makefile
	lib/libisc/Makefile
	lib/libmenu/Makefile
	lib/libmilter/Makefile
	lib/libpanel/Makefile

Replaced all `beforeinstall' targets for installing includes
with the INCS stuff.

Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS,
and for compatibility with NetBSD.  Similarly for INCOWN, INCGRP,
and INCMODE.

Consistently use INCLUDEDIR instead of /usr/include.

gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes
were only lightly tested due to the missing contrib/libstdc++-v3.
I fully tested the pre-WIP_GCC31 version of this patch with the
contrib/libstdc++.295 stuff.

These changes have been tested on i386 with the -DNO_WERROR "make
world" and "make release".
2002-05-12 16:01:00 +00:00
Jacques Vidrine
95ba43303b Turn on the set-user-ID bit for k5su if ENABLE_SUID_K5SU is defined. 2002-05-12 03:17:31 +00:00
Jacques Vidrine
bd9a339ccc Do not install this with set-user-ID bit set. This utility does not
grok the `wheel' group.

Noticed by:	jmallett
2002-05-11 14:05:07 +00:00
Jacques Vidrine
b97d597ffc = We need -lcrypt' and -lcom_err' to when building Kerberos
applications.
= The Heimdal version number is hiding here also.  Correct it.
2002-05-09 00:50:49 +00:00
Ruslan Ermilov
a39bc9aac5 Don't emulate INTERNALLIB. 2002-05-08 13:56:08 +00:00
Jacques Vidrine
b32781172b Update Heimdal version string to 0.4e. This should have been done when that
version was imported on 2002/02/19.
2002-04-29 15:31:45 +00:00
Ruslan Ermilov
6bde859f40 Milestone #1 in cross-arch make releases.
Do not install games and profiled libraries to the ${CHROOTDIR}
with the initial installworld.

Eliminate the need in the second installworld.  For that, make sure
_everything_ is built in the "world" environment, using the right
tool chain.

Added SUBDIR_OVERRIDE helper stuff to Makefile.inc1.  Split the
buildworld process into stages, and skip some stages when
SUBDIR_OVERRIDE is set (used to build crypto, krb4, and krb5
dists).

Added NO_MAKEDB_RUN knob to Makefile.inc1 to avoid running
makewhatis(1) at the end of installworld (used when making crypto,
krb4, and krb5 dists).

In release/scripts/doFS.sh, ensure that the correct boot blocks are
used.

Moved the creation of the "crypto" dist from release.5 to
release.2.

In release.3 and doMFSKERN, build kernels in the "world"
environment.  KERNELS now means "additional" kernels, GENERIC is
always built.

Ensure we build crunched binaries in the "world" environment.
Obfuscate release/Makefile some more (WMAKEENV) to achieve this.

Inline createBOOTMFS target.

Use already built GENERIC kernel modules to augment mfsfd's
/stand/modules.  GC doMODULES as such.

Assorted fixes:

Get rid of the "afterdistribute" target by moving the single use
of it from sys/Makefile to etc/Makefile's "distribute".

Makefile.inc1: apparently "etc" no longer needs to be last for
"distribute" to succeed.

gnu/usr.bin/perl/library/Makefile.inc: do not override the
"install" and "distribute" targets, do it the "canonical" way.

release/scripts/{man,cat}pages-make.sh: make sure Perl manpages and
catpages appear in the right dists.  Note that because Perl does
not respect the MANBUILDCAT (and NOMAN), this results in a loss of
/usr/share/perl/man/cat* empty directories.  This will be fixed
soon.

Turn MAKE_KERBEROS4 into a plain boolean variable (if it is set it
means "make KerberosIV"), as documented in the make.conf(5)
manpage.  Most of the userland makefiles did not test it for "YES"
anyway.

XXX Should specialized kerberized libpam versions be included into
the krb4 and krb5 dists?  (libpam.a would be incorrect anyway if
both krb4 and krb5 dists were choosen.)

Make sure "games" dist is made before "catpages", otherwise games
catpages settle in the wrong dist.

Fast build machine provided by: Igor Kucherenko <kivvy@sunbay.com>
2002-04-26 17:55:27 +00:00
Ruslan Ermilov
fdab7c18dc Replaced hacks in previous revision with the "standard" way of
building internal libraries.  This also unbreaks this makefile
after recent share/mk changes.
2002-04-25 10:23:10 +00:00
Jacques Vidrine
c2541847fd Fix build when MAKE_KERBEROS4 is not requested. This was broken with
the last Heimdal import.

Reported by:	jhay, roam
(both the same day!)
2002-02-21 15:54:20 +00:00
Jacques Vidrine
60b9808291 Bump major library version of all Heimdal Kerberos libraries
after import from KTH repository circa 2002/02/17.
2002-02-19 16:02:28 +00:00
Jacques Vidrine
eacee0ff7e Update build after import of Heimdal Kerberos 2002/02/17. 2002-02-19 15:53:33 +00:00
Ruslan Ermilov
19f56da943 Fixed -DMAKE_KERBEROS5 world breakage in kerberos5/lib/libroken
(make-roken is a build tool).  This bug was hiding itself after
a just fixed bug in cross-linker (binutuils/ld/Makefile,v 1.20).

The bug was fatal for cross builds; for example, an alpha binary
(make-roken) was attempted to be run on i386.

Added make-roken to the list of build-tools in libasn1.  It only
worked because another build tool needs make-roken implicitly:

(build-tools: asn1_compile: print_version.o: roken.h: make-roken).

Spotted by:	nectar
2002-02-11 16:47:05 +00:00
Ruslan Ermilov
cdbf1b6b05 Install script via SCRIPTS. 2001-12-17 16:52:32 +00:00
Assar Westerlund
515d0f1f97 add krb4 libraries 2001-12-17 01:33:20 +00:00
John Hay
2e761cd11a Add the necessary paths to the kerberos libraries and includes.
This fix "make release".

Reviewed by:	markm
2001-12-03 17:45:25 +00:00
Mark Murray
d282330c31 Style clean-up, and diff-reduce WRT src/secure/*telnet*/Makefile
Lost in this commit - KerberosIV compatability. This will be
re-added later.
2001-11-30 21:14:44 +00:00
Assar Westerlund
0a2bc5cab2 use cp instead of mv to get the right name of the yacc-generated
files, mv fails badly with parallel makes

Submitted by:	Vincent Poy <vince@oahu.WURLDLINK.NET>
2001-11-06 04:30:15 +00:00
Assar Westerlund
ceb6fd100e make libtelnet (and telnet, telnetd) use libkrb when required 2001-11-01 03:16:03 +00:00
Assar Westerlund
ae7f04bdca also install roken-common.h 2001-10-05 04:56:37 +00:00
Assar Westerlund
fb0007c704 style fixes (by the way of bde) 2001-08-27 13:25:43 +00:00
Assar Westerlund
5b297c07e0 sort SUBDIR
Requested by: bde
2001-08-27 09:09:10 +00:00
Assar Westerlund
ec4ca830cc add krb5-config 2001-08-27 00:08:53 +00:00
Mark Murray
7c5a3600ab Diff reduce all the crypto telnet Makefiles. 2001-08-20 12:32:45 +00:00
Mark Murray
563df95270 Revamp and diff-reduce the various secure telnets. Make sure that
Kerberos5 has _a_ telnet (which is not currently K5 enabled).
Incorporate BDE's static linking fixes.
2001-08-03 16:03:26 +00:00
Assar Westerlund
265f31c20e add dependency for lex.o on roken.h (from "Alexander N. Kabaev"
<ak03@gte.com>)
remove duplicate build-tools target
2001-07-12 08:36:01 +00:00
Assar Westerlund
4ed5408587 add an explicit dependency to run yacc before lex instead of using
.ORDER
2001-06-21 19:19:00 +00:00
Assar Westerlund
c2a6ca2a3c update infrastructure for heimdal 0.3f 2001-06-21 12:55:45 +00:00
Mark Murray
6f321c74d2 Install this SUID root. Heck, it is su, after all. 2001-06-04 19:54:35 +00:00
Assar Westerlund
3abfa903d2 use print_version from lib/vers instead of lib/roken 2001-05-14 09:24:50 +00:00
Assar Westerlund
319b2df8ad install libroken and roken.h 2001-05-13 20:57:48 +00:00
Assar Westerlund
21d27f9321 de-constify to make it compatible with (krb4) and make-print-version
Submitted by:	Peter Pentchev <roam@orbitel.bg> (just inverted)
2001-05-11 16:56:36 +00:00
Mark Murray
d407604556 Fix PAMized telnet in exactly the same way as BDE did it for the other
telnet instances.
2001-05-11 09:39:11 +00:00
Ruslan Ermilov
4ecbb30346 Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.
Approved by:	markm
2001-03-28 12:08:22 +00:00
Ruslan Ermilov
a603fae202 MAN[1-9] -> MAN. 2001-03-27 14:07:31 +00:00
Ruslan Ermilov
d4b78f94d9 MAN[1-9] -> MAN. 2001-03-27 13:58:21 +00:00
Mark Murray
aa09f2ccf6 *Sigh*. What I did without this, I have no idea. 2001-03-05 11:18:35 +00:00
Assar Westerlund
a1092eac69 try hard to make sure this does not get build as a shared library 2001-02-24 02:10:32 +00:00
John Baldwin
22736af0ec Fix release. Just as in other kerberos5 libraries, we need to include
${.OBJDIR} in the includes list and generate a couple of headers from their
.et sources for beforedepend and all.
2001-02-23 18:31:26 +00:00
Assar Westerlund
5bf44e3d56 remove definition of KRB4, this gets defined conditionally in
kerberos5/Makefile and should not have a constant value here.

Submitted by:	Jun Kuriyama <kuriyama@imgsrc.co.jp>
2001-02-21 13:27:39 +00:00
Mark Murray
5fa0a06cbe Fix build, and make parallel build much more robust. 2001-02-14 19:47:24 +00:00
Assar Westerlund
2655cbec4e update build infrastructure for heimdal 0.3e 2001-02-13 16:57:04 +00:00
Jacques Vidrine
fb44daad61 Fix ordering for real this time. 2000-08-30 03:44:30 +00:00
Jacques Vidrine
af343dfbbe Add a dependency needed when using parallel make.
Approved by:	markm
2000-08-29 19:21:08 +00:00
Kris Kennaway
7c99dc5eaa Unbreak heimdal build: we can no longer #include <netinet6/in6.h> 2000-07-06 10:09:59 +00:00
Mark Murray
00ffb9a030 Properly separate the K5-only buld from K4.
Submitted by:	sheldonh
2000-03-23 14:56:47 +00:00
John Hay
f52756af73 Point SDIR at ${.CURDIR}/../secure so that ssh and sshd can be found when
the krb5 versions are built during make release.

Reviewed by:	markm
2000-03-03 20:37:15 +00:00
Mark Murray
394c9e8edc Oops! this macro needs to be defined for "make release".
Found by:	phk
2000-03-02 11:16:25 +00:00
Mark Murray
b825cbde03 KerberosIV is no longer compulsory. This should fix "make release". 2000-03-01 13:50:48 +00:00
Mark Murray
967b7d28a4 Targets and macros for "make release". 2000-02-29 11:59:35 +00:00
Mark Murray
079654e8e2 Remove largescale evidence of crack-smoking.
Where a k4 applet has a k5 namesake, rename the k5 version
from k<app> to k5<app>. (Repo copy done).

Do some repairs to dependancies to support make world properly.
2000-02-28 19:15:32 +00:00
Mark Murray
fc4b5dfa38 Use libcrypto instead of libdes. Upgrade for Heimdal-0.2p 2000-02-24 21:15:14 +00:00
Mark Murray
fea326b4d1 Use libcrypto in place of libdes. 2000-02-24 20:57:04 +00:00
Yoshinobu Inoue
4dd8b5ab79 another tcp apps IPv6 updates.(should be make world safe)
ftp, telnet, ftpd, faithd
  also telnet related sync with crypto, secure, kerberosIV

Obtained from: KAME project
2000-01-27 09:28:38 +00:00
Mark Murray
268139931b Another target to keep "make release" orthogonal. 2000-01-24 20:45:13 +00:00
Mark Murray
5e8c735fa3 Make a "do nothing" target to help "make release" look clean. 2000-01-24 20:41:08 +00:00
Mark Murray
d12b18b9fb Move CFLAGS to a more obvious place and allow INET6 to work. 2000-01-24 20:06:02 +00:00
Mark Murray
9085ca309f Move CFLAGS to a more obvious place and allow INET6 to work properly. 2000-01-24 20:04:47 +00:00
Mark Murray
0de66b379c Bring in rest of K5 (AKA Heimdal) userland.
The brave amongst you may want to start playing with this (ATM
experimental) code.
2000-01-24 19:56:26 +00:00
Mark Murray
eb9e1f54bd Userland build of Kerberos5 (AKA Heimdal). More to come.
This is not ready for primetime yet! Please hold off on the bug reports.
2000-01-15 21:38:08 +00:00
Mark Murray
eaaceb5416 Bring in SRA for telnet.
Submitted by:	Nick Sayer
1999-10-07 18:59:55 +00:00
Bruce Evans
84a65bd944 Merged src/lib/libtelnet rev.1.9 (fixed removing of obsolete shared
library: wrong library directory, wrong library extension and wrong
comment).  This is mainly of historical interest, if any.  The library
that gets removed is aout.
1999-09-13 16:38:58 +00:00
Mark Murray
63b51f8be4 Fix for new Common Error system. 1999-09-05 14:07:40 +00:00
Peter Wemm
efa0a3f5f5 Don't -DTERMCAP or we define a few conflicting functions and cause
recursion in a rather ugly way.
1999-08-30 08:12:20 +00:00
Peter Wemm
97d92980a9 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
Mark Murray
0346639d07 Link everything against libcrypt. ELF builds complain without it.
Clean up the master makefile a bit and add a "dekerberise" target
for those who have shot themselves in the foot.

Thanks to:	Randy Bush
1999-01-25 06:49:43 +00:00
Mark Murray
e6d0d4a4c4 While I am no longer making a shared library, nuke the old one to prevent
ld from picking it up spuriously.
1998-08-30 13:08:54 +00:00
Mark Murray
622bd6c690 Stop making the shared library for libtelnet (crypto version). This
should have happened years ago.
1998-08-29 20:24:54 +00:00
Mark Murray
0d5894c3bd Fix a break in the includes where the build blows chunks if it is
being built in a totally clean environment.

Found by: jkh and "make release"
1997-10-02 15:03:23 +00:00
Mark Murray
5f6559a29b Initial import of the new kerberosIV Makefiles.
I will follow up with the userland sources over the next few days.
The impatient of you can play with this, but you do this without
support or blessing until I am finished ;-)
1997-09-24 20:37:15 +00:00