Date: Tue, 22 Jul 2003 18:03:48 +0100 From: Mark Murray <mark@grondar.org> To: Ruslan Ermilov <ru@freebsd.org> Cc: current@freebsd.org Subject: Re: make release broken [FIX] Message-ID: <200307221703.h6MH3mZ2064345@grimreaper.grondar.org> In-Reply-To: Your message of "Tue, 22 Jul 2003 19:42:33 %2B0300." <20030722164233.GA64431@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is on my TODO.
Do not commit this - I have a much cleaner fix.
M
Ruslan Ermilov writes:
>
> --v9Ux+11Zm5mwPlX6
> Content-Type: multipart/mixed; boundary="a8Wt8u1KmwUX3Y2C"
> Content-Disposition: inline
>
>
> --a8Wt8u1KmwUX3Y2C
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
>
> Hi!
>
> As many of you probably know, recent telnet commit broke snapshot
> building. Since I needed a working "make release" to go on with
> my task on floppy-less "make release" (for AMD64, etc.), I had to
> just fix it. Attached is the patch. It also fixes another issue
> with this telnet commit: it ensures that crypto telnet[d] do not
> end up in the "base" distribution.
>
>
> Cheers,
> --=20
> Ruslan Ermilov Sysadmin and DBA,
> ru@sunbay.com Sunbay Software Ltd,
> ru@FreeBSD.org FreeBSD committer
>
> --a8Wt8u1KmwUX3Y2C
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: attachment; filename=p
> Content-Transfer-Encoding: quoted-printable
>
> Index: release/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/release/Makefile,v
> retrieving revision 1.787
> diff -u -r1.787 Makefile
> --- release/Makefile 4 Jul 2003 14:39:17 -0000 1.787
> +++ release/Makefile 21 Jul 2003 20:14:33 -0000
> @@ -236,7 +236,8 @@
> .if !defined(FIXCRYPTO)
> FIXCRYPTO!=3D cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
> FIXCRYPTO+=3D bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpd
> ump \
> - lib/libfetch usr.bin/fetch
> + lib/libfetch usr.bin/fetch \
> + lib/libtelnet libexec/telnetd usr.bin/telnet
> .if !defined(NO_SENDMAIL)
> FIXCRYPTO+=3D usr.sbin/sendmail
> .endif
> Index: lib/libtelnet/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/lib/libtelnet/Makefile,v
> retrieving revision 1.16
> diff -u -r1.16 Makefile
> --- lib/libtelnet/Makefile 20 Jul 2003 23:29:46 -0000 1.16
> +++ lib/libtelnet/Makefile 21 Jul 2003 19:58:26 -0000
> @@ -13,10 +13,10 @@
> =20
> WARNS?=3D 2
> =20
> -.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
> +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OP=
> ENSSL)
> SRCS+=3D encrypt.c auth.c enc_des.c sra.c pk.c
> CFLAGS+=3D -DENCRYPTION -DAUTHENTICATION -DSRA
> -.if !defined(NO_KERBEROS)
> +.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
> SRCS+=3D kerberos5.c
> CFLAGS+=3D -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
> CFLAGS+=3D -DFORWARD -Dnet_write=3Dtelnet_net_write
> Index: libexec/telnetd/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/libexec/telnetd/Makefile,v
> retrieving revision 1.21
> diff -u -r1.21 Makefile
> --- libexec/telnetd/Makefile 20 Jul 2003 23:29:46 -0000 1.21
> +++ libexec/telnetd/Makefile 21 Jul 2003 20:19:17 -0000
> @@ -28,12 +28,13 @@
> DPADD=3D ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
> LDADD=3D -lutil -ltermcap ${LIBTELNET}
> =20
> -.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
> +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OP=
> ENSSL)
> +DISTRIBUTION=3D crypto
> SRCS+=3D authenc.c
> CFLAGS+=3D -DAUTHENTICATION -DENCRYPTION
> DPADD+=3D ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
> LDADD+=3D -lmp -lcrypto -lcrypt ${MINUSLPAM}
> -.if !defined(NO_KERBEROS)
> +.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
> CFLAGS+=3D -DKRB5 -DFORWARD -Dnet_write=3Dtelnet_net_write
> DPADD+=3D ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
> LDADD+=3D -lkrb5 -lasn1 -lroken -lcom_err
> Index: usr.bin/telnet/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/usr.bin/telnet/Makefile,v
> retrieving revision 1.23
> diff -u -r1.23 Makefile
> --- usr.bin/telnet/Makefile 20 Jul 2003 23:29:46 -0000 1.23
> +++ usr.bin/telnet/Makefile 22 Jul 2003 11:41:02 -0000
> @@ -20,25 +20,26 @@
> DPADD=3D ${LIBTERMCAP} ${LIBTELNET}
> LDADD=3D -ltermcap ${LIBTELNET}
> =20
> -.if !defined(RELEASE_CRUNCH)
> -CFLAGS+=3D -DINET6 -DIPSEC
> -DPADD+=3D ${LIBIPSEC}
> -LDADD+=3D -lipsec
> -.else
> +.if defined(RELEASE_CRUNCH)
> .PATH: ${TELNETDIR}/libtelnet
> SRCS+=3D genget.c getent.c misc.c
> CFLAGS+=3D -DHAS_CGETENT
> -.endif
> +.else
> +CFLAGS+=3D -DINET6 -DIPSEC
> +DPADD+=3D ${LIBIPSEC}
> +LDADD+=3D -lipsec
> =20
> -.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
> +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OP=
> ENSSL)
> +DISTRIBUTION=3D crypto
> SRCS+=3D authenc.c=20
> CFLAGS+=3D -DENCRYPTION -DAUTHENTICATION -DIPSEC
> DPADD+=3D ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
> LDADD+=3D -lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
> -.if !defined(NO_KERBEROS)
> +.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
> CFLAGS+=3D -DKRB5 -DFORWARD -Dnet_write=3Dtelnet_net_write
> DPADD+=3D ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
> LDADD+=3D -lkrb5 -lasn1 -lcom_err -lroken
> +.endif
> .endif
> .endif
> =20
>
> --a8Wt8u1KmwUX3Y2C--
>
> --v9Ux+11Zm5mwPlX6
> Content-Type: application/pgp-signature
> Content-Disposition: inline
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.1 (FreeBSD)
>
> iD8DBQE/HWl5Ukv4P6juNwoRAgnvAJ96n/MFl2mtKOPU4v6H2/7xEQjQbQCfWKZO
> l3wwJ/OZmt0wCqmhWkpvMGg=
> =9BF1
> -----END PGP SIGNATURE-----
>
> --v9Ux+11Zm5mwPlX6--
--
Mark Murray
iumop ap!sdn w,I idlaH
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307221703.h6MH3mZ2064345>