diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-03-05 22:16:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-03-05 22:16:14 +0000 |
| commit | d4a5a9a5751216ceb93b2d9c144ecb9c9ebf391f (patch) | |
| tree | 9f770c8d0629ff03bd81ab44e47bf60df0f80ed9 /net-misc | |
| parent | scrub patch (diff) | |
| download | gentoo-2-d4a5a9a5751216ceb93b2d9c144ecb9c9ebf391f.tar.gz gentoo-2-d4a5a9a5751216ceb93b2d9c144ecb9c9ebf391f.tar.bz2 gentoo-2-d4a5a9a5751216ceb93b2d9c144ecb9c9ebf391f.zip | |
Glue selinux and X509 support #125108 by Alon Bar-Lev.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-4.3_p2-selinux.patch.glue | 17 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-4.3_p2-r1.ebuild | 9 |
3 files changed, 29 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 9fae037e4038..61a9149c6ba7 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.159 2006/03/05 14:54:55 lcars Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.160 2006/03/05 22:16:14 vapier Exp $ + + 05 Mar 2006; Mike Frysinger <vapier@gentoo.org> + +files/openssh-4.3_p2-selinux.patch.glue, openssh-4.3_p2-r1.ebuild: + Glue selinux and X509 support #125108 by Alon Bar-Lev. 05 Mar 2006; Andrea Barisani <lcars@gentoo.org> openssh-4.3_p1.ebuild, openssh-4.3_p2.ebuild, openssh-4.3_p2-r1.ebuild: diff --git a/net-misc/openssh/files/openssh-4.3_p2-selinux.patch.glue b/net-misc/openssh/files/openssh-4.3_p2-selinux.patch.glue new file mode 100644 index 000000000000..7f82e26be834 --- /dev/null +++ b/net-misc/openssh/files/openssh-4.3_p2-selinux.patch.glue @@ -0,0 +1,17 @@ +--- openssh-4.3_p2-selinux.patch.orig 2006-03-05 17:13:49.000000000 -0500 ++++ openssh-4.3_p2-selinux.patch 2006-03-05 17:14:25.000000000 -0500 +@@ -18,11 +18,11 @@ + auth-chall.o auth2-chall.o groupaccess.o \ + auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ + @@ -136,7 +137,7 @@ +- $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBLDAP) $(LIBS) + + sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) +-- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS) +-+ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(LIBS) ++- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBLDAP) $(LIBS) +++ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBLDAP) $(LIBSELINUX) $(LIBS) + + scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o + $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) diff --git a/net-misc/openssh/openssh-4.3_p2-r1.ebuild b/net-misc/openssh/openssh-4.3_p2-r1.ebuild index f199feea8082..65926325ba8f 100644 --- a/net-misc/openssh/openssh-4.3_p2-r1.ebuild +++ b/net-misc/openssh/openssh-4.3_p2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r1.ebuild,v 1.2 2006/03/05 14:54:55 lcars Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r1.ebuild,v 1.3 2006/03/05 22:16:14 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -55,7 +55,12 @@ src_unpack() { use X509 && epatch "${DISTDIR}"/${X509_PATCH} use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch - epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch + if use X509 ; then + cp "${FILESDIR}"/openssh-4.3_p2-selinux.patch . + epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch.glue ./openssh-4.3_p2-selinux.patch + else + epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch + fi use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch if ! use X509 ; then if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then |