Re: make release broken [FIX]
On Fri, Jul 25, 2003 at 01:59:40PM -0700, David O'Brien wrote: > On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote: > > > > On 22-Jul-2003 Ruslan Ermilov wrote: > > > 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. > > > > Why not simply enable 'NO_FLOPPIES' on the arch's that don't want > > floppies? > > For one, its broken -- NO_FLOPPIES doesn't build the bootmfs floppy but > still does the driver floppy. At least for Alpha this was true during > 5.1 RC time. > Please look at the latest release/Makefile, then follow up in this thread. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software Ltd, [EMAIL PROTECTED] FreeBSD committer pgp0.pgp Description: PGP signature
Re: make release broken [FIX]
On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote: > > On 22-Jul-2003 Ruslan Ermilov wrote: > > 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. > > Why not simply enable 'NO_FLOPPIES' on the arch's that don't want > floppies? For one, its broken -- NO_FLOPPIES doesn't build the bootmfs floppy but still does the driver floppy. At least for Alpha this was true during 5.1 RC time. -- -- David ([EMAIL PROTECTED]) ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: make release broken [FIX]
On Wed, Jul 23, 2003 at 11:33:50AM +0100, Mark Murray wrote: > Hi > > Please do not commit this. > Please stop repeating this endlessly. This patch is only for those who need a working "make release" urgently, like me. You made it clear that you're working on a better fix. -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software Ltd, [EMAIL PROTECTED] FreeBSD committer pgp0.pgp Description: PGP signature
Re: make release broken [FIX]
Hi
Please do not commit this.
M
Ruslan Ermilov writes:
>
> --A9z/3b/E4MkkD+7G
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
>
> On Tue, Jul 22, 2003 at 07:42:33PM +0300, Ruslan Ermilov wrote:
> > Hi!
> >=20
> > 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.
> >=20
> Missed in the patch: set DISTRIBUTION=3Dcrypto in lib/libtelnet/Makefile,
> so that we still have crypto/usr/include/arpa/telnet.h.
>
> %%%
> Index: 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
> --- Makefile 20 Jul 2003 23:29:46 - 1.16
> +++ Makefile 23 Jul 2003 06:37:09 -
> @@ -13,10 +13,11 @@
> =20
> WARNS?=3D2
> =20
> -.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
> +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OP=
> ENSSL)
> +DISTRIBUTION=3D crypto
> 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
> %%%
>
>
> Cheers,
> --=20
> Ruslan ErmilovSysadmin and DBA,
> [EMAIL PROTECTED] Sunbay Software Ltd,
> [EMAIL PROTECTED] FreeBSD committer
>
> --A9z/3b/E4MkkD+7G
> Content-Type: application/pgp-signature
> Content-Disposition: inline
>
> -BEGIN PGP SIGNATURE-
> Version: GnuPG v1.2.1 (FreeBSD)
>
> iD8DBQE/Hi8lUkv4P6juNwoRArAKAJ0QpXpQ9YPuG5gXUo/5p+uia83CiACfTkYW
> Myhb+SttdXFnNahueIHJ7Us=
> =LyZK
> -END PGP SIGNATURE-
>
> --A9z/3b/E4MkkD+7G--
--
Mark Murray
iumop ap!sdn w,I idlaH
___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: make release broken [FIX]
On Tue, Jul 22, 2003 at 07:42:33PM +0300, Ruslan Ermilov wrote:
> 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.
>
Missed in the patch: set DISTRIBUTION=crypto in lib/libtelnet/Makefile,
so that we still have crypto/usr/include/arpa/telnet.h.
%%%
Index: Makefile
===
RCS file: /home/ncvs/src/lib/libtelnet/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile20 Jul 2003 23:29:46 - 1.16
+++ Makefile23 Jul 2003 06:37:09 -
@@ -13,10 +13,11 @@
WARNS?=2
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
SRCS+= kerberos5.c
CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write
%%%
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
[EMAIL PROTECTED] Sunbay Software Ltd,
[EMAIL PROTECTED] FreeBSD committer
pgp0.pgp
Description: PGP signature
Re: make release broken [FIX]
On Tue, Jul 22, 2003 at 03:07:01PM -0400, John Baldwin wrote:
>
> >> Are you eliminating the mfsroot?
> >>
> > Yes.
>
> Ugh.
>
> How does sysinstall work with this change? You do realize that we
> mount the MFS as /, then mount the disk under /mnt, chroot to /mnt,
> then mount the CD in /dist in the chroot and install from there?
> Are you going to mount the CD as root or something? It is probably
> a lot simpler to simply let sysinstall always execute in a MFS root.
>
John, Warner,
At this stage it's obvious to me that we'd better with always
building mfsroot stuff, even for platforms that do not provide
floppy installation (AMD64). As such, the following commit
would be in order, but as it falls under the "obrien vs ru"
category, I hereby ask (again) your permission to commit it:
%%%
Index: Makefile
===
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.790
diff -u -r1.790 Makefile
--- Makefile23 Jul 2003 06:00:56 - 1.790
+++ Makefile23 Jul 2003 06:02:11 -
@@ -985,14 +985,8 @@
md5 * > CHECKSUM.MD5) \
)
-.if target(release.9.${TARGET_ARCH})
-RELEASE9=release.9.${TARGET_ARCH}
-.else
-RELEASE9=release.9
-.endif
-
doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \
- release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET}
+ release.6 release.7 release.8 release.9 ${FIXIT_TARGET}
@cd ${.CURDIR} && ${MAKE} ${EXTRAS}
@echo "Release done"
%%%
The release.9 target is responsible for creating mfsroot, amongst
other tasks.
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
[EMAIL PROTECTED] Sunbay Software Ltd,
[EMAIL PROTECTED] FreeBSD committer
pgp0.pgp
Description: PGP signature
Re: make release broken [FIX]
On Tue, Jul 22, 2003 at 03:07:01PM -0400, John Baldwin wrote: > > >> >> Why not simply enable 'NO_FLOPPIES' on the arch's that don't want > >> >> floppies? > >> >> > >> Are you eliminating the mfsroot? > >> > > Yes. > > Ugh. > Yes, after looking into this a bit deeper, I must agree that preserving the mfsroot is much simpler. And I will probably do just that. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software Ltd, [EMAIL PROTECTED] FreeBSD committer pgp0.pgp Description: PGP signature
Re: make release broken [FIX]
On 22-Jul-2003 Ruslan Ermilov wrote:
> On Tue, Jul 22, 2003 at 02:45:52PM -0400, John Baldwin wrote:
>>
>> On 22-Jul-2003 Ruslan Ermilov wrote:
>> > On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote:
>> >>
>> >> On 22-Jul-2003 Ruslan Ermilov wrote:
>> >> > 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.
>> >>
>> >> Why not simply enable 'NO_FLOPPIES' on the arch's that don't want
>> >> floppies?
>> >>
>> > Because NO_FLOPPIES doesn't mean like it sounds; it means "do not
>> > create floppy _images_", and we want to skip much more than that.
>> > I have a preliminary patch that is currently under the "make
>> > release" test. Let me know (or anyone else) if you want to review
>> > it or the final version before I commit it.
>>
>> Are you eliminating the mfsroot?
>>
> Yes.
Ugh.
>> All the bootable CD's use
>> that right now, so what more are you doing than eliminating
>> the floppy images?
>>
> Part of the patch for the iso.1 target has this (cut-n-pasted):
>
> @@ -885,10 +873,7 @@
> .if ${TARGET} != "pc98"
> @echo "Setting up /boot"
> @rm -f ${CD_DISC2}/boot/loader.conf
> - @cp ${RD}/mfsroot/mfsroot.gz ${CD_DISC2}/boot/mfsroot.gz
> - @echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf
> - @echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf
> - @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf
> + @echo 'init_path="/usr/sbin/sysinstall"' > ${CD_DISC2}/boot/loader.conf
> @cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
> .endif
> .if !defined(NOPORTS)
How does sysinstall work with this change? You do realize that we
mount the MFS as /, then mount the disk under /mnt, chroot to /mnt,
then mount the CD in /dist in the chroot and install from there?
Are you going to mount the CD as root or something? It is probably
a lot simpler to simply let sysinstall always execute in a MFS root.
If you really want to rewrite the installation environment, then you
might want to talk that over on a mailing list first to get some input.
It's not a trivial task.
--
John Baldwin <[EMAIL PROTECTED]> <>< http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!" - http://www.FreeBSD.org/
___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: make release broken [FIX]
On Tue, Jul 22, 2003 at 02:45:52PM -0400, John Baldwin wrote:
>
> On 22-Jul-2003 Ruslan Ermilov wrote:
> > On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote:
> >>
> >> On 22-Jul-2003 Ruslan Ermilov wrote:
> >> > 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.
> >>
> >> Why not simply enable 'NO_FLOPPIES' on the arch's that don't want
> >> floppies?
> >>
> > Because NO_FLOPPIES doesn't mean like it sounds; it means "do not
> > create floppy _images_", and we want to skip much more than that.
> > I have a preliminary patch that is currently under the "make
> > release" test. Let me know (or anyone else) if you want to review
> > it or the final version before I commit it.
>
> Are you eliminating the mfsroot?
>
Yes.
> All the bootable CD's use
> that right now, so what more are you doing than eliminating
> the floppy images?
>
Part of the patch for the iso.1 target has this (cut-n-pasted):
@@ -885,10 +873,7 @@
.if ${TARGET} != "pc98"
@echo "Setting up /boot"
@rm -f ${CD_DISC2}/boot/loader.conf
- @cp ${RD}/mfsroot/mfsroot.gz ${CD_DISC2}/boot/mfsroot.gz
- @echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf
- @echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf
- @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf
+ @echo 'init_path="/usr/sbin/sysinstall"' > ${CD_DISC2}/boot/loader.conf
@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
.endif
.if !defined(NOPORTS)
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
[EMAIL PROTECTED] Sunbay Software Ltd,
[EMAIL PROTECTED] FreeBSD committer
pgp0.pgp
Description: PGP signature
Re: make release broken [FIX]
On 22-Jul-2003 Ruslan Ermilov wrote: > On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote: >> >> On 22-Jul-2003 Ruslan Ermilov wrote: >> > 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. >> >> Why not simply enable 'NO_FLOPPIES' on the arch's that don't want >> floppies? >> > Because NO_FLOPPIES doesn't mean like it sounds; it means "do not > create floppy _images_", and we want to skip much more than that. > I have a preliminary patch that is currently under the "make > release" test. Let me know (or anyone else) if you want to review > it or the final version before I commit it. Are you eliminating the mfsroot? All the bootable CD's use that right now, so what more are you doing than eliminating the floppy images? -- John Baldwin <[EMAIL PROTECTED]> <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: make release broken [FIX]
On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote: > > On 22-Jul-2003 Ruslan Ermilov wrote: > > 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. > > Why not simply enable 'NO_FLOPPIES' on the arch's that don't want > floppies? > Because NO_FLOPPIES doesn't mean like it sounds; it means "do not create floppy _images_", and we want to skip much more than that. I have a preliminary patch that is currently under the "make release" test. Let me know (or anyone else) if you want to review it or the final version before I commit it. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software Ltd, [EMAIL PROTECTED] FreeBSD committer pgp0.pgp Description: PGP signature
RE: make release broken [FIX]
On 22-Jul-2003 Ruslan Ermilov wrote: > 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. Why not simply enable 'NO_FLOPPIES' on the arch's that don't want floppies? -- John Baldwin <[EMAIL PROTECTED]> <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: make release broken [FIX]
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 ErmilovSysadmin and DBA,
> [EMAIL PROTECTED] Sunbay Software Ltd,
> [EMAIL PROTECTED] 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 - 1.787
> +++ release/Makefile 21 Jul 2003 20:14:33 -
> @@ -236,7 +236,8 @@
> .if !defined(FIXCRYPTO)
> FIXCRYPTO!=3Dcd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
> FIXCRYPTO+=3Dbin/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+=3Dusr.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/Makefile20 Jul 2003 23:29:46 - 1.16
> +++ lib/libtelnet/Makefile21 Jul 2003 19:58:26 -
> @@ -13,10 +13,10 @@
> =20
> WARNS?=3D2
> =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 - 1.21
> +++ libexec/telnetd/Makefile 21 Jul 2003 20:19:17 -
> @@ -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 - 1.23
> +++ usr.bin/telnet/Makefile 22 Jul 2003 11:41:02 -
> @@ -20,25 +20,26 @@
> DPADD=3D ${LIBTERMCAP} ${LIBTELNET}
> LDADD=3D -ltermcap ${LIBTELNET}
> =20
> -.if !defined(RELEASE_CRUNCH)
> -CFLAGS+=3D -DINET6 -DIPSEC
> -DPADD+=3D
make release broken [FIX]
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,
--
Ruslan Ermilov Sysadmin and DBA,
[EMAIL PROTECTED] Sunbay Software Ltd,
[EMAIL PROTECTED] FreeBSD committer
Index: release/Makefile
===
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.787
diff -u -r1.787 Makefile
--- release/Makefile4 Jul 2003 14:39:17 - 1.787
+++ release/Makefile21 Jul 2003 20:14:33 -
@@ -236,7 +236,8 @@
.if !defined(FIXCRYPTO)
FIXCRYPTO!=cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
FIXCRYPTO+=bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
- lib/libfetch usr.bin/fetch
+ lib/libfetch usr.bin/fetch \
+ lib/libtelnet libexec/telnetd usr.bin/telnet
.if !defined(NO_SENDMAIL)
FIXCRYPTO+=usr.sbin/sendmail
.endif
Index: lib/libtelnet/Makefile
===
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 - 1.16
+++ lib/libtelnet/Makefile 21 Jul 2003 19:58:26 -
@@ -13,10 +13,10 @@
WARNS?=2
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
SRCS+= kerberos5.c
CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write
Index: libexec/telnetd/Makefile
===
RCS file: /home/ncvs/src/libexec/telnetd/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- libexec/telnetd/Makefile20 Jul 2003 23:29:46 - 1.21
+++ libexec/telnetd/Makefile21 Jul 2003 20:19:17 -
@@ -28,12 +28,13 @@
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap ${LIBTELNET}
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= authenc.c
CFLAGS+= -DAUTHENTICATION -DENCRYPTION
DPADD+=${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
LDADD+=-lmp -lcrypto -lcrypt ${MINUSLPAM}
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+=${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
LDADD+=-lkrb5 -lasn1 -lroken -lcom_err
Index: usr.bin/telnet/Makefile
===
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 - 1.23
+++ usr.bin/telnet/Makefile 22 Jul 2003 11:41:02 -
@@ -20,25 +20,26 @@
DPADD= ${LIBTERMCAP} ${LIBTELNET}
LDADD= -ltermcap ${LIBTELNET}
-.if !defined(RELEASE_CRUNCH)
-CFLAGS+= -DINET6 -DIPSEC
-DPADD+=${LIBIPSEC}
-LDADD+=-lipsec
-.else
+.if defined(RELEASE_CRUNCH)
.PATH: ${TELNETDIR}/libtelnet
SRCS+= genget.c getent.c misc.c
CFLAGS+= -DHAS_CGETENT
-.endif
+.else
+CFLAGS+= -DINET6 -DIPSEC
+DPADD+=${LIBIPSEC}
+LDADD+=-lipsec
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= authenc.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC
DPADD+=${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
LDADD+=-lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+=${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+=-lkrb5 -lasn1 -lcom_err -lroken
+.endif
.endif
.endif
pgp0.pgp
Description: PGP signature
make release broken (+ fix)
It looks like if_wx was not removed from /usr/src/release/i386/drivers.conf which breaks make release. Index: drivers.conf === RCS file: /home/ncvs/src/release/i386/drivers.conf,v retrieving revision 1.2 diff -c -r1.2 drivers.conf *** drivers.conf7 Nov 2000 14:00:04 - 1.2 --- drivers.conf23 Oct 2001 22:31:58 - *** *** 54,58 vrif_vr 2 network "VIA VT3043/VT86C100A Rhine PCI ethernet card" wbif_wb 2 network "Winbond W89C840F PCI ethernet card" wiif_wi 2 network "Lucent WaveLAN/IEEE 802.11 PCMCIA card" - wxif_wx 2 network "Intel Gigabit Ethernet (82452) card" xlif_xl 2 network "3COM 3c90x / 3c90xB PCI ethernet card" --- 54,57 dave c -- Dave Cornejo @ Dogwood Media, Fremont, California (also [EMAIL PROTECTED]) "There aren't any monkeys chasing us..." - Xochi To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
