diff --git a/AUTHORS b/AUTHORS index e69de29..bd79912 100644 --- a/AUTHORS +++ b/AUTHORS @@ -0,0 +1 @@ +Marc Wäckerlin (http://marc.waeckerlin.org) diff --git a/ChangeLog b/ChangeLog index e69de29..8b1d9a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,1141 @@ +2014-06-03 07:21 marc + + * src/cardos.hxx: + https://dev.swisssign.com/projects/swissstick/ticket/1137 forget + PIN/password feature incorrectly reports an error; refs #32 + +2014-05-20 12:27 marc + + * src/openssl.hxx, src/pcsc.hxx: openssl version info to be + desplayed in about (some nerves are blank after heartbleed); refs + #30 + +2014-05-19 11:39 marc + + * libpcscxx.spec.in: add PKCS11 include path to RPM spec; refs #30 + +2014-05-16 12:36 marc + + * debian/control: replace libp11-kit-dev by libpkcs11-helper1-dev + beacause it's missing on lucid; refs #30 + +2014-05-16 12:24 marc + + * debian/control, debian/rules: replace libp11-kit-dev by + libpkcs11-helper1-dev beacause it's missing on lucid; refs #30 + +2014-05-16 12:07 marc + + * debian/control, debian/rules: replace libp11-kit-dev + libgnutls-dev beacause it's missing on lucid; refs #30 + +2014-05-16 11:03 marc + + * configure.in, debian/rules: set MOC to /usr/bin/moc for debian, + because on lucid it would be /usr/bin/moc-qt4, but there is no + /usr/bin/rcc-qt4, only /usr/bin/rcc; refs #30 + +2014-05-12 07:35 marc + + * libpcscxx.spec.in: fix rpm build; refs #30 + +2014-05-09 11:21 marc + + * src/cardos.hxx, src/suisseid.hxx: puk-unlock forgotten - added; + refs #30 + +2014-05-07 12:31 marc + + * debian/control: build dependencies; refs #30 + +2014-05-07 12:09 marc + + * debian/control: restore debian build; refs #30 + +2014-05-07 11:51 marc + + * debian/control, debian/rules: restore debian build; refs #30 + +2014-05-07 09:13 marc + + * src/cryptoki.hxx: give better exception; refs #30 + +2014-05-06 16:19 marc + + * configure.in: hack to be undone later - check for headers later; + refs #30 + +2014-05-06 16:17 marc + + * configure.in: hack to be undone later; refs #30 + +2014-05-06 16:14 marc + + * src/pcsc.hxx: fixed issue with invalid devices; refs #30 + +2014-05-06 15:48 marc + + * debian/rules: configure location of pkcs11.h; refs #30 + +2014-05-06 15:42 marc + + * configure.in, src/cryptoki.hxx: configure location of pkcs11.h; + refs #30 + +2014-05-05 11:44 marc + + * src/makefile.am, src/pkcs11: no own pkcs11; refs #30 + +2014-05-05 08:15 marc + + * configure.in, doc/examples/makefile.am, src/cardos.hxx, + src/makefile.am, src/suisseid.hxx: Correctly decode values; refs + #31 + +2014-04-29 08:31 marc + + * src/cryptoki.hxx: conversions for 64 bit mingw; refs #30 + +2014-04-29 08:17 marc + + * doc/examples/makefile.am: mingw linking; refs #30 + +2014-04-28 11:49 marc + + * doc/examples/makefile.am: mingw libs changed; refs #30 + +2014-04-28 11:47 marc + + * configure.in: first check Qt5 and allow to pass UIC/MOC + explicitely; refs #30 + +2014-04-28 09:27 marc + + * src/makefile.am: mingw libs changed; refs #30 + +2014-04-28 09:12 marc + + * src/pcsc.hxx: winscard.h in lowercase is part of mingw; refs #30 + +2014-04-28 09:07 marc + + * src/pcsc.hxx: Windows not properly detected; refs #30 + +2014-04-04 11:27 marc + + * src/cryptoki.hxx, src/suisseid.hxx: fixed wrong calculation of + max pin len; refs #28 + +2014-04-04 06:52 marc + + * libpcscxx.spec.in: package cardgui for deb and rpm; refs #28 + +2014-04-03 15:00 marc + + * configure.in, src/makefile.am: detect moc and uic; refs #28 + +2014-04-03 14:14 marc + + * src/suisseid.hxx: Certificate has now label and id; refs #28 + +2014-04-03 12:33 marc + + * debian/libpcscxx.install, libpcscxx.spec.in: package cardgui for + deb and rpm; refs #28 + +2014-04-03 11:21 marc + + * doc/examples/cardos-demo.cxx, doc/examples/create-files-demo.cxx, + doc/examples/suisse-id-demo.hxx, src/cardos.hxx, + src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx, + src/suisseid.hxx: replaced mrw::Shared by std::shared_ptr; refs + #28 + +2014-04-02 13:20 marc + + * configure.in: removed DISTCHECK_CONFIGURE_FLAGS; refs #28 + +2014-04-02 12:42 marc + + * configure.in: setup DISTCHECK_CONFIGURE_FLAGS; refs #28 + +2014-04-02 12:39 marc + + * configure.in: setup DISTCHECK_CONFIGURE_FLAGS; refs #28 + +2014-04-02 12:04 marc + + * configure.in: setup DISTCHECK_CONFIG_FLAGS; refs #28 + +2014-04-02 11:46 marc + + * configure.in: setup DISTCHECK_CONFIG_FLAGS; refs #28 + +2014-04-02 11:01 marc + + * src/makefile.am: fix distribution - make distcheck works now; + refs #28 + +2014-04-02 09:03 marc + + * src/makefile.am: fix winscard-link on mingw; refs #28 + +2014-04-02 08:49 marc + + * src/makefile.am: fix winscard-link on mingw; refs #28 + +2014-04-02 08:07 marc + + * src/makefile.am: fix PCSC-framework-link on mac; refs #28 + +2014-04-02 06:57 marc + + * src/cryptoki.hxx: fix for non C++11-compilers (mac); refs #28 + +2014-04-02 06:57 marc + + * configure.in: fix for non C++11-compilers (mac); refs #28 + +2014-04-02 06:31 marc + + * src/cryptoki.hxx: fix for non C++11-compilers (mac); refs #28 + +2014-04-01 13:10 marc + + * doc/examples/cardos-demo.cxx, doc/examples/create-files-demo.cxx, + doc/examples/cryptoki-demo.cxx, + doc/examples/cryptoki-sign-demo.cxx, src/cardos.hxx, + src/cryptaux.hxx, src/cryptoki.cxx, src/cryptoki.hxx, + src/openssl-engine.hxx, src/openssl.hxx, src/overview.doc, + src/pcsc.hxx, src/suisseid.hxx: fixed tons of warnings; refs #28 + +2014-03-31 13:26 marc + + * configure.in: fixed qt build; refs #28 + +2014-03-31 11:10 marc + + * src/suisseid.hxx: some minor changes accorfing o what's really + needed/supported; refs #28 + +2014-03-31 09:41 marc + + * src/cardgui.cxx, src/cardos.hxx, src/suisseid.hxx: some minor + changes accorfing o what's really needed/supported; refs #28 + +2014-03-28 13:54 marc + + * configure.in, doc/examples/makefile.am, src/makefile.am: + compile-fix: support Qt4 - cleanup of connection management, new + major version number 3, use static connection methods; refs #26, + refs #28, refs #29 + +2014-03-26 15:32 marc + + * src/cardgui.hxx: compile-fix: support Qt4 - cleanup of connection + management, new major version number 3, use static connection + methods; refs #26, refs #28, refs #29 + +2014-03-26 15:30 marc + + * configure.in: compile-fix - cleanup of connection management, new + major version number 3, use static connection methods; refs #26, + refs #28, refs #29 + +2014-03-26 15:07 marc + + * configure.in, doc/examples/cardos-demo.cxx, + doc/examples/create-files-demo.cxx, doc/examples/makefile.am, + doc/examples/moc_cardgui-model.cxx, doc/examples/pcsc-demo.cxx, + src/cardgui-model.hxx, src/cardgui.cxx, src/cardgui.hxx, + src/cardgui.ui, src/cardos.hxx, src/cryptaux.hxx, + src/makefile.am, src/openssl-engine.cxx, src/openssl-engine.hxx, + src/openssl.hxx, src/password.hxx, src/password.ui, src/pcsc.hxx, + src/suisseid.hxx: cleanup of connection management, new major + version number 3, use static connection methods; refs #26, refs + #28, refs #29 + +2014-03-24 09:23 marc + + * doc/examples/create-files-demo.cxx, src/cardos.hxx, + src/cryptaux.hxx, src/openssl-engine.cxx, src/openssl-engine.hxx, + src/openssl.hxx: more unsuccessful tests; refs #28 + +2014-03-21 12:09 marc + + * src/pcsc.hxx: fix check; refs #29 + +2014-03-18 11:48 marc + + * src/pcsc.hxx: new method reset for pcsc connections; refs #29 + +2014-03-10 08:10 marc + + * doc/examples/create-files-demo.cxx: preparations for writing a + file - forgotten new file; refs #28 + +2014-03-07 15:53 marc + + * doc/examples/cardos-demo.cxx, doc/examples/makefile.am, + doc/examples/suisse-id-demo.cxx, src/cardos.hxx, + src/cryptaux.hxx, src/suisseid.hxx: preparations for writing a + file; refs #28 + +2014-03-05 14:56 marc + + * src/suisseid.hxx: locking needs reader; refs #28 + +2014-03-05 14:23 marc + + * makefile.am, src/cardos.hxx: bug in initialization from transport + state; refs #28 + +2014-03-04 12:11 marc + + * src/cardos.hxx: bug in initialization from transport state; refs + #28 + +2014-03-04 09:50 marc + + * src/cryptoki.hxx: fixed for QT4/5: Compile problem; refs #28 + +2014-03-04 08:51 marc + + * src/cryptoki.hxx: fixed for QT4/5: Compile problem; refs #28 + +2014-03-04 07:51 marc + + * src/cryptoki.hxx: fixed for QT4/5: Compile problem; refs #28 + +2014-03-03 09:55 marc + + * doc/examples/suisse-id-demo.cxx: fixed for QT4/5: refs #28 + +2014-02-27 12:57 marc + + * doc/doxyfile.in, doc/examples/cryptoki-demo.cxx, + doc/examples/cryptoki-sign-demo.cxx, + doc/examples/suisse-id-demo.cxx, src/cryptaux.hxx, + src/cryptoki.hxx, src/suisseid.hxx: more documentation; refs #28 + +2014-01-31 13:32 marc + + * doc/doxyfile.in, doc/examples/suisse-id-demo.cxx, + doc/examples/suisse-id-demo.hxx, src/cardos.hxx, + src/cryptaux.hxx, src/cryptoki.hxx, src/openssl.hxx, + src/overview.doc, src/pcsc.hxx, src/suisseid.hxx: documentation; + refs #27 + +2014-01-28 07:58 marc + + * src/suisseid.hxx: backward-compatible (non C++11) constants; refs + #27 + +2014-01-27 13:48 marc + + * doc/examples/suisse-id-demo.cxx, src/suisseid.hxx: added methods + to get specific certificates; refs #27 + +2014-01-23 13:32 marc + + * src/cryptoki.hxx: forgotten inline declaratin; refs #27 + +2014-01-22 15:17 marc + + * doc/examples/suisse-id-demo.cxx: better interface to get binary + certificates; refs #28 + +2014-01-22 15:14 marc + + * doc/examples/suisse-id-demo.cxx, src/cryptoki.hxx, + src/suisseid.hxx: better interface to get binary certificates; + refs #28 + +2014-01-21 08:20 marc + + * src/cryptoki.hxx: copy constructor requires explicit default + constructor; refs #28 + +2014-01-20 13:05 marc + + * src/cryptoki.hxx: moved copy-initialization to copy constructor; + refs #28 + +2014-01-13 10:41 marc + + * src/cryptoki.hxx: add methods to convert slot and token info from + C-structure; refs #28 + +2013-12-12 13:40 marc + + * COPYING, INSTALL, configure.in, doc/examples/makefile.am, + doc/examples/suisse-id-demo.cxx: add example for using + QSslCertificate; refs #28 + +2013-11-12 15:40 marc + + * src/pcsc.hxx: resolve problem with very old compiler and Mac + 10.5; refs #28 + +2013-11-12 15:06 marc + + * src/cryptoki.hxx, src/openssl-engine.hxx: resolve problem with + very old compiler (gcc 4.0); refs #28 + +2013-11-11 11:49 marc + + * src/cardos.hxx, src/cryptaux.hxx, src/cryptoki.hxx, + src/openssl.hxx, src/pcsc.hxx: bug fixes and reference counters + (prevents hanging); refs #28 + +2013-11-07 10:03 marc + + * src/makefile.am: removed left over certimport; refs #28 + +2013-11-06 14:21 marc + + * configure.in, debian/changelog.in: Flexible package signature; + refs #28 + +2013-11-06 12:24 marc + + * configure.in, debian/control, debian/rules, + doc/examples/cryptoki-sign-demo.cxx, doc/examples/makefile.am, + doc/examples/openssl-engine-demo.cxx, + doc/examples/suisse-id-demo.cxx, doc/examples/suisse-id-demo.hxx, + src/cardos.hxx, src/cryptaux.hxx, src/cryptoki.cxx, + src/cryptoki.hxx, src/makefile.am, src/openssl-engine.hxx, + src/openssl.hxx, src/pcsc.hxx, src/suisseid.hxx: Added all + SuisseID Functionality except certificate import from server, + which shall remain closed; refs #28 + +2013-10-23 13:33 marc + + * src/suisseid.hxx: documentation for card status check and + iniialization; refs #28 + +2013-10-21 13:49 marc + + * configure.in: compile with -stc=c++11 if availabel; refs #28 + +2013-10-21 13:42 marc + + * ax_cxx_compile_stdcxx_11.m4, configure.in: compile with + -stc=c++11 if availabel; refs #28 + +2013-10-21 12:13 marc + + * doc/examples/suisse-id-demo.cxx, src/cryptoki.hxx: default + arguments; refs #28 + +2013-10-21 07:10 marc + + * doc/doxyfile.in, doc/examples/cardos-demo.cxx, + doc/examples/cryptoki-sign-demo.cxx, doc/examples/makefile.am, + doc/examples/suisse-id-demo.cxx, src/cardos.hxx, + src/cryptaux.hxx, src/makefile.am, src/pcsc.hxx, + src/suisseid.hxx: added basic suisse id functions; refs #28 + +2013-10-15 11:57 marc + + * configure.in, doc/examples/cryptoki-demo.cxx, + doc/examples/cryptoki-sign-demo.cxx, doc/examples/pcsc-demo.cxx, + doc/examples/suisse-id-demo.cxx, src/cryptoki.cxx, + src/cryptoki.hxx, src/pcsc.hxx: added draft lib for suisseid - by + now: detect Post SuisseID; refs #28 + +2013-10-11 13:51 marc + + * doc/examples/makefile.am, doc/examples/suisse-id-demo.cxx, + src/pcsc.hxx: erste suisseid demo; refs #28 + +2013-10-10 12:23 marc + + * src/cryptoki.cxx, src/openssl.hxx, src/pcsc.hxx: typos; refs #28 + +2013-10-10 09:13 marc + + * src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx: functions to + scan specific cards; refs #28 + +2013-10-03 06:33 marc + + * doc/examples/cryptoki-sign-demo.cxx: typos; refs #27 + +2013-10-02 14:00 marc + + * doc/examples/cryptoki-sign-demo.cxx: typos; refs #27 + +2013-10-02 13:57 marc + + * doc/examples/cryptoki-sign-demo.cxx: typos; refs #27 + +2013-09-27 14:36 marc + + * doc/examples/cryptoki-sign-demo.cxx: try to also support C++ < + 201103; refs #27 + +2013-09-24 12:55 marc + + * doc/examples/makefile.am: only in gcc 4.7 and newer: -std=c++11; + refs #27 + +2013-09-24 12:05 marc + + * doc/examples/cryptoki-sign-demo.cxx, doc/examples/makefile.am: + add example for signing; refs #27 + +2013-06-13 13:39 marc + + * debian/rules: fixed: make deb; refs #26 + +2013-06-13 12:38 marc + + * src/pcsc.hxx: work-around with pcsc::shared_ptr::t - again; + refs #26 + +2013-06-13 11:59 marc + + * src/pcsc.hxx: work-around with pcsc::shared_ptr::t; refs #26 + +2013-06-13 10:37 marc + + * src/pcsc.hxx: added compiler warning; refs #26 + +2013-06-13 09:30 marc + + * src/pcsc.hxx: fallback for old compilers - use: -DNO_CXX2011; + refs #26 + +2013-06-13 09:24 marc + + * src/pcsc.hxx: fallback for old compilers; refs #26 + +2013-06-13 09:16 marc + + * src/pcsc.hxx: fallback for old compilers; refs #26 + +2013-06-13 09:13 marc + + * debian/rules, libpcscxx.spec.in: add CPPFLAGS=-std=c++0x for + debian and rpm package builds ; refs #26 + +2013-06-13 09:07 marc + + * NEWS, libpcscxx.spec.in, src/pcsc.hxx: shared pointer is now from + std C++/11; refs #26 + +2013-04-03 09:14 marc + + * src/openssl-engine.hxx: Problem was not here but in swissbrowser; + closes #25 + +2013-04-02 14:31 marc + + * src/openssl-engine.hxx: still nothing, undo and more log; refs + #25 + +2013-04-02 12:54 marc + + * src/openssl-engine.hxx: still nothing, more log; refs #25 + +2013-04-02 12:07 marc + + * src/openssl-engine.hxx: next try, don't call ENGINE_free; refs + #25 + +2013-04-02 08:36 marc + + * debian/control: added dependency on libssl-dev for the + dev-package; closes #19 + +2013-04-02 08:32 marc + + * src/openssl-engine.hxx: removed ENGINE_set_destroy_function; refs + #25 + +2013-01-25 14:36 marc + + * libpcscxx.spec.in, src/pcsc.hxx: fix fedora-18 bug; closes #24 + +2012-12-12 09:24 jenkins + + * README: added README contents; refs #23 + +2012-12-12 08:30 marc + + * README: added README contents; refs #23 + +2012-11-20 10:37 marc + + * src/pcsc.hxx: try to use the e-health hack only for windoze; refs + #22 + +2012-11-16 14:24 marc + + * src/pcsc.hxx: requested by Laurent Pages: Indeed the smartcard + detection on Windows does not work properly; refs #22 + +2012-09-19 07:08 marc + + * libpcscxx.spec.in: other dependency for fedora; refs #21 + +2012-09-18 13:36 marc + + * libpcscxx.spec.in: other dependency for fedora; refs #21 + +2012-06-15 12:30 marc + + * doc/examples/makefile.am: missing include path in example + makefile; refs #20 + +2012-06-15 12:23 marc + + * doc/examples/makefile.am: missing include path in example + makefile; refs #20 + +2012-06-11 09:58 marc + + * debian/rules: allow OpenSSL 0.8 in debian build for old + debian/ubuntu versions; refs #20 + +2012-06-11 06:25 marc + + * src/openssl.hxx: disallow old SSL versions; refs #20 + +2012-06-08 09:38 marc + + * src/openssl.hxx: remove const; refs #20 + +2012-06-08 09:07 marc + + * src/openssl.hxx: remove const; refs #20 + +2012-06-08 08:31 marc + + * doc/examples/makefile.am, src/openssl.hxx: remove const; refs #20 + +2012-03-14 09:54 marc + + * src/pcsc.hxx: added method control; refs #18 + +2011-12-20 11:30 marc + + * libpcscxx.spec.in: replaced lib with %_lib; refs #17 + +2011-11-10 13:28 marc + + * src/openssl-engine.hxx, src/pcsc.hxx: conflict in #define; closes + #1 + +2011-11-10 10:31 marc + + * configure.in, doc/examples/makefile.am, doc/makefile.am, + libpcscxx.spec.in, makefile.am, src/makefile.am: new make target + rpm; builds versionnumber; closes #1 + +2011-10-31 15:36 marc + + * src/makefile.am: remove ls *.doc; closes #16 + +2011-10-26 10:31 marc + + * src/makefile.am: add libraries for natty; refs #15 + +2011-10-26 09:43 marc + + * src/makefile.am: add libraries; refs #15 + +2011-09-08 08:56 marc + + * src/openssl.hxx: fixed DATADIR; closes #14 + +2011-09-05 08:35 marc + + * src/openssl.hxx: some bugs fixed; closes #13 + +2011-06-21 07:32 marc + + * src/cryptoki.hxx: closes #12 + +2011-05-03 11:57 marc + + * doc/examples/openssl-engine-demo.cxx, src/openssl-engine.hxx: + template for engine registry; refs #11 + +2011-05-03 11:11 marc + + * src/openssl-engine.hxx: more robust implementation and better + interface to engine registrator; refs #11 + +2011-04-26 12:43 marc + + * src/openssl.hxx: more debug log; refs #11 + +2011-04-21 09:50 marc + + * src/cryptoki.hxx, src/makefile.am, src/openssl-engine.hxx, + src/pkcs11, src/pkcs11/apiclient.h, src/pkcs11/pkcs11.h, + src/pkcs11/pkcs11types.h: partial undo of changeset [92] because + Mac has no opensc; closes #11 + +2011-04-21 06:30 marc + + * src/cryptoki.hxx, src/openssl-engine.hxx, src/openssl.hxx: done + in first release; closes #11 + +2011-04-15 09:42 marc + + * src/cryptoki.hxx, src/makefile.am, src/pcsc.hxx, src/pkcs11: + better handling of empty reader list; refs #11 + +2011-04-15 06:52 marc + + * doc/examples/openssl-engine-demo.cxx: better logging in PCSC and + first engine release; refs #11 + +2011-04-15 06:50 marc + + * doc/examples/makefile.am, src/cryptoki.cxx, src/makefile.am, + src/openssl-engine.cxx, src/openssl-engine.hxx, src/pcsc.hxx: + better logging in PCSC and first engine release; refs #11 + +2011-03-29 12:54 marc + + * install-64-and-32-bit-linux.sh, src/cryptoki.cxx, + src/cryptoki.hxx, src/pcsc.hxx: checked-in too much, undo; refs + #10 + +2011-03-29 12:52 marc + + * doc/examples/cryptoki-demo.cxx, doc/examples/pcsc-demo.cxx: + checked-in too much, undo; refs #10 + +2011-03-29 12:50 marc + + * doc/examples/makefile.am, install-64-and-32-bit-linux.sh, + src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx: added -lcrypto + to examples; refs #10 + +2010-10-07 12:04 marc + + * src/makefile.am: removed -lssl; refs #9 + +2010-09-27 06:53 marc + + * src/makefile.am, src/pcsc.cxx, src/pcsc.hxx: Removed + SCardCancelTransaction completely; Added neesting counter; refs + #8 + +2010-09-24 07:12 marc + + * src/pcsc.hxx: hangs on mac, try to end transaction after cancel; + refs #8 + +2010-09-23 15:20 marc + + * src/pcsc.hxx: commit instead of cancel for win; closes #8 + +2010-09-17 08:59 marc + + * COPYING, INSTALL, configure.in, src/cryptoki.hxx, test: now it + compiles again; refs #7 + +2010-09-17 07:44 marc + + * src/cryptoki.hxx, src/pcsc.hxx: bug in session managing, + redesign: removed smart resources, don't allow to copy sessions; + refs #7 + +2010-08-27 13:10 marc + + * COPYING, INSTALL, doc/examples/makefile.am, src/makefile.am, + test/makefile.am: compiles on mac; refs #6 + +2010-08-27 12:51 marc + + * src/makefile.am, src/openssl.hxx, src/versiontest.cxx: version + checker and changes for openssl 1.0.0; refs #6 + +2010-08-27 12:28 marc + + * src/makefile.am: wrong path on mac; refs #6 + +2010-08-27 11:15 marc + + * src/openssl.hxx: first part: const or not const that is the + question; refs #6 + +2010-08-27 09:43 marc + + * src/openssl.hxx: first part: const or not const that is the + question; refs #6 + +2010-08-26 14:06 marc + + * src/openssl.hxx: compile problems on mac; refs #5 + +2010-08-26 13:36 marc + + * doc/examples/makefile.am: better build flags, out of the box + lin,mac,win; refs #5 + +2010-08-26 13:24 marc + + * doc/examples/makefile.am: better build flags, out of the box + lin,mac,win; refs #5 + +2010-08-26 13:19 marc + + * doc/examples/makefile.am: better build flags, out of the box + lin,mac,win; refs #5 + +2010-08-26 13:13 marc + + * doc/examples/makefile.am, src/pkcs11/pkcs11.h: better build + flags, out of the box lin,mac,win; refs #5 + +2010-08-26 12:24 marc + + * configure.in, doc/examples/makefile.am, src/cryptoki.hxx, + src/makefile.am: better build flags, out of the box lin,mac,win; + refs #5 + +2010-08-03 13:48 marc + + * configure.in, doc/examples/cryptoki-demo.cxx, + doc/examples/makefile.am, doc/examples/openssl-ssl-demo.cxx, + doc/examples/openssl-tcp-demo.cxx, doc/examples/pcsc-demo.cxx, + install-64-and-32-bit-linux.sh, src/cryptoki.hxx, + src/makefile.am, src/openssl.hxx, src/pcsc.hxx, src/version.cxx: + added version info, refs #4 + +2010-06-08 10:28 marc + + * doc/examples/makefile.am, test/makefile.am: more dependencies on + 64bit lucid, see #1 + +2010-06-01 13:38 marc + + * doc/examples/makefile.am, install-32-bit-lin-win.sh: 32bit-build + added, refs #1 + +2010-05-12 08:16 marc + + * makefile.am: Back to chroot builds, see #1 + +2010-05-12 08:15 marc + + * debian/changelog.in: Maintainer E-Mail changed, see #1 + +2010-05-12 08:08 marc + + * debian/changelog.in: Maintainer E-Mail changed, see #1 + +2010-05-12 07:46 marc + + * debian/control: Maintainer E-Mail changed, see #1 + +2010-04-26 06:43 marc + + * configure.in: vesion increased, see #3 + +2010-04-16 11:49 marc + + * makefile.am: build debian for all architectures, see #1 + +2010-04-15 14:27 marc + + * src/openssl.hxx: closes #2 + +2010-04-15 13:16 marc + + * configure.in, debian/rules, src/libpcscxx.pc.in: bugfixes for + debian, see #1 + +2010-04-08 12:41 marc + + * configure.in, debian, debian/changelog.in, debian/compat, + debian/control, debian/copyright, debian/dirs, debian/docs, + debian/libpcscxx-dev.dirs, debian/libpcscxx-dev.install, + debian/libpcscxx.dirs, debian/libpcscxx.doc-base.EX, + debian/libpcscxx.install, debian/rules, debian/shlibs.local.ex, + debian/watch.ex, makefile.am, src/libpcscxx.pc.in, + src/makefile.am: new target make deb to create debian package, + refs #1 + +2010-03-03 15:37 marc + + * doc/examples/makefile.am, doc/examples/openssl-ssl-demo.cxx, + doc/examples/openssl-tcp-demo.cxx, src/openssl.hxx: TCP- and + SSL-Connection Examples + +2010-02-10 13:21 marc + + * install-64-and-32-bit-linux.sh, src/cryptoki.cxx, + src/cryptoki.hxx: some details: user opensc-pkcs11.so by default; + catch all exceptions on load + +2009-12-09 11:13 marc + + * install-64-and-32-bit-linux.sh, src/cryptoki.cxx, + src/cryptoki.hxx: new method Init.reset() - try whether we can + find newly added slots + +2009-11-24 12:10 marc + + * COPYING, INSTALL, src/cryptoki.hxx: first successful encrypt + +2009-11-17 15:56 marc + + * COPYING, INSTALL, src/cryptoki.cxx, src/cryptoki.hxx, + src/openssl.hxx: compiled on mac + +2009-11-02 14:44 marc + + * COPYING, INSTALL, src/openssl.hxx: bin ich blöd oder was? + +2009-10-26 12:40 marc + + * src/openssl.hxx: pkcs7 + +2009-10-23 14:57 marc + + * src/cryptoki.cxx, src/cryptoki.hxx, src/makefile.am: works for + certimporter on win + +2009-10-21 08:52 marc + + * configure.in, doc/examples/makefile.am, + install-64-and-32-bit-linux.sh, src/cryptoki.cxx, + src/cryptoki.hxx, src/makefile.am, src/pcsc.hxx, + test/makefile.am: compiles for windoze + +2009-10-14 13:31 marc + + * src/cryptaux.hxx, src/cryptoki.cxx, src/cryptoki.hxx, + src/openssl.hxx, src/pcsc.hxx: now secure channel enabled + +2009-10-07 07:22 marc + + * doc/examples/pcsc-demo.cxx, src/pcsc.hxx: transmit now sets up + message + +2009-10-01 19:14 marc + + * src/cryptoki.cxx, src/cryptoki.hxx, src/openssl.hxx, + test/makefile.am, test/sharedpointer_test.cxx: create and delete + with certificate and key + +2009-09-29 07:24 marc + + * src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx: destroy object + +2009-09-22 13:25 marc + + * src/cryptoki.cxx, src/cryptoki.hxx, src/openssl.hxx: new creation + attributes + +2009-09-22 11:21 marc + + * src/cryptoki.cxx, src/cryptoki.hxx: pass label on creation + +2009-09-22 07:58 marc + + * src/makefile.am: linkable again + +2009-09-22 07:40 marc + + * doc/examples/makefile.am, src/makefile.am, src/openssl.hxx: + compilable again + +2009-09-22 07:04 marc + + * src/cryptoki.cxx, src/openssl.hxx: mor get methods in certificate + +2009-09-21 14:52 marc + + * src/openssl.hxx: new certificate attribute get methods + +2009-09-21 07:43 marc + + * doc/examples/cryptoki-demo.cxx, src/cryptaux.hxx, + src/cryptoki.cxx, src/cryptoki.hxx, src/makefile.am, + src/openssl.hxx, src/pcsc.hxx: auxiliaries are now in + cryptaux.hxx; some get methods for openssl::X509 + +2009-09-18 13:57 marc + + * src/openssl.hxx: X509 subject to DER + +2009-09-18 13:31 marc + + * src/openssl.hxx: ssl connection first try + +2009-09-18 11:41 marc + + * doc/makefile.am, src/cryptoki.hxx, src/openssl.hxx, + src/overview.doc, src/pcsc.hxx: improved doxygen + +2009-09-18 08:24 marc + + * src/openssl.hxx: openssl fixed + +2009-09-17 14:57 marc + + * src/makefile.am, src/openssl.hxx: now with openssl wrapper + +2009-09-16 14:52 marc + + * src/cryptoki.cxx, src/cryptoki.hxx: first try to create + +2009-09-10 12:13 marc + + * src/cryptoki.hxx: login + +2009-09-09 16:14 marc + + * src/cryptoki.hxx: ulong to string conversion + +2009-09-09 12:12 marc + + * src/cryptoki.hxx: mark hex with 0x + +2009-09-09 06:59 marc + + * src/cryptoki.hxx: more texts and no prefix in text + +2009-09-08 14:45 marc + + * src/cryptoki.hxx: texts changed + +2009-09-03 07:46 marc + + * src/cryptoki.hxx: get single attribute also with access operator + +2009-09-02 13:57 marc + + * doc/examples/cryptoki-demo.cxx, src/cryptoki.hxx: attributes read + +2009-09-02 08:45 marc + + * doc/examples/cryptoki-demo.cxx, src/cryptoki.hxx: read attributes + - in test + +2009-09-01 16:15 marc + + * doc/examples/cryptoki-demo.cxx, doc/examples/makefile.am, + src/cryptoki.hxx: We can read objects :-) + +2009-09-01 13:12 marc + + * src/cryptoki.hxx, src/makefile.am, src/pkcs11/apiclient.h, + src/pkcs11/cryptoki.h, src/pkcs11/pkcs11.h, src/pkcs11/pkcs11f.h, + src/pkcs11/pkcs11t.h, src/pkcs11/pkcs11types.h: no more crash (on + linux) + +2009-09-01 10:01 marc + + * src/pcsc.hxx: compiles on mac + +2009-09-01 09:11 marc + + * src/cryptoki.cxx, src/cryptoki.hxx: find objects + +2009-08-31 14:53 marc + + * doc/examples/makefile.am, src/cryptoki.hxx, src/makefile.am, + src/pkcs11, src/pkcs11/cryptoki.h, src/pkcs11/pkcs11.h, + src/pkcs11/pkcs11f.h, src/pkcs11/pkcs11t.h: own pkcs11 header + from rsa + +2009-08-31 13:59 marc + + * doc/examples/cryptoki-demo.cxx, src/cryptoki.hxx, src/pcsc.hxx: + better error messages + +2009-08-31 11:28 marc + + * doc/examples/cryptoki-demo.cxx, src/cryptoki.hxx: attributes are + on the way + +2009-08-28 14:57 marc + + * doc/examples/cryptoki-demo.cxx, src/cryptoki.hxx: even more + +2009-08-28 06:56 marc + + * configure.in, doc/examples/cryptoki-demo.cpp, + doc/examples/cryptoki-demo.cxx, doc/examples/makefile.am, + doc/examples/pcsc-demo.cpp, doc/examples/pcsc-demo.cxx, + doc/makefile.am, src/cryptoki.hxx, src/makefile.am: many new but + completely untested methods + +2009-08-27 14:46 marc + + * doc/examples/cryptoki-demo.cpp, doc/examples/pcsc-demo.cpp, + src/cryptoki.cxx, src/cryptoki.hxx, src/makefile.am: first test + with cryptoki + +2009-08-25 14:05 marc + + * src/pcsc.hxx: resolved problem with proprietary KOBIL windoze + driver + +2009-08-19 13:42 marc + + * src/pcsc.hxx: corrections + +2009-08-11 13:55 marc + + * src/pcsc.hxx: same error to text for all OSes (had unknown error + on Mac) + +2009-07-24 11:13 marc + + * src/pcsc.hxx: add also hex reader name (in case we get non + printing chars) + +2009-07-16 07:23 marc + + * doc/examples/pcsc-demo.cpp, src/pcsc.hxx: Bug in SCardTransmit + parameter + +2009-07-14 11:48 marc + + * src/pcsc.hxx: win: even more error details when unknown + +2009-07-14 09:16 marc + + * src/pcsc.hxx: all: pass context to check; win: even more error + messages + +2009-07-13 13:51 marc + + * src/pcsc.hxx: error strings also for windoof + +2009-07-10 10:02 marc + + * src/pcsc.hxx: mac: other types + +2009-07-09 12:28 marc + + * COPYING, INSTALL, doc/makefile.am, src/makefile.am, src/pcsc.hxx: + compilable and usable + +2009-06-17 12:30 marc + + * doc/examples, doc/examples/pcsc-demo.cpp, src/pcsc.hxx: imported + pcsc.hxx + +2009-06-17 12:24 marc + + * AUTHORS, ChangeLog, NEWS, README, bootstrap.sh, configure.in, + doc, doc/doxyfile.in, doc/makefile.am, makefile.am, src, + src/main.cxx, src/makefile.am, test, test/makefile.am: new + project structure + +2009-06-17 11:53 marc + + * .: start + diff --git a/configure.ac b/configure.ac index 3928e37..d90846d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,10 @@ # $Id$ AC_CONFIG_MACRO_DIR([m4]) + +m4_define(x_package_name, libpcscxx) +m4_define(x_major, 3) +m4_define(x_minor, 0) + AC_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR]) AC_DEFUN([AX_DEFINE_DIR], [ prefix_NONE= @@ -16,46 +21,38 @@ dnl refers to ${prefix}. Thus we have to use `eval' twice. test "$exec_prefix_NONE" && exec_prefix=NONE ]) -AC_INIT([README]) +m4_define(x_least, m4_esyscmd_s( + LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" + for path in . .. ../..; do + if svn info $path 2>&1 > /dev/null; then + LEAST=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') + (cd $path && svn2cl) + break; + fi + done + echo -n $LEAST +)) +m4_define(x_bugreport, m4_esyscmd_s( + head -1 AUTHORS | \ + sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp' +)) +AC_INIT(x_package_name, x_major.x_minor.x_least, x_bugreport, x_package_name) + +AM_INIT_AUTOMAKE([1.9 tar-pax]) + SRC_DIR=src TST_DIR= DOC_DIR=doc -m4_define(x_packagename, libpcscxx) -m4_define(x_major, 3) -m4_define(x_minor, 0) -PACKAGENAME=x_packagename -MAJOR=x_major -MINOR=x_minor -BUILDDATE=$(date "+%d.%m.%Y/%H.%M") - -if svn info . 2>&1 > /dev/null; then - LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p') - break; -else - LEAST=[$(pwd | sed -n 's,^.*/'${PACKAGENAME}'-'${MAJOR}'\.'${MINOR}'\.\([0-9]*\).*$,\1,p')] - if test -z "${LEAST}"; then - LEAST="ERROR CANNOT DETERMINE REVISION NUMBER from $(pwd)" - fi -fi - -AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org]) - # files to create -AC_CONFIG_FILES([makefile ${PACKAGENAME}.spec +AC_CONFIG_FILES([makefile ${PACKAGE_NAME}.spec src/makefile doc/doxyfile doc/examples/makefile doc/makefile - src/${PACKAGENAME}.pc debian/changelog]) - -# copy M4 to shell -AC_SUBST(MAJOR) -AC_SUBST(MINOR) -AC_SUBST(LEAST) -AC_SUBST(BUILDDATE) + src/${PACKAGE_NAME}.pc debian/changelog debian/control]) # libtool versioning LIB_MAJOR=m4_eval(x_major+x_minor) -LIB_MINOR=${LEAST} +LIB_MINOR=x_least LIB_LEAST=x_minor LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}" AC_SUBST(LIB_VERSION) @@ -67,15 +64,9 @@ AC_SUBST(HOME) AX_DEFINE_DIR([DATADIR], [datadir]) #AC_SUBST(DATADIR) -# macros -README=README -AC_SUBST_FILE(README) -CHANGE_LOG=ChangeLog -AC_SUBST_FILE(CHANGE_LOG) - -AM_CPPFLAGS+="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'" +AM_CPPFLAGS="-DPACKAGE_VERSION='\"${PACKAGE_VERSION}\"' -DPACKAGE_NAME='\"${PACKAGE_NAME}\"'" -# Get rid of that stupid -O2 -g options! +# Get rid of that stupid -O2 -g opions! CXXFLAGS="${CXXFLAGS:-}" # languages @@ -110,8 +101,8 @@ AC_ARG_ENABLE(pkcs11-download, ]) dnl problem in libs: -Wshadow -Wcast-qual dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) -dnl AC_CHECK_HEADER([pkcs11.h], [], [AC_MSG_ERROR([Header pkcs11.h is required])]) -dnl AC_CHECK_HEADER([wintypes.h], [], [AC_MSG_ERROR([Header wintypes.h is required])]) +AC_CHECK_HEADER([pkcs11.h], [], [AC_MSG_ERROR([Header pkcs11.h is required])]) +AC_CHECK_HEADER([wintypes.h], [], [AC_MSG_ERROR([Header wintypes.h is required])]) AC_CHECK_HEADER([mrw/checkcxx11.hxx], [], [AC_MSG_ERROR([please install mrw-c++])]) AX_CXX_CHECK_QT([QTGUI], [QtCore QtGui QtWidgets]) AX_CXX_CHECK_QT([QTNETWORK], [QtNetwork]) @@ -120,7 +111,7 @@ AC_ARG_ENABLE(pedantic, [AS_HELP_STRING([--enable-pedantic], [enable all warnings and checks, abort on warnings])], [have_pedantic="$enableval"; test "$enableval" = "yes" && \ - AM_CXXFLAGS+=" -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"]) + AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"]) dnl problem in libs: -Wshadow -Wcast-qual dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes") @@ -140,11 +131,25 @@ esac AM_CONDITIONAL(MINGW32, test "$MINGW32" = "yes") AM_CONDITIONAL(MAC, test "$MAC" = "yes") -# author for signing packages -if test -z "$PACKAGERID"; then - PACKAGERID="Marc Wäckerlin (http://marc.waeckerlin.org) " -fi -AC_ARG_VAR(PACKAGERID, [Signature identification of the package author.]) +# macros +README=$(tail -n +3 README) +README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g') +DESCRIPTION=$(head -1 README) +AUTHOR=$(head -1 AUTHORS) +AC_SUBST(AUTHOR) +_AM_SUBST_NOTMAKE([AUTHOR]) +AC_SUBST(DESCRIPTION) +_AM_SUBST_NOTMAKE([DESCRIPTION]) +AC_SUBST(README) +_AM_SUBST_NOTMAKE([README]) +AC_SUBST(README_DEB) +_AM_SUBST_NOTMAKE([README_DEB]) +DISTRO=$(lsb_release -sc) +AC_SUBST(DISTRO) +BUILD_NUMBER=${BUILD_NUMBER:-1} +AC_SUBST(BUILD_NUMBER) +BUILD_DATE=$(date -R) +AC_SUBST(BUILD_DATE) # export macros SRCDIR=${srcdir} @@ -154,13 +159,13 @@ AC_SUBST(TST_DIR) AC_SUBST(DOC_DIR) AC_SUBST(HAVE_DOT) AC_SUBST(THREADS) -AC_SUBST(PACKAGENAME) AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CPPFLAGS) AC_SUBST(LIBS) # create output AC_OUTPUT + # infos and warnings if test "$have_doxygen" = "no"; then AC_MSG_WARN([Missing program doxygen! diff --git a/debian/changelog.in b/debian/changelog.in index 1ed1ade..8382038 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,5 +1,5 @@ -@PACKAGE@ (@VERSION@-1) unstable; urgency=low +@PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low * See https://dev.marc.waeckerlin.org/projects/@PACKAGE@ for changes - -- @PACKAGERID@ @BUILDDATE@ + -- @AUTHOR@ @BUILD_DATE@ diff --git a/debian/control b/debian/control deleted file mode 100644 index ea09823..0000000 --- a/debian/control +++ /dev/null @@ -1,41 +0,0 @@ -Source: libpcscxx -Priority: extra -Maintainer: Marc Wäckerlin -Build-Depends: debhelper (>= 7), autotools-dev, libssl-dev, libpkcs11-helper1-dev, libpcsclite-dev, mrw-c++-dev -Standards-Version: 3.8.1 -Section: libs -Homepage: https://dev.marc.waeckerlin.org/projects/libpcscxx - -Package: libpcscxx-dev -Section: libdevel -Architecture: any -Depends: libpcscxx (= ${binary:Version}), libssl-dev, libpkcs11-helper1-dev, libpcsclite-dev, mrw-c++-dev -Description: C++ Wrapper around PCSClite, Cryptoki, OpenSSL - C++ wrappers around the ugly C-Interfaces of pcsc-lite, cryptoki and - open-ssl. - . - Development Package - . - For more details, see: https://dev.marc.waeckerlin.org/projects/libpcscxx - -Package: libpcscxx-dbg -Section: debug -Architecture: any -Depends: libpcscxx (= ${binary:Version}) -Description: C++ Wrapper around PCSClite, Cryptoki, OpenSSL - C++ wrappers around the ugly C-Interfaces of pcsc-lite, cryptoki and - open-ssl. - . - Debugging Symbols - . - For more details, see: https://dev.marc.waeckerlin.org/projects/libpcscxx - -Package: libpcscxx -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ Wrapper around PCSClite, Cryptoki, OpenSSL - C++ wrappers around the ugly C-Interfaces of pcsc-lite, cryptoki and - open-ssl. - . - For more details, see: https://dev.marc.waeckerlin.org/projects/libpcscxx diff --git a/debian/control.in b/debian/control.in new file mode 100644 index 0000000..e4a9b18 --- /dev/null +++ b/debian/control.in @@ -0,0 +1,28 @@ +Source: @PACKAGE_NAME@ +Priority: extra +Maintainer: @AUTHOR@ +Build-Depends: debhelper (>= 7), pkg-config, autotools-dev, doxygen, graphviz, lsb-release, libssl-dev, libpkcs11-helper1-dev, libpcsclite-dev, mrw-c++-dev +Standards-Version: 3.8.1 +Section: libs +Homepage: https://dev.marc.waeckerlin.org/projects/libpcscxx + +Package: @PACKAGE_NAME@-dev +Section: libdevel +Architecture: any +Depends: @PACKAGE_NAME@ (= ${binary:Version}), libssl-dev, libpkcs11-helper1-dev, libpcsclite-dev, mrw-c++-dev +Description: @DESCRIPTION@ - Development Package +@README_DEB@ + +Package: @PACKAGE_NAME@-dbg +Section: debug +Architecture: any +Depends: @PACKAGE_NAME@ (= ${binary:Version}) +Description: @DESCRIPTION@ - Debug Symbols +@README_DEB@ + +Package: @PACKAGE_NAME@ +Section: libs +Architecture: any +Depends: @PACKAGE_NAME@ (= ${binary:Version}), ${misc:Depends} +Description: @DESCRIPTION@ +@README_DEB@ diff --git a/debian/rules b/debian/rules index bc8b230..9045bec 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,4 @@ -#!/usr/bin/make -f +!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. @@ -9,97 +9,5 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif - - - - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -config.status: configure - dh_testdir -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - CPPFLAGS="${CPPFLAGS} -DALLOW_SSL_0_8 -std=c++0x -I/usr/include/PCSC -I/usr/include/pkcs11-helper-1.0" CXXFLAGS="-ggdb" LDFLAG="-ggdb" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" MOC=/usr/bin/moc -# does not work: LDFLAGS="-Wl,-z,defs" - - -build: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f [Mm]akefile ] || $(MAKE) distclean - rm -f config.sub config.guess - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install - - -# Build architecture-independent files here. -binary-indep: install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman - dh_link - dh_strip --dbg-package=libpcscxx-dbg - dh_compress - dh_fixperms -# dh_perl -# dh_python - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ diff --git a/doc/doxyfile.in b/doc/doxyfile.in index 19c739b..55e9cd3 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -26,13 +26,13 @@ DOXYFILE_ENCODING = UTF-8 # identify the project. Note that if you do not use Doxywizard you need # to put quotes around the project name if it contains spaces. -PROJECT_NAME = "Projektdokumentation @PACKAGENAME@" +PROJECT_NAME = "Projektdokumentation @PACKAGE_NAME@" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "Version @MAJOR@.@MINOR@.@LEAST@" +PROJECT_NUMBER = "Version @PACKAGE_VERSION@" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer @@ -1548,7 +1548,7 @@ TAGFILES = # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = @PACKAGENAME@.doxytag +GENERATE_TAGFILE = @PACKAGE_NAME@.doxytag # If the ALLEXTERNALS tag is set to YES all external classes will be listed # in the class index. If set to NO only the inherited external classes diff --git a/doc/makefile.am b/doc/makefile.am index ffdcaa7..5c473fc 100644 --- a/doc/makefile.am +++ b/doc/makefile.am @@ -26,10 +26,10 @@ if PEDANTIC test \! -s doxygen.errors endif # cd latex && make -# mv latex/refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf +# mv latex/refman.pdf @PACKAGE_NAME@-@PACKAGE_VERSION@.pdf -CLEANFILES = doxygen.errors @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf -DISTCLEANFILES = @PACKAGENAME@.doxytag +CLEANFILES = doxygen.errors @PACKAGE_NAME@-@PACKAGE_VERSION@.pdf +DISTCLEANFILES = @PACKAGE_NAME@.doxytag MAINTAINERCLEANFILES = makefile.in distclean-local: diff --git a/libpcscxx.spec.in b/libpcscxx.spec.in index 69411de..dd5f426 100644 --- a/libpcscxx.spec.in +++ b/libpcscxx.spec.in @@ -1,10 +1,10 @@ Summary: C++ Wrapper around OpenSSL, PCSC and Cryptoki -Name: @PACKAGENAME@ +Name: @PACKAGE_NAME@ Version: @VERSION@ Release: 1 License: LGPL Group: Development/Libraries/C++ -URL: https://dev.marc.waeckerlin.org/projects/@PACKAGENAME@ +URL: https://dev.marc.waeckerlin.org/projects/@PACKAGE_NAME@ Source0: %{name}-%{version}.tar.gz BuildRequires: subversion gcc-c++ doxygen graphviz texlive automake autoconf libtool make pcsc-lite-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -24,7 +24,7 @@ This package contains only the shared libraries required at runtime. %setup -q CPPFLAGS="-std=c++0x -I/usr/include/PCSC -I/usr/include/pkcs11-helper-1.0" \ ./configure --prefix=/usr \ - --docdir=/usr/share/doc/packages/@PACKAGENAME@ \ + --docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \ --libdir=/usr/%_lib %build @@ -39,19 +39,19 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) /usr/bin/* -/usr/%_lib/@PACKAGENAME@.so.* +/usr/%_lib/@PACKAGE_NAME@.so.* %doc -/usr/share/doc/packages/@PACKAGENAME@/AUTHORS -/usr/share/doc/packages/@PACKAGENAME@/COPYING -/usr/share/doc/packages/@PACKAGENAME@/ChangeLog -/usr/share/doc/packages/@PACKAGENAME@/INSTALL -/usr/share/doc/packages/@PACKAGENAME@/NEWS -/usr/share/doc/packages/@PACKAGENAME@/README +/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS +/usr/share/doc/packages/@PACKAGE_NAME@/COPYING +/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog +/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL +/usr/share/doc/packages/@PACKAGE_NAME@/NEWS +/usr/share/doc/packages/@PACKAGE_NAME@/README %package devel Summary: C++ Wrapper around OpenSSL, PCSC and Cryptoki (development files) Group: Development/Libraries/C++ -Requires: @PACKAGENAME@ = @VERSION@ +Requires: @PACKAGE_NAME@ = @VERSION@ %description devel @README@ @@ -60,14 +60,14 @@ This Package contains all files required for developement. %files devel %defattr(-,root,root,-) -/usr/%_lib/@PACKAGENAME@.so -/usr/%_lib/@PACKAGENAME@.a +/usr/%_lib/@PACKAGE_NAME@.so +/usr/%_lib/@PACKAGE_NAME@.a /usr/%_lib/pkgconfig -/usr/%_lib/@PACKAGENAME@.la +/usr/%_lib/@PACKAGE_NAME@.la /usr/include/ /usr/share/pkgconfig %doc -/usr/share/doc/packages/@PACKAGENAME@/html -/usr/share/doc/packages/@PACKAGENAME@/@PACKAGENAME@.spec +/usr/share/doc/packages/@PACKAGE_NAME@/html +/usr/share/doc/packages/@PACKAGE_NAME@/@PACKAGE_NAME@.spec %changelog diff --git a/makefile.am b/makefile.am index d7afd43..177d21c 100644 --- a/makefile.am +++ b/makefile.am @@ -20,15 +20,15 @@ EXTRA_DIST = bootstrap.sh debian DISTCLEANFILES = debian/changelog deb: dist - tar xzvf @PACKAGE@-@VERSION@.tar.gz - cd @PACKAGE@-@VERSION@ && dpkg-buildpackage - rm -rf @PACKAGE@-@VERSION@ + tar xzvf @PACKAGE_TARNAME@-@VERSION@.tar.gz + cd @PACKAGE_TARNAME@-@VERSION@ && dpkg-buildpackage + rm -rf @PACKAGE_TARNAME@-@VERSION@ -doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog @PACKAGENAME@.spec +doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog @PACKAGE_NAME@.spec -RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \ - /usr/src/packages/RPMS/i586/@PACKAGENAME@-devel-@MAJOR@.@MINOR@.@LEAST@-1.i586.rpm \ - /usr/src/packages/SRPMS/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.src.rpm +RPMS = /usr/src/packages/RPMS/i586/@PACKAGE_NAME@-@PACKAGE_VERSION@-1.i586.rpm \ + /usr/src/packages/RPMS/i586/@PACKAGE_NAME@-devel-@PACKAGE_VERSION@-1.i586.rpm \ + /usr/src/packages/SRPMS/@PACKAGE_NAME@-@PACKAGE_VERSION@-1.src.rpm .PHONY: release tag rpm webserver \ doc clean-local distclean-local dist-hool install-data-hook \ @@ -37,26 +37,27 @@ RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586. release: tag webserver rpm: dist - cp @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz \ + cp @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz \ /usr/src/packages/SOURCES/ - rpmbuild -ba --clean @PACKAGENAME@.spec + rpmbuild -ba --clean @PACKAGE_NAME@.spec deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog clean-local: - - rm doxygen.err lib@PACKAGENAME@.doxytag - - rm @PACKAGENAME@-dev_@MAJOR@.@MINOR@.@LEAST@-*.deb \ - @PACKAGENAME@_@MAJOR@.@MINOR@.@LEAST@-*.changes \ - @PACKAGENAME@_@MAJOR@.@MINOR@.@LEAST@-1.tar.gz \ - @PACKAGENAME@_@MAJOR@.@MINOR@.@LEAST@-1.dsc \ - @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz \ - @PACKAGENAME@_@MAJOR@.@MINOR@.@LEAST@-*.deb + - rm doxygen.err lib@PACKAGE_NAME@.doxytag + - rm @PACKAGE_NAME@-dev_@PACKAGE_VERSION@-*.deb \ + @PACKAGE_NAME@_@PACKAGE_VERSION@-*.changes \ + @PACKAGE_NAME@_@PACKAGE_VERSION@-1.tar.gz \ + @PACKAGE_NAME@_@PACKAGE_VERSION@-1.dsc \ + @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz \ + @PACKAGE_NAME@_@PACKAGE_VERSION@-*.deb distclean-local: - rm -r ${top_builddir}/@DOC_DIR@/html/* ${top_builddir}/@DOC_DIR@/latex/* - rm makefile makefile.in doxygen.err libmrw.doxytag - find . -name '*~' | xargs rm - rm -r autom4te.cache - - rm aclocal.m4 config.guess config.sub configure \ - depcomp install-sh ltmain.sh makefile makefile.in \ - missing mkinstalldirs + - rm aclocal.m4 config.guess config.sub configure depcomp \ + install-sh ltmain.sh makefile makefile.in missing \ + mkinstalldirs m4/libtool.m4 m4/ltoptions.m4 \ + m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 compile \ No newline at end of file diff --git a/src/libpcscxx.pc.in b/src/libpcscxx.pc.in index 66d83ff..36ca744 100644 --- a/src/libpcscxx.pc.in +++ b/src/libpcscxx.pc.in @@ -1,9 +1,9 @@ -prefix=@PACKAGENAME@ +prefix=@PACKAGE_NAME@ exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include -Name: @PACKAGENAME@ +Name: @PACKAGE_NAME@ Description: C++ wrappers around pcsc-lite, cryptoki, openssh Version: @VERSION@ Libs: -L${libdir} -lpcscxx diff --git a/src/version.cxx b/src/version.cxx index ddcd7ce..35dfb68 100644 --- a/src/version.cxx +++ b/src/version.cxx @@ -9,8 +9,8 @@ namespace pcsc { std::string version() { - return PACKAGENAME "-" PACKAGEVERSION; + return PACKAGE_NAME "-" PACKAGE_VERSION; } - const std::string IDENT("$Id: " PACKAGENAME "-" PACKAGEVERSION " $"); - const std::string WHAT("#(@)" PACKAGENAME "-" PACKAGEVERSION); + const std::string IDENT("$Id: " PACKAGE_NAME "-" PACKAGE_VERSION " $"); + const std::string WHAT("#(@)" PACKAGE_NAME "-" PACKAGE_VERSION); }