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)

7 files changed, 24 insertions, 117 deletions

diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index e1eef6c9fb4c..75b50ebdf986 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -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:
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.2.4.1-tpm_util.c.patch b/dev-libs/opencryptoki/files/opencryptoki-2.2.4.1-tpm_util.c.patch
deleted file mode 100644
index d1b7eef7fe38..000000000000
--- a/dev-libs/opencryptoki/files/opencryptoki-2.2.4.1-tpm_util.c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -upr opencryptoki-2.2.4.1.orig/usr/lib/pkcs11/tpm_stdll/tpm_util.c opencryptoki-2.2.4.1/usr/lib/pkcs11/tpm_stdll/tpm_util.c
---- opencryptoki-2.2.4.1.orig/usr/lib/pkcs11/tpm_stdll/tpm_util.c	2007-02-03 00:19:41.000000000 +0200
-+++ opencryptoki-2.2.4.1/usr/lib/pkcs11/tpm_stdll/tpm_util.c	2007-03-25 20:42:38.926868516 +0300
-@@ -51,6 +51,10 @@
- 
- #include "tpm_specific.h"
- 
-+#ifndef UINT64
-+#define UINT64 unsigned long long
-+#endif
-+
- extern TSS_HCONTEXT tspContext;
- 
- UINT32
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.2.8-remove_openlog.patch b/dev-libs/opencryptoki/files/opencryptoki-2.2.8-remove_openlog.patch
deleted file mode 100644
index 199db5a649d9..000000000000
--- a/dev-libs/opencryptoki/files/opencryptoki-2.2.8-remove_openlog.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- opencryptoki-2.2.8.orig/usr/lib/pkcs11/api/apiutil.c	2010-06-04 17:04:48.000000000 -0400
-+++ opencryptoki-2.2.8/usr/lib/pkcs11/api/apiutil.c	2010-06-04 17:06:23.000000000 -0400
-@@ -380,7 +380,6 @@
- 
-    if (!enabled){
-       enabled=1;
--      openlog("openCryptokiModule",LOG_PID|LOG_NDELAY,LOG_DAEMON);
-       setlogmask(LOG_UPTO(LOG_DEBUG));
- 	logit(LOG_DEBUG,"Logging enabled %d enabled",enabled);
-    }
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.2.8-remove_recursive_chmod.patch b/dev-libs/opencryptoki/files/opencryptoki-2.2.8-remove_recursive_chmod.patch
deleted file mode 100644
index c8a22e6bb4bf..000000000000
--- a/dev-libs/opencryptoki/files/opencryptoki-2.2.8-remove_recursive_chmod.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: opencryptoki-2.3.2/usr/sbin/pkcs_slot/pkcs_slot.in
-===================================================================
---- opencryptoki-2.3.2.orig/usr/sbin/pkcs_slot/pkcs_slot.in
-+++ opencryptoki-2.3.2/usr/sbin/pkcs_slot/pkcs_slot.in
-@@ -356,12 +356,14 @@ fi
- DEVICE=$1
- DEPTH=$2
- 
-+# Ensure that any directories created are group-accessible
-+umask 002
-+
- # Check for the existance of the directories 
- if [ ! -d @localstatedir@/lib/opencryptoki ]
- then
- 	@MKDIR_P@ @localstatedir@/lib/opencryptoki
-         @CHGRP@ pkcs11 @localstatedir@/lib/opencryptoki
--	@CHMOD@ -R g+rwX @localstatedir@/lib/opencryptoki
- fi
- 
- 
-@@ -502,7 +504,6 @@ then
- echo "TRUE|0|$SLOT_DESCRIPTION|$MANUFACTURER|TRUE|FALSE|TRUE|0|0|1|1|NONE|$CCA_DLL_FN|$CCA_INIT" >>$CFGFILE
- fi
- 
--@CHMOD@ -R g+wrX @localstatedir@/lib/opencryptoki
- 
- 
- 
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.2.8-steal_shmem.patch b/dev-libs/opencryptoki/files/opencryptoki-2.2.8-steal_shmem.patch
deleted file mode 100644
index 45e1e7104411..000000000000
--- a/dev-libs/opencryptoki/files/opencryptoki-2.2.8-steal_shmem.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur opencryptoki-2.2.8.orig/usr/sbin/pkcsslotd/shmem.c opencryptoki-2.2.8/usr/sbin/pkcsslotd/shmem.c
---- opencryptoki-2.2.8.orig/usr/sbin/pkcsslotd/shmem.c	2010-06-02 09:18:27.000000000 -0700
-+++ opencryptoki-2.2.8/usr/sbin/pkcsslotd/shmem.c	2010-06-02 11:41:31.000000000 -0700
-@@ -374,10 +374,20 @@
- 
- 
-    if ( shmid < 0 ) {
--      ErrLog(SLOTD_MSG(SHMEMCR, 
--              "Shared memory creation failed (0x%X)\n"), errno);
--      ErrLog(SLOTD_MSG(IPCRM, "perform ipcrm -M 0x%X\n"), tok);
--      return FALSE;
-+      ErrLog(SLOTD_MSG(SHMEMCR,
-+                       "Shared memory creation failed (0x%X)\n"), errno);
-+      ErrLog(SLOTD_MSG(SHMEMCR, "Reclaiming 0x%X\n"), tok);
-+      shmid = shmget( tok, sizeof( Slot_Mgr_Shr_t ), 0 );
-+      DestroySharedMemory();
-+      shmid = shmget( tok, sizeof( Slot_Mgr_Shr_t ),
-+                      IPC_CREAT | IPC_EXCL |  S_IRUSR |
-+	              S_IRGRP  | S_IWUSR | S_IWGRP   );
-+      if ( shmid < 0 ) {
-+          ErrLog(SLOTD_MSG(SHMEMCR,
-+                           "Shared memory reclamation failed (0x%X)\n"), errno);
-+          ErrLog(SLOTD_MSG(IPCRM, "perform ipcrm -M 0x%X\n"), tok);
-+          return FALSE;
-+      }
-    }
- 
-    // SAB Set the group ownership of the shared mem segment..
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.3.2-build.patch b/dev-libs/opencryptoki/files/opencryptoki-2.3.2-build.patch
deleted file mode 100644
index c54a02157bf3..000000000000
--- a/dev-libs/opencryptoki/files/opencryptoki-2.3.2-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: opencryptoki-2.3.2/usr/lib/pkcs11/api/Makefile.am
-===================================================================
---- opencryptoki-2.3.2.orig/usr/lib/pkcs11/api/Makefile.am
-+++ opencryptoki-2.3.2/usr/lib/pkcs11/api/Makefile.am
-@@ -15,17 +15,17 @@ opencryptoki_libopencryptoki_la_CFLAGS =
- opencryptoki_libopencryptoki_la_SOURCES = api_interface.c shrd_mem.c apiutil.c
- 
- install-data-hook:
-+	$(MKDIR_P) $(DESTDIR)$(libdir)/opencryptoki/stdll
-+	$(MKDIR_P) $(DESTDIR)$(libdir)/pkcs11
- 	cd $(DESTDIR)$(libdir)/opencryptoki && \
- 		ln -sf libopencryptoki.so PKCS11_API.so 
- 	cd $(DESTDIR)$(libdir)/opencryptoki && \
- 		ln -sf $(sbindir) methods
--	$(MKDIR_P) $(DESTDIR)$(libdir)/pkcs11
- 	cd $(DESTDIR)$(libdir)/pkcs11 && \
- 		ln -sf $(sbindir) methods
- 	cd $(DESTDIR)$(libdir)/pkcs11 && \
- 		ln -sf ../opencryptoki/libopencryptoki.so PKCS11_API.so
- 	cd $(DESTDIR)$(libdir)/pkcs11 && \
- 		ln -sf ../opencryptoki/libopencryptoki.so libopencryptoki.so
--	$(MKDIR_P) $(DESTDIR)$(libdir)/opencryptoki/stdll
- 	cd $(DESTDIR)$(libdir)/pkcs11 && \
- 		ln -sf ../opencryptoki/stdll/ stdll
diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild
index 20e4cd7348b7..503f7f026511 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-2.3.2.ebuild
@@ -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 @@ pkg_setup() {
 }
 
 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
 }