Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3-0]: src Apply patch (requested by tsutsui in ticket #1256):
details: https://anonhg.NetBSD.org/src/rev/f599f07d8b9b
branches: netbsd-3-0
changeset: 579194:f599f07d8b9b
user: tron <tron%NetBSD.org@localhost>
date: Mon Apr 17 23:14:53 2006 +0000
description:
Apply patch (requested by tsutsui in ticket #1256):
Make PAM work on NetBSD ports without shared library support.
This fixes PR lib/32421.
diffstat:
crypto/dist/ssh/includes.h | 3 ++-
crypto/dist/ssh/namespace.h | 33 +++++++++++++++++++++++++++++++++
crypto/dist/ssh/readpassphrase.c | 3 ++-
crypto/dist/ssh/readpassphrase.h | 3 ++-
distrib/sets/lists/base/shl.mi | 4 ++--
lib/libpam/libpam/Makefile | 20 ++++++++++++++++----
lib/libssh/shlib_version | 3 ++-
share/mk/bsd.prog.mk | 19 ++++++++++++++++---
8 files changed, 75 insertions(+), 13 deletions(-)
diffs (184 lines):
diff -r d0dca8f8cd32 -r f599f07d8b9b crypto/dist/ssh/includes.h
--- a/crypto/dist/ssh/includes.h Mon Apr 10 20:19:06 2006 +0000
+++ b/crypto/dist/ssh/includes.h Mon Apr 17 23:14:53 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: includes.h,v 1.9 2005/02/13 18:14:04 christos Exp $ */
+/* $NetBSD: includes.h,v 1.9.4.1 2006/04/17 23:14:53 tron Exp $ */
/* $OpenBSD: includes.h,v 1.18 2004/06/13 15:03:02 djm Exp $ */
/*
@@ -60,6 +60,7 @@
# include <security/pam_appl.h>
#endif
+#include "namespace.h"
#include "version.h"
#include "random.h"
diff -r d0dca8f8cd32 -r f599f07d8b9b crypto/dist/ssh/namespace.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/dist/ssh/namespace.h Mon Apr 17 23:14:53 2006 +0000
@@ -0,0 +1,33 @@
+#ifndef _SSH_NAMESPACE_H_
+#define _SSH_NAMESPACE_H_
+#define addargs ssh_addargs
+#define atomicio ssh_atomicio
+#define chop ssh_chop
+#define colon ssh_colon
+#define convtime ssh_convtime
+#define debug ssh_debug
+#define debug2 ssh_debug2
+#define debug3 ssh_debug3
+#define do_log ssh_do_log
+#define error ssh_error
+#define fatal ssh_fatal
+#define freeargs ssh_freeargs
+#define freerrset ssh_freerrset
+#define hpdelim ssh_hpdelim
+#define getpass ssh_getpass
+#define getpeereid ssh_getpeereid
+#define getrrsetbyname ssh_getrrsetbyname
+#define logit ssh_logit
+#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
+#define verbose ssh_verbose
+#define xfree ssh_free
+#define xmalloc ssh_malloc
+#define xrealloc ssh_realloc
+#define xstrdup ssh_strdup
+#endif /* _SSH_NAMESPACE_H_ */
diff -r d0dca8f8cd32 -r f599f07d8b9b crypto/dist/ssh/readpassphrase.c
--- a/crypto/dist/ssh/readpassphrase.c Mon Apr 10 20:19:06 2006 +0000
+++ b/crypto/dist/ssh/readpassphrase.c Mon Apr 17 23:14:53 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: readpassphrase.c,v 1.4 2005/02/13 06:01:36 christos Exp $ */
+/* $NetBSD: readpassphrase.c,v 1.4.4.1 2006/04/17 23:14:53 tron Exp $ */
/*
* Copyright (c) 2000 Todd C. Miller <Todd.Miller%courtesan.com@localhost>
* All rights reserved.
@@ -26,6 +26,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "includes.h"
#if defined(LIBC_SCCS) && !defined(lint)
static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.7 2001/08/07 19:34:11 millert Exp $";
#endif /* LIBC_SCCS and not lint */
diff -r d0dca8f8cd32 -r f599f07d8b9b crypto/dist/ssh/readpassphrase.h
--- a/crypto/dist/ssh/readpassphrase.h Mon Apr 10 20:19:06 2006 +0000
+++ b/crypto/dist/ssh/readpassphrase.h Mon Apr 17 23:14:53 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: readpassphrase.h,v 1.3 2005/02/13 06:01:36 christos Exp $ */
+/* $NetBSD: readpassphrase.h,v 1.3.4.1 2006/04/17 23:14:53 tron Exp $ */
/* $OpenBSD: readpassphrase.h,v 1.1 2000/11/21 00:48:38 millert Exp $ */
/*
@@ -42,6 +42,7 @@
__BEGIN_DECLS
char * readpassphrase __P((const char *, char *, size_t, int));
+char * getpass __P((const char *));
__END_DECLS
#endif /* !_READPASSPHRASE_H_ */
diff -r d0dca8f8cd32 -r f599f07d8b9b distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Mon Apr 10 20:19:06 2006 +0000
+++ b/distrib/sets/lists/base/shl.mi Mon Apr 17 23:14:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.304.2.5 2005/09/08 19:15:43 tron Exp $
+# $NetBSD: shl.mi,v 1.304.2.5.2.1 2006/04/17 23:14:53 tron Exp $
# Note: libtermcap and libtermlib are hardlinked and share the same version.
./lib/libc.so.12.128.2 base-sys-shlib
./lib/libcrypt.so.0.2 base-sys-shlib
@@ -76,7 +76,7 @@
./usr/lib/libskey.so.1.0 base-sys-shlib skey
./usr/lib/libsl.so.2.0 base-krb5-shlib kerberos
./usr/lib/libss.so.4.0 base-krb5-shlib kerberos
-./usr/lib/libssh.so.1.0 base-secsh-bin crypto
+./usr/lib/libssh.so.1.0.1 base-secsh-bin crypto
./usr/lib/libssl.so.3.0 base-crypto-shlib crypto
./usr/lib/libtermcap.so.0.5 base-sys-shlib
./usr/lib/libtermlib.so.0.5 base-sys-shlib
diff -r d0dca8f8cd32 -r f599f07d8b9b lib/libpam/libpam/Makefile
--- a/lib/libpam/libpam/Makefile Mon Apr 10 20:19:06 2006 +0000
+++ b/lib/libpam/libpam/Makefile Mon Apr 17 23:14:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/03 22:40:49 he Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2006/04/17 23:14:53 tron Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -152,9 +152,21 @@
STOBJS+= openpam_static_modules.o
# Static module support. These go ONLY in the static libpam.a
-STATIC_MODULES= pam_chroot pam_deny pam_echo pam_exec pam_group pam_guest \
- pam_lastlog pam_nologin pam_permit pam_rhosts pam_rootok \
- pam_securetty pam_self pam_unix
+STATIC_MODULES= pam_chroot pam_deny pam_echo pam_exec pam_ftpusers pam_group \
+ pam_guest pam_lastlog pam_login_access pam_nologin pam_permit pam_radius \
+ pam_rhosts pam_rootok pam_securetty pam_self pam_unix
+
+.if (${MKKERBEROS} != "no")
+STATIC_MODULES+= pam_krb5 pam_ksu
+.endif
+
+.if (${MKSKEY} != "no")
+STATIC_MODULES+= pam_skey
+.endif
+
+.if (${MKCRYPTO} != "no")
+STATIC_MODULES+= pam_ssh
+.endif
MODULE_DIR=../modules
.for MOD in ${STATIC_MODULES}
diff -r d0dca8f8cd32 -r f599f07d8b9b lib/libssh/shlib_version
--- a/lib/libssh/shlib_version Mon Apr 10 20:19:06 2006 +0000
+++ b/lib/libssh/shlib_version Mon Apr 17 23:14:53 2006 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: shlib_version,v 1.2 2005/02/13 06:06:48 christos Exp $
+# $NetBSD: shlib_version,v 1.2.4.1 2006/04/17 23:14:53 tron Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=1
minor=0
+teeny=1
diff -r d0dca8f8cd32 -r f599f07d8b9b share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk Mon Apr 10 20:19:06 2006 +0000
+++ b/share/mk/bsd.prog.mk Mon Apr 17 23:14:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.206 2005/03/04 20:41:08 he Exp $
+# $NetBSD: bsd.prog.mk,v 1.206.4.1 2006/04/17 23:14:53 tron Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -75,8 +75,21 @@
# PAM applications, if linked statically, need more libraries
.if (${MKPIC} == "no")
-PAM_STATIC_LDADD= -lcrypt -lrpcsvc -lutil
-PAM_STATIC_DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
+.if (${MKCRYPTO} != "no")
+PAM_STATIC_LDADD+= -lssh
+PAM_STATIC_DPADD+= ${LIBSSH}
+.endif
+.if (${MKKERBEROS} != "no")
+PAM_STATIC_LDADD+= -lkafs -lkrb -lkrb5 -lasn1 -lroken -lcom_err -lcrypto
+PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB} ${LIBKRB5} ${LIBASN1} ${LIBROKEN} \
+ ${LIBCOM_ERR} ${LIBCRYPTO}
+.endif
+.if (${MKSKEY} != "no")
+PAM_STATIC_LDADD+= -lskey
+PAM_STATIC_DPADD+= ${LIBSKEY}
+.endif
+PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
+PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
.else
PAM_STATIC_LDADD=
PAM_STATIC_DPADD=
Home |
Main Index |
Thread Index |
Old Index