Commit Graph

260 Commits

Author SHA1 Message Date
markm
522acafcec 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
markm
d6aec2b6d6 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
ru
495eff2a20 Fixed "make checkdpadd".
OK'ed by:	markm
2003-07-02 23:46:39 +00:00
mr
1d896515bd s/USE_OPENLDAP/WITH_OPENLDAP/ per request from kris. 2003-06-18 14:23:44 +00:00
mr
de0f8d4cff 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
markm
fac5c11855 Remove some KRB4 scraps, and allow NOSHARED make worlds to
complete.

OK'ed by:	re(scottl)
2003-05-11 18:49:29 +00:00
markm
ee63e7dc15 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
markm
fad590ab7e Trasmute moer "krb5" distibutions into "crypto". 2003-05-01 21:21:15 +00:00
imp
b0693a4cbc 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
markm
2abe88edc1 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
71eb06a12b 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
nectar
c4f823a8ba Unbreak Kerberos 5 authentication in telnet.
(Credential forwarding is still broken.)

PR:	bin/45397
2003-03-06 13:41:53 +00:00
nectar
8bafd7d816 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
nectar
dc656bd28b Update version numbers after import of Heimdal 0.5.1.
Approved by:	re
2002-11-24 21:00:51 +00:00
nectar
846c25bc5c 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
ru
7920e22cea Take __FreeBSD_version into account when BOOTSTRAPPING. 2002-11-13 13:49:29 +00:00
jhb
067d117fc1 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
des
9a4bce7a4b Unbreak 'make release' by adding libssh to KPROGS.
Suggested by:	jhay
2002-10-30 14:27:12 +00:00
assar
9543d6aebb 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
ru
b3c0f70717 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
0a7f0ba37e Zap now-unused SHLIB_MINOR 2002-09-28 00:25:32 +00:00
markm
84c5377d82 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
nectar
5012a39145 Fix k5admind by dropping libkadm5clnt from LDADD. 2002-09-20 17:31:03 +00:00
nectar
296dd3ab99 Reorder libraries in LDADD in case some wants to statically
link these applications.
2002-09-20 17:09:38 +00:00
nectar
2658a0653c 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
nectar
7ac6b7a75f This is Heimdal 0.5. 2002-09-19 12:59:18 +00:00
nectar
ffbde8ea6c This is Heimdal 0.5. 2002-09-19 12:12:26 +00:00
nectar
c715b040b6 Update build infrastructure after import of Heimdal Kerberos 2002/09/16. 2002-09-16 21:10:29 +00:00
nectar
93ca8e9c88 = The prefix should be /usr', not /'.
= Correct the Heimdal version number hiding in here.
2002-09-01 14:45:17 +00:00
nectar
5510fffec8 Update build infrastructure after import of Heimdal Kerberos 2002/08/29. 2002-08-30 21:33:20 +00:00
ru
3f0a0a8957 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
fjoe
e1a15dd5a4 Kerberos 5 no longer needs -lmd
Approved by:	nectar
2002-08-04 22:23:48 +00:00
ru
42fdc9105e Heimdal Texinfo manual. 2002-07-05 05:47:13 +00:00
markm
a451e34e3b Give k5admin a manpage. 2002-07-03 14:31:52 +00:00
ru
2f23cfb579 Make this -j safe. 2002-05-14 15:27:13 +00:00
ru
c47610e655 MAN[1-9] -> MAN. 2002-05-13 12:11:54 +00:00
ru
bc2e1305d8 Removed now unused INTERNALSTATICLIB.
INTERNALLIB now implies NOPIC and NOPROFILE.
Removed gratuitous NOMAN.
2002-05-13 11:09:07 +00:00
ru
59049318b6 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
nectar
73258fd6a3 Turn on the set-user-ID bit for k5su if ENABLE_SUID_K5SU is defined. 2002-05-12 03:17:31 +00:00
nectar
555b23e66d 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
nectar
a4e647e53d = 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
ru
db8d7fd8dd Don't emulate INTERNALLIB. 2002-05-08 13:56:08 +00:00
nectar
fb7d15efa8 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
ru
8ad1c2807b 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
ru
6b33a41705 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
nectar
85e421e953 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
nectar
3ea171f473 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
nectar
63b64d9c11 Update build after import of Heimdal Kerberos 2002/02/17. 2002-02-19 15:53:33 +00:00
ru
514239b04b 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
ru
492591a47e Install script via SCRIPTS. 2001-12-17 16:52:32 +00:00
assar
51ff4e7d8a add krb4 libraries 2001-12-17 01:33:20 +00:00
jhay
882107c92b 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
markm
a9aad3d379 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
d6a7ad3361 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
8e6deccca7 make libtelnet (and telnet, telnetd) use libkrb when required 2001-11-01 03:16:03 +00:00
assar
ec54256760 also install roken-common.h 2001-10-05 04:56:37 +00:00
assar
f883e3ecc8 style fixes (by the way of bde) 2001-08-27 13:25:43 +00:00
assar
28497f6cc1 sort SUBDIR
Requested by: bde
2001-08-27 09:09:10 +00:00
assar
673b6e2dbf add krb5-config 2001-08-27 00:08:53 +00:00
markm
e909686930 Diff reduce all the crypto telnet Makefiles. 2001-08-20 12:32:45 +00:00
markm
18d8718070 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
4168dcbf7d 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
a0eb3fcc17 add an explicit dependency to run yacc before lex instead of using
.ORDER
2001-06-21 19:19:00 +00:00
assar
fbf015e5d8 update infrastructure for heimdal 0.3f 2001-06-21 12:55:45 +00:00
markm
ccc10801db Install this SUID root. Heck, it is su, after all. 2001-06-04 19:54:35 +00:00
assar
db6c759b2b use print_version from lib/vers instead of lib/roken 2001-05-14 09:24:50 +00:00
assar
a7c1f8c826 install libroken and roken.h 2001-05-13 20:57:48 +00:00
assar
e79f2a8ad8 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
markm
325cb417fd 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
ru
98c6ecb383 Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.
Approved by:	markm
2001-03-28 12:08:22 +00:00
ru
7d28ec8ab9 MAN[1-9] -> MAN. 2001-03-27 14:07:31 +00:00
ru
747a439541 MAN[1-9] -> MAN. 2001-03-27 13:58:21 +00:00
markm
3053373025 *Sigh*. What I did without this, I have no idea. 2001-03-05 11:18:35 +00:00
assar
4c4f54019b try hard to make sure this does not get build as a shared library 2001-02-24 02:10:32 +00:00
jhb
77373f9493 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
a30114724b 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
markm
00b58122f2 Fix build, and make parallel build much more robust. 2001-02-14 19:47:24 +00:00
assar
e0c026600d update build infrastructure for heimdal 0.3e 2001-02-13 16:57:04 +00:00
nectar
4216ea085f Fix ordering for real this time. 2000-08-30 03:44:30 +00:00
nectar
7f9383d3e6 Add a dependency needed when using parallel make.
Approved by:	markm
2000-08-29 19:21:08 +00:00
kris
2e12ba136e Unbreak heimdal build: we can no longer #include <netinet6/in6.h> 2000-07-06 10:09:59 +00:00
markm
c1ba294b4d Properly separate the K5-only buld from K4.
Submitted by:	sheldonh
2000-03-23 14:56:47 +00:00
jhay
db4c104b70 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
markm
f58aca17ad Oops! this macro needs to be defined for "make release".
Found by:	phk
2000-03-02 11:16:25 +00:00
markm
3197c29bd1 KerberosIV is no longer compulsory. This should fix "make release". 2000-03-01 13:50:48 +00:00
markm
f30e29569a Targets and macros for "make release". 2000-02-29 11:59:35 +00:00
markm
5dffca5013 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
markm
3c2d308df1 Use libcrypto instead of libdes. Upgrade for Heimdal-0.2p 2000-02-24 21:15:14 +00:00
markm
be68b23c6f Use libcrypto in place of libdes. 2000-02-24 20:57:04 +00:00
shin
ce15efb7c0 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
markm
db37470fb1 Another target to keep "make release" orthogonal. 2000-01-24 20:45:13 +00:00
markm
dee734c69f Make a "do nothing" target to help "make release" look clean. 2000-01-24 20:41:08 +00:00
markm
5abeae5a38 Move CFLAGS to a more obvious place and allow INET6 to work. 2000-01-24 20:06:02 +00:00
markm
f4836cbd85 Move CFLAGS to a more obvious place and allow INET6 to work properly. 2000-01-24 20:04:47 +00:00
markm
fb64b7d717 This commit was generated by cvs2svn to compensate for changes in r56545,
which included commits to RCS files with non-trunk default branches.
2000-01-24 19:56:26 +00:00
markm
979bcb7d84 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
markm
650315718f 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
markm
789632cad6 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
markm
4db4ae05f6 This commit was generated by cvs2svn to compensate for changes in r56067,
which included commits to RCS files with non-trunk default branches.
2000-01-15 21:38:08 +00:00
markm
bb8da1d188 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
markm
2417a47109 Bring in SRA for telnet.
Submitted by:	Nick Sayer
1999-10-07 18:59:55 +00:00
bde
b51a4df50f 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
markm
f376ecbba1 Fix for new Common Error system. 1999-09-05 14:07:40 +00:00
peter
a89c5431fa 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
efabb9ccb1 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
markm
924db72bc6 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
markm
424a005468 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
markm
9e7958ad43 Stop making the shared library for libtelnet (crypto version). This
should have happened years ago.
1998-08-29 20:24:54 +00:00
markm
0d52c7fc1d 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
markm
49407ce799 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