Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openssh: ChangeLog openssh-5.0_p1.ebuild
Date: Sat, 05 Apr 2008 00:35:16
Message-Id: E1JhwNF-00021J-EX@stork.gentoo.org
1 vapier 08/04/05 00:35:13
2
3 Modified: ChangeLog
4 Added: openssh-5.0_p1.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.2_pre5)
8
9 Revision Changes Path
10 1.306 net-misc/openssh/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.306&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?rev=1.306&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/ChangeLog?r1=1.305&r2=1.306
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v
19 retrieving revision 1.305
20 retrieving revision 1.306
21 diff -u -r1.305 -r1.306
22 --- ChangeLog 3 Apr 2008 16:55:26 -0000 1.305
23 +++ ChangeLog 5 Apr 2008 00:35:12 -0000 1.306
24 @@ -1,6 +1,11 @@
25 # ChangeLog for net-misc/openssh
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.305 2008/04/03 16:55:26 dertobi123 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.306 2008/04/05 00:35:12 vapier Exp $
29 +
30 +*openssh-5.0_p1 (05 Apr 2008)
31 +
32 + 05 Apr 2008; Mike Frysinger <vapier@g.o> +openssh-5.0_p1.ebuild:
33 + Version bump.
34
35 03 Apr 2008; Tobias Scherbaum <dertobi123@g.o>
36 openssh-4.7_p1-r6.ebuild:
37
38
39
40 1.1 net-misc/openssh/openssh-5.0_p1.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.0_p1.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-5.0_p1.ebuild?rev=1.1&content-type=text/plain
44
45 Index: openssh-5.0_p1.ebuild
46 ===================================================================
47 # Copyright 1999-2008 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.0_p1.ebuild,v 1.1 2008/04/05 00:35:12 vapier Exp $
50
51 inherit eutils flag-o-matic ccc multilib autotools pam
52
53 # Make it more portable between straight releases
54 # and _p? releases.
55 PARCH=${P/_/}
56
57 X509_PATCH="${PARCH}+x509-6.1.1.diff.gz"
58 #LDAP_PATCH="${PARCH/openssh-4.9/openssh-lpk-4.6}-0.3.9.patch"
59 HPN_PATCH="${PARCH/5.0/4.9}-hpn13v2.diff.gz"
60
61 DESCRIPTION="Port of OpenBSD's free SSH release"
62 HOMEPAGE="http://www.openssh.org/"
63 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
64 http://www.sxw.org.uk/computing/patches/openssh-4.7p1-gsskex-20070927.patch
65 ${LDAP_PATCH:+ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )}
66 ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-6.1.1/${X509_PATCH} )}
67 ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )}"
68
69 LICENSE="as-is"
70 SLOT="0"
71 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
72 IUSE="static pam tcpd kerberos skey selinux X509 ldap smartcard hpn libedit X"
73
74 RDEPEND="pam? ( virtual/pam )
75 dev-libs/pkcs11-helper
76 kerberos? ( virtual/krb5 )
77 selinux? ( >=sys-libs/libselinux-1.28 )
78 skey? ( >=app-admin/skey-1.1.5-r1 )
79 ldap? ( net-nds/openldap )
80 libedit? ( dev-libs/libedit )
81 >=dev-libs/openssl-0.9.6d
82 >=sys-libs/zlib-1.2.3
83 smartcard? ( dev-libs/opensc )
84 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
85 X? ( x11-apps/xauth )
86 userland_GNU? ( sys-apps/shadow )"
87 DEPEND="${RDEPEND}
88 dev-util/pkgconfig
89 virtual/os-headers
90 sys-devel/autoconf"
91 PROVIDE="virtual/ssh"
92
93 S=${WORKDIR}/${PARCH}
94
95 pkg_setup() {
96 # this sucks, but i'd rather have people unable to `emerge -u openssh`
97 # than not be able to log in to their server any more
98 maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; }
99 local fail="
100 $(maybe_fail X509 X509_PATCH)
101 $(maybe_fail ldap LDAP_PATCH)
102 "
103 fail=$(echo ${fail})
104 if [[ -n ${fail} ]] ; then
105 eerror "Sorry, but this version does not yet support features"
106 eerror "that you requested: ${fail}"
107 eerror "Please mask ${PF} for now and check back later:"
108 eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
109 die "booooo"
110 fi
111 }
112
113 src_unpack() {
114 unpack ${PARCH}.tar.gz
115 cd "${S}"
116
117 sed -i \
118 -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
119 pathnames.h || die
120
121 use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-4.9_p1-x509-hpn-glue.patch
122 use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
123 if ! use X509 ; then
124 if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
125 epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${PN}-4.4_p1-ldap-hpn-glue.patch
126 epatch "${FILESDIR}"/${P}-lpk-64bit.patch #210110
127 fi
128 #epatch "${DISTDIR}"/openssh-4.7p1-gsskex-20070927.patch #115553
129 else
130 use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap"
131 fi
132 epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
133 [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
134 epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665
135
136 sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
137
138 eautoreconf
139 }
140
141 src_compile() {
142 addwrite /dev/ptmx
143 addpredict /etc/skey/skeykeys #skey configure code triggers this
144
145 local myconf=""
146 if use static ; then
147 append-ldflags -static
148 use pam && ewarn "Disabling pam support becuse of static flag"
149 myconf="${myconf} --without-pam"
150 else
151 myconf="${myconf} $(use_with pam)"
152 fi
153
154 econf \
155 --with-ldflags="${LDFLAGS}" \
156 --disable-strip \
157 --sysconfdir=/etc/ssh \
158 --libexecdir=/usr/$(get_libdir)/misc \
159 --datadir=/usr/share/openssh \
160 --disable-suid-ssh \
161 --with-privsep-path=/var/empty \
162 --with-privsep-user=sshd \
163 --with-md5-passwords \
164 --with-ssl-engine \
165 $(use_with ldap) \
166 $(use_with libedit) \
167 $(use_with kerberos kerberos5 /usr) \
168 $(use_with tcpd tcp-wrappers) \
169 $(use_with selinux) \
170 $(use_with skey) \
171 $(use_with smartcard opensc) \
172 ${myconf} \
173 || die "bad configure"
174 emake || die "compile problem"
175 }
176
177 src_install() {
178 emake install-nokeys DESTDIR="${D}" || die
179 fperms 600 /etc/ssh/sshd_config
180 dobin contrib/ssh-copy-id
181 newinitd "${FILESDIR}"/sshd.rc6 sshd
182 newconfd "${FILESDIR}"/sshd.confd sshd
183 keepdir /var/empty
184
185 newpamd "${FILESDIR}"/sshd.pam_include.1 sshd
186 use pam \
187 && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
188 && dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
189
190 doman contrib/ssh-copy-id.1
191 dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
192
193 diropts -m 0700
194 dodir /etc/skel/.ssh
195 }
196
197 pkg_postinst() {
198 enewgroup sshd 22
199 enewuser sshd 22 -1 /var/empty sshd
200
201 # help fix broken perms caused by older ebuilds.
202 # can probably cut this after the next stage release.
203 chmod u+x "${ROOT}"/etc/skel/.ssh >& /dev/null
204
205 ewarn "Remember to merge your config files in /etc/ssh/ and then"
206 ewarn "restart sshd: '/etc/init.d/sshd restart'."
207 if use pam ; then
208 echo
209 ewarn "Please be aware users need a valid shell in /etc/passwd"
210 ewarn "in order to be allowed to login."
211 fi
212 }
213
214
215
216 --
217 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups