1 |
darkside 11/09/02 19:08:32 |
2 |
|
3 |
Modified: ChangeLog ca-certificates-20110502-r2.ebuild |
4 |
Log: |
5 |
Add Gentoo Prefix support, convert to EAPI3, use prefix variables, modify ROOT variable in update-ca-certificates script. Signed off by maintainer with discussion |
6 |
|
7 |
(Portage version: 2.1.10.3/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.48 app-misc/ca-certificates/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.48&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.48&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?r1=1.47&r2=1.48 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v |
19 |
retrieving revision 1.47 |
20 |
retrieving revision 1.48 |
21 |
diff -u -r1.47 -r1.48 |
22 |
--- ChangeLog 2 Sep 2011 17:47:17 -0000 1.47 |
23 |
+++ ChangeLog 2 Sep 2011 19:08:32 -0000 1.48 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for app-misc/ca-certificates |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.47 2011/09/02 17:47:17 vapier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.48 2011/09/02 19:08:32 darkside Exp $ |
29 |
+ |
30 |
+ 02 Sep 2011; Jeremy Olexa <darkside@g.o> |
31 |
+ ca-certificates-20110502-r2.ebuild: |
32 |
+ Add Gentoo Prefix support, convert to EAPI3, use prefix variables, modify |
33 |
+ ROOT variable in update-ca-certificates script. Signed off by maintainer with |
34 |
+ discussion |
35 |
|
36 |
*ca-certificates-20110502-r2 (02 Sep 2011) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.2 app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?rev=1.2&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?rev=1.2&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?r1=1.1&r2=1.2 |
46 |
|
47 |
Index: ca-certificates-20110502-r2.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v |
50 |
retrieving revision 1.1 |
51 |
retrieving revision 1.2 |
52 |
diff -u -r1.1 -r1.2 |
53 |
--- ca-certificates-20110502-r2.ebuild 2 Sep 2011 17:47:17 -0000 1.1 |
54 |
+++ ca-certificates-20110502-r2.ebuild 2 Sep 2011 19:08:32 -0000 1.2 |
55 |
@@ -1,8 +1,8 @@ |
56 |
# Copyright 1999-2011 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v 1.1 2011/09/02 17:47:17 vapier Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v 1.2 2011/09/02 19:08:32 darkside Exp $ |
60 |
|
61 |
-EAPI="2" |
62 |
+EAPI="3" |
63 |
|
64 |
inherit eutils |
65 |
|
66 |
@@ -12,20 +12,21 @@ |
67 |
|
68 |
LICENSE="MPL-1.1" |
69 |
SLOT="0" |
70 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
71 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
72 |
IUSE="" |
73 |
|
74 |
DEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )" |
75 |
RDEPEND="${DEPEND} |
76 |
dev-libs/openssl |
77 |
- sys-apps/debianutils" |
78 |
+ sys-apps/debianutils |
79 |
+ kernel_AIX? ( app-arch/deb2targz )" # platforms like AIX don't have a good ar |
80 |
|
81 |
S=${WORKDIR} |
82 |
|
83 |
pkg_setup() { |
84 |
# For the conversion to having it in CONFIG_PROTECT_MASK, |
85 |
# we need to tell users about it once manually first. |
86 |
- [[ -f /etc/env.d/98ca-certificates ]] \ |
87 |
+ [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \ |
88 |
|| ewarn "You should run update-ca-certificates manually after etc-update" |
89 |
} |
90 |
|
91 |
@@ -48,13 +49,14 @@ |
92 |
find * -name '*.crt' | LC_ALL=C sort |
93 |
) > "${S}"/etc/ca-certificates.conf |
94 |
|
95 |
+ sed -i "/^ROOT=""/s:=.*:='${EPREFIX}':" "${S}"/usr/sbin/update-ca-certificates || die |
96 |
"${S}"/usr/sbin/update-ca-certificates --root "${S}" |
97 |
} |
98 |
|
99 |
src_install() { |
100 |
- cp -pPR * "${D}"/ || die |
101 |
+ cp -pPR * "${ED}"/ || die |
102 |
|
103 |
- mv "${D}"/usr/share/doc/{ca-certificates,${PF}} || die |
104 |
+ mv "${ED}"/usr/share/doc/{ca-certificates,${PF}} || die |
105 |
prepalldocs |
106 |
|
107 |
echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates |
108 |
@@ -62,16 +64,16 @@ |
109 |
} |
110 |
|
111 |
pkg_postinst() { |
112 |
- if [ -d "${ROOT}/usr/local/share/ca-certificates" ] ; then |
113 |
+ if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then |
114 |
# if the user has local certs, we need to rebuild again |
115 |
# to include their stuff in the db. |
116 |
# However it's too overzealous when the user has custom certs in place. |
117 |
# --fresh is to clean up dangling symlinks |
118 |
- "${ROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" |
119 |
+ "${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}" |
120 |
fi |
121 |
|
122 |
local c badcerts=0 |
123 |
- for c in $(find -L "${ROOT}"etc/ssl/certs/ -type l) ; do |
124 |
+ for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do |
125 |
ewarn "Broken symlink for a certificate at $c" |
126 |
badcerts=1 |
127 |
done |
128 |
@@ -79,6 +81,6 @@ |
129 |
ewarn "You MUST remove the above broken symlinks" |
130 |
ewarn "Otherwise any SSL validation that use the directory may fail!" |
131 |
ewarn "To batch-remove them, run:" |
132 |
- ewarn "find -L ${ROOT}etc/ssl/certs/ -type l -exec rm {} +" |
133 |
+ ewarn "find -L ${EROOT}etc/ssl/certs/ -type l -exec rm {} +" |
134 |
fi |
135 |
} |