diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2005-02-18 15:51:03 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2005-02-18 15:51:03 +0000 |
commit | dc913094028298502947027cf786ee74230b0816 (patch) | |
tree | 2ad556a0a683435777a85461610f980dd3acce5c | |
parent | 75b68c75298120fab353a6dafb47b162fa888f5a (diff) |
do not embed compile date and such in the binaries so they don't change
all time, ok millert@
-rw-r--r-- | usr.sbin/amd/amd/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/amd/amd/amq_subr.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/get_args.c | 3 | ||||
-rw-r--r-- | usr.sbin/amd/config/newvers.sh | 79 |
4 files changed, 4 insertions, 89 deletions
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index a6a9cbcc306..1f9f1dccc6f 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.2 (Berkeley) 4/22/94 -# $Id: Makefile,v 1.1 1995/10/18 08:47:09 deraadt Exp $ +# $Id: Makefile,v 1.2 2005/02/18 15:51:02 henning Exp $ .include "../config/Makefile.config" @@ -15,7 +15,6 @@ SRCS= afs_ops.c am_ops.c clock.c util.c xutil.c \ pfs_ops.c rpc_fwd.c sched.c sfs_ops.c amq_svc.c \ amq_subr.c umount_fs.c host_ops.c nfsx_ops.c \ ufs_ops.c ifs_ops.c amd.c get_args.c restart.c wire.c -OBJS+= vers.${PROG}.o CFLAGS+=-I${.CURDIR}/../rpcx CFLAGS+=-I${.CURDIR}/../config CFLAGS+=-I${.CURDIR}/../include @@ -23,14 +22,10 @@ CFLAGS+=-DARCH_REP=\"${MACHINE}\" CFLAGS+=-DOS_REP=\"${OS}\" CFLAGS+=-DOS_HDR=\"os-${OS}.h\" CFLAGS+=${CONFIG} -CLEANFILES+=vers.${PROG}.c vers.${PROG}.o version.amd DPADD+= ${LIBCOMPAT} LDADD+= -lcompat -vers.${PROG}.c: ${SRCS:.c=.o} - @d=${.CURDIR}/ sh ${.CURDIR}/../config/newvers.sh ${PROG} ${MACHINE} ${OS} - .PATH: ${.CURDIR}/../rpcx ${.CURDIR}/../config .include "../../Makefile.inc" .include <bsd.prog.mk> diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c index a88458d0c80..93aec676379 100644 --- a/usr.sbin/amd/amd/amq_subr.c +++ b/usr.sbin/amd/amd/amq_subr.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)amq_subr.c 8.1 (Berkeley) 6/6/93 - * $Id: amq_subr.c,v 1.10 2003/06/02 23:36:51 millert Exp $ + * $Id: amq_subr.c,v 1.11 2005/02/18 15:51:02 henning Exp $ */ /* @@ -246,7 +246,7 @@ amqproc_getvers_1(void *argp, struct svc_req *rqstp) { static amq_string res; - res = version; + res = "amd 1.1.1.1 of 1995/10/18 08:47:13 bsd44"; return &res; } diff --git a/usr.sbin/amd/amd/get_args.c b/usr.sbin/amd/amd/get_args.c index f6fe43138be..ea5729eecf6 100644 --- a/usr.sbin/amd/amd/get_args.c +++ b/usr.sbin/amd/amd/get_args.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)get_args.c 8.1 (Berkeley) 6/6/93 - * $Id: get_args.c,v 1.7 2003/06/02 23:36:51 millert Exp $ + * $Id: get_args.c,v 1.8 2005/02/18 15:51:02 henning Exp $ */ /* @@ -175,7 +175,6 @@ get_args(int c, char *v[]) break; case 'v': - fprintf(stderr, "%s%s (%s-endian).\n", copyright, version, endian); fputs("Map support for: ", stderr); mapc_showtypes(stderr); fputs(".\nFS: ", stderr); diff --git a/usr.sbin/amd/config/newvers.sh b/usr.sbin/amd/config/newvers.sh deleted file mode 100644 index 158eb5742a4..00000000000 --- a/usr.sbin/amd/config/newvers.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 1989 Jan-Simon Pendry -# Copyright (c) 1989 Imperial College of Science, Technology & Medicine -# Copyright (c) 1989, 1993 -# The Regents of the University of California. All Rights Reserved. -# -# This code is derived from software contributed to Berkeley by -# Jan-Simon Pendry at Imperial College, London. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# from: @(#)newvers.sh 8.1 (Berkeley) 6/6/93 -# $Id: newvers.sh,v 1.4 2003/06/12 01:15:08 deraadt Exp $ -# -PATH=/usr/ucb:/bin:/usr/bin:$PATH -if [ $# -ne 3 ]; then echo "Usage: newvers program arch os" >&2; exit 1; fi -version="version.$1" -if [ ! -r $version ]; then echo 0 > $version; chmod 444 $version; fi -v=`cat $version` -t=`date` -if [ ! -s "$d../config/RELEASE" -o ! -s "$d../text/COPYRIGHT" ]; then - echo ERROR: config file missing >&2 - exit 1 -fi -rm -f vers.$1.c -( -cat << %% -char copyright[] = "\\ -%% -sed 's/$/\\n\\/' $d../text/COPYRIGHT -cat << %% -"; -char version[] = "\\ -%% -cat << %% -$1 \\ -%% -sed \ - -e 's/\$//g' \ - -e 's/[A-Z][a-z]*://g' \ - -e 's/ */ /g' \ - -e 's/^ //' \ - -e 's/$/\\/' \ - $d../config/RELEASE -cat << %% - #${v}: ${t}\\n\\ -%% -case "$2" in -[aeiou]*) echo "an \\" ;; -*) echo "a \\";; -esac -echo "$2 running $3\";" -) > vers.$1.c -rm -f $version -expr ${v} + 1 > $version -chmod 444 $version |