From a4149af1bec19c690e243de052c10fd939207525 Mon Sep 17 00:00:00 2001
From: Maxim Burgerhout <maxim@wzzrd.com>
Date: Mon, 1 Oct 2012 14:00:47 +0200
Subject: [PATCH] Update to 1.8.0

Support for yk_challenge_response, Yubikey 2.3, bugfixes and more
Drop bigendian patch, is now in upstream source
---
 .gitignore                   |  1 +
 69-yubikey.rules             | 11 +++++++++++
 sources                      |  2 +-
 ykpers-1.6.0-bigendian.patch | 11 -----------
 ykpers.spec                  | 23 ++++++++++++++---------
 5 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 69-yubikey.rules
 delete mode 100644 ykpers-1.6.0-bigendian.patch

diff --git a/.gitignore b/.gitignore
index 300b58b..4e3d9a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ykpers-1.3.3.tar.gz
 /ykpers-1.6.0.tar.gz
 /ykpers-1.6.2.tar.gz
 /ykpers-1.6.3.tar.gz
+/ykpers-1.8.0.tar.gz
diff --git a/69-yubikey.rules b/69-yubikey.rules
new file mode 100644
index 0000000..a39ecca
--- /dev/null
+++ b/69-yubikey.rules
@@ -0,0 +1,11 @@
+ACTION!="add|change", GOTO="yubico_end"
+
+# Udev rules for letting the console user access the Yubikey USB
+# device node, needed for challenge/response to work correctly.
+
+# Yubico Yubikey II
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010", \
+    ENV{ID_SECURITY_TOKEN}="1"
+
+LABEL="yubico_end"
+
diff --git a/sources b/sources
index 156c7ec..3cc8e5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-585b73f18a74d85a920065abcc1d82f7  ykpers-1.6.3.tar.gz
+b283a56cd50876cfcec274f1dffa67dc  ykpers-1.8.0.tar.gz
diff --git a/ykpers-1.6.0-bigendian.patch b/ykpers-1.6.0-bigendian.patch
deleted file mode 100644
index 13e8025..0000000
--- a/ykpers-1.6.0-bigendian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ykpers-1.6.0/tests/test_args_to_config.c.bigendian ykpers-1.6.0/tests/test_args_to_config.c
---- ykpers-1.6.0/tests/test_args_to_config.c.bigendian	2011-07-21 11:27:59.614946704 +0200
-+++ ykpers-1.6.0/tests/test_args_to_config.c	2011-07-21 11:28:52.805128364 +0200
-@@ -86,6 +86,7 @@ void _check_success(int rc, YKP_CONFIG *
- 	/* insert CRC */
- 	ycfg->crc = ~yubikey_crc16 ((unsigned char *) ycfg,
- 				    offsetof(struct config_st, crc));
-+	ycfg->crc = yk_endian_swap_16(ycfg->crc);
- 
- 	config_matches_expected = ! memcmp(expected, ycfg, sizeof(*ycfg));
- 	if (! config_matches_expected) {
diff --git a/ykpers.spec b/ykpers.spec
index 3cc54b7..991f052 100644
--- a/ykpers.spec
+++ b/ykpers.spec
@@ -1,13 +1,13 @@
 Name:           ykpers
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Yubikey personalization program
 
 Group:          Applications/System
 License:        BSD
 URL:            http://code.google.com/p/yubikey-personalization/
 Source0:        http://yubikey-personalization.googlecode.com/files/%{name}-%{version}.tar.gz
-#Patch0:         %{name}-1.6.0-bigendian.patch
+Source1:        69-yubikey.rules
 
 %ifnarch s390 s390x
 BuildRequires: libusb1-devel
@@ -31,11 +31,9 @@ use ykpers.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .bigendian
 
 %build
 %configure --enable-static=no --disable-rpath \
-           --with-udevrulesdir=/lib/udev/rules.d \
 %ifnarch s390 s390x
     --with-backend=libusb-1.0
 %else
@@ -47,11 +45,13 @@ use ykpers.
 %{__make} %{?_smp_mflags}
 
 %check
-pwd
-%{__make} check LD_LIBRARY_PATH="../.libs"
+export LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/.libs
+%{__make} check
 
 %install
 %{__make} install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p"
+install -D -p -m 0755 %{SOURCE1} \
+    ${RPM_BUILD_ROOT}/usr/lib/udev/rules.d/69-yubikey.rules
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -67,10 +67,10 @@ pwd
 %{_bindir}/ykpersonalize
 %{_bindir}/ykchalresp
 %{_libdir}/libykpers-1.so.1
-%{_libdir}/libykpers-1.so.1.6.2
+%{_libdir}/libykpers-1.so.1.8.0
 %{_mandir}/man1/ykpersonalize.1.gz
 %{_mandir}/man1/ykchalresp.1.gz
-/lib/udev/rules.d/70-yubikey.rules
+/usr/lib/udev/rules.d/69-yubikey.rules
 
 %files devel
 %defattr(-,root,root,-)
@@ -81,6 +81,11 @@ pwd
 %exclude %{_libdir}/libykpers-1.la
 
 %changelog
+* Mon Oct 1 2012 - Maxim Burgerhout <wzzrd@fedoraproject.org> - 1.8.0-1
+- Update to 1.8.0:
+- Support for yk_challenge_response, Yubikey 2.3, bugfixes and more
+- Drop bigendian patch, is now in upstream source
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild