diff options
author | wiz <wiz> | 2006-02-04 00:33:17 +0000 |
---|---|---|
committer | wiz <wiz> | 2006-02-04 00:33:17 +0000 |
commit | d09f2046309be44a2c0b6f0c77304fd926215e58 (patch) | |
tree | 199e9c50fc7a57673ad89c2187d01b809bb0bb02 /security | |
parent | 7b11ab0d61cd5b52d47500bdc3b9bc8411fd148e (diff) | |
download | pkgsrc-d09f2046309be44a2c0b6f0c77304fd926215e58.tar.gz |
Add x11 option to ssh2 package.
Remove obsolete ssh2-nox11 package.
Replaces PR 32716 by Tracy Di Marco White.
Diffstat (limited to 'security')
-rw-r--r-- | security/Makefile | 3 | ||||
-rw-r--r-- | security/ssh2-nox11/DESCR | 8 | ||||
-rw-r--r-- | security/ssh2-nox11/Makefile | 11 | ||||
-rw-r--r-- | security/ssh2/Makefile | 94 | ||||
-rw-r--r-- | security/ssh2/Makefile.common | 99 | ||||
-rw-r--r-- | security/ssh2/options.mk | 16 |
6 files changed, 104 insertions, 127 deletions
diff --git a/security/Makefile b/security/Makefile index 7ea4179f7dc..e4d01d02628 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.261 2006/02/01 02:51:16 xtraeme Exp $ +# $NetBSD: Makefile,v 1.262 2006/02/04 00:33:17 wiz Exp $ # COMMENT= Security tools @@ -227,7 +227,6 @@ SUBDIR+= srp_client SUBDIR+= ssh-askpass SUBDIR+= ssh-ip-tunnel SUBDIR+= ssh2 -SUBDIR+= ssh2-nox11 SUBDIR+= ssldump SUBDIR+= sslwrap SUBDIR+= steghide diff --git a/security/ssh2-nox11/DESCR b/security/ssh2-nox11/DESCR deleted file mode 100644 index 8a3fcb41d4f..00000000000 --- a/security/ssh2-nox11/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 without any X Windows support. diff --git a/security/ssh2-nox11/Makefile b/security/ssh2-nox11/Makefile deleted file mode 100644 index 902d2882a30..00000000000 --- a/security/ssh2-nox11/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2004/12/28 01:39:32 reed Exp $ -# - -PKGNAME= ${DISTNAME:C/ssh-/ssh2-nox11-/} -COMMENT= Secure Shell client and server for V.2 SSH protocol without X11 support -PKGREVISION= 2 -CONFLICTS= ssh2-[0-9]* -CONFIGURE_ARGS+= --without-x # be explicit - -.include "../../security/ssh2/Makefile.common" -.include "../../mk/bsd.pkg.mk" diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index 7edb1c18a57..b769c6c3e01 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -1,14 +1,94 @@ -# $NetBSD: Makefile,v 1.12 2005/08/24 09:13:24 kivinen Exp $ -# +# $NetBSD: Makefile,v 1.13 2006/02/04 00:33:17 wiz Exp $ +DISTNAME= ssh-3.2.9.1 PKGNAME= ${DISTNAME:C/ssh-/ssh2-/} -COMMENT= Secure Shell client and server for V.2 SSH protocol PKGREVISION= 4 +CATEGORIES= security +MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/ + +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.ssh.com/ +COMMENT= Secure Shell client and server for V.2 SSH protocol + +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+= USE_INET6 + +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 "options.mk" + +.include "../../mk/bsd.prefs.mk" + +.if (${OPSYS:M*BSD} == "") && (${OPSYS} != "Linux") +LICENSE= no-commercial-use +.endif + +.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} + +# 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 -CONFLICTS= ssh2-nox11-[0-9]* +DOCS= CHANGES FAQ HOWTO.anonymous.sftp INSTALL LICENSE \ + NEWS README REGEX-SYNTAX SSH2.QUICKSTART \ + RFC.authorization_program_protocol \ + RFC.kbdint_plugin_protocol -CONFIGURE_ARGS+= --with-x # be explicit +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE} +.for file in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/${PKGBASE} +.endfor + ${INSTALL_DATA_DIR} ${EGDIR} +.for file in ${EGFILES} + ${INSTALL_DATA} ${WRKSRC}/${file} ${EGDIR} +.endfor -.include "../../mk/x11.buildlink3.mk" -.include "../../security/ssh2/Makefile.common" +.include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common deleted file mode 100644 index bf31e1ecc52..00000000000 --- a/security/ssh2/Makefile.common +++ /dev/null @@ -1,99 +0,0 @@ -# $NetBSD: Makefile.common,v 1.18 2005/12/29 06:22:12 jlam Exp $ -# - -DISTNAME= ssh-3.2.9.1 -CATEGORIES= security -MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.ssh.com/ - -CONFLICTS+= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]* -CONFLICTS+= openssh+gssapi-[0-9]* - -GNU_CONFIGURE= YES - -BUILD_DEFS+= USE_INET6 - -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 - -.if defined(USE_X11) -PLIST_SUBST+= X11_SUPPORT= -.else -PLIST_SUBST+= X11_SUPPORT='@comment ' -.endif - -.include "../../mk/bsd.prefs.mk" - -.if (${OPSYS:M*BSD} == "") && (${OPSYS} != "Linux") -LICENSE= no-commercial-use -.endif - -.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.SunOS= /etc # Older Solaris doesn't have a /var/run -.endif - -.if defined(SSH_PID_DIR.${OPSYS}) -SSH_PID_DIR= ${SSH_PID_DIR.${OPSYS}} -.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} - -# 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 -INSTALLATION_DIRS+= share/doc/${PKGBASE} - -post-install: -.for FILE in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/doc/${PKGBASE} -.endfor -.for FILE in ${EGFILES} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${EGDIR} -.endfor - -.include "../../security/tcp_wrappers/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" diff --git a/security/ssh2/options.mk b/security/ssh2/options.mk new file mode 100644 index 00000000000..34360c59435 --- /dev/null +++ b/security/ssh2/options.mk @@ -0,0 +1,16 @@ +# $NetBSD: options.mk,v 1.1 2006/02/04 00:33:17 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.ssh2 +PKG_SUPPORTED_OPTIONS= x11 +PKG_SUGGESTED_OPTIONS= x11 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mx11) +CONFIGURE_ARGS+= --with-x +PLIST_SUBST+= X11_SUPPORT= +.include "../../mk/x11.buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-x +PLIST_SUBST+= X11_SUPPORT='@comment ' +.endif |