Print this page
Now (mostly?) pkglint clean and using more SunSSH-like method and SMF manifest.
First stab at the full Joyent wad (still needs work!!!)
| 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 #
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 31 VER=7.1p2
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 37 BUILDARCH=32
38 38 # Since we're only building 32-bit, don't bother with isaexec subdirs
39 39 CONFIGURE_OPTS_32="
|
↓ open down ↓ |
39 lines elided |
↑ open up ↑ |
40 40 --prefix=$PREFIX
41 41 --sysconfdir=/etc/ssh
42 42 --includedir=$PREFIX/include
43 43 --bindir=$PREFIX/bin
44 44 --sbindir=$PREFIX/sbin
45 45 --libdir=$PREFIX/lib
46 46 --libexecdir=$PREFIX/libexec
47 47 "
48 48 # Feature choices
49 49 CONFIGURE_OPTS="
50 + --with-audit=solaris
51 + --with-kerberos5=$PREFIX/usr
52 + --with-pam
53 + --with-sandbox=solaris
50 54 --with-solaris-contracts
51 - --with-solaris-projects
55 + --with-solaris-privs
52 56 --with-tcp-wrappers
53 - --with-ssl-engine
54 - --with-pam
55 - --with-audit=solaris
57 + --with-4in6
58 + --enable-strip=no
59 + --without-rpath
56 60 --disable-lastlog
61 + --with-privsep-user=daemon
62 + --with-ssl-engine
63 + --with-solaris-projects
57 64 "
58 65
59 -install_smf() {
60 - logmsg "Installing SMF components"
61 - logcmd mkdir -p $DESTDIR/lib/svc/manifest/network || \
62 - logerr "--- Failed to create manifest directory"
63 - logcmd cp $SRCDIR/ssh.xml $DESTDIR/lib/svc/manifest/network/ || \
64 - logerr "--- Failed to copy manifest file"
65 - logcmd mkdir -p $DESTDIR/lib/svc/method || \
66 - logerr "--- Failed to create method directory"
67 - logcmd cp $SRCDIR/method-sshd $DESTDIR/lib/svc/method/sshd || \
68 - logerr "--- Failed to copy method script"
66 +CFLAGS+="-DPAM_ENHANCEMENT -DSET_USE_PAM -DPAM_BUGFIX -DDTRACE_SFTP "
67 +CFLAGS+="-I/usr/include/kerberosv5 -DKRB5_BUILD_FIX -DDISABLE_BANNER "
68 +CFLAGS+="-DDEPRECATE_SUNSSH_OPT -DOPTION_DEFAULT_VALUE -DSANDBOX_SOLARIS"
69 +
70 +auto_reconf() {
71 + # This package needs a whack upside the head post-patches!
72 + pushd $TMPDIR/$BUILDDIR
73 + autoreconf -fi
74 + popd
69 75 }
70 76
71 -CFLAGS+="-DPAM_ENHANCEMENT -DSET_USE_PAM -DPAM_BUGFIX -DDTRACE_SFTP"
72 -
73 77 init
74 78 download_source $PROG $PROG $VER
75 79 patch_source
80 +auto_reconf
76 81 prep_build
77 82 run_autoconf
78 83 build
79 84
80 85 # Remove the letter from VER for packaging
81 86 VER=${VER//p/.}
82 87
83 88 # Client package
84 89 RUN_DEPENDS_IPS="-pkg:/network/ssh -pkg:/network/ssh/ssh-key"
85 90 make_package client.mog
86 91
87 92 # Server package
88 93 PKG=network/openssh-server
89 94 PKGE=$(url_encode $PKG)
90 95 SUMMARY="OpenSSH Server"
91 96 DESC="OpenSSH Secure Shell protocol Server"
92 97 RUN_DEPENDS_IPS="-pkg:/service/network/ssh pkg:/network/openssh@$VER"
93 -install_smf
94 98 make_package server.mog
95 99
96 100 clean_up
97 101
98 102 # Vim hints
99 103 # vim:ts=4:sw=4:et:
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX