| 1 |
vapier 10/04/20 08:04:34 |
| 2 |
|
| 3 |
Modified: dropbear-0.52.ebuild ChangeLog |
| 4 |
Added: dropbear-0.52-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix path to xauth #314645 by Jochen Schlick. |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.10 net-misc/dropbear/dropbear-0.52.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild?rev=1.10&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild?rev=1.10&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild?r1=1.9&r2=1.10 |
| 15 |
|
| 16 |
Index: dropbear-0.52.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v |
| 19 |
retrieving revision 1.9 |
| 20 |
retrieving revision 1.10 |
| 21 |
diff -u -r1.9 -r1.10 |
| 22 |
--- dropbear-0.52.ebuild 5 Nov 2009 16:02:47 -0000 1.9 |
| 23 |
+++ dropbear-0.52.ebuild 20 Apr 2010 08:04:34 -0000 1.10 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2009 Gentoo Foundation |
| 26 |
+# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v 1.9 2009/11/05 16:02:47 armin76 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v 1.10 2010/04/20 08:04:34 vapier Exp $ |
| 30 |
|
| 31 |
inherit eutils savedconfig pam |
| 32 |
|
| 33 |
@@ -43,6 +43,7 @@ |
| 34 |
epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch |
| 35 |
sed -i \ |
| 36 |
-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ |
| 37 |
+ -e '/XAUTH_COMMAND/s:/X11R6/:/:' \ |
| 38 |
options.h |
| 39 |
sed -i \ |
| 40 |
-e '/pam_start/s:sshd:dropbear:' \ |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.78 net-misc/dropbear/ChangeLog |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/ChangeLog?rev=1.78&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/ChangeLog?rev=1.78&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/ChangeLog?r1=1.77&r2=1.78 |
| 49 |
|
| 50 |
Index: ChangeLog |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v |
| 53 |
retrieving revision 1.77 |
| 54 |
retrieving revision 1.78 |
| 55 |
diff -u -r1.77 -r1.78 |
| 56 |
--- ChangeLog 5 Nov 2009 16:02:47 -0000 1.77 |
| 57 |
+++ ChangeLog 20 Apr 2010 08:04:34 -0000 1.78 |
| 58 |
@@ -1,6 +1,12 @@ |
| 59 |
# ChangeLog for net-misc/dropbear |
| 60 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.77 2009/11/05 16:02:47 armin76 Exp $ |
| 62 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.78 2010/04/20 08:04:34 vapier Exp $ |
| 64 |
+ |
| 65 |
+*dropbear-0.52-r1 (20 Apr 2010) |
| 66 |
+ |
| 67 |
+ 20 Apr 2010; Mike Frysinger <vapier@g.o> dropbear-0.52.ebuild, |
| 68 |
+ +dropbear-0.52-r1.ebuild: |
| 69 |
+ Fix path to xauth #314645 by Jochen Schlick. |
| 70 |
|
| 71 |
05 Nov 2009; Raúl Porcel <armin76@g.o> dropbear-0.52.ebuild: |
| 72 |
ia64/m68k/s390/sh/sparc stable wrt #282028 |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.1 net-misc/dropbear/dropbear-0.52-r1.ebuild |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/dropbear-0.52-r1.ebuild?rev=1.1&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dropbear/dropbear-0.52-r1.ebuild?rev=1.1&content-type=text/plain |
| 80 |
|
| 81 |
Index: dropbear-0.52-r1.ebuild |
| 82 |
=================================================================== |
| 83 |
# Copyright 1999-2010 Gentoo Foundation |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52-r1.ebuild,v 1.1 2010/04/20 08:04:34 vapier Exp $ |
| 86 |
|
| 87 |
inherit eutils savedconfig pam |
| 88 |
|
| 89 |
DESCRIPTION="small SSH 2 client/server designed for small memory environments" |
| 90 |
HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html" |
| 91 |
SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 |
| 92 |
http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" |
| 93 |
|
| 94 |
LICENSE="MIT" |
| 95 |
SLOT="0" |
| 96 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 97 |
IUSE="bsdpty minimal multicall pam static syslog zlib" |
| 98 |
|
| 99 |
DEPEND="zlib? ( sys-libs/zlib ) |
| 100 |
pam? ( virtual/pam )" |
| 101 |
RDEPEND="${DEPEND} |
| 102 |
pam? ( >=sys-auth/pambase-20080219.1 )" |
| 103 |
PROVIDE="virtual/ssh" |
| 104 |
|
| 105 |
set_options() { |
| 106 |
use minimal \ |
| 107 |
&& progs="dropbear dbclient dropbearkey" \ |
| 108 |
|| progs="dropbear dbclient dropbearkey dropbearconvert scp" |
| 109 |
use multicall && makeopts="${makeopts} MULTI=1" |
| 110 |
use static && makeopts="${makeopts} STATIC=1" |
| 111 |
} |
| 112 |
|
| 113 |
pkg_setup() { |
| 114 |
if use pam && use static ; then |
| 115 |
die "USE='pam static' makes no sense ... pick one" |
| 116 |
fi |
| 117 |
|
| 118 |
enewgroup sshd 22 |
| 119 |
enewuser sshd 22 -1 /var/empty sshd |
| 120 |
} |
| 121 |
|
| 122 |
src_unpack() { |
| 123 |
unpack ${A} |
| 124 |
cd "${S}" |
| 125 |
epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch |
| 126 |
sed -i \ |
| 127 |
-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ |
| 128 |
-e '/XAUTH_COMMAND/s:/X11R6/:/:' \ |
| 129 |
options.h |
| 130 |
sed -i \ |
| 131 |
-e '/pam_start/s:sshd:dropbear:' \ |
| 132 |
svr-authpam.c || die |
| 133 |
restore_config options.h |
| 134 |
} |
| 135 |
|
| 136 |
src_compile() { |
| 137 |
if use static && use pam ; then |
| 138 |
ewarn "You cannot have USE='static pam'. Assuming static is more important." |
| 139 |
fi |
| 140 |
econf \ |
| 141 |
$(use_enable zlib) \ |
| 142 |
$(use_enable pam) \ |
| 143 |
$(use_enable !bsdpty openpty) \ |
| 144 |
$(use_enable syslog) \ |
| 145 |
|| die |
| 146 |
set_options |
| 147 |
emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed" |
| 148 |
} |
| 149 |
|
| 150 |
src_install() { |
| 151 |
set_options |
| 152 |
emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed" |
| 153 |
doman *.8 |
| 154 |
newinitd "${FILESDIR}"/dropbear.init.d dropbear || die |
| 155 |
newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die |
| 156 |
dodoc CHANGES README TODO SMALL MULTI |
| 157 |
|
| 158 |
# The multi install target does not install the links |
| 159 |
if use multicall ; then |
| 160 |
cd "${D}"/usr/bin |
| 161 |
local x |
| 162 |
for x in ${progs} ; do |
| 163 |
ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" |
| 164 |
done |
| 165 |
rm -f dropbear |
| 166 |
dodir /usr/sbin |
| 167 |
dosym ../bin/dropbearmulti /usr/sbin/dropbear |
| 168 |
cd "${S}" |
| 169 |
fi |
| 170 |
save_config options.h |
| 171 |
|
| 172 |
if ! use minimal ; then |
| 173 |
mv "${D}"/usr/bin/{,db}scp || die |
| 174 |
fi |
| 175 |
|
| 176 |
pamd_mimic system-remote-login dropbear auth account password session \ |
| 177 |
|| die "unable to mimic system-remote-login pamd file." |
| 178 |
} |
Archives