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