Module Name: src
Committed By: christos
Date: Fri Jan 16 20:17:49 UTC 2015
Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc
src/crypto/external/bsd/openssh/dist: misc.h namespace.h
src/crypto/external/bsd/openssh/lib: Makefile
Removed Files:
src/crypto/external/bsd/openssh/dist: strtonum.c
Log Message:
kill another copy of strtonum.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/misc.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/namespace.h
cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/openssh/dist/strtonum.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/Makefile.inc
diff -u src/crypto/external/bsd/openssh/Makefile.inc:1.6 src/crypto/external/bsd/openssh/Makefile.inc:1.7
--- src/crypto/external/bsd/openssh/Makefile.inc:1.6 Sun Oct 19 12:30:58 2014
+++ src/crypto/external/bsd/openssh/Makefile.inc Fri Jan 16 15:17:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2014/10/19 16:30:58 christos Exp $
+# $NetBSD: Makefile.inc,v 1.7 2015/01/16 20:17:49 christos Exp $
WARNS?= 4
@@ -10,7 +10,7 @@ WITH_OPENSSL=1
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
-CPPFLAGS+=-DWITH_SSH1 -DWITH_OPENSSL -DENABLE_PKCS11
+CPPFLAGS+=-DWITH_SSH1 -DWITH_OPENSSL -DENABLE_PKCS11 -D_OPENBSD_SOURCE
.if !defined(NOPIC)
CPPFLAGS+=-DHAVE_DLOPEN
.endif
Index: src/crypto/external/bsd/openssh/dist/misc.h
diff -u src/crypto/external/bsd/openssh/dist/misc.h:1.7 src/crypto/external/bsd/openssh/dist/misc.h:1.8
--- src/crypto/external/bsd/openssh/dist/misc.h:1.7 Sun Oct 19 12:30:58 2014
+++ src/crypto/external/bsd/openssh/dist/misc.h Fri Jan 16 15:17:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.h,v 1.7 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: misc.h,v 1.8 2015/01/16 20:17:49 christos Exp $ */
/* $OpenBSD: misc.h,v 1.54 2014/07/15 15:54:14 millert Exp $ */
/*
@@ -66,7 +66,6 @@ int unix_listener(const char *, int, in
int bcrypt_pbkdf(const char *, size_t, const u_int8_t *, size_t,
u_int8_t *, size_t, unsigned int);
-long long strtonum(const char *, long long, long long, const char **);
struct passwd *pwcopy(struct passwd *);
const char *ssh_gai_strerror(int);
Index: src/crypto/external/bsd/openssh/dist/namespace.h
diff -u src/crypto/external/bsd/openssh/dist/namespace.h:1.3 src/crypto/external/bsd/openssh/dist/namespace.h:1.4
--- src/crypto/external/bsd/openssh/dist/namespace.h:1.3 Sun Oct 19 12:30:58 2014
+++ src/crypto/external/bsd/openssh/dist/namespace.h Fri Jan 16 15:17:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.3 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: namespace.h,v 1.4 2015/01/16 20:17:49 christos Exp $ */
#ifndef _SSH_NAMESPACE_H_
#define _SSH_NAMESPACE_H_
#define addargs ssh_addargs
@@ -22,7 +22,6 @@
#define pwcopy ssh_pwcopy
#define replacearg ssh_replacearg
#define strdelim ssh_strdelim
-#define strtonum ssh_strtonum
#define tohex ssh_tohex
#define uudecode ssh_uudecode
#define uuencode ssh_uuencode
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.15 src/crypto/external/bsd/openssh/lib/Makefile:1.16
--- src/crypto/external/bsd/openssh/lib/Makefile:1.15 Sun Oct 19 23:05:13 2014
+++ src/crypto/external/bsd/openssh/lib/Makefile Fri Jan 16 15:17:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/10/20 03:05:13 christos Exp $
+# $NetBSD: Makefile,v 1.16 2015/01/16 20:17:49 christos Exp $
.include <bsd.own.mk>
@@ -88,8 +88,7 @@ ssh-dss.c \
ssh-ecdsa.c \
ssh-rsa.c
-# umac.c
-SRCS+= fmt_scaled.c strtonum.c
+SRCS+= fmt_scaled.c
SRCS+= readpassphrase.c getpeereid.c getrrsetbyname.c
COPTS.monitor_fdpass.c = -Wno-stack-protector
