PERFORCE change 30133 for review
Peter Wemm
peter at FreeBSD.org
Wed Apr 30 14:25:01 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30133
Change 30133 by peter at peter_daintree on 2003/04/30 14:24:38
IFC @30132 (mostly vendor/$FreeBSD$ syncup)
Affected files ...
.. //depot/projects/hammer/etc/Makefile#9 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#9 integrate
.. //depot/projects/hammer/etc/rc.d/kpasswdd#1 branch
.. //depot/projects/hammer/etc/root/dot.k5login#1 branch
.. //depot/projects/hammer/etc/root/dot.klogin#2 delete
.. //depot/projects/hammer/gnu/usr.bin/groff/font/Makefile.dev#2 integrate
.. //depot/projects/hammer/lib/libdisk/chunk.c#7 integrate
.. //depot/projects/hammer/lib/libdisk/create_chunk.c#11 integrate
.. //depot/projects/hammer/lib/libdisk/disk.c#12 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.h#9 integrate
.. //depot/projects/hammer/lib/libdisk/rules.c#10 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/math_private.h#3 integrate
.. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#3 integrate
Differences ...
==== //depot/projects/hammer/etc/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.309 2003/04/18 17:51:53 mtm Exp $
+# $FreeBSD: src/etc/Makefile,v 1.310 2003/04/30 20:58:48 markm Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -99,7 +99,7 @@
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.cshrc ${DESTDIR}/root/.cshrc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- dot.klogin ${DESTDIR}/root/.klogin; \
+ dot.k5login ${DESTDIR}/root/.k5login; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.login ${DESTDIR}/root/.login; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
==== //depot/projects/hammer/etc/defaults/rc.conf#9 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.175 2003/04/30 20:58:49 markm Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -153,8 +153,9 @@
kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO).
kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC
kadmind5_server_enable="NO" # Run kadmind (or NO)
-kadmind5_server="/usr/libexec/k5admind" # path to kerberos 5 admin daemon
-kerberos_stash="NO" # Is the kerberos master key stashed?
+kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon
+kpasswdd_server_enable="NO" # Run kpasswdd (or NO)
+kpasswdd_server="/usr/libexec/kpasswdd" # path to kerberos 5 passwd daemon
rwhod_enable="NO" # Run the rwho daemon (or NO).
rwhod_flags="" # Flags for rwhod
==== //depot/projects/hammer/gnu/usr.bin/groff/font/Makefile.dev#2 (text+ko) ====
@@ -1,11 +1,6 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.10 2002/07/29 09:40:08 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.11 2003/04/30 20:48:03 ru Exp $
-DEVICEDIR?= ${fontdir}/dev${DEV}
-
-all: ${DEVFILES}
-
-beforeinstall: ${DEVFILES}
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
- ${.ALLSRC} ${DESTDIR}${DEVICEDIR}
+FILES= ${DEVFILES}
+FILESDIR?= ${fontdir}/dev${DEV}
.include <bsd.prog.mk>
==== //depot/projects/hammer/lib/libdisk/chunk.c#7 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.47 2003/01/10 19:25:38 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.48 2003/04/30 21:03:16 peter Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -318,7 +318,8 @@
if (platform == p_sparc64) {
offset = Prev_Cyl_Aligned(d, offset);
size = Next_Cyl_Aligned(d, size);
- } else if (platform == p_i386 || platform == p_pc98 || platform == p_amd64) {
+ } else if (platform == p_i386 || platform == p_pc98 ||
+ platform == p_amd64) {
if (type != freebsd)
break;
if (!(flags & CHUNK_ALIGN))
==== //depot/projects/hammer/lib/libdisk/create_chunk.c#11 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.80 2003/04/04 16:35:13 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.81 2003/04/30 21:03:16 peter Exp $");
#include <stdio.h>
#include <stdlib.h>
==== //depot/projects/hammer/lib/libdisk/disk.c#12 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.115 2003/04/30 17:14:58 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.116 2003/04/30 21:03:16 peter Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -56,6 +56,8 @@
p_ia64
#elif defined(__ppc__)
p_ppc
+#elif defined(__amd64__)
+ p_amd64
#else
IHAVENOIDEA
#endif
==== //depot/projects/hammer/lib/libdisk/libdisk.h#9 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
-* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.56 2003/04/30 17:14:58 obrien Exp $
+* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.57 2003/04/30 21:03:16 peter Exp $
*
*/
@@ -70,7 +70,7 @@
#if !defined(__ia64__)
u_char *boot1;
#endif
-#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */
+#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */
u_char *boot2;
#endif
struct chunk *chunks;
==== //depot/projects/hammer/lib/libdisk/rules.c#10 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.30 2003/04/23 12:15:31 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.31 2003/04/30 21:03:16 peter Exp $");
#include <stdio.h>
#include <stdlib.h>
==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.15 2001/10/10 17:48:43 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.16 2003/04/30 21:05:33 peter Exp $");
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
@@ -45,7 +45,7 @@
#endif /* LIBC_SCCS and not lint */
/*
- * i386 machine dependent routines for kvm. Hopefully, the forthcoming
+ * AMD64 machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module.
*/
@@ -66,8 +66,8 @@
#include "kvm_private.h"
#ifndef btop
-#define btop(x) (x86_64_btop(x))
-#define ptob(x) (x86_64_ptob(x))
+#define btop(x) (amd64_btop(x))
+#define ptob(x) (amd64_ptob(x))
#endif
struct vmstate {
==== //depot/projects/hammer/lib/msun/src/math_private.h#3 (text+ko) ====
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: src/lib/msun/src/math_private.h,v 1.12 2002/05/21 04:00:47 benno Exp $
+ * $FreeBSD: src/lib/msun/src/math_private.h,v 1.13 2003/04/30 21:06:30 peter Exp $
*/
#ifndef _MATH_PRIVATE_H_
@@ -226,7 +226,7 @@
int __kernel_rem_pio2f(float*,float*,int,int,int,const int*);
#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || \
- defined(__powerpc__) || defined(__x86_64__)
+ defined(__powerpc__) || defined(__amd64__)
#define __generic___ieee754_acos __ieee754_acos
#define __generic___ieee754_asin __ieee754_asin
#define __generic___ieee754_atan2 __ieee754_atan2
==== //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#3 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/libexec/rtld-elf/i386/lockdflt.c,v 1.8 2002/07/06 20:25:55 jdp Exp $
+ * $FreeBSD: src/libexec/rtld-elf/amd64/lockdflt.c,v 1.9 2003/04/30 21:09:06 peter Exp $
*/
/*
More information about the p4-projects
mailing list