Author: ed
Date: Sun Apr 5 22:08:18 2009
New Revision: 190751
URL: http://svn.freebsd.org/changeset/base/190751
Log:
Remove if_ppp(4) and if_sl(4).
Not only did these two drivers depend on IFF_NEEDSGIANT, they were
broken 7 months ago during the MPSAFE TTY import. if_ppp(4) has been
replaced by ppp(8). There is no replacement for if_sl(4).
If we see regressions in for example the ports tree, we should just use
__FreeBSD_version 800045 to check whether if_ppp(4) and if_sl(4) are
present. Version 800045 is used to denote the import of MPSAFE TTY.
Discussed with: rwatson, but also rwatson's IFF_NEEDSGIANT emails on the
lists.
Deleted:
head/sbin/slattach/
head/sbin/startslip/
head/share/man/man4/ppp.4
head/share/man/man4/sl.4
head/sys/net/bsd_comp.c
head/sys/net/if_ppp.c
head/sys/net/if_ppp.h
head/sys/net/if_pppvar.h
head/sys/net/if_sl.c
head/sys/net/if_slvar.h
head/sys/net/ppp_comp.h
head/sys/net/ppp_deflate.c
head/sys/net/ppp_tty.c
head/sys/net/slip.h
head/tools/build/options/WITHOUT_SLIP
head/usr.sbin/pppd/
head/usr.sbin/pppstats/
head/usr.sbin/sliplogin/
Modified:
head/ObsoleteFiles.inc
head/rescue/rescue/Makefile
head/sbin/Makefile
head/share/man/man4/Makefile
head/share/mk/bsd.own.mk
head/usr.sbin/Makefile
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Sun Apr 5 21:52:13 2009 (r190750)
+++ head/ObsoleteFiles.inc Sun Apr 5 22:08:18 2009 (r190751)
@@ -14,6 +14,26 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20090405: removal of if_ppp(4) and if_sl(4)
+OLD_FILES+=sbin/slattach
+OLD_FILES+=sbin/startslip
+OLD_FILES+=usr/include/net/if_ppp.h
+OLD_FILES+=usr/include/net/if_pppvar.h
+OLD_FILES+=usr/include/net/if_slvar.h
+OLD_FILES+=usr/include/net/ppp_comp.h
+OLD_FILES+=usr/include/net/slip.h
+OLD_FILES+=usr/sbin/sliplogin
+OLD_FILES+=usr/sbin/pppd
+OLD_FILES+=usr/sbin/pppstats
+OLD_FILES+=usr/share/man/man1/startslip.1.gz
+OLD_FILES+=usr/share/man/man4/if_ppp.4.gz
+OLD_FILES+=usr/share/man/man4/if_sl.4.gz
+OLD_FILES+=usr/share/man/man4/ppp.4.gz
+OLD_FILES+=usr/share/man/man4/sl.4.gz
+OLD_FILES+=usr/share/man/man8/pppd.8.gz
+OLD_FILES+=usr/share/man/man8/pppstats.8.gz
+OLD_FILES+=usr/share/man/man8/slattach.8.gz
+OLD_FILES+=usr/share/man/man8/sliplogin.8.gz
# 20090319: uscanner(4) has been removed
OLD_FILES+=usr/share/man/man4/uscanner.4.gz
# 20090313: k8temp(4) renamed to amdtemp(4)
Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile Sun Apr 5 21:52:13 2009 (r190750)
+++ head/rescue/rescue/Makefile Sun Apr 5 22:08:18 2009 (r190751)
@@ -118,7 +118,7 @@ CRUNCH_PROGS_sbin= atacontrol badsect
mount_udf mount_unionfs newfs \
newfs_msdos nos-tun ping reboot \
restore rcorder route routed rtquery rtsol savecore \
- slattach spppcontrol startslip swapon sysctl tunefs umount
+ spppcontrol swapon sysctl tunefs umount
.if ${MK_ATM} != "no"
CRUNCH_PROGS_sbin+= atmconfig
Modified: head/sbin/Makefile
==============================================================================
--- head/sbin/Makefile Sun Apr 5 21:52:13 2009 (r190750)
+++ head/sbin/Makefile Sun Apr 5 22:08:18 2009 (r190751)
@@ -82,9 +82,7 @@ SUBDIR= adjkerntz \
${_sconfig} \
setkey \
shutdown \
- slattach \
spppcontrol \
- ${_startslip} \
${_sunlabel} \
swapon \
sysctl \
@@ -130,10 +128,6 @@ _quotacheck= quotacheck
_routed= routed
.endif
-.if ${MK_SLIP} != "no"
-_startslip= startslip
-.endif
-
.if ${MACHINE_ARCH} == "i386"
.if ${MACHINE} == "i386"
_fdisk= fdisk
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Sun Apr 5 21:52:13 2009
(r190750)
+++ head/share/man/man4/Makefile Sun Apr 5 22:08:18 2009
(r190751)
@@ -289,7 +289,6 @@ MAN= aac.4 \
ppbus.4 \
ppc.4 \
ppi.4 \
- ppp.4 \
psm.4 \
pst.4 \
pt.4 \
@@ -324,7 +323,6 @@ MAN= aac.4 \
sio.4 \
sis.4 \
sk.4 \
- sl.4 \
smb.4 \
smbus.4 \
smp.4 \
@@ -531,7 +529,6 @@ MLINKS+=pccbb.4 cbb.4
MLINKS+=pcm.4 snd.4 \
pcm.4 sound.4
MLINKS+=pcn.4 if_pcn.4
-MLINKS+=ppp.4 if_ppp.4
MLINKS+=ral.4 if_ral.4
MLINKS+=re.4 if_re.4
MLINKS+=rl.4 if_rl.4
@@ -544,7 +541,6 @@ MLINKS+=scsi.4 CAM.4 \
MLINKS+=sf.4 if_sf.4
MLINKS+=sis.4 if_sis.4
MLINKS+=sk.4 if_sk.4
-MLINKS+=sl.4 if_sl.4
MLINKS+=smp.4 SMP.4
MLINKS+=sn.4 if_sn.4
MLINKS+=snd_envy24.4 snd_ak452x.4
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Sun Apr 5 21:52:13 2009 (r190750)
+++ head/share/mk/bsd.own.mk Sun Apr 5 22:08:18 2009 (r190751)
@@ -372,7 +372,6 @@ WITH_IDEA=
SENDMAIL \
SETUID_LOGIN \
SHAREDOCS \
- SLIP \
SSP \
SYSINSTALL \
SYMVER \
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Sun Apr 5 21:52:13 2009 (r190750)
+++ head/usr.sbin/Makefile Sun Apr 5 22:08:18 2009 (r190751)
@@ -129,8 +129,6 @@ SUBDIR= ${_ac} \
powerd \
${_ppp} \
${_pppctl} \
- ${_pppd} \
- ${_pppstats} \
${_praliases} \
${_praudit} \
procctl \
@@ -166,7 +164,6 @@ SUBDIR= ${_ac} \
setfmac \
setpmac \
${_sicontrol} \
- ${_sliplogin} \
${_slstat} \
smbmsg \
snapinfo \
@@ -363,8 +360,6 @@ _portsnap= portsnap
.if ${MK_PPP} != "no"
_ppp= ppp
#_pppctl handled below
-_pppd= pppd
-_pppstats= pppstats
.endif
.if ${MK_QUOTAS} != "no"
@@ -385,11 +380,6 @@ _praliases= praliases
_sendmail= sendmail
.endif
-.if ${MK_SLIP} != "no"
-_sliplogin= sliplogin
-_slstat= slstat
-.endif
-
.if ${MK_SYSINSTALL} != "no"
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "sparc64"
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
