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 | b0b6e5117c520aa80e12f2d9cdec124aafac9980 (patch) | |
| tree | 3afd2d1a5bd7aad13f67d77599582ed1d02774b1 /net-misc | |
| parent | scrub patch (diff) | |
| download | historical-b0b6e5117c520aa80e12f2d9cdec124aafac9980.tar.gz historical-b0b6e5117c520aa80e12f2d9cdec124aafac9980.tar.bz2 historical-b0b6e5117c520aa80e12f2d9cdec124aafac9980.zip | |
Glue selinux and X509 support #125108 by Alon Bar-Lev.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/Manifest | 10 | ||||
| -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 |
4 files changed, 39 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/Manifest b/net-misc/openssh/Manifest index ae6492fe9503..720c58d2380b 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 79b6c012884405654f7d5493853b60a7 ChangeLog 26292 RMD160 055947eeaea9f224e708f1ec1ee2abece1e2bd6a ChangeLog 26292 SHA256 8c5bae7c1bf759052bd9d57ddac996596920ee069b2a314d8ecb4e493ccc95ea ChangeLog 26292 @@ -133,3 +136,10 @@ SHA256 5337d1aed6d478b03a730c328f972698b84f753cd8d966d1bf2a301b2a21116e openssh- MD5 269c2306d09d8eb07b1ff2e5339dc9c8 openssh-4.3_p2.ebuild 5297 RMD160 604110f3f589e1d76851a557ffaedcd31a8a51d2 openssh-4.3_p2.ebuild 5297 SHA256 01f549d0f1a4324b9d873a58a257731b9c463965ea11bea42439420296f52cdd openssh-4.3_p2.ebuild 5297 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.1 (GNU/Linux) + +iD8DBQFEC2N12+ySkm8kpY0RAtOcAKC/jb2kgrExlIMiVzkkBc9ymrZS4QCfUEMc +pukwJooBU9dIiw6tYdra8y0= +=nyN7 +-----END PGP SIGNATURE----- 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 |