From 77bc28544a42e71898ee5d334a382497d29e3357 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Wed, 17 Sep 1997 14:19:54 +0000 Subject: generalize Todd's work for ftp/pppd/rsh to ramdisks and miniroots on all architectures. --- distrib/Makefile | 4 ++-- distrib/alpha/Makefile | 4 ++-- distrib/alpha/ramdisk/raminst.conf | 4 ++-- distrib/alpha/special/Makefile | 5 ----- distrib/alpha/special/ftp/Makefile | 26 ------------------------ distrib/i386/Makefile | 4 ++-- distrib/i386/floppies/ramdisk/instbin-nokrb.conf | 4 ++-- distrib/i386/floppies/ramdisk/instbin.conf | 4 ++-- distrib/i386/special/Makefile | 5 ----- distrib/i386/special/ftp/Makefile | 26 ------------------------ distrib/i386/special/pppd/Makefile | 17 ---------------- distrib/i386/special/rsh/Makefile | 10 --------- distrib/miniroot/list | 3 ++- distrib/ramdisk/list | 3 ++- distrib/special/Makefile | 5 +++++ distrib/special/ftp/Makefile | 26 ++++++++++++++++++++++++ distrib/special/pppd/Makefile | 17 ++++++++++++++++ distrib/special/rsh/Makefile | 14 +++++++++++++ 18 files changed, 78 insertions(+), 103 deletions(-) delete mode 100644 distrib/alpha/special/Makefile delete mode 100644 distrib/alpha/special/ftp/Makefile delete mode 100644 distrib/i386/special/Makefile delete mode 100644 distrib/i386/special/ftp/Makefile delete mode 100644 distrib/i386/special/pppd/Makefile delete mode 100644 distrib/i386/special/rsh/Makefile create mode 100644 distrib/special/Makefile create mode 100644 distrib/special/ftp/Makefile create mode 100644 distrib/special/pppd/Makefile create mode 100644 distrib/special/rsh/Makefile diff --git a/distrib/Makefile b/distrib/Makefile index b8e20bf8847..65cc2ba54b7 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 1997/08/06 09:40:30 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1997/09/17 14:18:58 deraadt Exp $ -SUBDIR= ${MACHINE} notes +SUBDIR= special ${MACHINE} notes # miniroot and ramdisk are supposed to be "generic" using Makefile.inc # to set up architectural dependencies.. diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile index 7d08958da61..d05e40f71b7 100644 --- a/distrib/alpha/Makefile +++ b/distrib/alpha/Makefile @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/10 21:04:22 millert Exp $ +# $OpenBSD: Makefile,v 1.4 1997/09/17 14:19:04 deraadt Exp $ -SUBDIR= special ramdisk +SUBDIR= ramdisk .include diff --git a/distrib/alpha/ramdisk/raminst.conf b/distrib/alpha/ramdisk/raminst.conf index 26d0cb4e092..0aa06bd1222 100644 --- a/distrib/alpha/ramdisk/raminst.conf +++ b/distrib/alpha/ramdisk/raminst.conf @@ -1,10 +1,10 @@ # -# $OpenBSD: raminst.conf,v 1.8 1997/09/10 21:04:24 millert Exp $ +# $OpenBSD: raminst.conf,v 1.9 1997/09/17 14:19:06 deraadt Exp $ # # ram.conf - unified binary for the RAM disk # -srcdirs distrib/alpha/special bin sbin usr.bin usr.sbin +srcdirs distrib/special bin sbin usr.bin usr.sbin srcdirs gnu/usr.bin sys/arch/alpha/stand progs cat chmod chown cp dd df disklabel ed grep expr fsck_ffs ftp diff --git a/distrib/alpha/special/Makefile b/distrib/alpha/special/Makefile deleted file mode 100644 index cf95303875e..00000000000 --- a/distrib/alpha/special/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 1997/09/11 10:38:39 deraadt Exp $ - -SUBDIR= ftp - -.include diff --git a/distrib/alpha/special/ftp/Makefile b/distrib/alpha/special/ftp/Makefile deleted file mode 100644 index 8cf18040885..00000000000 --- a/distrib/alpha/special/ftp/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 1997/09/10 21:04:25 millert Exp $ -# $NetBSD: Makefile,v 1.13 1997/08/18 10:20:13 lukem Exp $ -# from: @(#)Makefile 8.2 (Berkeley) 4/3/94 - -# Define SMALL to disable command line editing -CFLAGS+=-DSMALL - -# Uncomment the following to provide defaults for gate-ftp operation -#CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21 - -# Uncomment the following for socks5 support. -#CFLAGS += -DSOCKS -include /usr/local/include/socks.h -#LDADD += -lsocks5 - -PROG= ftp -SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \ - stringlist.c util.c -MAN= -.PATH: ${.CURDIR}/../../../../usr.bin/ftp - -LDADD+= -ltermcap -DPADD+= ${LIBTERMCAP} - -#COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes - -.include diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile index d8da97da8cc..581348d5032 100644 --- a/distrib/i386/Makefile +++ b/distrib/i386/Makefile @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile,v 1.2 1997/09/07 19:59:02 millert Exp $ +# $OpenBSD: Makefile,v 1.3 1997/09/17 14:19:19 deraadt Exp $ -SUBDIR= ../crunch special floppies +SUBDIR= ../crunch floppies .include diff --git a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf index 2867385aa66..0495629ddb8 100644 --- a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf +++ b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf @@ -1,9 +1,9 @@ -# $OpenBSD: instbin-nokrb.conf,v 1.7 1997/09/07 19:59:03 millert Exp $ +# $OpenBSD: instbin-nokrb.conf,v 1.8 1997/09/17 14:19:22 deraadt Exp $ # # instbin-nokrb.conf - unified binary for the inst/upgr floppies # -srcdirs distrib/i386/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin +srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin srcdirs usr.sbin/pppd usr.bin/vi sys/arch/i386/stand progs cat chat chmod chown cp dd df disklabel ed diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf index 42213e3043c..b3915f51e16 100644 --- a/distrib/i386/floppies/ramdisk/instbin.conf +++ b/distrib/i386/floppies/ramdisk/instbin.conf @@ -1,9 +1,9 @@ -# $OpenBSD: instbin.conf,v 1.15 1997/09/07 19:59:04 millert Exp $ +# $OpenBSD: instbin.conf,v 1.16 1997/09/17 14:19:23 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # -srcdirs distrib/i386/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin +srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin srcdirs usr.sbin/pppd usr.bin/vi sys/arch/i386/stand progs cat chat chmod chown cp dd df disklabel ed diff --git a/distrib/i386/special/Makefile b/distrib/i386/special/Makefile deleted file mode 100644 index 31cb1c36d8c..00000000000 --- a/distrib/i386/special/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 1997/09/07 19:59:04 millert Exp $ - -SUBDIR= ftp pppd - -.include diff --git a/distrib/i386/special/ftp/Makefile b/distrib/i386/special/ftp/Makefile deleted file mode 100644 index 46d79762b85..00000000000 --- a/distrib/i386/special/ftp/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 1997/09/07 19:59:05 millert Exp $ -# $NetBSD: Makefile,v 1.13 1997/08/18 10:20:13 lukem Exp $ -# from: @(#)Makefile 8.2 (Berkeley) 4/3/94 - -# Define SMALL to disable command line editing -CFLAGS+=-DSMALL - -# Uncomment the following to provide defaults for gate-ftp operation -#CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21 - -# Uncomment the following for socks5 support. -#CFLAGS += -DSOCKS -include /usr/local/include/socks.h -#LDADD += -lsocks5 - -PROG= ftp -SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \ - stringlist.c util.c -MAN= -.PATH: ${.CURDIR}/../../../../usr.bin/ftp - -LDADD+= -ltermcap -DPADD+= ${LIBTERMCAP} - -#COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes - -.include diff --git a/distrib/i386/special/pppd/Makefile b/distrib/i386/special/pppd/Makefile deleted file mode 100644 index 634a4ef55d6..00000000000 --- a/distrib/i386/special/pppd/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 1997/09/07 19:59:06 millert Exp $ -# $NetBSD: Makefile,v 1.13 1996/12/18 16:54:57 christos Exp $ - -PROG= pppd -SRCS= auth.c cbcp.c ccp.c chap.c chap_ms.c demand.c fsm.c ipcp.c \ - ipxcp.c lcp.c magic.c main.c options.c sys-bsd.c upap.c - -.PATH: ${.CURDIR}/../../../../usr.sbin/pppd ${.CURDIR}/../../sys/net -MAN= -BINMODE=4555 -BINOWN= root - -LDADD= -lutil -DPADD= ${LIBUTIL} -CFLAGS+= -I. -DHAVE_PATHS_H - -.include diff --git a/distrib/i386/special/rsh/Makefile b/distrib/i386/special/rsh/Makefile deleted file mode 100644 index 6ae763fc1e8..00000000000 --- a/distrib/i386/special/rsh/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 1997/09/08 04:35:00 millert Exp $ - -PROG= rsh -SRCS= rsh.c -MAN= -BINOWN= root -BINMODE=4555 -.PATH: ${.CURDIR}/../../../../usr.bin/rsh - -.include diff --git a/distrib/miniroot/list b/distrib/miniroot/list index 76a247b9ed7..40349ddd449 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,6 +1,7 @@ -# $OpenBSD: list,v 1.12 1997/08/24 22:44:59 deraadt Exp $ +# $OpenBSD: list,v 1.13 1997/09/17 14:19:33 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ +SRCDIRS distrib/special SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin usr.bin/vi # copy the crunched binary, link to it, and kill it diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list index 89f9c9c3828..98bab9d4cbf 100644 --- a/distrib/ramdisk/list +++ b/distrib/ramdisk/list @@ -1,6 +1,7 @@ -# $OpenBSD: list,v 1.4 1997/05/15 23:32:35 deraadt Exp $ +# $OpenBSD: list,v 1.5 1997/09/17 14:19:42 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ +SRCDIRS distrib/special SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin SRCDIRS usr.bin/vi diff --git a/distrib/special/Makefile b/distrib/special/Makefile new file mode 100644 index 00000000000..7dbd224ee75 --- /dev/null +++ b/distrib/special/Makefile @@ -0,0 +1,5 @@ +# $OpenBSD: Makefile,v 1.1 1997/09/17 14:19:47 deraadt Exp $ + +SUBDIR= ftp pppd rsh + +.include diff --git a/distrib/special/ftp/Makefile b/distrib/special/ftp/Makefile new file mode 100644 index 00000000000..0dcf6cd3c14 --- /dev/null +++ b/distrib/special/ftp/Makefile @@ -0,0 +1,26 @@ +# $OpenBSD: Makefile,v 1.1 1997/09/17 14:19:49 deraadt Exp $ +# $NetBSD: Makefile,v 1.13 1997/08/18 10:20:13 lukem Exp $ +# from: @(#)Makefile 8.2 (Berkeley) 4/3/94 + +# Define SMALL to disable command line editing +CFLAGS+=-DSMALL + +# Uncomment the following to provide defaults for gate-ftp operation +#CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21 + +# Uncomment the following for socks5 support. +#CFLAGS += -DSOCKS -include /usr/local/include/socks.h +#LDADD += -lsocks5 + +PROG= ftp +SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \ + stringlist.c util.c +MAN= +.PATH: ${.CURDIR}/../../../usr.bin/ftp + +LDADD+= -ltermcap +DPADD+= ${LIBTERMCAP} + +#COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes + +.include diff --git a/distrib/special/pppd/Makefile b/distrib/special/pppd/Makefile new file mode 100644 index 00000000000..4ba56fb8969 --- /dev/null +++ b/distrib/special/pppd/Makefile @@ -0,0 +1,17 @@ +# $OpenBSD: Makefile,v 1.1 1997/09/17 14:19:51 deraadt Exp $ +# $NetBSD: Makefile,v 1.13 1996/12/18 16:54:57 christos Exp $ + +PROG= pppd +SRCS= auth.c cbcp.c ccp.c chap.c chap_ms.c demand.c fsm.c ipcp.c \ + ipxcp.c lcp.c magic.c main.c options.c sys-bsd.c upap.c + +.PATH: ${.CURDIR}/../../../usr.sbin/pppd ${.CURDIR}/../../sys/net +MAN= +BINMODE=4555 +BINOWN= root + +LDADD= -lutil +DPADD= ${LIBUTIL} +CFLAGS+= -I. -DHAVE_PATHS_H + +.include diff --git a/distrib/special/rsh/Makefile b/distrib/special/rsh/Makefile new file mode 100644 index 00000000000..62e29f47823 --- /dev/null +++ b/distrib/special/rsh/Makefile @@ -0,0 +1,14 @@ +# $OpenBSD: Makefile,v 1.1 1997/09/17 14:19:53 deraadt Exp $ +# $NetBSD: Makefile,v 1.13 1996/12/18 16:54:57 christos Exp $ + +PROG= rsh +SRCS= rsh.c + +KERBEROS=no + +.PATH: ${.CURDIR}/../../../usr.bin/rsh +MAN= +BINMODE=4555 +BINOWN= root + +.include -- cgit v1.2.3