* [gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ChangeLog ca-certificates-20110502-r2.ebuild
@ 2011-09-02 17:47 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-02 17:47 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/02 17:47:17
Modified: ChangeLog
Added: ca-certificates-20110502-r2.ebuild
Log:
Move the config file generation to src_compile for most people to make binpkgs easier to deploy.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.47 app-misc/ca-certificates/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?r1=1.46&r2=1.47
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog 1 Sep 2011 14:14:07 -0000 1.46
+++ ChangeLog 2 Sep 2011 17:47:17 -0000 1.47
@@ -1,6 +1,14 @@
# ChangeLog for app-misc/ca-certificates
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.46 2011/09/01 14:14:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.47 2011/09/02 17:47:17 vapier Exp $
+
+*ca-certificates-20110502-r2 (02 Sep 2011)
+
+ 02 Sep 2011; Mike Frysinger <vapier@gentoo.org>
+ +files/ca-certificates-20090709-root.patch,
+ +ca-certificates-20110502-r2.ebuild:
+ Move the config file generation to src_compile for most people to make
+ binpkgs easier to deploy.
01 Sep 2011; Tony Vroon <chainsaw@gentoo.org>
ca-certificates-20110502-r1.ebuild:
1.1 app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?rev=1.1&content-type=text/plain
Index: ca-certificates-20110502-r2.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $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 $
EAPI="2"
inherit eutils
DESCRIPTION="Common CA Certificates PEM files"
HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}+nmu1_all.deb"
LICENSE="MPL-1.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
DEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )"
RDEPEND="${DEPEND}
dev-libs/openssl
sys-apps/debianutils"
S=${WORKDIR}
pkg_setup() {
# For the conversion to having it in CONFIG_PROTECT_MASK,
# we need to tell users about it once manually first.
[[ -f /etc/env.d/98ca-certificates ]] \
|| ewarn "You should run update-ca-certificates manually after etc-update"
}
src_unpack() {
unpack ${A}
unpack ./data.tar.gz
rm -f control.tar.gz data.tar.gz debian-binary
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-20090709-root.patch
}
src_compile() {
(
echo "# Automatically generated by ${CATEGORY}/${PF}"
echo "# $(date -u)"
echo "# Do not edit."
cd "${S}"/usr/share/ca-certificates
find * -name '*.crt' | LC_ALL=C sort
) > "${S}"/etc/ca-certificates.conf
"${S}"/usr/sbin/update-ca-certificates --root "${S}"
}
src_install() {
cp -pPR * "${D}"/ || die
mv "${D}"/usr/share/doc/{ca-certificates,${PF}} || die
prepalldocs
echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
doenvd 98ca-certificates
}
pkg_postinst() {
if [ -d "${ROOT}/usr/local/share/ca-certificates" ] ; then
# if the user has local certs, we need to rebuild again
# to include their stuff in the db.
# However it's too overzealous when the user has custom certs in place.
# --fresh is to clean up dangling symlinks
"${ROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
fi
local c badcerts=0
for c in $(find -L "${ROOT}"etc/ssl/certs/ -type l) ; do
ewarn "Broken symlink for a certificate at $c"
badcerts=1
done
if [ $badcerts -eq 1 ]; then
ewarn "You MUST remove the above broken symlinks"
ewarn "Otherwise any SSL validation that use the directory may fail!"
ewarn "To batch-remove them, run:"
ewarn "find -L ${ROOT}etc/ssl/certs/ -type l -exec rm {} +"
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ChangeLog ca-certificates-20110502-r2.ebuild
@ 2011-09-02 19:08 Jeremy Olexa (darkside)
0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-09-02 19:08 UTC (permalink / raw
To: gentoo-commits
darkside 11/09/02 19:08:32
Modified: ChangeLog ca-certificates-20110502-r2.ebuild
Log:
Add Gentoo Prefix support, convert to EAPI3, use prefix variables, modify ROOT variable in update-ca-certificates script. Signed off by maintainer with discussion
(Portage version: 2.1.10.3/cvs/Linux i686)
Revision Changes Path
1.48 app-misc/ca-certificates/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?r1=1.47&r2=1.48
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog 2 Sep 2011 17:47:17 -0000 1.47
+++ ChangeLog 2 Sep 2011 19:08:32 -0000 1.48
@@ -1,6 +1,12 @@
# ChangeLog for app-misc/ca-certificates
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.47 2011/09/02 17:47:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.48 2011/09/02 19:08:32 darkside Exp $
+
+ 02 Sep 2011; Jeremy Olexa <darkside@gentoo.org>
+ ca-certificates-20110502-r2.ebuild:
+ Add Gentoo Prefix support, convert to EAPI3, use prefix variables, modify
+ ROOT variable in update-ca-certificates script. Signed off by maintainer with
+ discussion
*ca-certificates-20110502-r2 (02 Sep 2011)
1.2 app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?r1=1.1&r2=1.2
Index: ca-certificates-20110502-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ca-certificates-20110502-r2.ebuild 2 Sep 2011 17:47:17 -0000 1.1
+++ ca-certificates-20110502-r2.ebuild 2 Sep 2011 19:08:32 -0000 1.2
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
-EAPI="2"
+EAPI="3"
inherit eutils
@@ -12,20 +12,21 @@
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+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"
IUSE=""
DEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )"
RDEPEND="${DEPEND}
dev-libs/openssl
- sys-apps/debianutils"
+ sys-apps/debianutils
+ kernel_AIX? ( app-arch/deb2targz )" # platforms like AIX don't have a good ar
S=${WORKDIR}
pkg_setup() {
# For the conversion to having it in CONFIG_PROTECT_MASK,
# we need to tell users about it once manually first.
- [[ -f /etc/env.d/98ca-certificates ]] \
+ [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
|| ewarn "You should run update-ca-certificates manually after etc-update"
}
@@ -48,13 +49,14 @@
find * -name '*.crt' | LC_ALL=C sort
) > "${S}"/etc/ca-certificates.conf
+ sed -i "/^ROOT=""/s:=.*:='${EPREFIX}':" "${S}"/usr/sbin/update-ca-certificates || die
"${S}"/usr/sbin/update-ca-certificates --root "${S}"
}
src_install() {
- cp -pPR * "${D}"/ || die
+ cp -pPR * "${ED}"/ || die
- mv "${D}"/usr/share/doc/{ca-certificates,${PF}} || die
+ mv "${ED}"/usr/share/doc/{ca-certificates,${PF}} || die
prepalldocs
echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
@@ -62,16 +64,16 @@
}
pkg_postinst() {
- if [ -d "${ROOT}/usr/local/share/ca-certificates" ] ; then
+ if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
# if the user has local certs, we need to rebuild again
# to include their stuff in the db.
# However it's too overzealous when the user has custom certs in place.
# --fresh is to clean up dangling symlinks
- "${ROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+ "${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}"
fi
local c badcerts=0
- for c in $(find -L "${ROOT}"etc/ssl/certs/ -type l) ; do
+ for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
ewarn "Broken symlink for a certificate at $c"
badcerts=1
done
@@ -79,6 +81,6 @@
ewarn "You MUST remove the above broken symlinks"
ewarn "Otherwise any SSL validation that use the directory may fail!"
ewarn "To batch-remove them, run:"
- ewarn "find -L ${ROOT}etc/ssl/certs/ -type l -exec rm {} +"
+ ewarn "find -L ${EROOT}etc/ssl/certs/ -type l -exec rm {} +"
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ChangeLog ca-certificates-20110502-r2.ebuild
@ 2011-09-03 17:33 Fabian Groffen (grobian)
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen (grobian) @ 2011-09-03 17:33 UTC (permalink / raw
To: gentoo-commits
grobian 11/09/03 17:33:45
Modified: ChangeLog ca-certificates-20110502-r2.ebuild
Log:
Create ED, so we can actually copy files into it, when D != ED (on Prefix)
(Portage version: 2.2.01.19120-prefix/cvs/Darwin i386)
Revision Changes Path
1.52 app-misc/ca-certificates/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?r1=1.51&r2=1.52
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog 3 Sep 2011 13:14:16 -0000 1.51
+++ ChangeLog 3 Sep 2011 17:33:45 -0000 1.52
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/ca-certificates
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.51 2011/09/03 13:14:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.52 2011/09/03 17:33:45 grobian Exp $
+
+ 03 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+ ca-certificates-20110502-r2.ebuild:
+ Create ED, so we can actually copy files into it, when D != ED (on Prefix)
03 Sep 2011; Raúl Porcel <armin76@gentoo.org>
ca-certificates-20110502-r1.ebuild:
1.3 app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild?r1=1.2&r2=1.3
Index: ca-certificates-20110502-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ca-certificates-20110502-r2.ebuild 2 Sep 2011 19:08:32 -0000 1.2
+++ ca-certificates-20110502-r2.ebuild 3 Sep 2011 17:33:45 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v 1.3 2011/09/03 17:33:45 grobian Exp $
EAPI="3"
@@ -54,6 +54,7 @@
}
src_install() {
+ mkdir -p "${ED}"
cp -pPR * "${ED}"/ || die
mv "${ED}"/usr/share/doc/{ca-certificates,${PF}} || die
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-03 17:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-02 17:47 [gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ChangeLog ca-certificates-20110502-r2.ebuild Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2011-09-02 19:08 Jeremy Olexa (darkside)
2011-09-03 17:33 Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox