* [gentoo-commits] gentoo-x86 commit in dev-libs/opencryptoki: opencryptoki-2.3.2.ebuild ChangeLog
@ 2010-12-01 3:32 Diego Petteno (flameeyes)
0 siblings, 0 replies; 2+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-12-01 3:32 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/12/01 03:32:17
Modified: opencryptoki-2.3.2.ebuild ChangeLog
Log:
Make it a use, not need, dependency as you might not have tpm hardware.
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild?r1=1.1&r2=1.2
Index: opencryptoki-2.3.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opencryptoki-2.3.2.ebuild 1 Dec 2010 03:25:11 -0000 1.1
+++ opencryptoki-2.3.2.ebuild 1 Dec 2010 03:32:17 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild,v 1.1 2010/12/01 03:25:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild,v 1.2 2010/12/01 03:32:17 flameeyes Exp $
EAPI="2"
@@ -64,7 +64,7 @@
# make sure that we don't modify the init script if the USE flags
# are enabled for the needed services.
sed -n \
- $(use tpm || echo '-e /need tcsd/d') \
+ $(use tpm || echo '-e /use tcsd/d') \
-e 'p' \
"${FILESDIR}/pkcsslotd.init.2" \
> "${T}"/pkcsslotd.init || die
1.9 dev-libs/opencryptoki/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 1 Dec 2010 03:25:11 -0000 1.8
+++ ChangeLog 1 Dec 2010 03:32:17 -0000 1.9
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/opencryptoki
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.8 2010/12/01 03:25:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.9 2010/12/01 03:32:17 flameeyes Exp $
+
+ 01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ opencryptoki-2.3.2.ebuild, files/pkcsslotd.init.2:
+ Make it a use, not need, dependency as you might not have tpm hardware.
*opencryptoki-2.3.2 (01 Dec 2010)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/opencryptoki: opencryptoki-2.3.2.ebuild ChangeLog
@ 2011-01-07 22:53 Diego Petteno (flameeyes)
0 siblings, 0 replies; 2+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-01-07 22:53 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/01/07 22:53:33
Modified: opencryptoki-2.3.2.ebuild ChangeLog
Log:
Move the patches out of the tree in a backports tarball. The backports are maintained in a git repository that more easily syncs up with upstream.
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild?r1=1.2&r2=1.3
Index: opencryptoki-2.3.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opencryptoki-2.3.2.ebuild 1 Dec 2010 03:32:17 -0000 1.2
+++ opencryptoki-2.3.2.ebuild 7 Jan 2011 22:53:33 -0000 1.3
@@ -1,15 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild,v 1.2 2010/12/01 03:32:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild,v 1.3 2011/01/07 22:53:33 flameeyes Exp $
EAPI="2"
+# backports are maintained as tags on Diego's repository on gitorious:
+# http://gitorious.org/~flameeyes/opencryptoki/flameeyess-opencryptoki
+BACKPORTS=1
+
inherit autotools eutils multilib
DESCRIPTION="PKCS#11 provider for IBM cryptographic hardware"
HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.bz2
- mirror://gentoo/opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2"
+ ${BACKPORTS:+
+ http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
LICENSE="CPL-0.5"
SLOT="0"
@@ -26,14 +31,11 @@
}
src_prepare() {
- # Enable fallback operation mode for imported keys.
- # Patch written by Kent Yoder.
- epatch "${WORKDIR}/opencryptoki-tpm_stdll-sw_fallback-June012006.patch"
- epatch "${FILESDIR}/opencryptoki-2.2.4.1-tpm_util.c.patch"
- epatch "${FILESDIR}/opencryptoki-2.2.8-steal_shmem.patch"
- epatch "${FILESDIR}/opencryptoki-2.2.8-remove_openlog.patch"
- epatch "${FILESDIR}/opencryptoki-2.2.8-remove_recursive_chmod.patch"
- epatch "${FILESDIR}/opencryptoki-2.3.2-build.patch"
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_MULTI_MSG="Applying backports patches #${BACKPORTS} ..." \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+ epatch
+
eautoreconf
}
1.10 dev-libs/opencryptoki/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opencryptoki/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 1 Dec 2010 03:32:17 -0000 1.9
+++ ChangeLog 7 Jan 2011 22:53:33 -0000 1.10
@@ -1,6 +1,15 @@
# ChangeLog for dev-libs/opencryptoki
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.9 2010/12/01 03:32:17 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.10 2011/01/07 22:53:33 flameeyes Exp $
+
+ 07 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+ -files/opencryptoki-2.2.4.1-tpm_util.c.patch,
+ -files/opencryptoki-2.2.8-remove_openlog.patch,
+ -files/opencryptoki-2.2.8-remove_recursive_chmod.patch,
+ -files/opencryptoki-2.2.8-steal_shmem.patch, opencryptoki-2.3.2.ebuild,
+ -files/opencryptoki-2.3.2-build.patch:
+ Move the patches out of the tree in a backports tarball. The backports are
+ maintained in a git repository that more easily syncs up with upstream.
01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
opencryptoki-2.3.2.ebuild, files/pkcsslotd.init.2:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-07 22:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-01 3:32 [gentoo-commits] gentoo-x86 commit in dev-libs/opencryptoki: opencryptoki-2.3.2.ebuild ChangeLog Diego Petteno (flameeyes)
-- strict thread matches above, loose matches on Subject: below --
2011-01-07 22:53 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox