From: deraadt Date: Wed, 23 Jul 2014 00:18:22 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dfb7c12ce6bbe53a65c2344ee12c7cb96b22ec6d;p=openbsd sync --- diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 5ca69af43d0..41ee73a3929 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -213,6 +213,7 @@ ./etc/signify/openbsd-56-fw.pub ./etc/signify/openbsd-56-pkg.pub ./etc/signify/openbsd-57-base.pub +./etc/signify/openbsd-57-fw.pub ./etc/signify/openbsd-57-pkg.pub ./etc/skel ./etc/skel/.ssh @@ -2780,6 +2781,7 @@ ./usr/sbin/groupmod ./usr/sbin/host ./usr/sbin/hostapd +./usr/sbin/httpd ./usr/sbin/identd ./usr/sbin/ifstated ./usr/sbin/ikectl diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 6d93c51ea0c..d3b42dc1940 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1572,6 +1572,7 @@ ./usr/share/man/man4/luna88k/lcd.4 ./usr/share/man/man4/luna88k/le.4 ./usr/share/man/man4/luna88k/mem.4 +./usr/share/man/man4/luna88k/pcexio.4 ./usr/share/man/man4/luna88k/spc.4 ./usr/share/man/man4/luphy.4 ./usr/share/man/man4/lxtphy.4 @@ -2207,6 +2208,7 @@ ./usr/share/man/man5/hppa/boot.conf.5 ./usr/share/man/man5/hppa64 ./usr/share/man/man5/hppa64/boot.conf.5 +./usr/share/man/man5/httpd.conf.5 ./usr/share/man/man5/i386 ./usr/share/man/man5/i386/boot.conf.5 ./usr/share/man/man5/ifstated.conf.5 @@ -2449,6 +2451,7 @@ ./usr/share/man/man8/hppa64/boot.8 ./usr/share/man/man8/hppa64/boot_hppa64.8 ./usr/share/man/man8/hppa64/mkboot.8 +./usr/share/man/man8/httpd.8 ./usr/share/man/man8/i386 ./usr/share/man/man8/i386/MAKEDEV.8 ./usr/share/man/man8/i386/ZZZ.8