1
0
mirror of https://github.com/openbsd/src.git synced 2025-01-03 06:45:37 -08:00

ping6(8) is now a hardlink to ping(8).

The instbin stuff looks good to deraadt@
This commit is contained in:
florian 2016-09-17 15:03:39 +00:00
parent 7c351c3237
commit 3ba998db29
24 changed files with 45 additions and 92 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.43 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.44 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -40,7 +40,7 @@ LINK instbin sbin/mount
LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/restore
LINK instbin sbin/route

View File

@ -1,8 +1,6 @@
# $OpenBSD: list.local,v 1.26 2015/10/07 18:02:06 krw Exp $
# $OpenBSD: list.local,v 1.27 2016/09/17 15:03:39 florian Exp $
# add local links; use bin/sh since instbin has already been unlinked
LINK instbin sbin/ping6
LINK instbin sbin/dhclient
LINK instbin sbin/bioctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.25 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.26 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -47,8 +47,7 @@ LINK instbin sbin/mount_nfs
LINK instbin sbin/newfs
LINK instbin sbin/newfs_ext2fs
LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.38 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.39 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -40,8 +40,7 @@ LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_nfs
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.46 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.47 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -41,7 +41,7 @@ LINK instbin sbin/mount
LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,9 +1,8 @@
# $OpenBSD: list.local,v 1.35 2014/12/03 20:11:19 florian Exp $
# $OpenBSD: list.local,v 1.36 2016/09/17 15:03:39 florian Exp $
# add local links; use bin/sh since instbin has already been unlinked
LINK instbin sbin/mount_ext2fs
LINK instbin sbin/mount_msdos
LINK instbin sbin/ping6
LINK instbin sbin/mount_udf
LINK instbin sbin/restore
LINK instbin sbin/bioctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.43 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.44 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -45,8 +45,7 @@ LINK instbin sbin/mount_msdos
LINK instbin sbin/mount_nfs
LINK instbin sbin/newfs
LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.28 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.29 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -47,8 +47,7 @@ LINK instbin sbin/mount_udf
LINK instbin sbin/newfs
LINK instbin sbin/newfs_ext2fs
LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.36 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.37 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -40,8 +40,7 @@ LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_nfs
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.64 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.65 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -46,8 +46,7 @@ LINK instbin sbin/mount_udf
LINK instbin sbin/newfs
LINK instbin sbin/newfs_msdos
LINK instbin sbin/pdisk
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.68 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.69 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -40,8 +40,7 @@ LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_nfs
LINK instbin sbin/mount_udf
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.20 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.21 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -44,8 +44,7 @@ LINK instbin sbin/mount_nfs
LINK instbin sbin/mount_udf
LINK instbin sbin/newfs
LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.58 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.59 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -40,8 +40,7 @@ LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_nfs
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.53 2016/09/13 22:27:50 rpe Exp $
# $OpenBSD: list,v 1.54 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -42,8 +42,7 @@ LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_nfs
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.34 2016/09/13 22:27:51 rpe Exp $
# $OpenBSD: list,v 1.35 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -44,8 +44,7 @@ LINK instbin sbin/mount_nfs
LINK instbin sbin/mount_udf
LINK instbin sbin/newfs
LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.60 2016/09/13 22:27:51 rpe Exp $
# $OpenBSD: list,v 1.61 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -42,8 +42,7 @@ LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_msdos
LINK instbin sbin/mount_udf
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/restore
LINK instbin sbin/route

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.56 2016/09/13 22:27:51 rpe Exp $
# $OpenBSD: list,v 1.57 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -38,8 +38,7 @@ LINK instbin sbin/mknod
LINK instbin sbin/mount
LINK instbin sbin/mount_ffs
LINK instbin sbin/newfs
LINK instbin sbin/ping
#LINK instbin sbin/ping6
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.49 2016/09/13 22:27:51 rpe Exp $
# $OpenBSD: list,v 1.50 2016/09/17 15:03:39 florian Exp $
SRCDIRS distrib/special
@ -38,7 +38,7 @@ LINK instbin sbin/mknod
LINK instbin sbin/mount
LINK instbin sbin/mount_ffs
LINK instbin sbin/newfs
LINK instbin sbin/ping
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
LINK instbin sbin/sysctl

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2016/09/03 13:37:40 guenther Exp $
# $OpenBSD: Makefile,v 1.42 2016/09/17 15:03:39 florian Exp $
SUBDIR= libstubs \
arch bioctl cat chmod chroot cp date dd df dhclient disklabel dmesg \
@ -6,7 +6,7 @@ SUBDIR= libstubs \
grep gzip hostname ifconfig init installboot kbd ksh ln ls md5 \
mkdir mknod mkuboot more mount mount_cd9660 mount_ext2fs \
mount_ffs mount_msdos mount_nfs mount_udf mt mv newfs newfs_ext2fs \
newfs_msdos pax pdisk ping ping6 pwd_mkdb reboot restore rm route sed \
newfs_msdos pax pdisk ping pwd_mkdb reboot restore rm route sed \
signify sleep stty sync sysctl umount
install:

View File

@ -1,20 +0,0 @@
# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:03 deraadt Exp $
PROG= ping6
CFLAGS+= -Wall
CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
CFLAGS+= -Wmissing-declarations
CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
MAN= ping6.8
LDADD= -lm
DPADD= ${LIBM}
BINOWN= root
BINGRP= bin
BINMODE=4555
.PATH: ${.CURDIR}/../../../sbin/ping6
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2015/10/30 11:00:52 florian Exp $
# $OpenBSD: Makefile,v 1.9 2016/09/17 15:03:39 florian Exp $
PROG= ping
@ -12,6 +12,7 @@ MAN= ping.8
LDADD= -lm
DPADD= ${LIBM}
LINKS= ${BINDIR}/ping ${BINDIR}/ping6
BINOWN= root
BINMODE=4555

View File

@ -1,19 +1,5 @@
# $OpenBSD: Makefile,v 1.11 2014/07/11 15:28:27 florian Exp $
PROG= ping6
CFLAGS+= -Wall
CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
CFLAGS+= -Wmissing-declarations
CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
# $OpenBSD: Makefile,v 1.12 2016/09/17 15:03:39 florian Exp $
MAN= ping6.8
LDADD= -lm
DPADD= ${LIBM}
BINOWN= root
BINGRP= bin
BINMODE=4555
.include <bsd.prog.mk>

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2014/04/26 11:02:45 florian Exp $
# $OpenBSD: Makefile,v 1.4 2016/09/17 15:03:39 florian Exp $
.include <bsd.own.mk>
SUBDIR= bgplg bgplgsh bgpctl ping traceroute ping6
SUBDIR= bgplg bgplgsh bgpctl ping traceroute
INCFILES= bgplg.head \
bgplg.foot \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2014/12/23 19:32:16 pascal Exp $
# $OpenBSD: Makefile,v 1.3 2016/09/17 15:03:40 florian Exp $
PROGDIR= ${.CURDIR}/../../../sbin/ping
@ -6,9 +6,11 @@ LDSTATIC= ${STATIC}
CFLAGS+= -I${PROGDIR}
NOMAN= yes
BINDIR= /var/www/bin
LINKS= ${BINDIR}/ping ${BINDIR}/ping6
.include "${PROGDIR}/Makefile"
BINDIR= /var/www/bin
BINMODE= 000
.PATH: ${PROGDIR}