1 |
vapier 11/11/19 08:02:21 |
2 |
|
3 |
Modified: ChangeLog dropbear-2011.54.ebuild |
4 |
Log: |
5 |
Bump to EAPI=4 so we can depend on zlib[static-libs] for USE=static #390959 by Sven E.. |
6 |
|
7 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.84 net-misc/dropbear/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/ChangeLog?rev=1.84&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/ChangeLog?rev=1.84&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/ChangeLog?r1=1.83&r2=1.84 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v |
19 |
retrieving revision 1.83 |
20 |
retrieving revision 1.84 |
21 |
diff -u -r1.83 -r1.84 |
22 |
--- ChangeLog 8 Nov 2011 13:21:30 -0000 1.83 |
23 |
+++ ChangeLog 19 Nov 2011 08:02:21 -0000 1.84 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for net-misc/dropbear |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.83 2011/11/08 13:21:30 vapier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.84 2011/11/19 08:02:21 vapier Exp $ |
29 |
+ |
30 |
+ 19 Nov 2011; Mike Frysinger <vapier@g.o> dropbear-2011.54.ebuild: |
31 |
+ Bump to EAPI=4 so we can depend on zlib[static-libs] for USE=static #390959 |
32 |
+ by Sven E.. |
33 |
|
34 |
*dropbear-2011.54 (08 Nov 2011) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 net-misc/dropbear/dropbear-2011.54.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: dropbear-2011.54.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- dropbear-2011.54.ebuild 8 Nov 2011 13:21:30 -0000 1.1 |
52 |
+++ dropbear-2011.54.ebuild 19 Nov 2011 08:02:21 -0000 1.2 |
53 |
@@ -1,6 +1,8 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild,v 1.1 2011/11/08 13:21:30 vapier Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild,v 1.2 2011/11/19 08:02:21 vapier Exp $ |
58 |
+ |
59 |
+EAPI="4" |
60 |
|
61 |
inherit eutils savedconfig pam |
62 |
|
63 |
@@ -14,31 +16,22 @@ |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
65 |
IUSE="bsdpty minimal multicall pam static syslog zlib" |
66 |
|
67 |
-DEPEND="zlib? ( sys-libs/zlib ) |
68 |
+DEPEND="static? ( zlib? ( sys-libs/zlib[static-libs] ) ) |
69 |
pam? ( virtual/pam )" |
70 |
RDEPEND="${DEPEND} |
71 |
+ !static? ( zlib? ( sys-libs/zlib ) ) |
72 |
pam? ( >=sys-auth/pambase-20080219.1 )" |
73 |
|
74 |
-set_options() { |
75 |
- use minimal \ |
76 |
- && progs="dropbear dbclient dropbearkey" \ |
77 |
- || progs="dropbear dbclient dropbearkey dropbearconvert scp" |
78 |
- use multicall && makeopts="${makeopts} MULTI=1" |
79 |
- use static && makeopts="${makeopts} STATIC=1" |
80 |
-} |
81 |
- |
82 |
-pkg_setup() { |
83 |
- if use pam && use static ; then |
84 |
- die "USE='pam static' makes no sense ... pick one" |
85 |
- fi |
86 |
+REQUIRED_USE="pam? ( !static )" |
87 |
|
88 |
- enewgroup sshd 22 |
89 |
- enewuser sshd 22 -1 /var/empty sshd |
90 |
+set_options() { |
91 |
+ progs="dropbear dbclient dropbearkey" |
92 |
+ progs+=" $(usex minimal "" "dropbearconvert scp")" |
93 |
+ use multicall && makeopts+=" MULTI=1" |
94 |
+ use static && makeopts+=" STATIC=1" |
95 |
} |
96 |
|
97 |
-src_unpack() { |
98 |
- unpack ${A} |
99 |
- cd "${S}" |
100 |
+src_prepare() { |
101 |
epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch |
102 |
sed -i \ |
103 |
-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ |
104 |
@@ -50,26 +43,25 @@ |
105 |
restore_config options.h |
106 |
} |
107 |
|
108 |
-src_compile() { |
109 |
- if use static && use pam ; then |
110 |
- ewarn "You cannot have USE='static pam'. Assuming static is more important." |
111 |
- fi |
112 |
+src_configure() { |
113 |
econf \ |
114 |
$(use_enable zlib) \ |
115 |
$(use_enable pam) \ |
116 |
$(use_enable !bsdpty openpty) \ |
117 |
- $(use_enable syslog) \ |
118 |
- || die |
119 |
+ $(use_enable syslog) |
120 |
+} |
121 |
+ |
122 |
+src_compile() { |
123 |
set_options |
124 |
- emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed" |
125 |
+ emake ${makeopts} PROGRAMS="${progs}" |
126 |
} |
127 |
|
128 |
src_install() { |
129 |
set_options |
130 |
- emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed" |
131 |
+ emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" |
132 |
doman *.8 |
133 |
- newinitd "${FILESDIR}"/dropbear.init.d dropbear || die |
134 |
- newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die |
135 |
+ newinitd "${FILESDIR}"/dropbear.init.d dropbear |
136 |
+ newconfd "${FILESDIR}"/dropbear.conf.d dropbear |
137 |
dodoc CHANGES README TODO SMALL MULTI |
138 |
|
139 |
# The multi install target does not install the links |
140 |
@@ -90,6 +82,10 @@ |
141 |
mv "${D}"/usr/bin/{,db}scp || die |
142 |
fi |
143 |
|
144 |
- pamd_mimic system-remote-login dropbear auth account password session \ |
145 |
- || die "unable to mimic system-remote-login pamd file." |
146 |
+ pamd_mimic system-remote-login dropbear auth account password session |
147 |
+} |
148 |
+ |
149 |
+pkg_preinst() { |
150 |
+ enewgroup sshd 22 |
151 |
+ enewuser sshd 22 -1 /var/empty sshd |
152 |
} |