summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2016-09-17 15:03:41 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2016-09-17 15:03:41 +0000
commiteaa65a3633d2a633d01727a1330610e222749756 (patch)
treeda1766b6b2915d3de55de9f9e4f78d7ac2a7460a
parent03908425aa5f0b200378192f7478d60a47e2c913 (diff)
ping6(8) is now a hardlink to ping(8).
The instbin stuff looks good to deraadt@
Diffstat
-rw-r--r--distrib/amd64/common/list4
-rw-r--r--distrib/amd64/ramdisk_cd/list.local4
-rw-r--r--distrib/armv7/ramdisk/list5
-rw-r--r--distrib/hppa/list5
-rw-r--r--distrib/i386/common/list4
-rw-r--r--distrib/i386/ramdisk_cd/list.local3
-rw-r--r--distrib/landisk/ramdisk/list5
-rw-r--r--distrib/loongson/ramdisk/list5
-rw-r--r--distrib/luna88k/ramdisk/list5
-rw-r--r--distrib/macppc/ramdisk/list5
-rw-r--r--distrib/miniroot/list5
-rw-r--r--distrib/octeon/ramdisk/list5
-rw-r--r--distrib/ramdisk/list5
-rw-r--r--distrib/sgi/ramdisk/list5
-rw-r--r--distrib/socppc/ramdisk/list5
-rw-r--r--distrib/sparc64/bsd.rd/list5
-rw-r--r--distrib/sparc64/ramdisk/list5
-rw-r--r--distrib/sparc64/ramdiskB/list4
-rw-r--r--distrib/special/Makefile4
-rw-r--r--distrib/special/ping6/Makefile20
-rw-r--r--sbin/ping/Makefile3
-rw-r--r--sbin/ping6/Makefile16
-rw-r--r--usr.bin/bgplg/Makefile4
-rw-r--r--usr.bin/bgplg/ping/Makefile6
24 files changed, 45 insertions, 92 deletions
diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index 4b4f4b13086..26f25d519ee 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -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
diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local
index 79982afebca..a222446cb8f 100644
--- a/distrib/amd64/ramdisk_cd/list.local
+++ b/distrib/amd64/ramdisk_cd/list.local
@@ -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
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 0d1305945c6..f9dc8dab205 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -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
diff --git a/distrib/hppa/list b/distrib/hppa/list
index 0e2e181406d..417c1119396 100644
--- a/distrib/hppa/list
+++ b/distrib/hppa/list
@@ -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
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 17d8e3917b4..70c90f86d46 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -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
diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local
index 8a59bc81ab6..b9a3717307d 100644
--- a/distrib/i386/ramdisk_cd/list.local
+++ b/distrib/i386/ramdisk_cd/list.local
@@ -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
diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index ea06d58e14d..b2b5ed4a92f 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list
@@ -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
diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index a1a41abcd30..9a42574fdf1 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list
@@ -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
diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index a0c121027ba..22e8ca42bf0 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list
@@ -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
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 2037cd5a88f..1da626e9a0e 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -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
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index 2ecac2c6fe1..9a90c67d661 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -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
diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list
index 54ed83dd5e3..e8754661691 100644
--- a/distrib/octeon/ramdisk/list
+++ b/distrib/octeon/ramdisk/list
@@ -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
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index 9ae8d3fc73d..f4662569a56 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -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
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index c58a0b2053b..c7bdb4b1de9 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -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
diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index 9bdfb53df3d..88a32331203 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -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
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index f56ccc507d2..4cab7cdfb02 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -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
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 1eac2c9d9ca..7206693b344 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -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
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index e4aadb6b955..55c0966d261 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -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
diff --git a/distrib/special/Makefile b/distrib/special/Makefile
index 7c345b11112..936f0d2f99d 100644
--- a/distrib/special/Makefile
+++ b/distrib/special/Makefile
@@ -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:
diff --git a/distrib/special/ping6/Makefile b/distrib/special/ping6/Makefile
deleted file mode 100644
index b52a8866685..00000000000
--- a/distrib/special/ping6/Makefile
+++ /dev/null
@@ -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>
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index f1dbffbce54..610d2e7d113 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -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
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index b4d6f104895..b3d111012e5 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -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>
diff --git a/usr.bin/bgplg/Makefile b/usr.bin/bgplg/Makefile
index a5730176df5..f17e18a2cba 100644
--- a/usr.bin/bgplg/Makefile
+++ b/usr.bin/bgplg/Makefile
@@ -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 \
diff --git a/usr.bin/bgplg/ping/Makefile b/usr.bin/bgplg/ping/Makefile
index f157d869b90..06d982f86b5 100644
--- a/usr.bin/bgplg/ping/Makefile
+++ b/usr.bin/bgplg/ping/Makefile
@@ -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}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 03:27:10 +0000