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