diff options
| author | gendalia <gendalia@pkgsrc.org> | 2012-12-12 22:04:42 +0000 |
|---|---|---|
| committer | gendalia <gendalia@pkgsrc.org> | 2012-12-12 22:04:42 +0000 |
| commit | b645c82dfee9924d8ad5777cb2aaca52c717de72 (patch) | |
| tree | 281ef2f94cfd188506227e7241b219122e404465 /security | |
| parent | 1fea00e00b97651537b1f9c65880bc6adc7744d6 (diff) | |
| download | pkgsrc-b645c82dfee9924d8ad5777cb2aaca52c717de72.tar.gz | |
"Hygiene demands it."
Sources are from 2003, current tectia client/server has vulnterabilities,
there are no security eyes on this version.
Diffstat (limited to 'security')
41 files changed, 0 insertions, 1633 deletions
diff --git a/security/ssh2/DESCR b/security/ssh2/DESCR deleted file mode 100644 index da9e9d321ea..00000000000 --- a/security/ssh2/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -Secure Shell is a program to log into another computer over a -network, to execute commands in a remote machine, and to move files -from one machine to another. It provides strong authentication -and secure communications over insecure channels. It is intended -as a replacement for rlogin, rsh, rcp, and rdist. - -The programs in this package implement version 2 of the Secure Shell -protocol. diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile deleted file mode 100644 index b88e2a25276..00000000000 --- a/security/ssh2/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# $NetBSD: Makefile,v 1.25 2011/12/17 23:42:59 sbd Exp $ - -DISTNAME= ssh-3.2.9.1 -PKGNAME= ${DISTNAME:C/ssh-/ssh2-/} -PKGREVISION= 8 -CATEGORIES= security -MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.ssh.com/ -LICENSE= ssh-communications-security-license - -RESTRICTED= Reciprocal grant required for derivative works. Non-comercial use restrictions on some systems. -NO_BIN_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} - -MAKE_JOBS_SAFE= no - -COMMENT= Secure Shell client and server for V.2 SSH protocol - -PKG_DESTDIR_SUPPORT= destdir - -CONFLICTS+= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]* -CONFLICTS+= openssh+gssapi-[0-9]* ssh2-nox11-[0-9]* - -GNU_CONFIGURE= YES - -BUILD_DEFS+= IPV6_READY - -CRYPTO= YES -PKG_SYSCONFSUBDIR= ssh2 - -DISTINFO_FILE= ${.CURDIR}/../../security/ssh2/distinfo -PATCHDIR= ${.CURDIR}/../../security/ssh2/patches -FILESDIR= ${.CURDIR}/../../security/ssh2/files -PLIST_SRC= ${.CURDIR}/../../security/ssh2/PLIST - -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc64" -# Later we may want to put an upper version bound on OS_VERSION or on -# gcc version for this. -CONFIGURE_ARGS+= --disable-compiler-optimizations -.endif - -SSH_PID_DIR= /var/run # default directory for PID files -.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[012345678]) -SSH_PID_DIR= /etc # Older Solaris doesn't have a /var/run -.endif - -CONFIGURE_ARGS+= --without-daemonpam --without-clientpam -CONFIGURE_ARGS+= --without-ssh-agent1-compat -CONFIGURE_ARGS+= --without-ssh1-compat -CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers} -CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q} - -# This seems to break x11 forwarding at least on NetBSD 3.1 amd64 -# and i386, so I assume it actually breaks it for all platforms. -# (i.e ssh localhost xterm does not work as client will get wrong -# auth cookie). -# Without this it will use the xauth method and that will work. -CONFIGURE_ARGS+= --without-x11-security - -# Setting FOREIGN_ETCDIR to PKG_SYSCONFBASEDIR may seem stupid -# if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm... -# -CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASEDIR:Q} -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} - -MAKE_ENV+= PKGBASE=${PKGBASE:Q} -MAKE_ENV+= RM=${RM:Q} - -RCD_SCRIPTS= ssh2_secure_shell - -EGDIR= ${PREFIX}/share/examples/${PKGBASE} -EGFILES= ext_authorization_example.sh \ - kbdint_plugin_example.sh - -CONFS= sshd2_config ssh2_config ssh_dummy_shell.out -CONF_FILES= # empty -.for file in ${CONFS} -CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} -.endfor -FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} - -OWN_DIRS= ${PKG_SYSCONFDIR}/knownhosts -OWN_DIRS+= ${PKG_SYSCONFDIR}/hostkeys - -DOCS= CHANGES FAQ HOWTO.anonymous.sftp INSTALL LICENSE \ - NEWS README REGEX-SYNTAX SSH2.QUICKSTART \ - RFC.authorization_program_protocol \ - RFC.kbdint_plugin_protocol - -TEST_TARGET= check - -post-install: - ${INSTALL_DATA_DIR} ${DESTDIR:Q}${PREFIX:Q}/share/doc/${PKGBASE} -.for file in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR:Q}${PREFIX:Q}/share/doc/${PKGBASE} -.endfor - ${INSTALL_DATA_DIR} ${DESTDIR:Q}${EGDIR:Q} -.for file in ${EGFILES} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR:Q}${EGDIR:Q} -.endfor - -.include "../../mk/termcap.buildlink3.mk" -.include "../../security/tcp_wrappers/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/security/ssh2/PLIST b/security/ssh2/PLIST deleted file mode 100644 index 08be24462b4..00000000000 --- a/security/ssh2/PLIST +++ /dev/null @@ -1,68 +0,0 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:13:39 joerg Exp $ -bin/scp -bin/scp2 -bin/sftp -bin/sftp-server -bin/sftp-server2 -bin/sftp2 -bin/ssh -bin/ssh-add -bin/ssh-add2 -bin/ssh-agent -bin/ssh-agent2 -${PLIST.x11}bin/ssh-askpass -${PLIST.x11}bin/ssh-askpass2 -bin/ssh-dummy-shell -bin/ssh-keygen -bin/ssh-keygen2 -bin/ssh-probe -bin/ssh-probe2 -bin/ssh-signer -bin/ssh-signer2 -bin/ssh2 -man/man1/scp.1 -man/man1/scp2.1 -man/man1/sftp.1 -man/man1/sftp2.1 -man/man1/ssh-add.1 -man/man1/ssh-add2.1 -man/man1/ssh-agent.1 -man/man1/ssh-agent2.1 -man/man1/ssh-dummy-shell.1 -man/man1/ssh-keygen.1 -man/man1/ssh-keygen2.1 -man/man1/ssh-probe.1 -man/man1/ssh-probe2.1 -man/man1/ssh.1 -man/man1/ssh2.1 -man/man1/sshregex.1 -man/man5/ssh2_config.5 -man/man5/sshd-check-conf.5 -man/man5/sshd2_config.5 -man/man5/sshd2_subconfig.5 -man/man8/sshd.8 -man/man8/sshd2.8 -sbin/sshd -sbin/sshd-check-conf -sbin/sshd2 -share/doc/${PKGBASE}/CHANGES -share/doc/${PKGBASE}/FAQ -share/doc/${PKGBASE}/HOWTO.anonymous.sftp -share/doc/${PKGBASE}/INSTALL -share/doc/${PKGBASE}/LICENSE -share/doc/${PKGBASE}/NEWS -share/doc/${PKGBASE}/README -share/doc/${PKGBASE}/REGEX-SYNTAX -share/doc/${PKGBASE}/RFC.authorization_program_protocol -share/doc/${PKGBASE}/RFC.kbdint_plugin_protocol -share/doc/${PKGBASE}/SSH2.QUICKSTART -share/examples/${PKGBASE}/ext_authorization_example.sh -share/examples/${PKGBASE}/kbdint_plugin_example.sh -share/examples/${PKGBASE}/ssh2_config -share/examples/${PKGBASE}/ssh_dummy_shell.out -share/examples/${PKGBASE}/sshd2_config -share/examples/${PKGBASE}/subconfig/anonymous.example -share/examples/${PKGBASE}/subconfig/host_ext.example -share/examples/${PKGBASE}/subconfig/host_int.example -share/examples/${PKGBASE}/subconfig/user.example -share/examples/rc.d/ssh2_secure_shell diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo deleted file mode 100644 index d9c5d2922c9..00000000000 --- a/security/ssh2/distinfo +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: distinfo,v 1.12 2006/11/02 12:31:58 kivinen Exp $ - -SHA1 (ssh-3.2.9.1.tar.gz) = 22e4589c889aef18e53a8942716084f0d8ede7db -RMD160 (ssh-3.2.9.1.tar.gz) = 21bfe97fae477dea1109c6e6eb44a448b6b2f250 -Size (ssh-3.2.9.1.tar.gz) = 2269281 bytes -SHA1 (patch-aa) = 34353e23d81916202216dc401e99f17b08f3d6fb -SHA1 (patch-ab) = 314e2e4165fb1d429297f235c9712ddc0d924865 -SHA1 (patch-ac) = aa4269fa9defce5d71a5e09df5aa95621c2b281d -SHA1 (patch-ad) = dcaaf5f545bd4650784dc6fd0dbcaae48cf3f9d3 -SHA1 (patch-ae) = 0d1f358bd97290118002cc0fc489cbf7e334e681 -SHA1 (patch-af) = e7c956b858d02dfaf20e1fe1bfc36322d9eb6d67 -SHA1 (patch-ag) = 0f7a448875262e2536255ace27cf1a8f0c2a0517 -SHA1 (patch-ah) = dc9a496187907e34c602a9f99a65f8fe8a83c54e -SHA1 (patch-ai) = 4236061632cd0970d26c8b9affb92111f5f6d5da -SHA1 (patch-aj) = 4190dff5f6fca937ff742233f8320b126428b51f -SHA1 (patch-ak) = dd7bc32a5b6cf4e8d8d5d35f46714ce21e52be1b -SHA1 (patch-al) = 401034768081c4181a92b9d9919ee6f6af9a8a5d -SHA1 (patch-am) = e0cb5d3f448570be653d8c039c310c3df909583d -SHA1 (patch-an) = 25a02df00dfe7484354316a87a30ce1144011f87 -SHA1 (patch-ao) = c129f78b7e19843090ade11ae503f780a37921a4 -SHA1 (patch-ap) = 3a7b34777734caf696f9c564f7de431597ff18f6 -SHA1 (patch-aq) = 3c7c3253e223ae253d8935e8c7fb49838cd2ca93 -SHA1 (patch-ar) = 2c47ced95f680547d9a68ebe91138644148de51b -SHA1 (patch-as) = 3ede9c75364ff2e6f9213ddb99768530e9cf173d -SHA1 (patch-at) = e6edd24c56190fef74fd7a66f6801dd2924b1c44 -SHA1 (patch-au) = b29f29502421da69e4de1a1803d3bb4269480eb7 -SHA1 (patch-av) = 1cfa5bb5f854ce40796810a147788ff8df2ba37f -SHA1 (patch-aw) = 5786c03afa3ee2d89ce5780bca6ccf8a81fa438b -SHA1 (patch-ax) = 0ed310db62cb0bd3d68c992d229d2c8fdbd0e535 -SHA1 (patch-ay) = 726b6466607708f52af7f110d5e7676087e89867 -SHA1 (patch-az) = 0bef02fd1f3c58d192d00ed50d87b97f1ab7c534 -SHA1 (patch-ba) = fd92d27b9335492a583b08f91353f8ae73014979 -SHA1 (patch-bb) = c306813fbb426e8a2d2de76e62a46317fe32947d -SHA1 (patch-bc) = d198fd85e0f7a14bb82baf639461795933c34230 -SHA1 (patch-bd) = 0a57de059fcd647c375f310d6d58712a2f3d4c89 -SHA1 (patch-be) = 788a8fa682e968d9e3cd55213547f82908cc3a0a -SHA1 (patch-bf) = 64fa9f13619a9d222af9a24d0b1069033facdef1 -SHA1 (patch-bg) = 73da22930f753fc02cd4a5bad30b4edf226d1180 -SHA1 (patch-bh) = 3a4798d70198858af33a6325325fb37dfc50356e -SHA1 (patch-bi) = 6d8ad1c52b0e27ba262c8837dbb55c8ca4e744a7 diff --git a/security/ssh2/files/ssh2_secure_shell.sh b/security/ssh2/files/ssh2_secure_shell.sh deleted file mode 100644 index 5af794cecb6..00000000000 --- a/security/ssh2/files/ssh2_secure_shell.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: ssh2_secure_shell.sh,v 1.2 2002/09/20 02:02:00 grant Exp $ -# -# PROVIDE: ssh2_secure_shell -# REQUIRE: DAEMON LOGIN - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="ssh2_secure_shell" -rcvar=$name -command="@PREFIX@/sbin/sshd2" -keygen_command="@PREFIX@/bin/ssh-keygen2" -pidfile="@SSH_PID_DIR@/sshd2_22.pid" -required_files="@PKG_SYSCONFDIR@/sshd2_config" -extra_commands="keygen reload" - -ssh2_secure_shell_keygen() -{ - ( - umask 022 - if [ -f @PKG_SYSCONFDIR@/hostkey ]; then - @ECHO@ "You already have an DSA host key in @PKG_SYSCONFDIR@/hostkey" - @ECHO@ "Skipping Key Generation" - else - ${keygen_command} -P -b 1024 -t dsa -c "1024-bit dsa hostkey" @PKG_SYSCONFDIR@/hostkey - fi - ) -} - -ssh2_secure_shell_precmd() -{ - if [ ! -f @PKG_SYSCONFDIR@/hostkey ]; then - $0 keygen - fi -} - -keygen_cmd=ssh2_secure_shell_keygen -start_precmd=ssh2_secure_shell_precmd - -if [ -f /etc/rc.subr ] -then - load_rc_config $name - run_rc_command "$1" -else - case ${1:-start} in - start) - if [ -x ${command} -a -f ${required_files} ] - then - @ECHO@ "Starting ${name}." - eval ${start_precmd} - eval ${command} ${sshd_flags} ${command_args} - fi - ;; - stop) - if [ -f ${pidfile} ]; then - pid=`@HEAD@ -1 ${pidfile}` - @ECHO@ "Stopping ${name}." - kill -TERM ${pid} - else - @ECHO@ "${name} not running?" - fi - ;; - restart) - ( $0 stop ) - sleep 1 - $0 start - ;; - status) - if [ -f ${pidfile} ]; then - pid=`@HEAD@ -1 ${pidfile}` - @ECHO@ "${name} is running as pid ${pid}." - else - @ECHO@ "${name} is not running." - fi - ;; - keygen) - eval ${keygen_cmd} - ;; - esac -fi diff --git a/security/ssh2/options.mk b/security/ssh2/options.mk deleted file mode 100644 index 85111a30286..00000000000 --- a/security/ssh2/options.mk +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:12 jlam Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.ssh2 -PKG_SUPPORTED_OPTIONS= x11 -PKG_SUGGESTED_OPTIONS= x11 - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= x11 - -.if !empty(PKG_OPTIONS:Mx11) -CONFIGURE_ARGS+= --with-x -PLIST.x11= yes -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt?= build -.include "../../x11/libXt/buildlink3.mk" -.if ${X11_TYPE} == "modular" -DEPENDS+= xauth>=1.0.2:../../x11/xauth -CONFIGURE_ENV+= ac_cv_path_XAUTH_PATH=${PREFIX:Q}/bin/xauth -.endif -.else -CONFIGURE_ARGS+= --without-x -.endif diff --git a/security/ssh2/patches/patch-aa b/security/ssh2/patches/patch-aa deleted file mode 100644 index d0b99413a69..00000000000 --- a/security/ssh2/patches/patch-aa +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2003/08/12 19:08:56 seb Exp $ - ---- acconfig.h.orig 2003-06-30 12:22:25.000000000 +0000 -+++ acconfig.h -@@ -253,6 +253,10 @@ library. */ - and logwtmp() calls. */ - #undef HAVE_LIBUTIL_LOGIN - -+/* Define this if libutil.a contains loginx(), logoutx(), -+ and logwtmpx() calls. */ -+#undef HAVE_LIBUTIL_LOGINX -+ - /* Location of system mail spool directory. */ - #undef MAIL_SPOOL_DIRECTORY - -@@ -268,9 +272,15 @@ library. */ - /* Define this if a prototype for logout() is defined in system headers. */ - #undef HAVE_PROTO_LOGOUT - -+/* Define this if a prototype for logoutx() is defined in system headers. */ -+#undef HAVE_PROTO_LOGOUTX -+ - /* Define this if a prototype for logwtmp() is defined in system headers. */ - #undef HAVE_PROTO_LOGWTMP - -+/* Define this if a prototype for logwtmpx() is defined in system headers. */ -+#undef HAVE_PROTO_LOGWTMPX -+ - /* Define this if a prototype for initgroups() is defined in system headers. */ - #undef HAVE_PROTO_INITGROUPS - -@@ -425,6 +435,8 @@ library. */ - /* Define this to point to where sshd2 should store it's pidfile. */ - #undef SSHD_PIDDIR - -+/* Define if both utmp and utmpx entries should be handled */ -+#undef SSH_UTMP_UTMPX - - - diff --git a/security/ssh2/patches/patch-ab b/security/ssh2/patches/patch-ab deleted file mode 100644 index e472e95b411..00000000000 --- a/security/ssh2/patches/patch-ab +++ /dev/null @@ -1,121 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/08/12 19:08:56 seb Exp $ - ---- apps/ssh/Makefile.am.orig 2003-06-30 12:22:11.000000000 +0000 -+++ apps/ssh/Makefile.am -@@ -18,7 +18,8 @@ WINCONF_OPTIONS = maintainer=sjl@ssh.com - etcdir = @ETCDIR@ - known_hosts_dir = $(etcdir)/knownhosts - host_keys_dir = $(etcdir)/hostkeys --subconfig_dir = $(etcdir)/subconfig -+egdir = $(prefix)/share/examples/${PKGBASE} -+subconfig_dir = $(egdir)/subconfig - STATIC_FLAG = @STATIC_FLAG@ - - # -@@ -569,13 +570,13 @@ COMPILE = $(CC) $(KERBEROS_INCS) $(INCLU - # - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) - # -+INSTALL_DATA_DIR= $(BSD_INSTALL_DATA_DIR) -+# - includes: - - make-install-dirs: -- -if test '!' -d $(DESTDIR)$(etcdir); then mkdir -p $(DESTDIR)$(etcdir); fi -- -if test '!' -d $(DESTDIR)$(known_hosts_dir); then mkdir -p $(DESTDIR)$(known_hosts_dir); fi -- -if test '!' -d $(DESTDIR)$(host_keys_dir); then mkdir -p $(DESTDIR)$(host_keys_dir); fi -- -if test '!' -d $(DESTDIR)$(subconfig_dir); then mkdir -p $(DESTDIR)$(subconfig_dir); fi -+ $(INSTALL_DATA_DIR) $(DESTDIR)$(egdir) -+ $(INSTALL_DATA_DIR) $(DESTDIR)$(subconfig_dir) - - generate-host-key: - -@if test -f $(DESTDIR)$(etcdir)/hostkey; \ -@@ -586,36 +587,20 @@ generate-host-key: - fi - - install-symlinks: -- -mv -f $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/ssh.old -- -mv -f $(DESTDIR)$(bindir)/ssh-agent $(DESTDIR)$(bindir)/ssh-agent.old -- -mv -f $(DESTDIR)$(bindir)/ssh-add $(DESTDIR)$(bindir)/ssh-add.old -- -mv -f $(DESTDIR)$(bindir)/ssh-askpass $(DESTDIR)$(bindir)/ssh-askpass.old -- -mv -f $(DESTDIR)$(bindir)/ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen.old -- -mv -f $(DESTDIR)$(bindir)/scp $(DESTDIR)$(bindir)/scp.old -- -mv -f $(DESTDIR)$(bindir)/sftp $(DESTDIR)$(bindir)/sftp.old -- -mv -f $(DESTDIR)$(bindir)/sftp-server $(DESTDIR)$(bindir)/sftp-server.old -- -mv -f $(DESTDIR)$(bindir)/ssh-signer $(DESTDIR)$(bindir)/ssh-signer.old -- -mv -f $(DESTDIR)$(bindir)/ssh-probe $(DESTDIR)$(bindir)/ssh-probe.old -- - (cd $(DESTDIR)$(bindir) && $(LN_S) ssh2 ssh) - (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-agent2 ssh-agent) - (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-add2 ssh-add) -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass) -+ case x"@CONFPROGRAMS@" in \ -+ x*askpass*) \ -+ (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass) ;; \ -+ esac - (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-keygen2 ssh-keygen) - (cd $(DESTDIR)$(bindir) && $(LN_S) scp2 scp) - (cd $(DESTDIR)$(bindir) && $(LN_S) sftp2 sftp) - (cd $(DESTDIR)$(bindir) && $(LN_S) sftp-server2 sftp-server) - (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-signer2 ssh-signer) - (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-probe2 ssh-probe) -- -mv -f $(DESTDIR)$(sbindir)/sshd $(DESTDIR)$(sbindir)/sshd.old - (cd $(DESTDIR)$(sbindir) && $(LN_S) sshd2 sshd) -- -mv -f $(DESTDIR)$(mandir)/man1/ssh.1 $(DESTDIR)$(mandir)/man1/ssh.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-add.1 $(DESTDIR)$(mandir)/man1/ssh-add.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-agent.1 $(DESTDIR)$(mandir)/man1/ssh-agent.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-keygen.1 $(DESTDIR)$(mandir)/man1/ssh-keygen.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/scp.1 $(DESTDIR)$(mandir)/man1/scp.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/sftp.1 $(DESTDIR)$(mandir)/man1/sftp.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-probe.1 $(DESTDIR)$(mandir)/man1/ssh-probe.old.1 - (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh2.1 ssh.1) - (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-add2.1 ssh-add.1) - (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-agent2.1 ssh-agent.1) -@@ -623,7 +608,6 @@ install-symlinks: - (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) scp2.1 scp.1) - (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) sftp2.1 sftp.1) - (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-probe2.1 ssh-probe.1) -- -mv -f $(DESTDIR)$(mandir)/man8/sshd.8 $(DESTDIR)$(mandir)/man8/sshd.old.8 - (cd $(DESTDIR)$(mandir)/man8 && $(LN_S) sshd2.8 sshd.8) - - clean-up-old: -@@ -642,23 +626,13 @@ install-exec-hook: - -chown root $(DESTDIR)$(bindir)/ssh-signer2 - -chmod $(SSH_SIGNER_INSTALL_MODE) $(DESTDIR)$(bindir)/ssh-signer2 - --install-data-hook: make-install-dirs generate-host-key install-symlinks -- -@if test '!' -f $(DESTDIR)$(etcdir)/sshd2_config ; then \ -- echo Installing $(DESTDIR)$(etcdir)/sshd2_config ; \ -+install-data-hook: make-install-dirs install-symlinks -+ echo Installing $(DESTDIR)$(egdir)/sshd2_config ; \ - $(INSTALL_DATA) $(srcdir)/sshd2_config \ -- $(DESTDIR)$(etcdir)/sshd2_config ; \ -- fi -- echo Updating $(DESTDIR)$(etcdir)/sshd2_config.example ; -- $(INSTALL_DATA) $(srcdir)/sshd2_config \ -- $(DESTDIR)$(etcdir)/sshd2_config.example ; -- -@if test '!' -f $(DESTDIR)$(etcdir)/ssh2_config ; then \ -- echo Installing $(DESTDIR)$(etcdir)/ssh2_config ; \ -- $(INSTALL_DATA) $(srcdir)/ssh2_config \ -- $(DESTDIR)$(etcdir)/ssh2_config ; \ -- fi -- echo Updating $(DESTDIR)$(etcdir)/ssh2_config.example ; -+ $(DESTDIR)$(egdir)/sshd2_config ; -+ echo Installing $(DESTDIR)$(egdir)/ssh2_config ; \ - $(INSTALL_DATA) $(srcdir)/ssh2_config \ -- $(DESTDIR)$(etcdir)/ssh2_config.example ; -+ $(DESTDIR)$(egdir)/ssh2_config ; - echo Updating $(DESTDIR)$(subconfig_dir)/host_ext.example ; - $(INSTALL_DATA) $(srcdir)/subconfig/host_ext.example \ - $(DESTDIR)$(subconfig_dir)/host_ext.example ; -@@ -671,8 +645,6 @@ install-data-hook: make-install-dirs gen - echo Updating $(DESTDIR)$(subconfig_dir)/user.example ; - $(INSTALL_DATA) $(srcdir)/subconfig/user.example \ - $(DESTDIR)$(subconfig_dir)/user.example ; -- -@if test '!' -f $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; then \ -- echo Installing $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \ -+ echo Installing $(DESTDIR)$(egdir)/ssh_dummy_shell.out ; \ - $(INSTALL_DATA) $(srcdir)/ssh_dummy_shell.out \ -- $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \ -- fi -+ $(DESTDIR)$(egdir)/ssh_dummy_shell.out ; diff --git a/security/ssh2/patches/patch-ac b/security/ssh2/patches/patch-ac deleted file mode 100644 index 297df25e347..00000000000 --- a/security/ssh2/patches/patch-ac +++ /dev/null @@ -1,156 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2004/07/25 12:29:19 grant Exp $ - ---- apps/ssh/Makefile.in.orig 2003-12-04 00:17:48.000000000 +1100 -+++ apps/ssh/Makefile.in -@@ -127,7 +127,8 @@ WINCONF_OPTIONS = maintainer=sjl@ssh.com - etcdir = @ETCDIR@ - known_hosts_dir = $(etcdir)/knownhosts - host_keys_dir = $(etcdir)/hostkeys --subconfig_dir = $(etcdir)/subconfig -+egdir = $(prefix)/share/examples/${PKGBASE} -+subconfig_dir = $(egdir)/subconfig - STATIC_FLAG = @STATIC_FLAG@ - - # -@@ -459,6 +460,8 @@ SSH_DEFS = -DETCDIR=\"$(etcdir)\" -DSSH_ - COMPILE = $(CC) $(KERBEROS_INCS) $(INCLUDES) $(SSH_DEFS) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) - # - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -+# -+INSTALL_DATA_DIR = $(BSD_INSTALL_DATA_DIR) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../sshconf.h - CONFIG_CLEAN_FILES = -@@ -874,7 +877,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) -+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - - mostlyclean-tags: - -@@ -1005,10 +1008,8 @@ maintainer-clean-generic clean mostlycle - includes: - - make-install-dirs: -- -if test '!' -d $(DESTDIR)$(etcdir); then mkdir -p $(DESTDIR)$(etcdir); fi -- -if test '!' -d $(DESTDIR)$(known_hosts_dir); then mkdir -p $(DESTDIR)$(known_hosts_dir); fi -- -if test '!' -d $(DESTDIR)$(host_keys_dir); then mkdir -p $(DESTDIR)$(host_keys_dir); fi -- -if test '!' -d $(DESTDIR)$(subconfig_dir); then mkdir -p $(DESTDIR)$(subconfig_dir); fi -+ $(INSTALL_DATA_DIR) $(DESTDIR)$(egdir) -+ $(INSTALL_DATA_DIR) $(DESTDIR)$(subconfig_dir) - - generate-host-key: - -@if test -f $(DESTDIR)$(etcdir)/hostkey; \ -@@ -1019,45 +1020,28 @@ generate-host-key: - fi - - install-symlinks: -- -mv -f $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/ssh.old -- -mv -f $(DESTDIR)$(bindir)/ssh-agent $(DESTDIR)$(bindir)/ssh-agent.old -- -mv -f $(DESTDIR)$(bindir)/ssh-add $(DESTDIR)$(bindir)/ssh-add.old -- -mv -f $(DESTDIR)$(bindir)/ssh-askpass $(DESTDIR)$(bindir)/ssh-askpass.old -- -mv -f $(DESTDIR)$(bindir)/ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen.old -- -mv -f $(DESTDIR)$(bindir)/scp $(DESTDIR)$(bindir)/scp.old -- -mv -f $(DESTDIR)$(bindir)/sftp $(DESTDIR)$(bindir)/sftp.old -- -mv -f $(DESTDIR)$(bindir)/sftp-server $(DESTDIR)$(bindir)/sftp-server.old -- -mv -f $(DESTDIR)$(bindir)/ssh-signer $(DESTDIR)$(bindir)/ssh-signer.old -- -mv -f $(DESTDIR)$(bindir)/ssh-probe $(DESTDIR)$(bindir)/ssh-probe.old -- -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh2 ssh) -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-agent2 ssh-agent) -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-add2 ssh-add) -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass) -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-keygen2 ssh-keygen) -- (cd $(DESTDIR)$(bindir) && $(LN_S) scp2 scp) -- (cd $(DESTDIR)$(bindir) && $(LN_S) sftp2 sftp) -- (cd $(DESTDIR)$(bindir) && $(LN_S) sftp-server2 sftp-server) -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-signer2 ssh-signer) -- (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-probe2 ssh-probe) -- -mv -f $(DESTDIR)$(sbindir)/sshd $(DESTDIR)$(sbindir)/sshd.old -- (cd $(DESTDIR)$(sbindir) && $(LN_S) sshd2 sshd) -- -mv -f $(DESTDIR)$(mandir)/man1/ssh.1 $(DESTDIR)$(mandir)/man1/ssh.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-add.1 $(DESTDIR)$(mandir)/man1/ssh-add.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-agent.1 $(DESTDIR)$(mandir)/man1/ssh-agent.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-keygen.1 $(DESTDIR)$(mandir)/man1/ssh-keygen.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/scp.1 $(DESTDIR)$(mandir)/man1/scp.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/sftp.1 $(DESTDIR)$(mandir)/man1/sftp.old.1 -- -mv -f $(DESTDIR)$(mandir)/man1/ssh-probe.1 $(DESTDIR)$(mandir)/man1/ssh-probe.old.1 -- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh2.1 ssh.1) -- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-add2.1 ssh-add.1) -- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-agent2.1 ssh-agent.1) -- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-keygen2.1 ssh-keygen.1) -- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) scp2.1 scp.1) -- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) sftp2.1 sftp.1) -- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-probe2.1 ssh-probe.1) -- -mv -f $(DESTDIR)$(mandir)/man8/sshd.8 $(DESTDIR)$(mandir)/man8/sshd.old.8 -- (cd $(DESTDIR)$(mandir)/man8 && $(LN_S) sshd2.8 sshd.8) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f ssh && $(LN_S) ssh2 ssh) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f ssh-agent && $(LN_S) ssh-agent2 ssh-agent) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f ssh-add && $(LN_S) ssh-add2 ssh-add) -+ case x"@CONFPROGRAMS@" in \ -+ x*askpass*) \ -+ (cd $(DESTDIR)$(bindir) && $(RM) -f ssh-askpass && $(LN_S) ssh-askpass2 ssh-askpass) ;; \ -+ esac -+ (cd $(DESTDIR)$(bindir) && $(RM) -f ssh-keygen && $(LN_S) ssh-keygen2 ssh-keygen) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f scp && $(LN_S) scp2 scp) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f sftp && $(LN_S) sftp2 sftp) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f sftp-server && $(LN_S) sftp-server2 sftp-server) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f ssh-signer && $(LN_S) ssh-signer2 ssh-signer) -+ (cd $(DESTDIR)$(bindir) && $(RM) -f ssh-probe && $(LN_S) ssh-probe2 ssh-probe) -+ (cd $(DESTDIR)$(sbindir) && $(RM) -f sshd && $(LN_S) sshd2 sshd) -+ (cd $(DESTDIR)$(mandir)/man1 && $(RM) -f ssh.1 && $(LN_S) ssh2.1 ssh.1) -+ (cd $(DESTDIR)$(mandir)/man1 && $(RM) -f ssh-add.1 && $(LN_S) ssh-add2.1 ssh-add.1) -+ (cd $(DESTDIR)$(mandir)/man1 && $(RM) -f ssh-agent.1 && $(LN_S) ssh-agent2.1 ssh-agent.1) -+ (cd $(DESTDIR)$(mandir)/man1 && $(RM) -f ssh-keygen.1 && $(LN_S) ssh-keygen2.1 ssh-keygen.1) -+ (cd $(DESTDIR)$(mandir)/man1 && $(RM) -f scp.1 && $(LN_S) scp2.1 scp.1) -+ (cd $(DESTDIR)$(mandir)/man1 && $(RM) -f sftp.1 && $(LN_S) sftp2.1 sftp.1) -+ (cd $(DESTDIR)$(mandir)/man1 && $(RM) -f sshprobe.1 && $(LN_S) ssh-probe2.1 ssh-probe.1) -+ (cd $(DESTDIR)$(mandir)/man8 && $(RM) -f sshd.8 && $(LN_S) sshd2.8 sshd.8) - - clean-up-old: - -rm -f $(DESTDIR)$(bindir)/ssh.old $(DESTDIR)$(bindir)/ssh-agent.old \ -@@ -1075,23 +1059,13 @@ install-exec-hook: - -chown root $(DESTDIR)$(bindir)/ssh-signer2 - -chmod $(SSH_SIGNER_INSTALL_MODE) $(DESTDIR)$(bindir)/ssh-signer2 - --install-data-hook: make-install-dirs generate-host-key install-symlinks -- -@if test '!' -f $(DESTDIR)$(etcdir)/sshd2_config ; then \ -- echo Installing $(DESTDIR)$(etcdir)/sshd2_config ; \ -- $(INSTALL_DATA) $(srcdir)/sshd2_config \ -- $(DESTDIR)$(etcdir)/sshd2_config ; \ -- fi -- echo Updating $(DESTDIR)$(etcdir)/sshd2_config.example ; -+install-data-hook: make-install-dirs install-symlinks -+ echo Installing $(DESTDIR)$(egdir)/sshd2_config ; \ - $(INSTALL_DATA) $(srcdir)/sshd2_config \ -- $(DESTDIR)$(etcdir)/sshd2_config.example ; -- -@if test '!' -f $(DESTDIR)$(etcdir)/ssh2_config ; then \ -- echo Installing $(DESTDIR)$(etcdir)/ssh2_config ; \ -- $(INSTALL_DATA) $(srcdir)/ssh2_config \ -- $(DESTDIR)$(etcdir)/ssh2_config ; \ -- fi -- echo Updating $(DESTDIR)$(etcdir)/ssh2_config.example ; -+ $(DESTDIR)$(egdir)/sshd2_config ; -+ echo Installing $(DESTDIR)$(egdir)/ssh2_config ; \ - $(INSTALL_DATA) $(srcdir)/ssh2_config \ -- $(DESTDIR)$(etcdir)/ssh2_config.example ; -+ $(DESTDIR)$(egdir)/ssh2_config ; - echo Updating $(DESTDIR)$(subconfig_dir)/host_ext.example ; - $(INSTALL_DATA) $(srcdir)/subconfig/host_ext.example \ - $(DESTDIR)$(subconfig_dir)/host_ext.example ; -@@ -1104,11 +1078,9 @@ install-data-hook: make-install-dirs gen - echo Updating $(DESTDIR)$(subconfig_dir)/user.example ; - $(INSTALL_DATA) $(srcdir)/subconfig/user.example \ - $(DESTDIR)$(subconfig_dir)/user.example ; -- -@if test '!' -f $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; then \ -- echo Installing $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \ -+ echo Installing $(DESTDIR)$(egdir)/ssh_dummy_shell.out ; \ - $(INSTALL_DATA) $(srcdir)/ssh_dummy_shell.out \ -- $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \ -- fi -+ $(DESTDIR)$(egdir)/ssh_dummy_shell.out ; - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/security/ssh2/patches/patch-ad b/security/ssh2/patches/patch-ad deleted file mode 100644 index ed8cf533651..00000000000 --- a/security/ssh2/patches/patch-ad +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2003/08/12 19:08:57 seb Exp $ - ---- configure.in.orig 2003-06-30 12:22:25.000000000 +0000 -+++ configure.in -@@ -1558,9 +1558,7 @@ dnl - *-*-netbsd*) - # no_shadows_password_checking=yes ? - # ^ (see above comment) -- -- # At least NetBSD 1.6 has a nonfunctional utmpx. -- no_utmpx=yes -+ AC_DEFINE(SSH_UTMP_UTMPX) - ;; - *) - ;; -@@ -1791,6 +1789,8 @@ if test -z "$no_libbsd"; then - fi - AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) - LIBS="$LIBS -lutil") -+AC_CHECK_LIB(util, loginx, AC_DEFINE(HAVE_LIBUTIL_LOGINX) -+ LIBS="$LIBS -lutil") - - if test -z "$no_vhangup"; then - AC_CHECK_FUNCS(vhangup) -@@ -1942,6 +1942,22 @@ if test "$ac_cv_have_proto_logout" = "ye - fi - AC_MSG_RESULT($ac_cv_have_proto_logout) - -+AC_MSG_CHECKING([whether there is a prototype for logoutx]) -+AC_CACHE_VAL(ac_cv_have_proto_logoutx, -+ [ AC_TRY_COMPILE(changequote(<<, >>)dnl -+ << $session_wtmp_includes -+/* If someone has a prototype like this for anything, then... well. */ -+void * logoutx(void *, int *, char *, int, char, void *[6][8][10][3][4], ...); -+>>, -+ changequote([, ])dnl -+ [ ; ], -+ ac_cv_have_proto_logoutx=no, -+ ac_cv_have_proto_logoutx=yes)]) -+if test "$ac_cv_have_proto_logoutx" = "yes"; then -+ AC_DEFINE(HAVE_PROTO_LOGOUTX) -+fi -+AC_MSG_RESULT($ac_cv_have_proto_logoutx) -+ - AC_MSG_CHECKING([whether there is a prototype for logwtmp]) - AC_CACHE_VAL(ac_cv_have_proto_logwtmp, - [ AC_TRY_COMPILE(changequote(<<, >>)dnl -@@ -1958,6 +1974,22 @@ if test "$ac_cv_have_proto_logwtmp" = "y - fi - AC_MSG_RESULT($ac_cv_have_proto_logwtmp) - -+AC_MSG_CHECKING([whether there is a prototype for logwtmpx]) -+AC_CACHE_VAL(ac_cv_have_proto_logwtmpx, -+ [ AC_TRY_COMPILE(changequote(<<, >>)dnl -+ << $session_wtmp_includes -+/* If someone has a prototype like this for anything, then... well. */ -+void * logwtmpx(void *, int *, char *, int, char, void *[6][8][10][3][4], ...); -+>>, -+ changequote([, ])dnl -+ [ ; ], -+ ac_cv_have_proto_logwtmpx=no, -+ ac_cv_have_proto_logwtmpx=yes)]) -+if test "$ac_cv_have_proto_logwtmpx" = "yes"; then -+ AC_DEFINE(HAVE_PROTO_LOGWTMPX) -+fi -+AC_MSG_RESULT($ac_cv_have_proto_logwtmpx) -+ - AC_CHECK_FUNCS(initgroups) - - if test "X$ac_cv_func_initgroups" = "Xyes"; then diff --git a/security/ssh2/patches/patch-ae b/security/ssh2/patches/patch-ae deleted file mode 100644 index f58a9c770be..00000000000 --- a/security/ssh2/patches/patch-ae +++ /dev/null @@ -1,157 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2003/08/12 19:08:57 seb Exp $ - ---- configure.orig 2003-06-30 12:22:32.000000000 +0000 -+++ configure -@@ -6631,9 +6631,10 @@ EOF - *-*-netbsd*) - # no_shadows_password_checking=yes ? - # ^ (see above comment) -+ cat >> confdefs.h <<\EOF -+#define SSH_UTMP_UTMPX 1 -+EOF - -- # At least NetBSD 1.6 has a nonfunctional utmpx. -- no_utmpx=yes - ;; - *) - ;; -@@ -8339,6 +8340,50 @@ else - echo "$ac_t""no" 1>&6 - fi - -+echo $ac_n "checking for loginx in -lutil""... $ac_c" 1>&6 -+echo "configure:8345: checking for loginx in -lutil" >&5 -+ac_lib_var=`echo util'_'loginx | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lutil $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 8353 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char loginx(); -+ -+int main() { -+loginx() -+; return 0; } -+EOF -+if { (eval echo configure:8364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBUTIL_LOGINX 1 -+EOF -+ -+ LIBS="$LIBS -lutil" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ - - if test -z "$no_vhangup"; then - for ac_func in vhangup -@@ -8678,8 +8723,44 @@ EOF - fi - echo "$ac_t""$ac_cv_have_proto_logout" 1>&6 - -+echo $ac_n "checking whether there is a prototype for logoutx""... $ac_c" 1>&6 -+echo "configure:8728: checking whether there is a prototype for logoutx" >&5 -+if eval "test \"`echo '$''{'ac_cv_have_proto_logoutx'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 8733 "configure" -+#include "confdefs.h" -+ $session_wtmp_includes -+/* If someone has a prototype like this for anything, then... well. */ -+void * logoutx(void *, int *, char *, int, char, void *[6][8][10][3][4], ...); -+ -+int main() { -+ ; -+; return 0; } -+EOF -+if { (eval echo configure:8743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_have_proto_logoutx=no -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_have_proto_logoutx=yes -+fi -+rm -f conftest* -+fi -+ -+if test "$ac_cv_have_proto_logoutx" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_PROTO_LOGOUTX 1 -+EOF -+ -+fi -+echo "$ac_t""$ac_cv_have_proto_logoutx" 1>&6 -+ - echo $ac_n "checking whether there is a prototype for logwtmp""... $ac_c" 1>&6 --echo "configure:8683: checking whether there is a prototype for logwtmp" >&5 -+echo "configure:8764: checking whether there is a prototype for logwtmp" >&5 - if eval "test \"`echo '$''{'ac_cv_have_proto_logwtmp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8714,6 +8795,42 @@ EOF - fi - echo "$ac_t""$ac_cv_have_proto_logwtmp" 1>&6 - -+echo $ac_n "checking whether there is a prototype for logwtmpx""... $ac_c" 1>&6 -+echo "configure:8800: checking whether there is a prototype for logwtmpx" >&5 -+if eval "test \"`echo '$''{'ac_cv_have_proto_logwtmpx'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 8805 "configure" -+#include "confdefs.h" -+ $session_wtmp_includes -+/* If someone has a prototype like this for anything, then... well. */ -+void * logwtmpx(void *, int *, char *, int, char, void *[6][8][10][3][4], ...); -+ -+int main() { -+ ; -+; return 0; } -+EOF -+if { (eval echo configure:8815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_have_proto_logwtmpx=no -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_have_proto_logwtmpx=yes -+fi -+rm -f conftest* -+fi -+ -+if test "$ac_cv_have_proto_logwtmpx" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_PROTO_LOGWTMPX 1 -+EOF -+ -+fi -+echo "$ac_t""$ac_cv_have_proto_logwtmpx" 1>&6 -+ - for ac_func in initgroups - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 diff --git a/security/ssh2/patches/patch-af b/security/ssh2/patches/patch-af deleted file mode 100644 index f263ae111b8..00000000000 --- a/security/ssh2/patches/patch-af +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-af,v 1.4 2003/08/12 19:08:58 seb Exp $ - ---- lib/sshsession/wtmp.c.orig 2003-06-30 12:22:13.000000000 +0000 -+++ lib/sshsession/wtmp.c -@@ -34,6 +34,13 @@ In particular, this updates: - # include <sys/mkdev.h> /* for minor() */ - # endif /* HAVE_SYS_MKDEV_H */ - # endif /* !SCO */ -+# if !defined(WTMPX_FILE) -+# if defined(_WTMPX_FILE) /* Solaris without _XPG4_2 or with __EXTENSIONS__ */ -+# define WTMPX_FILE _WTMPX_FILE -+# elif defined(_PATH_WTMPX) /* NetBSD at least */ -+# define WTMPX_FILE _PATH_WTMPX -+# endif -+# endif - #endif /* HAVE_UTMPX_H */ - #ifdef HAVE_USERSEC_H - # include <usersec.h> -@@ -62,9 +69,15 @@ void login(const struct utmp *); - #ifndef HAVE_PROTO_LOGOUT - int logout(const char *); - #endif /* !HAVE_PROTO_LOGOUT */ -+#ifndef HAVE_PROTO_LOGOUTX -+int logoutx(const char *, int, int); -+#endif /* !HAVE_PROTO_LOGOUTX */ - #ifndef HAVE_PROTO_LOGWTMP - void logwtmp(const char *, const char *, const char *); - #endif /* !HAVE_PROTO_LOGWTMP */ -+#ifndef HAVE_PROTO_LOGWTMPX -+void logwtmpx(const char *, const char *, const char *, int, int); -+#endif /* !HAVE_PROTO_LOGWTMPX */ - - /* Returns the time when the user last logged in, and name of the host - from which the user logged in from. Returns 0 if the information -@@ -217,7 +230,7 @@ void ssh_user_record_login(SshUser user, - # endif /* LASTLOG_IS_DIR */ - #endif /* HAVE_LASTLOG_H || HAVE_LASTLOG */ - --#if defined(HAVE_UTMP_H) && !defined(HAVE_UTMPX_H) -+#if defined(HAVE_UTMP_H) && (!defined(HAVE_UTMPX_H) || defined(SSH_UTMP_UTMPX)) - struct utmp u; - const char *utmp, *wtmp; - -@@ -587,6 +600,10 @@ void ssh_user_record_logout(pid_t pid, c - const char *line = ttyname + 5; /* /dev/ttyq8 -> ttyq8 */ - if (logout((char *)line)) - logwtmp((char *)line, "", ""); -+# ifdef HAVE_LIBUTIL_LOGINX -+ if (logoutx((char *)line, 0, DEAD_PROCESS)) -+ logwtmpx((char *)line, "", "", 0, DEAD_PROCESS); -+# endif - #else /* HAVE_LIBUTIL_LOGIN */ - ssh_user_record_login(NULL, pid, ttyname, "", ""); - #endif /* HAVE_LIBUTIL_LOGIN */ diff --git a/security/ssh2/patches/patch-ag b/security/ssh2/patches/patch-ag deleted file mode 100644 index 53c31bae90f..00000000000 --- a/security/ssh2/patches/patch-ag +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2003/08/12 19:08:58 seb Exp $ - ---- sshconf.h.in.orig 2003-06-30 12:22:30.000000000 +0000 -+++ sshconf.h.in -@@ -1,4 +1,4 @@ --/* sshconf.h.in. Generated automatically from configure.in by autoheader 2.13. */ -+/* sshconf.h.in. Generated automatically from configure.in by autoheader. */ - #ifndef SSHCONF_H - #define SSHCONF_H - -@@ -256,6 +256,10 @@ library. */ - and logwtmp() calls. */ - #undef HAVE_LIBUTIL_LOGIN - -+/* Define this if libutil.a contains loginx(), logoutx(), -+ and logwtmpx() calls. */ -+#undef HAVE_LIBUTIL_LOGINX -+ - /* Location of system mail spool directory. */ - #undef MAIL_SPOOL_DIRECTORY - -@@ -271,9 +275,15 @@ library. */ - /* Define this if a prototype for logout() is defined in system headers. */ - #undef HAVE_PROTO_LOGOUT - -+/* Define this if a prototype for logoutx() is defined in system headers. */ -+#undef HAVE_PROTO_LOGOUTX -+ - /* Define this if a prototype for logwtmp() is defined in system headers. */ - #undef HAVE_PROTO_LOGWTMP - -+/* Define this if a prototype for logwtmpx() is defined in system headers. */ -+#undef HAVE_PROTO_LOGWTMPX -+ - /* Define this if a prototype for initgroups() is defined in system headers. */ - #undef HAVE_PROTO_INITGROUPS - -@@ -407,6 +417,9 @@ library. */ - /* Define this to point to where sshd2 should store it's pidfile. */ - #undef SSHD_PIDDIR - -+/* Define if both utmp and utmpx entries should be handled */ -+#undef SSH_UTMP_UTMPX -+ - /* Enable the RSA code. */ - #undef WITH_RSA - diff --git a/security/ssh2/patches/patch-ah b/security/ssh2/patches/patch-ah deleted file mode 100644 index f3491201f37..00000000000 --- a/security/ssh2/patches/patch-ah +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2004/05/28 12:00:10 kivinen Exp $ - ---- lib/sshutil/sshsysutil/sshunixfdstream.c.orig 2003-12-03 15:17:31.000000000 +0200 -+++ lib/sshutil/sshsysutil/sshunixfdstream.c -@@ -337,16 +337,21 @@ int ssh_stream_fd_write(void *context, c - if (sdata->writefd >= 0) - { - len = write(sdata->writefd, buf, size); -- if (len >= 0) -+ if (len > 0) - return len; - -- if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) -+ if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR || -+ /* Special case for NetBSD 2.0, it may return len = 0 and errno = 0 -+ which simply means, try again */ -+ (len == 0 && errno == 0)) - { - /* Cannot write more at this time. */ - sdata->write_has_failed = TRUE; - ssh_stream_fd_request(sdata); - return -1; - } -+ else if (len == 0) -+ return 0; - - /* A real error occurred while writing. */ - sdata->write_has_failed = TRUE; diff --git a/security/ssh2/patches/patch-ai b/security/ssh2/patches/patch-ai deleted file mode 100644 index 6c49a0d4364..00000000000 --- a/security/ssh2/patches/patch-ai +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/authc-kbd-interactive.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/authc-kbd-interactive.c -@@ -103,7 +103,7 @@ SSH_FSM_STEP(ssh_kbd_process_packet) - - ssh_encode_buffer(gdata->response_packet, - SSH_FORMAT_CHAR, SSH_MSG_USERAUTH_INFO_RESPONSE, -- SSH_FORMAT_UINT32, gdata->num_prompts, -+ SSH_FORMAT_UINT32, (SshUInt32) gdata->num_prompts, - SSH_FORMAT_END); - - -@@ -345,7 +345,8 @@ void ssh_client_auth_kbd_interact(SshAut - /* language tag */ - SSH_FORMAT_UINT32_STR, lang_tag, strlen(lang_tag), - /* XXX devices, what do we support? */ -- SSH_FORMAT_UINT32_STR, "", 0L, -+ SSH_FORMAT_UINT32_STR, "", -+ (size_t) 0L, - SSH_FORMAT_END); - (*completion)(SSH_AUTH_CLIENT_SEND_AND_CONTINUE, - user, buffer, completion_context); diff --git a/security/ssh2/patches/patch-aj b/security/ssh2/patches/patch-aj deleted file mode 100644 index b4ae7f76dec..00000000000 --- a/security/ssh2/patches/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2005/08/24 09:13:24 kivinen Exp $ - ---- apps/ssh/lib/sshproto/sshconn.c.orig 2003-12-03 15:17:34.000000000 +0200 -+++ apps/ssh/lib/sshproto/sshconn.c -@@ -452,7 +452,8 @@ Boolean ssh_conn_send_channel_data_type( - (unsigned int) SSH_MSG_CHANNEL_DATA, - SSH_FORMAT_UINT32, (SshUInt32) - channel->remote_id, -- SSH_FORMAT_UINT32_STR, buf, len, -+ SSH_FORMAT_UINT32_STR, buf, -+ (size_t) len, - SSH_FORMAT_END); - } - else -@@ -465,7 +466,8 @@ Boolean ssh_conn_send_channel_data_type( - SSH_FORMAT_UINT32, (SshUInt32) - channel->remote_id, - SSH_FORMAT_UINT32, (SshUInt32) i, -- SSH_FORMAT_UINT32_STR, buf, len, -+ SSH_FORMAT_UINT32_STR, buf, -+ (size_t) len, - SSH_FORMAT_END); - } - diff --git a/security/ssh2/patches/patch-ak b/security/ssh2/patches/patch-ak deleted file mode 100644 index e5ee668bae2..00000000000 --- a/security/ssh2/patches/patch-ak +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2005/08/24 09:13:24 kivinen Exp $ - ---- apps/ssh/lib/sshproto/trcommon.c.orig 2003-12-03 15:17:33.000000000 +0200 -+++ apps/ssh/lib/sshproto/trcommon.c -@@ -555,7 +555,7 @@ void ssh_tr_send_packet(SshTransportComm - SSH_DEBUG(5, ("Outgoing empty, sending empty ignore packet.")); - ret = ssh_encode_buffer(&new_packet, - SSH_FORMAT_CHAR, (unsigned int) SSH_MSG_IGNORE, -- SSH_FORMAT_UINT32, 0L, -+ SSH_FORMAT_UINT32, (SshUInt32) 0L, - SSH_FORMAT_END); - SSH_VERIFY(ret > 0); - ssh_tr_encode_packet(tr, ssh_buffer_ptr(&new_packet), -@@ -3171,7 +3171,7 @@ void ssh_tr_process_up_incoming_packet(S - - ssh_encode_buffer(new_packet, - SSH_FORMAT_CHAR, (unsigned int) SSH_MSG_IGNORE, -- SSH_FORMAT_UINT32, ignore_len, -+ SSH_FORMAT_UINT32, (SshUInt32) ignore_len, - SSH_FORMAT_END); - - ssh_xbuffer_append_space(new_packet, &datap, ignore_len); diff --git a/security/ssh2/patches/patch-al b/security/ssh2/patches/patch-al deleted file mode 100644 index 002bf10a3d8..00000000000 --- a/security/ssh2/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2005/08/24 09:13:24 kivinen Exp $ - ---- apps/ssh/ssh-agent2.c.orig 2003-12-03 15:17:27.000000000 +0200 -+++ apps/ssh/ssh-agent2.c -@@ -1802,7 +1802,7 @@ void ssh_agenti_ssh1_encode_mp(SshBuffer - num_buf = ssh_xmalloc(num_buf_len); - ssh_mp_get_buf(num_buf, num_buf_len, n); - ssh_encode_buffer(buffer, -- SSH_FORMAT_DATA, len_buf, 2, -+ SSH_FORMAT_DATA, len_buf, (size_t) 2, - SSH_FORMAT_DATA, num_buf, num_buf_len, - SSH_FORMAT_END); - ssh_xfree(num_buf); diff --git a/security/ssh2/patches/patch-am b/security/ssh2/patches/patch-am deleted file mode 100644 index 404076dfa52..00000000000 --- a/security/ssh2/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2005/08/24 09:13:24 kivinen Exp $ - ---- apps/ssh/ssh-signer2.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/ssh-signer2.c -@@ -264,7 +264,7 @@ SSH_FSM_STEP(signer_send_error) - (unsigned int) gdata->error_code_to_ssh2, - SSH_FORMAT_UINT32_STR, gdata->error_message_to_ssh2, - strlen(gdata->error_message_to_ssh2), -- SSH_FORMAT_UINT32_STR, "en", 2, -+ SSH_FORMAT_UINT32_STR, "en", (size_t) 2, - SSH_FORMAT_END); - - ssh_packet_wrapper_can_receive(gdata->wrapper, FALSE); diff --git a/security/ssh2/patches/patch-an b/security/ssh2/patches/patch-an deleted file mode 100644 index 35e9ef845c2..00000000000 --- a/security/ssh2/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2005/08/24 09:13:24 kivinen Exp $ - ---- apps/ssh/ssh1proto.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/ssh1proto.c -@@ -3918,7 +3918,7 @@ void ssh1_handle_packet_smsg_auth_rsa_ch - SSH_FORMAT_UINT32_STR, - challenge_buf, challenge_len, - SSH_FORMAT_UINT32_STR, -- ssh1->session_id, 16, -+ ssh1->session_id, (size_t) 16, - SSH_FORMAT_END); - ssh_xfree(challenge_buf); - ssh1->mode = SSH1_AGENT_OPERATION_IN_PROGRESS; diff --git a/security/ssh2/patches/patch-ao b/security/ssh2/patches/patch-ao deleted file mode 100644 index cf5c2729401..00000000000 --- a/security/ssh2/patches/patch-ao +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2005/08/24 09:13:24 kivinen Exp $ - ---- apps/ssh/sshchsession.c.orig 2003-12-03 15:17:23.000000000 +0200 -+++ apps/ssh/sshchsession.c -@@ -2315,9 +2315,9 @@ void ssh_channel_session_eof_callback(vo - { - ssh_encode_buffer(&buffer, - SSH_FORMAT_UINT32, (SshUInt32) -exit_status, -- SSH_FORMAT_BOOLEAN, FALSE, -- SSH_FORMAT_UINT32_STR, NULL, 0, -- SSH_FORMAT_UINT32_STR, NULL, 0, -+ SSH_FORMAT_BOOLEAN, (Boolean) FALSE, -+ SSH_FORMAT_UINT32_STR, NULL, (size_t) 0, -+ SSH_FORMAT_UINT32_STR, NULL, (size_t) 0, - SSH_FORMAT_END); - - diff --git a/security/ssh2/patches/patch-ap b/security/ssh2/patches/patch-ap deleted file mode 100644 index 7d8de244a5d..00000000000 --- a/security/ssh2/patches/patch-ap +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2005/08/24 09:13:24 kivinen Exp $ - ---- apps/ssh/sshpamserver.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/sshpamserver.c -@@ -306,7 +306,8 @@ int send_packet(int fd, SshPacketType pa - - buffer = ssh_xbuffer_allocate(); - ssh_encode_buffer(buffer, -- SSH_FORMAT_UINT32, ssh_buffer_len(packet) + 1, -+ SSH_FORMAT_UINT32, -+ (SshUInt32) (ssh_buffer_len(packet) + 1), - SSH_FORMAT_CHAR, (unsigned int)packet_type, - SSH_FORMAT_DATA, ssh_buffer_ptr(packet), - ssh_buffer_len(packet), diff --git a/security/ssh2/patches/patch-aq b/security/ssh2/patches/patch-aq deleted file mode 100644 index 69d4a5d4f8f..00000000000 --- a/security/ssh2/patches/patch-aq +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/agentclient.c.orig 2003-12-03 15:17:24.000000000 +0200 -+++ apps/ssh/agentclient.c -@@ -831,7 +831,8 @@ void ssh_agent_lock(SshAgent agent, cons - ssh_packet_wrapper_send_encode(agent->wrapper, - SSH_AGENT_LOCK, - SSH_FORMAT_UINT32_STR, -- password, (password ? strlen(password) : 0), -+ password, (size_t) -+ (password ? strlen(password) : 0), - SSH_FORMAT_END); - } - -@@ -858,7 +859,8 @@ void ssh_agent_unlock(SshAgent agent, co - ssh_packet_wrapper_send_encode(agent->wrapper, - SSH_AGENT_UNLOCK, - SSH_FORMAT_UINT32_STR, -- password, (password ? strlen(password) : 0), -+ password, (size_t) -+ (password ? strlen(password) : 0), - SSH_FORMAT_END); - } - diff --git a/security/ssh2/patches/patch-ar b/security/ssh2/patches/patch-ar deleted file mode 100644 index c70b8a1680b..00000000000 --- a/security/ssh2/patches/patch-ar +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/authc-kerberos-tgt.c.orig 2003-12-03 15:17:25.000000000 +0200 -+++ apps/ssh/authc-kerberos-tgt.c -@@ -181,9 +181,11 @@ void ssh_client_auth_kerberos_tgt(SshAut - b = ssh_xbuffer_allocate(); - ssh_encode_buffer(b, - SSH_FORMAT_UINT32_STR, -- auth_data.data, auth_data.length, -+ auth_data.data, -+ (size_t) auth_data.length, - SSH_FORMAT_UINT32_STR, -- tgt_data.data, tgt_data.length, -+ tgt_data.data, -+ (size_t) tgt_data.length, - SSH_FORMAT_END); - - /* Send the authentication request (and complete this operation). */ diff --git a/security/ssh2/patches/patch-as b/security/ssh2/patches/patch-as deleted file mode 100644 index ded58eb29f9..00000000000 --- a/security/ssh2/patches/patch-as +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-as,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/authc-kerberos.c.orig 2003-12-03 15:17:25.000000000 +0200 -+++ apps/ssh/authc-kerberos.c -@@ -127,7 +127,8 @@ void ssh_client_auth_kerberos(SshAuthCli - b = ssh_xbuffer_allocate(); - ssh_encode_buffer(b, - SSH_FORMAT_UINT32_STR, -- auth_data.data, auth_data.length, -+ auth_data.data, -+ (size_t) auth_data.length, - SSH_FORMAT_END); - - /* Send the authentication request (and complete this operation). */ diff --git a/security/ssh2/patches/patch-at b/security/ssh2/patches/patch-at deleted file mode 100644 index ae0ac5bb0e5..00000000000 --- a/security/ssh2/patches/patch-at +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-at,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/authc-pam.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/authc-pam.c -@@ -81,8 +81,10 @@ SSH_FSM_STEP(ssh_pamc_process_packet) - SSH_TRACE(4, ("Received %d messages.", num_msgs)); - - ssh_encode_buffer(gdata->response_packet, -- SSH_FORMAT_BOOLEAN, TRUE, -- SSH_FORMAT_UINT32, gdata->num_msgs, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) TRUE, -+ SSH_FORMAT_UINT32, -+ (SshUInt32) gdata->num_msgs, - SSH_FORMAT_END); - - SSH_FSM_SET_NEXT(ssh_pamc_process_next_msg); -@@ -234,7 +236,8 @@ SSH_FSM_STEP(ssh_pamc_append_response) - gdata->response_retcode = SSH_PAM_DEFAULT_RESP_RETCODE; - - ssh_encode_buffer(gdata->response_packet, -- SSH_FORMAT_CHAR, gdata->response_retcode, -+ SSH_FORMAT_CHAR, -+ (unsigned int) gdata->response_retcode, - SSH_FORMAT_UINT32_STR, - gdata->response_len ? gdata->response : "", - gdata->response_len, -@@ -341,7 +344,8 @@ void ssh_client_auth_pam(SshAuthClientOp - SSH_TRACE(2, ("Starting pam auth...")); - buffer = ssh_xbuffer_allocate(); - ssh_encode_buffer(buffer, -- SSH_FORMAT_BOOLEAN, FALSE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) FALSE, - SSH_FORMAT_END); - (*completion)(SSH_AUTH_CLIENT_SEND_AND_CONTINUE, - user, buffer, completion_context); diff --git a/security/ssh2/patches/patch-au b/security/ssh2/patches/patch-au deleted file mode 100644 index 1bbfda42773..00000000000 --- a/security/ssh2/patches/patch-au +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-au,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/authc-passwd.c.orig 2003-12-03 15:17:24.000000000 +0200 -+++ apps/ssh/authc-passwd.c -@@ -136,7 +136,8 @@ void ssh_client_auth_passwd(SshAuthClien - - b = ssh_xbuffer_allocate(); - ret_val = ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, FALSE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) FALSE, - SSH_FORMAT_UINT32_STR, password, - strlen(password), - SSH_FORMAT_END); -@@ -229,7 +230,8 @@ void ssh_client_auth_passwd(SshAuthClien - b = ssh_xbuffer_allocate(); - - ret_val = ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) TRUE, - SSH_FORMAT_UINT32_STR, - old_password, strlen(old_password), - SSH_FORMAT_UINT32_STR, diff --git a/security/ssh2/patches/patch-av b/security/ssh2/patches/patch-av deleted file mode 100644 index 01403b8eb06..00000000000 --- a/security/ssh2/patches/patch-av +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-av,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/authc-pubkey.c.orig 2003-12-03 15:17:24.000000000 +0200 -+++ apps/ssh/authc-pubkey.c -@@ -208,7 +208,8 @@ SshBuffer ssh_client_auth_pubkey_try_key - if (!draft_incompatibility) - { - ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, FALSE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) FALSE, - SSH_FORMAT_UINT32_STR, c->pubkey_alg, - strlen((char *)c->pubkey_alg), - SSH_FORMAT_UINT32_STR, c->pubkeyblob, -@@ -219,7 +220,8 @@ SshBuffer ssh_client_auth_pubkey_try_key - { - /* Remote end has publickey draft incompatibility bug. */ - ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, FALSE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) FALSE, - /* Against the draft. Here should be string - 'publickey algorithm'*/ - SSH_FORMAT_UINT32_STR, c->pubkeyblob, -@@ -328,7 +330,8 @@ void ssh_client_auth_pubkey_sign_complet - ) - { - ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) TRUE, - SSH_FORMAT_UINT32_STR, c->pubkey_alg, - strlen((char *)c->pubkey_alg), - SSH_FORMAT_UINT32_STR, c->pubkeyblob, -@@ -341,7 +344,8 @@ void ssh_client_auth_pubkey_sign_complet - { - /* Remote end has publickey draft incompatibility bug. */ - ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) TRUE, - /* Against the draft. Here should be string - 'publickey algorithm'*/ - SSH_FORMAT_UINT32_STR, -@@ -702,7 +706,8 @@ Boolean ssh_client_auth_pubkey_send_sign - strlen(service), - SSH_FORMAT_UINT32_STR, SSH_AUTH_PUBKEY, - strlen(SSH_AUTH_PUBKEY), -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) TRUE, - SSH_FORMAT_UINT32_STR, c->pubkey_alg, - strlen(c->pubkey_alg), - SSH_FORMAT_UINT32_STR, c->pubkeyblob, -@@ -722,7 +727,7 @@ Boolean ssh_client_auth_pubkey_send_sign - strlen(service), - /* against the draft. Here should - be 'string "publickey"'*/ -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, (Boolean) TRUE, - /* against the draft. Here should - be 'string public key algorith - name'*/ diff --git a/security/ssh2/patches/patch-aw b/security/ssh2/patches/patch-aw deleted file mode 100644 index 545965a90db..00000000000 --- a/security/ssh2/patches/patch-aw +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/authc-securid.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/authc-securid.c -@@ -133,7 +133,7 @@ SSH_FSM_STEP(ssh_securid_send_pin) - - ssh_encode_buffer(gdata->response_packet, - SSH_FORMAT_BOOLEAN, -- TRUE, -+ (Boolean) TRUE, - SSH_FORMAT_UINT32_STR, - gdata->pin_info->final_pin, - strlen(gdata->pin_info->final_pin), -@@ -333,7 +333,7 @@ SSH_FSM_STEP(ssh_securid_challenge) - gdata->response_packet = ssh_xbuffer_allocate(); - ssh_encode_buffer(gdata->response_packet, - SSH_FORMAT_BOOLEAN, -- TRUE, -+ (Boolean) TRUE, - SSH_FORMAT_UINT32_STR, passphrase, strlen(passphrase), - SSH_FORMAT_END); - -@@ -451,7 +451,7 @@ void ssh_client_auth_securid(SshAuthClie - b = ssh_xbuffer_allocate(); - ssh_encode_buffer(b, - SSH_FORMAT_BOOLEAN, -- FALSE, -+ (Boolean) FALSE, - SSH_FORMAT_UINT32_STR, passcode, strlen(passcode), - SSH_FORMAT_END); - diff --git a/security/ssh2/patches/patch-ax b/security/ssh2/patches/patch-ax deleted file mode 100644 index 5660f5c082d..00000000000 --- a/security/ssh2/patches/patch-ax +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/auths-kbd-interactive.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/auths-kbd-interactive.c -@@ -203,7 +203,8 @@ SSH_FSM_STEP(ssh_server_kbd_int_create_r - lang_tag = "en"; - - ret = ssh_encode_buffer(state->packet, -- SSH_FORMAT_CHAR, SSH_MSG_USERAUTH_INFO_REQUEST, -+ SSH_FORMAT_CHAR, -+ (unsigned int) SSH_MSG_USERAUTH_INFO_REQUEST, - SSH_FORMAT_UINT32_STR, name, strlen(name), - SSH_FORMAT_UINT32_STR, state->instruction, - strlen(state->instruction), diff --git a/security/ssh2/patches/patch-ay b/security/ssh2/patches/patch-ay deleted file mode 100644 index 5acb44f6fcb..00000000000 --- a/security/ssh2/patches/patch-ay +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/auths-pam.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/auths-pam.c -@@ -255,7 +255,8 @@ void received_packet_cb(SshPacketType pa - - ssh_buffer_clear(gdata->client_packet); - ssh_encode_buffer(gdata->client_packet, -- SSH_FORMAT_CHAR, SSH_MSG_USERAUTH_PAM_MSG, -+ SSH_FORMAT_CHAR, -+ (unsigned int) SSH_MSG_USERAUTH_PAM_MSG, - SSH_FORMAT_DATA, data, len, - SSH_FORMAT_END); - (*gdata->completion_proc)(SSH_AUTH_SERVER_CONTINUE_WITH_PACKET_BACK, diff --git a/security/ssh2/patches/patch-az b/security/ssh2/patches/patch-az deleted file mode 100644 index 6641854e3c9..00000000000 --- a/security/ssh2/patches/patch-az +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-az,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/auths-pubkey.c.orig 2003-12-03 15:17:25.000000000 +0200 -+++ apps/ssh/auths-pubkey.c -@@ -1103,7 +1103,7 @@ Boolean ssh_server_auth_pubkey_verify(Ss - strlen(service), - SSH_FORMAT_UINT32_STR, SSH_AUTH_PUBKEY, - strlen(SSH_AUTH_PUBKEY), -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, (Boolean) TRUE, - SSH_FORMAT_UINT32_STR, certs_type, - strlen((char *)certs_type), - SSH_FORMAT_UINT32_STR, certs, tbloblen, -@@ -1122,7 +1122,7 @@ Boolean ssh_server_auth_pubkey_verify(Ss - strlen(service), - /* against the draft. Here should be 'string - "publickey"'*/ -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, (Boolean) TRUE, - /* against the draft. Here should be 'string - public key algorith name'*/ - SSH_FORMAT_UINT32_STR, certs, tbloblen, diff --git a/security/ssh2/patches/patch-ba b/security/ssh2/patches/patch-ba deleted file mode 100644 index 4e3573fe87c..00000000000 --- a/security/ssh2/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/auths-securid.c.orig 2003-12-03 15:17:26.000000000 +0200 -+++ apps/ssh/auths-securid.c -@@ -265,7 +265,7 @@ SSH_FSM_STEP(server_securid_get_next_cod - SSH_FORMAT_CHAR, - (unsigned int)SSH_MSG_USERAUTH_SECURID_CHALLENGE, - SSH_FORMAT_BOOLEAN, -- TRUE, -+ (Boolean) TRUE, - SSH_FORMAT_END); - - (*gdata->completion_proc)(SSH_AUTH_SERVER_CONTINUE_WITH_PACKET_BACK, diff --git a/security/ssh2/patches/patch-bb b/security/ssh2/patches/patch-bb deleted file mode 100644 index 96fce95fa58..00000000000 --- a/security/ssh2/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/lib/sshproto/sshauthc.c.orig 2003-12-03 15:17:34.000000000 +0200 -+++ apps/ssh/lib/sshproto/sshauthc.c -@@ -378,7 +378,7 @@ void ssh_authc_completion_proc(SshAuthCl - auth->methods[i].name), - SSH_FORMAT_DATA, - packet ? ssh_buffer_ptr(packet) : NULL, -- packet ? ssh_buffer_len(packet) : 0, -+ packet ? ssh_buffer_len(packet) : (size_t) 0, - SSH_FORMAT_END); - - /* Mark that we have one more request out waiting for reply. */ diff --git a/security/ssh2/patches/patch-bc b/security/ssh2/patches/patch-bc deleted file mode 100644 index 2b11257d04c..00000000000 --- a/security/ssh2/patches/patch-bc +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/lib/sshproto/tests/t-userauth.c.orig 2003-12-03 15:17:34.000000000 +0200 -+++ apps/ssh/lib/sshproto/tests/t-userauth.c -@@ -336,7 +336,7 @@ void simple_password_client(SshAuthClien - ssh_debug("simple_password_client: sending pongpong %ld", pd->count); - #endif - ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, (Boolean) TRUE, - SSH_FORMAT_UINT32, pd->count, - SSH_FORMAT_END); - if (pd->count < pingpong_count) -@@ -357,7 +357,7 @@ void simple_password_client(SshAuthClien - ssh_debug("simple_password_client: sending req"); - #endif - ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, FALSE, -+ SSH_FORMAT_BOOLEAN, (Boolean) FALSE, - SSH_FORMAT_UINT32_STR, pass, strlen(pass), - SSH_FORMAT_END); - (*completion_proc)(SSH_AUTH_CLIENT_SEND, user, b, -@@ -392,7 +392,7 @@ void simple_password_client(SshAuthClien - #endif - b = ssh_xbuffer_allocate(); - ssh_encode_buffer(b, -- SSH_FORMAT_BOOLEAN, TRUE, -+ SSH_FORMAT_BOOLEAN, (Boolean) TRUE, - SSH_FORMAT_UINT32, pd->count, - SSH_FORMAT_END); - if (pd->count < pingpong_count) diff --git a/security/ssh2/patches/patch-bd b/security/ssh2/patches/patch-bd deleted file mode 100644 index bec995dde74..00000000000 --- a/security/ssh2/patches/patch-bd +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- apps/ssh/sshchx11.c.orig 2003-12-03 15:17:25.000000000 +0200 -+++ apps/ssh/sshchx11.c -@@ -492,7 +492,8 @@ void ssh_channel_x11_send_request(SshCom - - ssh_buffer_init(&buffer); - ssh_encode_buffer(&buffer, -- SSH_FORMAT_BOOLEAN, FALSE, /* XXX single-connection */ -+ SSH_FORMAT_BOOLEAN, -+ (Boolean) FALSE, /* XXX single-connection */ - SSH_FORMAT_UINT32_STR, - ct->x11_fake_proto, ct->x11_fake_proto_len, - SSH_FORMAT_UINT32_STR, new_data, strlen(new_data), diff --git a/security/ssh2/patches/patch-be b/security/ssh2/patches/patch-be deleted file mode 100644 index 089477ce77d..00000000000 --- a/security/ssh2/patches/patch-be +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-be,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- lib/sshutil/sshnet/sshinetencode.c.orig 2003-12-03 15:17:31.000000000 +0200 -+++ lib/sshutil/sshnet/sshinetencode.c -@@ -31,9 +31,10 @@ size_t ssh_encode_ipaddr_array(unsigned - SSH_ASSERT(desired_len <= SSH_MAX_IPADDR_ENCODED_LENGTH); - if ((got = ssh_encode_array(buf, bufsize, - SSH_FORMAT_CHAR, (unsigned int) ip->type, -- SSH_FORMAT_UINT32, ip->mask_len, -+ SSH_FORMAT_UINT32, (SshUInt32) ip->mask_len, - SSH_FORMAT_DATA, -- ip->addr_data, SSH_IP_ADDR_LEN(ip), -+ ip->addr_data, -+ (size_t) SSH_IP_ADDR_LEN(ip), - SSH_FORMAT_END)) != desired_len) - return 0; - return desired_len; -@@ -91,7 +92,8 @@ size_t ssh_decode_ipaddr_array(const uns - if ((got = ssh_decode_array(buf + point, len - point, - SSH_FORMAT_UINT32, &mask_len, - SSH_FORMAT_DATA, -- ip->addr_data, SSH_IP_ADDR_LEN(ip), -+ ip->addr_data, -+ (size_t) SSH_IP_ADDR_LEN(ip), - SSH_FORMAT_END)) != (4 + SSH_IP_ADDR_LEN(ip))) - return 0; - diff --git a/security/ssh2/patches/patch-bf b/security/ssh2/patches/patch-bf deleted file mode 100644 index 8b274c1e6bf..00000000000 --- a/security/ssh2/patches/patch-bf +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- lib/sshutil/sshnet/sshsocks.c.orig 2003-12-03 15:17:31.000000000 +0200 -+++ lib/sshutil/sshnet/sshsocks.c -@@ -375,8 +375,10 @@ SocksError ssh_socks_server_parse_open(S - return SSH_SOCKS_ERROR_INVALID_ARGUMENT; - } - ret = ssh_decode_array(data + bytes, len - bytes, -- SSH_FORMAT_DATA, ip, ip_addr_len, -- SSH_FORMAT_DATA, port_buf, 2, -+ SSH_FORMAT_DATA, ip, -+ (size_t) ip_addr_len, -+ SSH_FORMAT_DATA, port_buf, -+ (size_t) 2, - SSH_FORMAT_END); - if (ret <= 0) - { -@@ -734,7 +736,8 @@ SocksError ssh_socks4_client_generate_op - - ret = ssh_encode_buffer(buffer, - SSH_FORMAT_DATA, username, strlen(username), -- SSH_FORMAT_DATA, "\0", 1, -+ SSH_FORMAT_DATA, "\0", -+ (size_t) 1, - SSH_FORMAT_END); - if (ret == 0) - { diff --git a/security/ssh2/patches/patch-bg b/security/ssh2/patches/patch-bg deleted file mode 100644 index 3fa4dbd1b2c..00000000000 --- a/security/ssh2/patches/patch-bg +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2006/09/22 13:58:46 kivinen Exp $ - ---- lib/sshcrypto/sshpk/sshrgf.c.orig 2003-12-03 15:17:33.000000000 +0200 -+++ lib/sshcrypto/sshpk/sshrgf.c -@@ -412,6 +412,7 @@ rgf_pkcs1_verify(Boolean do_unpad, - unsigned char *digest; - size_t digest_len, return_len; - Boolean rv; -+ int ps_len, digestinfo_len; - - if (hash->context == NULL) - return SSH_RGF_OP_FAILED; -@@ -419,6 +420,9 @@ rgf_pkcs1_verify(Boolean do_unpad, - *output_msg = NULL; - *output_msg_len = 0; - -+ ps_len = 0; -+ digestinfo_len = 0; -+ - /* Decode the msg. */ - if ((ber_buf = ssh_malloc(max_output_msg_len)) == NULL) - return SSH_RGF_OP_FAILED; -@@ -457,8 +461,25 @@ rgf_pkcs1_verify(Boolean do_unpad, - (*hash->def->rgf_hash_finalize)(hash, digest); - hash_oid = (*hash->def->rgf_hash_asn1_oid)(hash); - -+ /* size of 'ff' padding */ -+ for(ps_len = 0; decrypted_signature[ps_len+2] == 255; ps_len++) -+ ; -+ -+ /* size of encoded digestinfo from the signature */ -+ switch(decrypted_signature[ps_len+4]){ -+ case 0x20: -+ digestinfo_len = 18; -+ break; -+ case 0x21: -+ digestinfo_len = 15; -+ break; -+ default : -+ digestinfo_len = 19; -+ } -+ - /* Compare. */ -- if (hash_oid == NULL || digest_len != return_len) -+ if (hash_oid == NULL || digest_len != return_len || -+ digestinfo_len + digest_len + 3 + ps_len != decrypted_signature_len) - { - ssh_free(oid); - ssh_free(temp_buf); diff --git a/security/ssh2/patches/patch-bh b/security/ssh2/patches/patch-bh deleted file mode 100644 index 2d1bd9bbe55..00000000000 --- a/security/ssh2/patches/patch-bh +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2006/11/02 12:31:58 kivinen Exp $ - ---- apps/ssh/scp2.c.orig 2003-12-03 15:17:22.000000000 +0200 -+++ apps/ssh/scp2.c -@@ -833,6 +833,7 @@ void scp_simple_progress_cb(SshFileCopyC - - fprintf(stdout, "%s | %4sB | %4sB/s | TOC: %s\r\n", - file_name, num_buffer, tr_rate_buffer, toc_buffer); -+ fflush(stdout); - ssh_xfree(file_name); - } - diff --git a/security/ssh2/patches/patch-bi b/security/ssh2/patches/patch-bi deleted file mode 100644 index cbaa3eae295..00000000000 --- a/security/ssh2/patches/patch-bi +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2006/11/02 12:31:58 kivinen Exp $ - ---- lib/sshutil/sshnet/sshunixtcp.c.orig 2003-12-03 15:17:31.000000000 +0200 -+++ lib/sshutil/sshnet/sshunixtcp.c -@@ -1459,7 +1459,6 @@ char *ssh_tcp_get_host_by_addr_sync(cons - #else /* VXWORKS */ - unsigned char outbuf[16]; - size_t outbuflen = 16; -- struct in_addr in_addr; - struct hostent *hp; - char *name; - int i; -@@ -1467,8 +1466,16 @@ char *ssh_tcp_get_host_by_addr_sync(cons - if (!ssh_inet_strtobin(addr, outbuf, &outbuflen)) - return NULL; - -- memmove(&in_addr.s_addr, outbuf, outbuflen); -- hp = gethostbyaddr((char *)&in_addr, sizeof(struct in_addr), AF_INET); -+#ifdef AF_INET6 -+ hp = gethostbyaddr((char *)outbuf, outbuflen, -+ (outbuflen == 16) ? AF_INET6 : AF_INET); -+#else /* AF_INET6 */ -+ if (outbuflen == 16) -+ return NULL; -+ hp = gethostbyaddr((char *)outbuf, outbuflen, -+ AF_INET); -+#endif /* AF_INET6 */ -+ - if (!hp) - return NULL; - -@@ -1491,7 +1498,8 @@ char *ssh_tcp_get_host_by_addr_sync(cons - - /* Look for the address from the list of addresses. */ - for (i = 0; hp->h_addr_list[i]; i++) -- if (memcmp(hp->h_addr_list[i], &in_addr, sizeof(in_addr)) == 0) -+ if (hp->h_length == outbuflen && -+ memcmp(hp->h_addr_list[i], outbuf, outbuflen) == 0) - break; - /* If we reached the end of the list, the address was not there. */ - if (!hp->h_addr_list[i]) |