summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/cyberjack/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/cyberjack/files')
-rw-r--r--dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch34
-rw-r--r--dev-libs/cyberjack/files/cyberjack-3.99.5_p05-install.patch26
-rw-r--r--dev-libs/cyberjack/files/cyberjack-3.99.5_p05-manpages.patch34
-rw-r--r--dev-libs/cyberjack/files/cyberjack-3.99.5_p05-returnvalue.patch29
-rw-r--r--dev-libs/cyberjack/files/cyberjack-r1.rules18
-rw-r--r--dev-libs/cyberjack/files/cyberjack.rules10
6 files changed, 151 insertions, 0 deletions
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
new file mode 100644
index 000000000000..035d414a09d9
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/423757
+
+--- libcyberjack/checksuite/cm_distri.cpp
++++ libcyberjack/checksuite/cm_distri.cpp
+@@ -15,6 +15,7 @@
+ #include "cm_distri.h"
+ #include "checksuite.h"
+
++#include <unistd.h> /* unlink */
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- tools/fox-dialog/main.cpp
++++ tools/fox-dialog/main.cpp
+@@ -9,6 +9,8 @@
+
+ #include <fx.h>
+
++#include <unistd.h> /* unlink */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <pwd.h>
+--- tools/mac-ui-helper/main.m
++++ tools/mac-ui-helper/main.m
+@@ -31,6 +31,8 @@
+ #import "PinDialog.h"
+ #import "Delegate.h"
+
++#include <unistd.h> /* unlink */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <pwd.h>
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-install.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-install.patch
new file mode 100644
index 000000000000..f0a2f0a2b41f
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-install.patch
@@ -0,0 +1,26 @@
+From c107dd6db4967a04297eab120500a7fc5c93f221 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 13 Feb 2014 23:10:37 +0100
+Subject: [PATCH 3/3] Do not install pcscd_init.diff
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ tools/cyberjack/scripts/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/cyberjack/scripts/Makefile.am b/tools/cyberjack/scripts/Makefile.am
+index e9cc408..e2098d2 100644
+--- a/tools/cyberjack/scripts/Makefile.am
++++ b/tools/cyberjack/scripts/Makefile.am
+@@ -1,6 +1,6 @@
+
+ cdscriptdir=$(libdir)/cyberjack
+-cdscript_SCRIPTS=getdist.sh pcscd_init.diff
++cdscript_SCRIPTS=getdist.sh
+
+-EXTRA_DIST=$(cdscript_SCRIPTS)
++EXTRA_DIST=$(cdscript_SCRIPTS) pcscd_init.diff
+
+--
+1.8.3.2
+
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-manpages.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-manpages.patch
new file mode 100644
index 000000000000..98568f34910d
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-manpages.patch
@@ -0,0 +1,34 @@
+From e5d3ac2ab70cb773671a63dfed45816d6e24d36d Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 13 Feb 2014 21:40:48 +0100
+Subject: [PATCH 1/3] Fix installation of man pages
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ doc/Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index a0a68f4..cba2e30 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -6,14 +6,12 @@ DOCFILES=\
+ #docfiledir=$(datarootdir)/doc/$(PACKAGE)
+ #docfile_DATA=$(DOCFILES)
+
+-manpagedir=$(mandir)
+-manpage_DATA= \
+- cyberjack.8
++man8_MANS=cyberjack.8
+
+ EXTRA_DIST=\
+ README.xml LIESMICH.xml \
+ verifypin_ascii.c verifypin_fpin2.c \
+- $(DOCFILES) $(manpage_DATA)
++ $(DOCFILES) $(man8_MANS)
+
+
+ %.ps: %.xml
+--
+1.8.3.2
+
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-returnvalue.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-returnvalue.patch
new file mode 100644
index 000000000000..0bdf275ff0c8
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-returnvalue.patch
@@ -0,0 +1,29 @@
+From b6d3ab6d0324f8b462f57aaa551bd1d4aa1465f3 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 13 Feb 2014 22:19:40 +0100
+Subject: [PATCH 2/3] Fix return value of rsct_platform_create_com if
+ --disable-nonserial
+
+Return NULL instead of CJ_ERR_OPENING_DEVICE (int).
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ cjeca32/Platform_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cjeca32/Platform_unix.cpp b/cjeca32/Platform_unix.cpp
+index e3f4997..cbe6876 100644
+--- a/cjeca32/Platform_unix.cpp
++++ b/cjeca32/Platform_unix.cpp
+@@ -54,7 +54,7 @@ CBaseCommunication *rsct_platform_create_com(const char *deviceName, CReader *re
+ com=new CUSBUnix(deviceName, reader);
+ # else
+ /* libusb and libhal not supported for serial devices */
+- return CJ_ERR_OPENING_DEVICE;
++ return NULL;
+ # endif
+ else
+ com=new CSerialUnix(deviceName, reader);
+--
+1.8.3.2
+
diff --git a/dev-libs/cyberjack/files/cyberjack-r1.rules b/dev-libs/cyberjack/files/cyberjack-r1.rules
new file mode 100644
index 000000000000..775ed4cb592d
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-r1.rules
@@ -0,0 +1,18 @@
+# If not adding the device, go away
+ACTION!="add", GOTO="cyberjack_rules_end"
+SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
+
+
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", MODE="660", GROUP="pcscd"
+
+# All done
+LABEL="cyberjack_rules_end"
diff --git a/dev-libs/cyberjack/files/cyberjack.rules b/dev-libs/cyberjack/files/cyberjack.rules
new file mode 100644
index 000000000000..ac94b1b663f5
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack.rules
@@ -0,0 +1,10 @@
+# If not adding the device, go away
+ACTION!="add", GOTO="cyberjack_rules_end"
+SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
+
+# Tested on cyberJack RFID standard
+ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", ENV{PCSCD}="1"
+
+# All done
+LABEL="cyberjack_rules_end"