* [gentoo-commits] dev/c1pher:master commit in: app-crypt/asekey/files/, dev-util/ati-stream-sdk/, app-crypt/asekey/
@ 2011-02-18 18:25 Dane Smith
0 siblings, 0 replies; only message in thread
From: Dane Smith @ 2011-02-18 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 0c2cb84c9078d5af9db6a01df67439b705e9957e
Author: smitdane <smitdane <AT> cipher <DOT> pnet <DOT> mitre <DOT> org>
AuthorDate: Fri Feb 18 18:20:56 2011 +0000
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 18:20:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=0c2cb84c
testing asekey
---
app-crypt/asekey/ChangeLog | 42 ++++++++
app-crypt/asekey/Manifest | 7 ++
app-crypt/asekey/asekey-3.6.ebuild | 31 ++++++
...emove-ifdhcreatechannel-counter-constrain.patch | 34 +++++++
.../files/asekey-3.6-install-driver-bundle.patch | 103 ++++++++++++++++++++
.../files/asekey-3.6-install-udev-rules.patch | 98 +++++++++++++++++++
app-crypt/asekey/metadata.xml | 5 +
dev-util/ati-stream-sdk/Manifest | 2 +-
dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild | 3 +-
9 files changed, 322 insertions(+), 3 deletions(-)
diff --git a/app-crypt/asekey/ChangeLog b/app-crypt/asekey/ChangeLog
new file mode 100644
index 0000000..d1259d8
--- /dev/null
+++ b/app-crypt/asekey/ChangeLog
@@ -0,0 +1,42 @@
+# ChangeLog for app-crypt/asekey
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/asekey/ChangeLog,v 1.10 2010/12/26 17:44:25 flameeyes Exp $
+
+ 26 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> -asekey-3.3.ebuild:
+ Wishfully remove 3.3 version.
+
+ 16 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
+ Maintainer should not be the herd. Remove wrong entry from metadata. Thx
+ to leio and his grumpy for reporting.
+
+ 14 Oct 2009; Mark Loeser <halcy0n@gentoo.org> asekey-3.3.ebuild:
+ QA fixes; remove useless dodoc LICENSE
+
+ 16 May 2009; Robin H. Johnson <robbat2@gentoo.org> asekey-3.3.ebuild,
+ asekey-3.4.ebuild:
+ Migration to virtual/libusb. Verified by code inspection.
+
+*asekey-3.4 (10 Apr 2009)
+
+ 10 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ +asekey-3.4.ebuild:
+ Version bump.
+
+ 01 Jun 2008; Daniel Black <dragonheart@gentoo.org> asekey-3.3.ebuild:
+ QA - add IUSE - bug #224349 thanks Marek Miller
+
+ 15 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> asekey-3.3.ebuild:
+ Fix postrm for multi libraries
+
+ 14 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> asekey-3.3.ebuild:
+ Fixup for pcsc-lite-1.4
+
+ 24 Jan 2007; Marius Mauch <genone@gentoo.org> asekey-3.3.ebuild:
+ Replacing einfo with elog
+
+*asekey-3.3 (16 Dec 2006)
+
+ 16 Dec 2006; Alon Bar-Lev <alonbl@gentoo.org> +metadata.xml,
+ +asekey-3.3.ebuild:
+ Initial import
+
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
new file mode 100644
index 0000000..dfb9aa1
--- /dev/null
+++ b/app-crypt/asekey/Manifest
@@ -0,0 +1,7 @@
+AUX asekey-3.4-remove-ifdhcreatechannel-counter-constrain.patch 1019 RMD160 36e443ca726adf9f91a24b258ef13a8a903cf12d SHA1 2d2c060a3b6d5a1959e89cf05e1c785a7f867b17 SHA256 9f5afe21b8f2749a2cda3b227e771509f4b530e478f6fd326285a507e8cd238c
+AUX asekey-3.6-install-driver-bundle.patch 2763 RMD160 f37e3a8d0a8fab23c8628650254bb79d17446527 SHA1 c7941d9745b87a5480a97301245cc1fd96baa7b8 SHA256 5ca5cbc9ebe483ce0abf5bf5e022bfed069581f7dc4d749bfa4f2eb8a8d3fad5
+AUX asekey-3.6-install-udev-rules.patch 2729 RMD160 9cd65989e896c33d653af70cfa88b6384c0d6bd8 SHA1 918c64fb89f7d3ccb3c5de23fe6ad491a60b8c61 SHA256 d59ddf0aff44bb81ea159a29d4c23349c034513ca47521ec82c9f9af21196307
+DIST asekey-3.6.tar.bz2 32969 RMD160 b4773bac50b41eb5543d4de64a1af93bcaf25d4f SHA1 b67e9e24e2e325065704604718e54d04b029c6db SHA256 f9a3db1a837a78419673c0c40e0d395f1f008df2f10763e9876de5b3abc3cc82
+EBUILD asekey-3.6.ebuild 947 RMD160 ecea0c1cf509b1087d4fbc20f15c845d09414d2b SHA1 3226ba9de870713ec7ce115ac8372cc0ecd22fa8 SHA256 4dcb9b35dfbfad92f2f6655b1bf47ab4aabae31b3a4416a441146d03b25775bc
+MISC ChangeLog 1449 RMD160 494e8aaa09ba54fd8689479eb4d85731ce1de9bb SHA1 95a646acbcbc8d69c826a4c97fd31e12b6480640 SHA256 4c22e22f9cf2ce767e12ce7a3d550d559e5e14e587f7a73555f811b2cafd5d58
+MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/app-crypt/asekey/asekey-3.6.ebuild b/app-crypt/asekey/asekey-3.6.ebuild
new file mode 100644
index 0000000..2fd019a
--- /dev/null
+++ b/app-crypt/asekey/asekey-3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/asekey/asekey-3.4.ebuild,v 1.2 2009/05/16 07:30:46 robbat2 Exp $
+EAPI="2"
+inherit eutils
+
+DESCRIPTION="ASEKey USB SIM Card Reader"
+HOMEPAGE="http://www.athena-scs.com"
+SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+IUSE=""
+KEYWORDS=""
+RDEPEND=">=sys-apps/pcsc-lite-1.3.0[usb]
+ =virtual/libusb-0*"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-install-driver-bundle.patch" \
+ "${FILESDIR}/${PN}-3.4-remove-ifdhcreatechannel-counter-constrain.patch" \
+ "${FILESDIR}/${P}-install-udev-rules.patch" \
+ || die "Patching failed"
+ sed -i -e 's:GROUP="pcscd":ENV{PCSCD}="1":' "92_pcscd_${PN}.rules" || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc ChangeLog README || die
+}
+
diff --git a/app-crypt/asekey/files/asekey-3.4-remove-ifdhcreatechannel-counter-constrain.patch b/app-crypt/asekey/files/asekey-3.4-remove-ifdhcreatechannel-counter-constrain.patch
new file mode 100644
index 0000000..f0555ba
--- /dev/null
+++ b/app-crypt/asekey/files/asekey-3.4-remove-ifdhcreatechannel-counter-constrain.patch
@@ -0,0 +1,34 @@
+diff --git a/ifdhandler.c b/ifdhandler.c
+index 22486e6..0b24ec8 100644
+--- a/ifdhandler.c
++++ b/ifdhandler.c
+@@ -76,8 +76,7 @@ RESPONSECODE IFDHCreateChannel ( DWORD Lun, DWORD Channel ) {
+ syslog(LOG_INFO, "==============================================\n");
+ #endif
+
+- if (Channel >= 0x1 && Channel <= 0xF)
+- createChannelCounter++;
++ createChannelCounter++;
+
+ if (!listenerStarted) {
+ pthread_create(&listenetThread, NULL, Listener, &readerData);
+@@ -117,6 +116,16 @@ RESPONSECODE IFDHCloseChannel ( DWORD Lun ) {
+ #endif
+
+ createChannelCounter--;
++
++ if (createChannelCounter < 0) {
++#ifdef ASE_DEBUG
++ syslog(LOG_INFO, "ASE IIIe USB Reader : "
++ "unballanced IFDH{Create,Close}Channel() invocations detected. "
++ "Bug in PCSC daemon?\n");
++#endif
++ createChannelCounter = 0;
++ }
++
+ if (createChannelCounter == 0) {
+ #ifdef ASE_DEBUG
+ syslog(LOG_INFO, "ASE IIIe USB Reader : killing listener\n");
+--
+1.7.3.4
+
diff --git a/app-crypt/asekey/files/asekey-3.6-install-driver-bundle.patch b/app-crypt/asekey/files/asekey-3.6-install-driver-bundle.patch
new file mode 100644
index 0000000..b4900f3
--- /dev/null
+++ b/app-crypt/asekey/files/asekey-3.6-install-driver-bundle.patch
@@ -0,0 +1,103 @@
+diff --git a/Info.plist b/Info.plist
+new file mode 100644
+index 0000000..beed195
+--- /dev/null
++++ b/Info.plist
+@@ -0,0 +1,31 @@
++<plist version="1.0">
++ <key>ifdVendorID</key>
++ <array>
++ <string>0x0DC3</string>
++ <string>0x0DC3</string>
++ </array>
++
++ <key>ifdProductID</key>
++ <array>
++ <string>0x1701</string>
++ <string>0x1702</string>
++ </array>
++
++ <key>ifdFriendlyName</key>
++ <array>
++ <string>ASEKey</string>
++ <string>ASEKey</string>
++ </array>
++
++ <key>CFBundleExecutable</key>
++ <array>
++ <string>libASEKey.so</string>
++ <string>libASEKey.so</string>
++ </array>
++
++ <key>ifdCapabilities</key>
++ <array>
++ <string>0x0000000</string>
++ <string>0x0000000</string>
++ </array>
++</plist>
+diff --git a/Makefile b/Makefile
+index fc903ab..51ef668 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+
+ include Makefile.inc
+
+-DRIVER_DIR=${DESTDIR}/${USBDROPDIR}/ifd-ASEKey
++DRIVER_DIR=${DESTDIR}/${USBDROPDIR}/ifd-ASEKey.bundle
+
+ CC=${BUILD}-gcc
+
+@@ -15,7 +15,8 @@ libASEKey.so: ${SOURCES}
+ etc: etc/reader.conf
+
+ etc/reader.conf: etc/reader.conf.in
+- sed "s#\%PCSC_DRIVERS_DIR\%#${USBDROPDIR}#g" < etc/reader.conf.in > etc/reader.conf
++ sed "s#\%PCSC_DRIVERS_DIR\%#${USBDROPDIR}#g; s#\%KERNEL_NAME\%#${KERNEL_NAME}#g" \
++ < etc/reader.conf.in > etc/reader.conf
+
+ clean-all: clean
+ rm Makefile.inc || true
+@@ -25,6 +26,7 @@ clean:
+ rm etc/reader.conf || true
+
+ install: all
+- install -c -d "${DRIVER_DIR}"
+- install -c -m 0755 libASEKey.so "${DRIVER_DIR}"
++ install -c -d "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
++ install -c -m 0644 Info.plist "${DRIVER_DIR}/Contents/"
++ install -c -m 0755 libASEKey.so "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
+
+diff --git a/configure b/configure
+index 7b44fa0..b21131c 100755
+--- a/configure
++++ b/configure
+@@ -71,5 +71,6 @@ echo "USBDROPDIR=${USBDROPDIR}" >> Makefile.inc
+ echo "BUILD=${BUILD}" >> Makefile.inc
+ echo "CFLAGS=${CFLAGS}" >> Makefile.inc
+ echo "LDFLAGS=${LDFLAGS}" >> Makefile.inc
++echo "KERNEL_NAME=$(uname)" >> Makefile.inc
+
+ exit 0
+diff --git a/etc/reader.conf.in b/etc/reader.conf.in
+index 8217f1d..89acff8 100755
+--- a/etc/reader.conf.in
++++ b/etc/reader.conf.in
+@@ -3,12 +3,12 @@
+
+ FRIENDLYNAME "ASEKey01"
+ DEVICENAME /dev/null
+-LIBPATH %PCSC_DRIVERS_DIR%/ifd-ASEKey/libASEKey.so
++LIBPATH %PCSC_DRIVERS_DIR%/ifd-ASEKey.bundle/Contents/%KERNEL_NAME%/libASEKey.so
+ CHANNELID 0x1
+
+ FRIENDLYNAME "ASEKey01"
+ DEVICENAME /dev/null
+-LIBPATH %PCSC_DRIVERS_DIR%/ifd-ASEKey/libASEKey.so
++LIBPATH %PCSC_DRIVERS_DIR%/ifd-ASEKey.bundle/Contents/%KERNEL_NAME%/libASEKey.so
+ CHANNELID 0x2
+
+ # End of file
+--
+1.7.4.rc1
+
diff --git a/app-crypt/asekey/files/asekey-3.6-install-udev-rules.patch b/app-crypt/asekey/files/asekey-3.6-install-udev-rules.patch
new file mode 100644
index 0000000..881eead
--- /dev/null
+++ b/app-crypt/asekey/files/asekey-3.6-install-udev-rules.patch
@@ -0,0 +1,98 @@
+diff --git a/92_pcscd_asekey.rules b/92_pcscd_asekey.rules
+new file mode 100644
+index 0000000..ddc7939
+--- /dev/null
++++ b/92_pcscd_asekey.rules
+@@ -0,0 +1,21 @@
++# udev rules to set the access rights of Asekey tokens so they can be used
++# by pcscd.
++#
++# File stolen from CCID driver.
++# This file is free software; you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as published by
++# the Free Software Foundation; either version 2.1 of the License, or (at
++# your option) any later version.
++
++# If not adding the device, go away
++ACTION!="add", GOTO="pcscd_asekey_rules_end"
++SUBSYSTEM!="usb", GOTO="pcscd_asekey_rules_end"
++ENV{DEVTYPE}!="usb_device", GOTO="pcscd_asekey_rules_end"
++
++# Asekey 0x1701
++ATTRS{idVendor}=="0dc3", ATTRS{idProduct}=="1701", GROUP="pcscd"
++# Asekey 0x1702
++ATTRS{idVendor}=="0dc3", ATTRS{idProduct}=="1702", GROUP="pcscd"
++
++# All done
++LABEL="pcscd_asekey_rules_end"
+diff --git a/Makefile b/Makefile
+index 51ef668..edcc435 100755
+--- a/Makefile
++++ b/Makefile
+@@ -2,6 +2,7 @@
+ include Makefile.inc
+
+ DRIVER_DIR=${DESTDIR}/${USBDROPDIR}/ifd-ASEKey.bundle
++UDEV_DIR=${DESTDIR}/${UDEVDIR}
+
+ CC=${BUILD}-gcc
+
+@@ -29,4 +30,6 @@ install: all
+ install -c -d "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
+ install -c -m 0644 Info.plist "${DRIVER_DIR}/Contents/"
+ install -c -m 0755 libASEKey.so "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
++ install -c -d "${UDEV_DIR}"
++ install -c -m 0644 92_pcscd_asekey.rules "${UDEV_DIR}"
+
+diff --git a/configure b/configure
+index b21131c..2408edc 100755
+--- a/configure
++++ b/configure
+@@ -9,6 +9,7 @@ BUILD=
+ PCSC_HEADERS=
+ PCSC_LIBS=
+ PKCS11_MODULE=
++UDEVDIR=
+
+ for p in $*; do
+ v=${p#*=}
+@@ -28,6 +29,9 @@ for p in $*; do
+ --with-pcsc-libs=*)
+ PCSC_LIBS="$v"
+ ;;
++ --with-udev-rules-dir=*)
++ UDEVDIR="$v"
++ ;;
+ --build=*)
+ BUILD="$v"
+ ;;
+@@ -42,6 +46,7 @@ if [ ${USAGE} != 0 ]; then
+ echo -e "\t--with-pcsc-drivers-dir=dir\tSet pcsc drivers directory."
+ echo -e "\t--with-pcsc-headers=dir\t\tSet manual pcsc headers directory."
+ echo -e "\t--with-pcsc-libs=dir\t\tSet manual pcsc library dir."
++ echo -e "\t--with-udev-rules-dir=dir\t\tSet manual udev rules dir."
+ exit 1
+ fi
+
+@@ -54,6 +59,10 @@ if [ -z "$USBDROPDIR" ]; then
+ exit 1
+ fi
+
++if [ -z "$UDEVDIR" ]; then
++ UDEVDIR="/lib/udev/rules.d"
++fi
++
+ if [ -z "$PCSC_HEADERS" ]; then
+ CFLAGS="$CFLAGS `pkg-config libpcsclite --cflags`"
+ else
+@@ -68,6 +77,7 @@ fi
+
+ echo "PREFIX=${PREFIX}" > Makefile.inc
+ echo "USBDROPDIR=${USBDROPDIR}" >> Makefile.inc
++echo "UDEVDIR=${UDEVDIR}" >> Makefile.inc
+ echo "BUILD=${BUILD}" >> Makefile.inc
+ echo "CFLAGS=${CFLAGS}" >> Makefile.inc
+ echo "LDFLAGS=${LDFLAGS}" >> Makefile.inc
+--
+1.7.4.rc1
+
diff --git a/app-crypt/asekey/metadata.xml b/app-crypt/asekey/metadata.xml
new file mode 100644
index 0000000..b02ffbb
--- /dev/null
+++ b/app-crypt/asekey/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+</pkgmetadata>
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index d3730a9..b114817 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
-EBUILD ati-stream-sdk-2.3.ebuild 1927 RMD160 f344a2c9456c8b5213949181103a3c01b2a2bbcf SHA1 9a3b5ccfe03d998ca0cd30a0c6b2a54c7df10b5b SHA256 95cbb0814be3941ed202ae17c87abafd68100083da396defbe9110c77a8c462e
+EBUILD ati-stream-sdk-2.3.ebuild 1902 RMD160 3223fecbf191d822e896965ba63be3ebb2475d1e SHA1 b30d65c95630319b86c0b7a4fe5cd22323379093 SHA256 1f55cff88074875c4867fd52441fd266fbc3ab96016865f93eb21a4a07598948
MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild
index 3adaf68..b5fbd23 100644
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild
@@ -29,14 +29,13 @@ S="${WORKDIR}/${MY_P}"
pkg_nofetch() {
ewarn "Proprietary software. Download at"
ewarn "http://developer.amd.com/gpu/AMDAPPSDK/downloads/Pages/default.aspx"
- ewarn "and move it to /usr/portage/distfiles/"
+ ewarn "and move it to distfiles"
}
src_unpack() {
default_src_unpack
mv ${MY_P}-lnx* ${MY_P} || die
- cd "${S}"
}
src_compile() { true; }
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-18 18:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-18 18:25 [gentoo-commits] dev/c1pher:master commit in: app-crypt/asekey/files/, dev-util/ati-stream-sdk/, app-crypt/asekey/ Dane Smith
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox