| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Thu, 25 Aug 2016 16:28:16 -0700 | |
| branch | s11u3-sru |
| changeset 7097 | 57c60272f142 |
| parent 6364 | fd8be207f137 |
| permissions | -rw-r--r-- |
|
6364
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch created to clear any merge conflicts from source in archive |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
repo to build properly on Solaris. |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
|
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
4 |
--- CACKey-0.7.4/cackey.spec 2016-05-20 01:53:54.710093467 -0400 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
+++ CACKey-0.7.4/cackey.spec 2016-05-20 01:34:23.363490949 -0400 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
@@ -5,12 +5,10 @@ |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
Release: 1 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
License: Public Domain |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
Packager: Roy Keene <[email protected]> |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
-======= |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
Version: @@VERS@@ |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
Release: 1 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
13 |
License: Public Domain |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
14 |
Packager: Roy Keene <[email protected]> |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
15 |
->>>>>>> trunk |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
16 |
URL: https://software.forge.mil/sf/frs/do/listReleases/projects.community_cac/frs.cackey |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
Source: %{name}-%{version}.tar.gz
|
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
@@ -23,11 +21,7 @@ |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
PC/SC compliant reader. It performs a similar function to "CoolKey", but |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
only supports Government Smartcards. It supports all Government Smartcards |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
22 |
that implement the Government Smartcard Interoperability Specification (GSC-IS) |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
23 |
-<<<<<<< HEAD |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
24 |
-v2.1 or newer. |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
25 |
-======= |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
26 |
v2.1 or newer as well as PIV cards that comply with NIST SP 800-73-3. |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
27 |
->>>>>>> trunk |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
28 |
|
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
29 |
|
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
30 |
%prep |