Print this page
Update OpenSSH to 7.1p1
fix openssh/sunssh exclude, allow openssh in entire
| Split |
Close |
| Expand all |
| Collapse all |
--- old/build/openssh/build.sh
+++ new/build/openssh/build.sh
1 1 #!/usr/bin/bash
2 2 #
3 3 # CDDL HEADER START
4 4 #
5 5 # The contents of this file are subject to the terms of the
6 6 # Common Development and Distribution License, Version 1.0 only
7 7 # (the "License"). You may not use this file except in compliance
8 8 # with the License.
9 9 #
10 10 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
11 11 # or http://www.opensolaris.org/os/licensing.
12 12 # See the License for the specific language governing permissions
13 13 # and limitations under the License.
14 14 #
15 15 # When distributing Covered Code, include this CDDL HEADER in each
16 16 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
17 17 # If applicable, add the following below this CDDL HEADER, with the
18 18 # fields enclosed by brackets "[]" replaced with your own identifying
19 19 # information: Portions Copyright [yyyy] [name of copyright owner]
20 20 #
|
↓ open down ↓ |
20 lines elided |
↑ open up ↑ |
21 21 # CDDL HEADER END
22 22 #
23 23 #
24 24 # Copyright 2011-2013 OmniTI Computer Consulting, Inc. All rights reserved.
25 25 # Use is subject to license terms.
26 26 #
27 27 # Load support functions
28 28 . ../../lib/functions.sh
29 29
30 30 PROG=openssh
31 -VER=6.7p1
31 +VER=7.1p1
32 32 VERHUMAN=$VER
33 33 PKG=network/openssh
34 34 SUMMARY="OpenSSH Client and utilities"
35 35 DESC="OpenSSH Secure Shell protocol Client and associated Utilities"
36 36
37 -GLOBAL_DEPENDS="library/security/openssl@1.0.2 library/zlib@1.2 system/library system/library/g++-4-runtime@4.7.2"
38 -
39 37 BUILDARCH=32
40 38 # Since we're only building 32-bit, don't bother with isaexec subdirs
41 39 CONFIGURE_OPTS_32="
42 40 --prefix=$PREFIX
43 41 --sysconfdir=/etc/ssh
44 42 --includedir=$PREFIX/include
45 43 --bindir=$PREFIX/bin
46 44 --sbindir=$PREFIX/sbin
47 45 --libdir=$PREFIX/lib
48 46 --libexecdir=$PREFIX/libexec
49 47 "
50 48 # Feature choices
51 49 CONFIGURE_OPTS="
52 50 --with-solaris-contracts
53 51 --with-solaris-projects
54 52 --with-tcp-wrappers
55 53 --with-ssl-engine
56 54 --with-pam
57 55 "
58 56
59 57 install_smf() {
60 58 logmsg "Installing SMF components"
61 59 logcmd mkdir -p $DESTDIR/lib/svc/manifest/network || \
62 60 logerr "--- Failed to create manifest directory"
63 61 logcmd cp $SRCDIR/ssh.xml $DESTDIR/lib/svc/manifest/network/ || \
64 62 logerr "--- Failed to copy manifest file"
65 63 logcmd mkdir -p $DESTDIR/lib/svc/method || \
66 64 logerr "--- Failed to create method directory"
67 65 logcmd cp $SRCDIR/method-sshd $DESTDIR/lib/svc/method/sshd || \
68 66 logerr "--- Failed to copy method script"
69 67 }
70 68
|
↓ open down ↓ |
22 lines elided |
↑ open up ↑ |
71 69 init
72 70 download_source $PROG $PROG $VER
73 71 patch_source
74 72 prep_build
75 73 build
76 74
77 75 # Remove the letter from VER for packaging
78 76 VER=${VER//p/.}
79 77
80 78 # Client package
81 -DEPENDS_IPS="-network/ssh -network/ssh/ssh-key $GLOBAL_DEPENDS"
79 +RUN_DEPENDS_IPS="-pkg:/network/ssh -pkg:/network/ssh/ssh-key"
82 80 make_package client.mog
83 81
84 82 # Server package
85 83 PKG=network/openssh-server
86 84 PKGE=$(url_encode $PKG)
87 85 SUMMARY="OpenSSH Server"
88 86 DESC="OpenSSH Secure Shell protocol Server"
89 -DEPENDS_IPS="-service/network/ssh network/openssh $GLOBAL_DEPENDS"
87 +RUN_DEPENDS_IPS="-pkg:/service/network/ssh pkg:/network/openssh@$VER"
90 88 install_smf
91 89 make_package server.mog
92 90
93 91 clean_up
94 92
95 93 # Vim hints
96 94 # vim:ts=4:sw=4:et:
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX