build system updated

master
Marc Wäckerlin 7 years ago
parent 4a397903a3
commit 04f436d682
  1. 1537
      ChangeLog
  2. 62
      ax_init_standard_project.m4
  3. 438
      bootstrap.sh
  4. 24
      build-in-docker.conf
  5. 105
      build-in-docker.sh
  6. 30
      debian/control.in
  7. 2
      resolve-debbuilddeps.sh
  8. 37
      resolve-rpmbuilddeps.sh

@ -1,1781 +1,2060 @@
2016-10-05 09:48
* [r383] debian/control.in:
fixed build for wily
2016-09-29 16:37
* [r382] COPYING, ChangeLog, INSTALL, autogen.sh[ADD],
ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4,
bootstrap.sh, build-in-docker.sh, configure.ac,
doc/footer.html.in[ADD], doc/header.html.in[ADD],
doc/plantuml.jar[ADD], doc/style.css[ADD],
mac-create-app-bundle.sh, makefile_test.inc.am[ADD],
resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh, sql-to-dot.sed:
update buildsystem
2016-06-08 10:56
* src/cardos.hxx: added APDU info
* [r381] src/cardos.hxx:
added APDU info
2016-04-04 08:53
* ChangeLog: after migration to new svn server
* [r380] ChangeLog:
after migration to new svn server
2015-12-18 16:04 marc
* build-in-docker.conf: added dependency for sid
* [r379] build-in-docker.conf:
added dependency for sid
2015-12-17 12:33 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.conf, build-in-docker.sh, libpcscxx.desktop.in,
resolve-debbuilddeps.sh, sql-to-dot.sed: use ./build-in-docker.sh
on build server
* [r378] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.conf[ADD], build-in-docker.sh,
libpcscxx.desktop.in[ADD], resolve-debbuilddeps.sh,
sql-to-dot.sed[ADD]:
use ./build-in-docker.sh on build server
2015-11-16 12:38 marc
* doc/doxyfile.in: SVG must not be interactive for embedding in
redmine
* [r377] doc/doxyfile.in:
SVG must not be interactive for embedding in redmine
2015-11-09 11:22 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
debian/control.in, resolve-debbuilddeps.sh: fixed build
dependencies
* [r376] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
debian/control.in, resolve-debbuilddeps.sh:
fixed build dependencies
2015-11-07 10:47 marc
* bootstrap.sh: there is no qt4-default
* [r375] bootstrap.sh:
there is no qt4-default
2015-11-07 09:23 marc
* bootstrap.sh, debian/control.in: there is no qt4-default
* [r374] bootstrap.sh, debian/control.in:
there is no qt4-default
2015-11-06 23:58 marc
* debian/control.in: fixed dependencies
* [r373] debian/control.in:
fixed dependencies
2015-11-05 09:53 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.sh, resolve-debbuilddeps.sh: updated build system
* [r372] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
build-in-docker.sh[ADD], resolve-debbuilddeps.sh:
updated build system
2015-11-05 08:44 marc
* doc/doxyfile.in: doxygen should not build search engine, it's
awful in embedded redmine
* [r371] doc/doxyfile.in:
doxygen should not build search engine, it's awful in embedded
redmine
2015-11-03 21:48 marc
* debian/control.in: updated dependencies
* [r370] debian/control.in:
updated dependencies
2015-11-03 11:45 marc
* ChangeLog, ax_check_qt.m4, bootstrap.sh, resolve-debbuilddeps.sh:
* [r369] ChangeLog, ax_check_qt.m4, bootstrap.sh,
resolve-debbuilddeps.sh:
prepared for build in a docker instance on jenkins
2015-11-01 23:53 marc
* AUTHORS, ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
resolve-debbuilddeps.sh: new author url
* [r368] AUTHORS, ChangeLog, ax_init_standard_project.m4,
bootstrap.sh, resolve-debbuilddeps.sh:
new author url
2015-09-22 11:36 marc
* ax_init_standard_project.m4: fixed little type in build that
affected only mac osx build
* [r367] ax_init_standard_project.m4:
fixed little type in build that affected only mac osx build
2015-09-22 11:12 marc
* ax_init_standard_project.m4: fixed little type in build that
affected only mac osx build - strange
* [r366] ax_init_standard_project.m4:
fixed little type in build that affected only mac osx build -
strange
2015-09-22 07:42 marc
* ax_check_qt.m4, ax_init_standard_project.m4, configure.ac,
src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx: don't throw
exception in destructur when card has been removed
* [r365] ax_check_qt.m4, ax_init_standard_project.m4, configure.ac,
src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx:
don't throw exception in destructur when card has been removed
2015-09-14 09:01 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
build-resource-file.sh, debian/control.in,
* [r364] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
build-resource-file.sh[ADD], debian/control.in,
debian/libpcscxx-dev.install, resolve-debbuilddeps.sh,
resolve-rpmbuilddeps.sh: added resolve-rpmbuilddeps.sh
resolve-rpmbuilddeps.sh[ADD]:
added resolve-rpmbuilddeps.sh
2015-09-01 12:28 marc
* debian/control.in: install qtX-default so that it fits for all
distributions
* [r363] debian/control.in:
install qtX-default so that it fits for all distributions
2015-09-01 12:26 marc
* debian/control.in: don't install qtX-default
* [r362] debian/control.in:
don't install qtX-default
2015-09-01 12:18 marc
* debian/control.in: install qtX-default
* [r361] debian/control.in:
install qtX-default
2015-09-01 12:14 marc
* resolve-debbuilddeps.sh: new script to resolve debian build
dependencies
* [r360] resolve-debbuilddeps.sh:
new script to resolve debian build dependencies
2015-09-01 12:13 marc
* resolve-debbuilddeps.sh: new script to resolve debian build
dependencies
* [r359] resolve-debbuilddeps.sh:
new script to resolve debian build dependencies
2015-09-01 12:00 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
resolve-debbuilddeps.sh: new script to resolve debian build
dependencies
* [r358] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
resolve-debbuilddeps.sh[ADD]:
new script to resolve debian build dependencies
2015-08-17 14:52 marc
* src/cryptaux.hxx: fix ambiguity
* [r357] src/cryptaux.hxx:
fix ambiguity
2015-08-17 14:47 marc
* src/cryptaux.hxx: fix ambiguity
* [r356] src/cryptaux.hxx:
fix ambiguity
2015-08-17 14:02 marc
* ax_init_standard_project.m4, bootstrap.sh: Debian sid is more
restrictive in time format
* [r355] ax_init_standard_project.m4, bootstrap.sh:
Debian sid is more restrictive in time format
2015-07-31 14:18 marc
* libpcscxx.spec.in: stupid fedora/centos does not handle
/path/to/dir correctly
* [r354] libpcscxx.spec.in:
stupid fedora/centos does not handle /path/to/dir correctly
2015-07-31 11:47 marc
* libpcscxx.spec.in: graphviz must not be used in fedora-20,
otherise it never terminates
* [r353] libpcscxx.spec.in:
graphviz must not be used in fedora-20, otherise it never
terminates
2015-07-31 10:44 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
configure.ac: fixed version number
* [r352] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
configure.ac:
fixed version number
2015-07-30 14:13 marc
* ax_check_qt.m4: qt4 in centos
* [r351] ax_check_qt.m4:
qt4 in centos
2015-07-30 13:59 marc
* libpcscxx.spec.in: qt4 in centos and p11 in suse11
* [r350] libpcscxx.spec.in:
qt4 in centos and p11 in suse11
2015-07-30 13:56 marc
* ax_check_qt.m4, bootstrap.sh, libpcscxx.spec.in: qt4 in centos
and p11 in suse11
* [r349] ax_check_qt.m4, bootstrap.sh, libpcscxx.spec.in:
qt4 in centos and p11 in suse11
2015-07-30 13:49 marc
* libpcscxx.spec.in: packages
* [r348] libpcscxx.spec.in:
packages
2015-07-30 13:32 marc
* libpcscxx.spec.in: packages for opensuse 11.4
* [r347] libpcscxx.spec.in:
packages for opensuse 11.4
2015-07-30 13:27 marc
* libpcscxx.spec.in: packages for centos
* [r346] libpcscxx.spec.in:
packages for centos
2015-07-30 13:12 marc
* libpcscxx.spec.in: packages for centos
* [r345] libpcscxx.spec.in:
packages for centos
2015-07-30 12:55 marc
* libpcscxx.spec.in: package bin
* [r344] libpcscxx.spec.in:
package bin
2015-07-30 12:40 marc
* ax_check_qt.m4: qt-tools are named tool-qt5 in suse :p
* [r343] ax_check_qt.m4:
qt-tools are named tool-qt5 in suse :p
2015-07-30 12:39 marc
* libpcscxx.spec.in: fedora packages ...
* [r342] libpcscxx.spec.in:
fedora packages ...
2015-07-30 12:33 marc
* ax_check_qt.m4, bootstrap.sh: qt-tools are named tool-qt5 in suse
:p
* [r341] ax_check_qt.m4, bootstrap.sh:
qt-tools are named tool-qt5 in suse :p
2015-07-30 12:15 marc
* libpcscxx.spec.in: fixed qt dependencies
* [r340] libpcscxx.spec.in:
fixed qt dependencies
2015-07-30 11:44 marc
* libpcscxx.spec.in: fixed qt dependencies
* [r339] libpcscxx.spec.in:
fixed qt dependencies
2015-07-30 10:21 marc
* configure.ac, libpcscxx.spec.in: fixed rpm dependency
* [r338] configure.ac, libpcscxx.spec.in:
fixed rpm dependency
2015-07-30 09:55 marc
* libpcscxx.spec.in: fixed rpm dependency
* [r337] libpcscxx.spec.in:
fixed rpm dependency
2015-07-30 09:38 marc
* libpcscxx.spec.in: fixed qt detection
* [r336] libpcscxx.spec.in:
fixed qt detection
2015-07-30 09:33 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
libpcscxx.spec.in: fixed qt detection
* [r335] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
libpcscxx.spec.in:
fixed qt detection
2015-07-30 08:39 marc
* libpcscxx.spec.in: ready for rpm
* [r334] libpcscxx.spec.in:
ready for rpm
2015-07-30 08:26 marc
* makefile.am: ready for rpm
* [r333] makefile.am:
ready for rpm
2015-07-30 08:13 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
libpcscxx.spec.in: enable rpm build
* [r332] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
libpcscxx.spec.in:
enable rpm build
2015-07-27 08:35 marc
* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh: better check for header
* [r331] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh:
better check for header
2015-07-27 06:33 marc
* configure.ac: remove test output
* [r330] configure.ac:
remove test output
2015-07-22 10:09 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh, libpcscxx:
* [r329] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
libpcscxx[ADD]:
buildsystem updated
2015-07-22 10:04 marc
* ax_init_standard_project.m4, configure.ac: mingw/windows-build
works
* [r328] ax_init_standard_project.m4, configure.ac:
mingw/windows-build works
2015-07-21 08:42 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
configure.ac, debian/control.in, mac-create-app-bundle.sh:
* [r327] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
configure.ac, debian/control.in, mac-create-app-bundle.sh[ADD]:
pcsclite does not exist on windows
2015-07-13 16:50 marc
* configure.ac: libpkcs11-helper-1 is even worse...
* [r326] configure.ac:
libpkcs11-helper-1 is even worse...
2015-07-13 14:51 marc
* configure.ac: prefere libpkcs11-helper-1
* [r325] configure.ac:
prefere libpkcs11-helper-1
2015-07-13 12:29 marc
* bootstrap.sh, doc, doc/doxyfile.in, doc/makefile.am: updated docu
* [r324] bootstrap.sh, doc, doc/doxyfile.in[ADD],
doc/makefile.am[ADD]:
updated docu
2015-07-13 08:39 marc
* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh: upgrade to newest bootstrap-build
* [r323] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh:
upgrade to newest bootstrap-build
2015-06-24 09:26 marc
* ChangeLog, ax_init_standard_project.m4: even more support for
weird and sloppy packages
* [r322] ChangeLog, ax_init_standard_project.m4:
even more support for weird and sloppy packages
2015-06-23 09:02 marc
* ax_init_standard_project.m4, configure.ac: even more improved way
to find the necessary include path
* [r321] ax_init_standard_project.m4, configure.ac:
even more improved way to find the necessary include path
2015-06-23 08:48 marc
* ax_init_standard_project.m4: even more improved way to find the
necessary include path
* [r320] ax_init_standard_project.m4:
even more improved way to find the necessary include path
2015-06-23 08:06 marc
* ChangeLog, ax_init_standard_project.m4: improved way to find the
necessary include path, even if module writers did a sloppy job
* [r319] ChangeLog, ax_init_standard_project.m4:
improved way to find the necessary include path, even if module
writers did a sloppy job
2015-06-19 07:18 marc
* ChangeLog, ax_init_standard_project.m4: don't scan subpathes of
/usr/include for include files
* [r318] ChangeLog, ax_init_standard_project.m4:
don't scan subpathes of /usr/include for include files
2015-06-18 14:34 marc
* ChangeLog, configure.ac: build fails with GNU TLS, because pcsc.h
there is something completely different
* [r317] ChangeLog, configure.ac:
build fails with GNU TLS, because pcsc.h there is something
completely different
2015-05-22 08:45 marc
* configure.ac: fixed package name for mac ports
* [r316] configure.ac:
fixed package name for mac ports
2015-05-20 12:12 marc
* ChangeLog, debian/libpcscxx-dev.install: fix in debian build
* [r315] ChangeLog, debian/libpcscxx-dev.install:
fix in debian build
2015-05-18 09:40 marc
* examples/makefile.am, src/makefile.am: cleanup build files
* [r314] examples/makefile.am, src/makefile.am:
cleanup build files
2015-05-18 09:21 marc
* ChangeLog, ax_init_standard_project.m4: fix build on mac, fix
wrong AX_PKG_CHECK
* [r313] ChangeLog, ax_init_standard_project.m4:
fix build on mac, fix wrong AX_PKG_CHECK
2015-05-13 13:35 marc
* ax_init_standard_project.m4: fixed some build issues, i.e. wrong
library version number
* [r312] ax_init_standard_project.m4:
fixed some build issues, i.e. wrong library version number
2015-05-12 13:32 marc
* ax_check_qt.m4, ax_init_standard_project.m4, configure.ac:
* [r311] ax_check_qt.m4, ax_init_standard_project.m4, configure.ac:
QtNetwork depends on QT >= 5.2
2015-05-12 08:57 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
src/makefile.am: fixed build
* [r310] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
src/makefile.am:
fixed build
2015-05-11 13:45 marc
* src/makefile.am: don't miss build of cert2text
* [r309] src/makefile.am:
don't miss build of cert2text
2015-05-09 22:35 marc
* ax_init_standard_project.m4: strange build error:
'configure:18658: error: possibly undefined macro: m4_default'
* [r308] ax_init_standard_project.m4:
strange build error: 'configure:18658: error: possibly undefined
macro: m4_default'
2015-05-09 16:51 marc
* ax_init_standard_project.m4, bootstrap.sh, src/libpcscxx.pc.in:
* [r307] ax_init_standard_project.m4, bootstrap.sh,
src/libpcscxx.pc.in:
corrected link command
2015-05-09 09:33 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
src/libpcscxx.pc.in: fixed pkg-config requirements
* [r306] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
src/libpcscxx.pc.in:
fixed pkg-config requirements
2015-05-08 23:38 marc
* ax_init_standard_project.m4, bootstrap.sh: fixed the mac bug
again, because last change was incompatible with debian changelog
format
* [r305] ax_init_standard_project.m4, bootstrap.sh:
fixed the mac bug again, because last change was incompatible
with debian changelog format
2015-05-08 23:12 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
configure.ac: build system fixed
* [r304] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
configure.ac:
build system fixed
2015-05-07 14:37 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
src/version.hxx: fixed mac issues
* [r303] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
src/version.hxx[ADD]:
fixed mac issues
2015-05-05 20:32 marc
* debian/control.in: dependencies imprved
* [r302] debian/control.in:
dependencies imprved
2015-05-04 09:30 marc
* ax_init_standard_project.m4, configure.ac: much more flexible and
stable package dependency checks
* [r301] ax_init_standard_project.m4, configure.ac:
much more flexible and stable package dependency checks
2015-05-04 06:56 marc
* src/cert2text.cxx: forgoten to add new file
* [r300] src/cert2text.cxx[ADD]:
forgoten to add new file
2015-04-30 14:28 marc
* ChangeLog, configure.ac, src/makefile.am: new tool cert2text to
show certificates
* [r299] ChangeLog, configure.ac, src/makefile.am:
new tool cert2text to show certificates
2015-03-24 08:02 marc
* ax_init_standard_project.m4: add test maintainr-clean
* [r298] ax_init_standard_project.m4:
add test maintainr-clean
2015-03-15 20:08 marc
* src/libpcscxx.pc.in: linking needs crypto ssl and pcsclite
* [r297] src/libpcscxx.pc.in:
linking needs crypto ssl and pcsclite
2015-03-15 19:29 marc
* ax_init_standard_project.m4, src/libpcscxx.pc.in: linking needs
crypto
* [r296] ax_init_standard_project.m4, src/libpcscxx.pc.in:
linking needs crypto
2015-03-15 16:52 marc
* configure.ac: no qt keywords
* [r295] configure.ac:
no qt keywords
2015-03-15 16:21 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
configure.ac: better build + no qt keywords
* [r294] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
configure.ac:
better build + no qt keywords
2015-03-14 14:25 marc
* examples/makefile.am, src/cardgui.hxx, src/makefile.am,
src/password.hxx: build fixed
* [r293] examples/makefile.am, src/cardgui.hxx, src/makefile.am,
src/password.hxx:
build fixed
2015-03-14 14:05 marc
* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh, configure.ac, src/libpcscxx.pc.in: wrong pkg-config
prefix
* [r292] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh, configure.ac, src/libpcscxx.pc.in:
wrong pkg-config prefix
2015-03-14 09:51 marc
* ax_init_standard_project.m4, bootstrap.sh: missreading: doxygen
-w html does not compile html onlx ...
* [r291] ax_init_standard_project.m4, bootstrap.sh:
missreading: doxygen -w html does not compile html onlx ...
2015-03-14 09:31 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
src/libpcscxx.pc.in: add compile dependencies
* [r290] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
src/libpcscxx.pc.in:
add compile dependencies
2015-03-13 16:30 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
debian/compat, debian/copyright, debian/dirs,
debian/libpcscxx.doc-base.EX, debian/shlibs.local.ex,
debian/watch.ex: improved bootstrapping
* [r289] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
debian/compat, debian/copyright[DEL], debian/dirs[DEL],
debian/libpcscxx.doc-base.EX[DEL], debian/shlibs.local.ex[DEL],
debian/watch.ex[DEL]:
improved bootstrapping
2015-03-12 09:16 marc
* ChangeLog, ax_init_standard_project.m4: bugfix new buildsystem:
makefile.in is in top_srcdir
* [r288] ChangeLog, ax_init_standard_project.m4:
bugfix new buildsystem: makefile.in is in top_srcdir
2015-03-11 16:00 marc
* ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4,
ax_init_standard_project.m4, bootstrap.sh, configure.ac,
debian/changelog.in, doc/doxyfile.in, doc/examples,
doc/makefile.am, examples, m4, makefile.am, src/makefile.am:
* [r287] ax_check_qt.m4[CPY], ax_cxx_compile_stdcxx_11.m4[CPY],
ax_init_standard_project.m4[ADD], bootstrap.sh, configure.ac,
debian/changelog.in, doc/doxyfile.in, doc/examples[DEL],
doc/makefile.am, examples[CPY], m4[DEL], makefile.am,
src/makefile.am:
completely new, megacool build system step 1
2015-03-05 14:48 marc
* debian/control.in: uic is required if qt is used
* [r286] debian/control.in:
uic is required if qt is used
2015-03-05 14:05 marc
* ChangeLog, m4/ax_check_qt.m4: don't stop if qt is not found; more
elegant way for adding qt rules
* [r285] ChangeLog, m4/ax_check_qt.m4:
don't stop if qt is not found; more elegant way for adding qt
rules
2015-03-05 13:44 marc
* m4/ax_check_qt.m4: don't stop if qt is not found; more elegant
way for adding qt rules
* [r284] m4/ax_check_qt.m4:
don't stop if qt is not found; more elegant way for adding qt
rules
2015-03-05 13:27 marc
* m4/ax_check_qt.m4: don't stop if qt is not found; more elegant
way for adding qt rules
* [r283] m4/ax_check_qt.m4:
don't stop if qt is not found; more elegant way for adding qt
rules
2015-03-05 13:21 marc
* m4/ax_check_qt.m4, src/makefile.am: don't stop if qt is not
found; more elegant way for adding qt rules
* [r282] m4/ax_check_qt.m4, src/makefile.am:
don't stop if qt is not found; more elegant way for adding qt
rules
2015-03-05 12:02 marc
* ChangeLog, m4/ax_check_qt.m4: qt tools are optional
* [r281] ChangeLog, m4/ax_check_qt.m4:
qt tools are optional
2015-03-05 09:05 marc
* configure.ac: support Qt4 which has no QWidgets - but Qt5 needs
it
* [r280] configure.ac:
support Qt4 which has no QWidgets - but Qt5 needs it
2015-03-05 08:34 marc
* configure.ac: support Qt4 which has no QWidgets
* [r279] configure.ac:
support Qt4 which has no QWidgets
2015-03-04 14:59 marc
* debian/control.in, doc/doxyfile.in: strange error «sh: 1:
/usr/bindot: not found; on squeeze, there's no qt5»
* [r278] debian/control.in, doc/doxyfile.in:
strange error «sh: 1: /usr/bindot: not found; on squeeze, there's
no qt5»
2015-03-04 14:44 marc
* configure.ac: fix «HAVE_QTNETWORK does not appear in
AM_CONDITIONAL» when there is no qt
* [r277] configure.ac:
fix «HAVE_QTNETWORK does not appear in AM_CONDITIONAL» when there
is no qt
2015-03-04 14:40 marc
* configure.ac, m4/ax_check_qt.m4: fix «HAVE_QTNETWORK does not
appear in AM_CONDITIONAL» when there is no qt
* [r276] configure.ac, m4/ax_check_qt.m4:
fix «HAVE_QTNETWORK does not appear in AM_CONDITIONAL» when there
is no qt
2015-03-04 13:28 marc
* m4/ax_check_qt.m4: try to fix «HAVE_QTNETWORK does not appear in
AM_CONDITIONAL» when there is no qt
* [r275] m4/ax_check_qt.m4:
try to fix «HAVE_QTNETWORK does not appear in AM_CONDITIONAL»
when there is no qt
2015-03-03 18:37 marc
* ChangeLog, README, configure.ac, debian/control.in: now also
depends on qt
* [r274] ChangeLog, README, configure.ac, debian/control.in:
now also depends on qt
2015-03-03 15:56 marc
* AUTHORS, ChangeLog, configure.ac, debian/changelog.in,
debian/control, debian/control.in, debian/rules, doc/doxyfile.in,
doc/makefile.am, libpcscxx.spec.in, makefile.am,
src/libpcscxx.pc.in, src/version.cxx: ported to new build system
* [r273] AUTHORS, ChangeLog, configure.ac, debian/changelog.in,
debian/control[DEL], debian/control.in[CPY], debian/rules,
doc/doxyfile.in, doc/makefile.am, libpcscxx.spec.in, makefile.am,
src/libpcscxx.pc.in, src/version.cxx:
ported to new build system
2014-12-11 10:00 marc
* src/suisseid.hxx: another work around the mac 10.10 yosemite PCSC
bug, this time fix cryptoki; refs #34
* [r272] src/suisseid.hxx:
another work around the mac 10.10 yosemite PCSC bug, this time
fix cryptoki; refs #34
2014-12-11 09:57 marc
* src/suisseid.hxx: another work around the mac 10.10 yosemite PCSC
bug, this time fix cryptoki; refs #34
* [r271] src/suisseid.hxx:
another work around the mac 10.10 yosemite PCSC bug, this time
fix cryptoki; refs #34
2014-12-11 09:06 marc
* m4/ax_check_qt.m4, src/suisseid.hxx: another work around the mac
10.10 yosemite PCSC bug, this time fix cryptoki; refs #34
* [r270] m4/ax_check_qt.m4, src/suisseid.hxx:
another work around the mac 10.10 yosemite PCSC bug, this time
fix cryptoki; refs #34
2014-12-01 11:27 marc
* src/suisseid.hxx: Apple Bug morte log; refs #34
* [r269] src/suisseid.hxx:
Apple Bug morte log; refs #34
2014-12-01 11:13 marc
* src/suisseid.hxx: Apple Bug morte log; refs #34
* [r268] src/suisseid.hxx:
Apple Bug morte log; refs #34
2014-12-01 10:27 marc
* src/pcsc.hxx: Apple Bug probably resolved with retry to reconnect
with SCARD_LEAVE_CARD; refs #34
* [r267] src/pcsc.hxx:
Apple Bug probably resolved with retry to reconnect with
SCARD_LEAVE_CARD; refs #34
2014-12-01 10:08 marc
* src/pcsc.hxx: Apple Bug not resolved, retry to reconnect with
SCARD_LEAVE_CARD more than once (up to 100 times); refs #34
* [r266] src/pcsc.hxx:
Apple Bug not resolved, retry to reconnect with SCARD_LEAVE_CARD
more than once (up to 100 times); refs #34
2014-12-01 09:08 marc
* src/pcsc.hxx: Apple Bug not resolved, retry more than once (up to
100 times); refs #34
* [r265] src/pcsc.hxx:
Apple Bug not resolved, retry more than once (up to 100 times);
refs #34
2014-11-12 07:54 marc
* src/pcsc.hxx: more log; refs #34
* [r264] src/pcsc.hxx:
more log; refs #34
2014-11-11 16:02 marc
* src/cryptoki.cxx: more log; refs #34
* [r263] src/cryptoki.cxx:
more log; refs #34
2014-11-11 16:00 marc
* src/cryptoki.cxx: more log; refs #34
* [r262] src/cryptoki.cxx:
more log; refs #34
2014-11-11 15:57 marc
* src/cryptoki.cxx: more log; refs #34
* [r261] src/cryptoki.cxx:
more log; refs #34
2014-11-11 14:09 marc
* src/pcsc.hxx: workaround Mac OS X 10.10 PCSC bug; refs #34
* [r260] src/pcsc.hxx:
workaround Mac OS X 10.10 PCSC bug; refs #34
2014-11-11 14:04 marc
* src/pcsc.hxx: workaround Mac OS X 10.10 PCSC bug; refs #34
* [r259] src/pcsc.hxx:
workaround Mac OS X 10.10 PCSC bug; refs #34
2014-11-11 13:56 marc
* src/pcsc.hxx: workaround Mac OS X 10.10 PCSC bug; refs #34
* [r258] src/pcsc.hxx:
workaround Mac OS X 10.10 PCSC bug; refs #34
2014-11-04 09:56 marc
* configure.ac, m4/ax_check_qt.m4: some rearrangements; refs #33
* [r257] configure.ac, m4/ax_check_qt.m4:
some rearrangements; refs #33
2014-11-04 08:53 marc
* ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4, configure.ac,
configure.in, m4, m4/ax_check_qt.m4,
m4/ax_cxx_compile_stdcxx_11.m4: some rearrangements; refs #33
* [r256] ax_check_qt.m4[DEL], ax_cxx_compile_stdcxx_11.m4[DEL],
configure.ac[CPY], configure.in[DEL], m4[ADD],
m4/ax_check_qt.m4[CPY], m4/ax_cxx_compile_stdcxx_11.m4[CPY]:
some rearrangements; refs #33
2014-10-27 09:22 marc
* ax_check_qt.m4, configure.in, doc/examples/makefile.am,
src/makefile.am: Missing -fPIC error in build of cardgui; refs
#33
* [r255] ax_check_qt.m4, configure.in, doc/examples/makefile.am,
src/makefile.am:
Missing -fPIC error in build of cardgui; refs #33
2014-10-08 08:51 marc
* ax_check_qt.m4: added qmake test; refs #33
* [r254] ax_check_qt.m4:
added qmake test; refs #33
2014-09-22 11:08 marc
* configure.in: Somehow options disappear, i.e. -fPIC; refs #33
* [r253] configure.in:
Somehow options disappear, i.e. -fPIC; refs #33
2014-09-19 09:04 marc
* ax_check_qt.m4: need variables; refs #33
* [r252] ax_check_qt.m4:
need variables; refs #33
2014-09-19 08:23 marc
* COPYING, INSTALL, ax_check_qt.m4, configure.in: much better qt
tests; refs #33
* [r251] COPYING, INSTALL, ax_check_qt.m4[ADD], configure.in:
much better qt tests; refs #33
2014-09-16 08:32 marc
* configure.in: corrected C++11-detection; refs #33
* [r250] configure.in:
corrected C++11-detection; refs #33
2014-09-16 08:24 marc
* configure.in: better Qt detection; refs #33
* [r249] configure.in:
better Qt detection; refs #33
2014-09-16 08:01 marc
* src/pcsc.hxx: changed all long to DWORD, now corrected former
unsigned long; refs #33
* [r248] src/pcsc.hxx:
changed all long to DWORD, now corrected former unsigned long;
refs #33
2014-09-16 07:47 marc
* src/cryptoki.hxx, src/pcsc.hxx: smaller bugfixes and type
adaptions; refs #33
* [r247] src/cryptoki.hxx, src/pcsc.hxx:
smaller bugfixes and type adaptions; refs #33
2014-09-15 06:54 marc
* src/openssl.hxx: forgotten return value; refs #33
* [r246] src/openssl.hxx:
forgotten return value; refs #33
2014-06-03 07:21 marc
* src/cardos.hxx:
* [r245] 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
* [r244] 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
* [r243] 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
* [r242] 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
* [r241] 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
* [r240] 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
* [r239] 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
* [r238] 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
* [r237] src/cardos.hxx, src/suisseid.hxx:
puk-unlock forgotten - added; refs #30
2014-05-07 12:31 marc
* debian/control: build dependencies; refs #30
* [r236] debian/control:
build dependencies; refs #30
2014-05-07 12:09 marc
* debian/control: restore debian build; refs #30
* [r235] debian/control:
restore debian build; refs #30
2014-05-07 11:51 marc
* debian/control, debian/rules: restore debian build; refs #30
* [r234] debian/control, debian/rules:
restore debian build; refs #30
2014-05-07 09:13 marc
* src/cryptoki.hxx: give better exception; refs #30
* [r233] 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
* [r232] 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
* [r231] 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
* [r230] 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
* [r229] 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
* [r228] 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
* [r227] src/makefile.am, src/pkcs11[DEL]:
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
* [r226] 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
* [r225] src/cryptoki.hxx:
conversions for 64 bit mingw; refs #30
2014-04-29 08:17 marc
* doc/examples/makefile.am: mingw linking; refs #30
* [r224] doc/examples/makefile.am:
mingw linking; refs #30
2014-04-28 11:49 marc
* doc/examples/makefile.am: mingw libs changed; refs #30
* [r223] 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
* [r222] 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
* [r221] 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
* [r220] 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
* [r219] 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
* [r218] 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
* [r217] 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
* [r216] 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
* [r215] 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
* [r214] 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,
* [r213] 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
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
* [r212] configure.in:
removed DISTCHECK_CONFIGURE_FLAGS; refs #28
2014-04-02 12:42 marc
* configure.in: setup DISTCHECK_CONFIGURE_FLAGS; refs #28
* [r211] configure.in:
setup DISTCHECK_CONFIGURE_FLAGS; refs #28
2014-04-02 12:39 marc
* configure.in: setup DISTCHECK_CONFIGURE_FLAGS; refs #28
* [r210] configure.in:
setup DISTCHECK_CONFIGURE_FLAGS; refs #28
2014-04-02 12:04 marc
* configure.in: setup DISTCHECK_CONFIG_FLAGS; refs #28
* [r209] configure.in:
setup DISTCHECK_CONFIG_FLAGS; refs #28
2014-04-02 11:46 marc
* configure.in: setup DISTCHECK_CONFIG_FLAGS; refs #28
* [r208] 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
* [r207] 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
* [r206] 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
* [r205] 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
* [r204] 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
* [r203] 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
* [r202] 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
* [r201] 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,
* [r200] 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
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
* [r199] 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
* [r198] 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
* [r197] 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:
* [r196] 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
* [r195] 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
* [r194] 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,
* [r193] 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
doc/examples/moc_cardgui-model.cxx[ADD],
doc/examples/pcsc-demo.cxx, src/cardgui-model.hxx[ADD],
src/cardgui.cxx[ADD], src/cardgui.hxx[ADD], src/cardgui.ui[ADD],
src/cardos.hxx, src/cryptaux.hxx, src/makefile.am,
src/openssl-engine.cxx, src/openssl-engine.hxx, src/openssl.hxx,
src/password.hxx[ADD], src/password.ui[ADD], 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,
* [r192] 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
src/openssl.hxx:
more unsuccessful tests; refs #28
2014-03-21 12:09 marc
* src/pcsc.hxx: fix check; refs #29
* [r191] src/pcsc.hxx:
fix check; refs #29
2014-03-18 11:48 marc
* src/pcsc.hxx: new method reset for pcsc connections; refs #29
* [r190] 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
* [r189] doc/examples/create-files-demo.cxx[ADD]:
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,
* [r188] 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
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
* [r187] 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
* [r186] 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
* [r185] 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
* [r184] 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
* [r183] 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
* [r182] 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
* [r181] 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,
* [r180] 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
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,
* [r179] 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
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
* [r178] 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
* [r177] 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
* [r176] 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
* [r175] 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
* [r174] 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
* [r173] 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
* [r172] 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
* [r171] 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
* [r170] 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
* [r169] 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
* [r168] 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
* [r167] 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
* [r166] 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
* [r165] configure.in, debian/changelog.in:
Flexible package signature; refs #28
2013-11-06 12:24 marc
* configure.in, debian/control, debian/rules,
* [r164] 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
doc/examples/suisse-id-demo.cxx,
doc/examples/suisse-id-demo.hxx[ADD], 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
* [r163] 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
* [r162] 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
* [r161] ax_cxx_compile_stdcxx_11.m4[ADD], 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
* [r160] 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,
* [r159] doc/doxyfile.in, doc/examples/cardos-demo.cxx[ADD],
doc/examples/cryptoki-sign-demo.cxx, doc/examples/makefile.am,
doc/examples/suisse-id-demo.cxx, src/cardos.hxx,
doc/examples/suisse-id-demo.cxx, src/cardos.hxx[ADD],
src/cryptaux.hxx, src/makefile.am, src/pcsc.hxx,
src/suisseid.hxx: added basic suisse id functions; refs #28
src/suisseid.hxx[ADD]:
added basic suisse id functions; refs #28
2013-10-15 11:57 marc
* configure.in, doc/examples/cryptoki-demo.cxx,
* [r158] 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
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
* [r157] doc/examples/makefile.am,
doc/examples/suisse-id-demo.cxx[ADD], 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
* [r156] 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
* [r155] 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
* [r154] doc/examples/cryptoki-sign-demo.cxx:
typos; refs #27
2013-10-02 14:00 marc
* doc/examples/cryptoki-sign-demo.cxx: typos; refs #27
* [r153] doc/examples/cryptoki-sign-demo.cxx:
typos; refs #27
2013-10-02 13:57 marc
* doc/examples/cryptoki-sign-demo.cxx: typos; refs #27
* [r152] 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
* [r151] 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
* [r150] 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:
* [r149] doc/examples/cryptoki-sign-demo.cxx[ADD],
doc/examples/makefile.am:
add example for signing; refs #27
2013-06-13 13:39 marc
* debian/rules: fixed: make deb; refs #26
* [r148] debian/rules:
fixed: make deb; refs #26
2013-06-13 12:38 marc
* src/pcsc.hxx: work-around with pcsc::shared_ptr<T>::t - again;
refs #26
* [r147] src/pcsc.hxx:
work-around with pcsc::shared_ptr<T>::t - again; refs #26
2013-06-13 11:59 marc
* src/pcsc.hxx: work-around with pcsc::shared_ptr<T>::t; refs #26
* [r146] src/pcsc.hxx:
work-around with pcsc::shared_ptr<T>::t; refs #26
2013-06-13 10:37 marc
* src/pcsc.hxx: added compiler warning; refs #26
* [r145] 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
* [r144] 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
* [r143] src/pcsc.hxx:
fallback for old compilers; refs #26
2013-06-13 09:16 marc
* src/pcsc.hxx: fallback for old compilers; refs #26
* [r142] 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
* [r141] 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
* [r140] 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
* [r139] 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
* [r138] 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
* [r137] 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
* [r136] 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
* [r135] 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
* [r134] 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
* [r130] libpcscxx.spec.in, src/pcsc.hxx:
fix fedora-18 bug; closes #24
2012-12-12 09:24 jenkins
* README: added README contents; refs #23
* [r126] README:
added README contents; refs #23
2012-12-12 08:30 marc
* README: added README contents; refs #23
* [r125] 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
* [r124] 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
* [r123] 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
* [r122] libpcscxx.spec.in:
other dependency for fedora; refs #21
2012-09-18 13:36 marc
* libpcscxx.spec.in: other dependency for fedora; refs #21
* [r121] 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
* [r120] 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
* [r119] 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
* [r118] 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
* [r117] src/openssl.hxx:
disallow old SSL versions; refs #20
2012-06-08 09:38 marc
* src/openssl.hxx: remove const; refs #20
* [r116] src/openssl.hxx:
remove const; refs #20
2012-06-08 09:07 marc
* src/openssl.hxx: remove const; refs #20
* [r115] src/openssl.hxx:
remove const; refs #20
2012-06-08 08:31 marc
* doc/examples/makefile.am, src/openssl.hxx: remove const; refs #20
* [r114] 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
* [r112] src/pcsc.hxx:
added method control; refs #18
2011-12-20 11:30 marc
* libpcscxx.spec.in: replaced lib with %_lib; refs #17
* [r107] 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
* [r105] 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
* [r104] configure.in, doc/examples/makefile.am, doc/makefile.am,
libpcscxx.spec.in[ADD], 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
* [r103] src/makefile.am:
remove ls *.doc; closes #16
2011-10-26 10:31 marc
* src/makefile.am: add libraries for natty; refs #15
* [r102] src/makefile.am:
add libraries for natty; refs #15
2011-10-26 09:43 marc
* src/makefile.am: add libraries; refs #15
* [r101] src/makefile.am:
add libraries; refs #15
2011-09-08 08:56 marc
* src/openssl.hxx: fixed DATADIR; closes #14
* [r100] src/openssl.hxx:
fixed DATADIR; closes #14
2011-09-05 08:35 marc
* src/openssl.hxx: some bugs fixed; closes #13
* [r99] src/openssl.hxx:
some bugs fixed; closes #13
2011-06-21 07:32 marc
* src/cryptoki.hxx: closes #12
* [r98] src/cryptoki.hxx:
closes #12
2011-05-03 11:57 marc
* doc/examples/openssl-engine-demo.cxx, src/openssl-engine.hxx:
* [r97] 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
* [r96] 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
* [r95] 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
* [r94] src/cryptoki.hxx, src/makefile.am, src/openssl-engine.hxx,
src/pkcs11[CPY], src/pkcs11/apiclient.h[CPY],
src/pkcs11/pkcs11.h[CPY], src/pkcs11/pkcs11types.h[CPY]:
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
* [r93] 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:
* [r92] src/cryptoki.hxx, src/makefile.am, src/pcsc.hxx,
src/pkcs11[DEL]:
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
* [r91] doc/examples/openssl-engine-demo.cxx[ADD]:
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:
* [r90] doc/examples/makefile.am, src/cryptoki.cxx,
src/makefile.am, src/openssl-engine.cxx[ADD],
src/openssl-engine.hxx[ADD], 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
* [r89] 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:
* [r88] 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
* [r87] 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
* [r86] 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
* [r85] src/makefile.am, src/pcsc.cxx[ADD], 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
* [r84] 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
* [r83] 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
* [r82] COPYING, INSTALL, configure.in, src/cryptoki.hxx,
test[DEL]:
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
* [r81] 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
* [r80] 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
* [r79] src/makefile.am, src/openssl.hxx, src/versiontest.cxx[ADD]:
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
* [r78] 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
* [r77] 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
* [r76] 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
* [r75] 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
* [r74] 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
* [r73] 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
* [r72] 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
* [r71] 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
* [r70] 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,
* [r69] 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:
src/makefile.am, src/openssl.hxx, src/pcsc.hxx,
src/version.cxx[ADD]:
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
* [r68] 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
* [r67] doc/examples/makefile.am, install-32-bit-lin-win.sh[CPY]:
32bit-build added, refs #1
2010-05-12 08:16 marc
* makefile.am: Back to chroot builds, see #1
* [r66] makefile.am:
Back to chroot builds, see #1
2010-05-12 08:15 marc
* debian/changelog.in: Maintainer E-Mail changed, see #1
* [r65] debian/changelog.in:
Maintainer E-Mail changed, see #1
2010-05-12 08:08 marc
* debian/changelog.in: Maintainer E-Mail changed, see #1
* [r64] debian/changelog.in:
Maintainer E-Mail changed, see #1
2010-05-12 07:46 marc
* debian/control: Maintainer E-Mail changed, see #1
* [r63] debian/control:
Maintainer E-Mail changed, see #1
2010-04-26 06:43 marc
* configure.in: vesion increased, see #3
* [r62] configure.in:
vesion increased, see #3
2010-04-16 11:49 marc
* makefile.am: build debian for all architectures, see #1
* [r61] makefile.am:
build debian for all architectures, see #1
2010-04-15 14:27 marc
* src/openssl.hxx: closes #2
* [r60] src/openssl.hxx:
closes #2
2010-04-15 13:16 marc
* configure.in, debian/rules, src/libpcscxx.pc.in: bugfixes for
debian, see #1
* [r59] 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
* [r58] configure.in, debian[ADD], debian/changelog.in[ADD],
debian/compat[ADD], debian/control[ADD], debian/copyright[ADD],
debian/dirs[ADD], debian/docs[ADD],
debian/libpcscxx-dev.dirs[ADD],
debian/libpcscxx-dev.install[ADD], debian/libpcscxx.dirs[ADD],
debian/libpcscxx.doc-base.EX[ADD], debian/libpcscxx.install[ADD],
debian/rules[ADD], debian/shlibs.local.ex[ADD],
debian/watch.ex[ADD], makefile.am, src/libpcscxx.pc.in[ADD],
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
* [r57] doc/examples/makefile.am,
doc/examples/openssl-ssl-demo.cxx[ADD],
doc/examples/openssl-tcp-demo.cxx[ADD], 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
* [r56] 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
* [r55] 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
* [r54] 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
* [r53] 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?
* [r52] COPYING, INSTALL, src/openssl.hxx:
bin ich blöd oder was?
2009-10-26 12:40 marc
* src/openssl.hxx: pkcs7
* [r51] src/openssl.hxx:
pkcs7
2009-10-23 14:57 marc
* src/cryptoki.cxx, src/cryptoki.hxx, src/makefile.am: works for
certimporter on win
* [r50] 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,
* [r49] configure.in, doc/examples/makefile.am,
install-64-and-32-bit-linux.sh[ADD], src/cryptoki.cxx,
src/cryptoki.hxx, src/makefile.am, src/pcsc.hxx,
test/makefile.am: compiles for windoze
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
* [r48] 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
* [r47] 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
* [r46] src/cryptoki.cxx, src/cryptoki.hxx, src/openssl.hxx,
test/makefile.am, test/sharedpointer_test.cxx[ADD]:
create and delete with certificate and key
2009-09-29 07:24 marc
* src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx: destroy object
* [r45] 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
* [r44] 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
* [r43] src/cryptoki.cxx, src/cryptoki.hxx:
pass label on creation
2009-09-22 07:58 marc
* src/makefile.am: linkable again
* [r42] src/makefile.am:
linkable again
2009-09-22 07:40 marc
* doc/examples/makefile.am, src/makefile.am, src/openssl.hxx:
* [r41] 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
* [r40] 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
* [r39] src/openssl.hxx:
new certificate attribute get methods
2009-09-21 07:43 marc
* doc/examples/cryptoki-demo.cxx, src/cryptaux.hxx,
* [r38] doc/examples/cryptoki-demo.cxx, src/cryptaux.hxx[ADD],
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
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
* [r37] src/openssl.hxx:
X509 subject to DER
2009-09-18 13:31 marc
* src/openssl.hxx: ssl connection first try
* [r36] 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
* [r35] doc/makefile.am, src/cryptoki.hxx, src/openssl.hxx,
src/overview.doc[ADD], src/pcsc.hxx:
improved doxygen
2009-09-18 08:24 marc
* src/openssl.hxx: openssl fixed
* [r34] src/openssl.hxx:
openssl fixed
2009-09-17 14:57 marc
* src/makefile.am, src/openssl.hxx: now with openssl wrapper
* [r33] src/makefile.am, src/openssl.hxx[ADD]:
now with openssl wrapper
2009-09-16 14:52 marc
* src/cryptoki.cxx, src/cryptoki.hxx: first try to create
* [r32] src/cryptoki.cxx, src/cryptoki.hxx:
first try to create
2009-09-10 12:13 marc
* src/cryptoki.hxx: login
* [r31] src/cryptoki.hxx:
login
2009-09-09 16:14 marc
* src/cryptoki.hxx: ulong to string conversion
* [r30] src/cryptoki.hxx:
ulong to string conversion
2009-09-09 12:12 marc
* src/cryptoki.hxx: mark hex with 0x
* [r29] src/cryptoki.hxx:
mark hex with 0x
2009-09-09 06:59 marc
* src/cryptoki.hxx: more texts and no prefix in text
* [r28] src/cryptoki.hxx:
more texts and no prefix in text
2009-09-08 14:45 marc
* src/cryptoki.hxx: texts changed
* [r27] src/cryptoki.hxx:
texts changed
2009-09-03 07:46 marc
* src/cryptoki.hxx: get single attribute also with access operator
* [r26] 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
* [r25] 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
* [r24] 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 :-)
* [r23] 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)
* [r22] src/cryptoki.hxx, src/makefile.am,
src/pkcs11/apiclient.h[ADD], src/pkcs11/cryptoki.h[DEL],
src/pkcs11/pkcs11.h, src/pkcs11/pkcs11f.h[DEL],
src/pkcs11/pkcs11t.h[DEL], src/pkcs11/pkcs11types.h[ADD]:
no more crash (on linux)
2009-09-01 10:01 marc
* src/pcsc.hxx: compiles on mac
* [r21] src/pcsc.hxx:
compiles on mac
2009-09-01 09:11 marc
* src/cryptoki.cxx, src/cryptoki.hxx: find objects
* [r20] 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
* [r19] doc/examples/makefile.am, src/cryptoki.hxx,
src/makefile.am, src/pkcs11[ADD], src/pkcs11/cryptoki.h[ADD],
src/pkcs11/pkcs11.h[ADD], src/pkcs11/pkcs11f.h[ADD],
src/pkcs11/pkcs11t.h[ADD]:
own pkcs11 header from rsa
2009-08-31 13:59 marc
* doc/examples/cryptoki-demo.cxx, src/cryptoki.hxx, src/pcsc.hxx:
* [r18] 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
* [r17] 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
* [r16] 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
* [r15] configure.in, doc/examples/cryptoki-demo.cpp[DEL],
doc/examples/cryptoki-demo.cxx[CPY],
doc/examples/makefile.am[ADD], doc/examples/pcsc-demo.cpp[DEL],
doc/examples/pcsc-demo.cxx[CPY], 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
* [r14] doc/examples/cryptoki-demo.cpp[ADD],
doc/examples/pcsc-demo.cpp, src/cryptoki.cxx[ADD],
src/cryptoki.hxx[ADD], src/makefile.am:
first test with cryptoki
2009-08-25 14:05 marc
* src/pcsc.hxx: resolved problem with proprietary KOBIL windoze
driver
* [r13] src/pcsc.hxx:
resolved problem with proprietary KOBIL windoze driver
2009-08-19 13:42 marc
* src/pcsc.hxx: corrections
* [r12] 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)
* [r11] 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)
* [r10] 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
* [r9] 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
* [r8] 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
* [r7] 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
* [r6] src/pcsc.hxx:
error strings also for windoof
2009-07-10 10:02 marc
* src/pcsc.hxx: mac: other types
* [r5] src/pcsc.hxx:
mac: other types
2009-07-09 12:28 marc
* COPYING, INSTALL, doc/makefile.am, src/makefile.am, src/pcsc.hxx:
* [r4] COPYING[ADD], INSTALL[ADD], 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
* [r3] doc/examples[ADD], doc/examples/pcsc-demo.cpp[ADD],
src/pcsc.hxx[ADD]:
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
* [r2] AUTHORS[ADD], ChangeLog[ADD], NEWS[ADD], README[ADD],
bootstrap.sh[ADD], configure.in[ADD], doc[ADD],
doc/doxyfile.in[ADD], doc/makefile.am[ADD], makefile.am[ADD],
src[ADD], src/main.cxx[ADD], src/makefile.am[ADD], test[ADD],
test/makefile.am[ADD]:
new project structure
2009-06-17 11:53 marc
* .: start
* [r1] .[ADD]:
start

@ -1,4 +1,4 @@
## @id $Id: ax_init_standard_project.m4 31 2015-05-05 15:06:08Z marc $
## @id $Id: ax_init_standard_project.m4 204 2016-09-29 18:29:53Z marc $
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
@ -7,7 +7,7 @@
m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
# define least version number from subversion's revision number:
# it is taken modulo 256 due to a bug on Apple's SX
# it is taken modulo 256 due to a bug on Apple's MaxOSX
m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
m4_ifdef([x_least_diff],
mrw_esyscmd_s([
@ -36,10 +36,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
fi
done
# Mac does not support LEAST > 255
echo $ECHO_N $(($VCS_REVISION%256))
])
)
))
echo $ECHO_N $(($VCS_REVISION%256))]))))
# define version number from subversion's revision number:
# it is taken modulo 256 due to a bug on Apple's MacOSX
@ -57,8 +54,8 @@ m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([
fi;
done
# Mac does not support LEAST > 255
echo $ECHO_N $(($VCS_REVISION/256))
])))
echo $ECHO_N $(($VCS_REVISION/256))])))
# setup version number
m4_define(x_version, [x_major.m4_ifdef([x_least_diff], x_minor, m4_eval(x_minor+x_minor_diff)).m4_eval(m4_ifdef([x_least_diff], [x_least-x_least_diff], [x_least]))])
@ -196,19 +193,35 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
COPYING=$(<COPYING)
AX_SUBST(COPYING)
_AM_SUBST_NOTMAKE([COPYING])
CHANGELOG=$(<ChangeLog)
AC_SUBST(CHANGELOG)
_AM_SUBST_NOTMAKE([CHANGELOG])
DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};s,\t, ,g;/^ \* /{s,,,;H;g;s,^, * ,;s,\n\([[^ ]]*\) *, \1\n ,}' ChangeLog)
if test -z "$DEB_CHANGELOG"; then
DEB_CHANGELOG=" * see file ChangeLog and project management web site"
fi
AC_SUBST(DEB_CHANGELOG)
_AM_SUBST_NOTMAKE([DEB_CHANGELOG])
AUTHOR=$(head -1 AUTHORS)
AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
PACKAGER=$(gpg -K --display-charset utf-8 --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
if test -z "${PACKAGER}"; then
PACKAGER="$AUTHOR"
fi
AX_SUBST(AUTHOR)
_AM_SUBST_NOTMAKE([AUTHOR])
AX_SUBST(AUTHOR_NAME)
AX_SUBST(AUTHOR_URL)
AX_SUBST(AUTHOR_MAIL)
AX_SUBST(PACKAGER)
PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
AX_SUBST(PROJECT_URL)
AX_SUBST(SOURCE_DOWNLOAD)
VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
AX_SUBST(VENDOR)
DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
AX_SUBST(DISTRO)
ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
@ -411,7 +424,7 @@ EOF
# use this in configure.ac to support CppUnit for C++ unit tests
AC_DEFUN([AX_USE_CPPUNIT], [
AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
PKG_CHECK_MODULES(CPPUNIT, cppunit, [have_cppunit="yes"], [have_cppunit="no"])
# infos and warnings
if test "$have_cppunit" = "no"; then
AC_MSG_WARN([Missing cppunit development library!
@ -432,8 +445,23 @@ maintainer-clean-example-targets:
EOF
])
# use this in configure.ac to support C++ examples
# use this in configure.ac to support NodeJS
AC_DEFUN([AX_USE_NODEJS], [
AC_PATH_PROG(ANDROID, [android], [0],
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
AC_CONFIG_FILES([nodejs/package.json])
AC_CONFIG_FILES([nodejs/makefile])
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-nodejs-targets], [nodejs/makefile.in])
test -f nodejs/makefile.in && cat >> nodejs/makefile.in <<EOF
#### Begin: Appended by $0
maintainer-clean-nodejs-targets:
-rm makefile.in
#### End: $0
EOF
])
# use this in configure.ac to support Cordova
AC_DEFUN([AX_USE_CORDOVA], [
AC_PATH_PROG(ANDROID, [android], [0],
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
AC_PATH_PROG(CORDOVA, [cordova], [0],
@ -446,14 +474,13 @@ AC_DEFUN([AX_USE_NODEJS], [
fi
AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0])
AX_SUBST(CORDOVA)
AC_CONFIG_FILES([nodejs/package.json])
AC_CONFIG_FILES([nodejs/makefile])
AC_CONFIG_FILES([cordova/makefile])
AC_CONFIG_FILES([cordova/config.xml])
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [examples/makefile.in])
test -f examples/makefile.in && cat >> examples/makefile.in <<EOF
EOF
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cordova-targets], [cordova/makefile.in])
test -f cordova/makefile.in && cat >> cordova/makefile.in <<EOF
#### Begin: Appended by $0
maintainer-clean-example-targets:
maintainer-clean-cordova-targets:
-rm makefile.in
#### End: $0
EOF
@ -535,6 +562,7 @@ AC_DEFUN([AX_USE_RPM_PACKAGING], [
EXTRA_DIST += \${PACKAGE_NAME}.spec.in
rpm: dist
rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
rpmsign --define "_gpg_name \${PACKAGER}" --addsign RPMS/*/*.rpm SRPMS/*.rpm
clean-rpm-targets:
-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
distclean-rpm-targets:
@ -599,7 +627,7 @@ doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
clean-documentation:
-rm doxygen.errors @PDF_DOC@
@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images doxygen_sqlite3.db
@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
distclean-documentation:
-rm -r html
-rm @PACKAGE_NAME@.doxytag
@ -621,7 +649,7 @@ AC_DEFUN([AX_USE_PERLDOC], [
PERL_SOURCES="m4_default([$1], [perl])"
AX_SUBST(PERL_SOURCES)
if test -z "$PERL_SOURCES"; then
AC_MSG_ERROR([You must specify the path to per files
AC_MSG_ERROR([You must specify the path to perl files
- use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
if test "$have_doxygen" = "no"; then

@ -149,6 +149,22 @@ GENERATED FILES
* src/version.cxx - if you enabled AX_USE_CXX
* html/makefile.am - if you enabled AX_BUILD_HTML
* scripts/makefile.am - if you enabled AX_USE_SCRIPTS
* nodejs/makefile.am - if you add AX_USE_NODEJS
* nodejs/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
* nodejs/package.json.in - if you add AX_USE_NODEJS
* nodejs/etc/${DEFAULT_PROJECT_NAME}.json - if you add AX_USE_NODEJS
* nodejs/etc/default/${DEFAULT_PROJECT_NAME} - if you add AX_USE_NODEJS
* nodejs/etc/init/${DEFAULT_PROJECT_NAME}.conf - if you add AX_USE_NODEJS
* nodejs/etc/systemd/system/${DEFAULT_PROJECT_NAME}.service - if you add AX_USE_NODEJS
* nodejs/public - if you add AX_USE_NODEJS
* nodejs/public/images - if you add AX_USE_NODEJS
* nodejs/public/javascripts/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
* nodejs/public/stylesheets/style.styl - if you add AX_USE_NODEJS
* nodejs/routes/index.js - if you add AX_USE_NODEJS
* nodejs/sockets/index.js - if you add AX_USE_NODEJS
* nodejs/views/index.ejs - if you add AX_USE_NODEJS
* nodejs/views/layout.ejs - if you add AX_USE_NODEJS
* nodejs/node_modules - if you add AX_USE_NODEJS
* doc/makefile.am - if you enabled AX_USE_DOXYGEN or AX_USE_PERLDOC
* doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
* doc/header.html.in - if you enabled AX_USE_DOXYGEN
@ -242,6 +258,7 @@ FILES
* Enable C++: AX_USE_CXX
* Enable LibTool library creation: AX_USE_LIBTOOL
* Enable Scripts: AX_USE_SCRIPTS
* Enable NodeJS project: AX_USE_NODEJS
* Enable Doxygen documentation generation: AX_USE_DOXYGEN
* Enable Perldoc documentation generation: AX_USE_PERLDOC
* Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
@ -284,11 +301,13 @@ VCS=""
VCSDEPENDS=""
if test -d .svn; then
VCS="svn"
VCSDEPENDS="subversion,"
VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
VCSDEPENDS_RPM="subversion,"
echo -e " \e[32msuccess\e[0m detected ${VCS}"
elif test -d .git; then
VCS="git"
VCSDEPENDS="git,"
VCSDEPENDS_DEB="git2cl, git,"
VCSDEPENDS_RPM="git,"
echo -e " \e[32msuccess\e[0m detected ${VCS}"
else
echo -e " \e[33mignored\e[0m"
@ -487,6 +506,8 @@ vcs2cl() {
if test -x $(which ${VCS}2cl); then
if test "${VCS}" = "git"; then
${VCS}2cl > ChangeLog
elif test "${VCS}" = "svn"; then
${VCS}2cl --break-before-msg -a -i
elif test -n "${VCS}"; then
${VCS}2cl
fi
@ -518,7 +539,7 @@ copy build-in-docker.sh
copy build-resource-file.sh
copy sql-to-dot.sed
copy mac-create-app-bundle.sh
AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1)
AUTHOR=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[ultimate\] *\)\?,,p' | head -1)
if test -z "${AUTHOR}"; then
AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
fi
@ -550,6 +571,7 @@ AX_INIT_STANDARD_PROJECT
#AX_USE_CXX
#AX_USE_LIBTOOL
#AX_USE_SCRIPTS
#AX_USE_NODEJS
#AX_USE_DOXYGEN
#AX_USE_PERLDOC
#AX_USE_DEBIAN_PACKAGING
@ -837,6 +859,349 @@ ${HEADER}dist_bin_SCRIPTS =
MAINTAINERCLEANFILES = makefile.in
EOF
if testtag AX_USE_NODEJS; then
checkdir nodejs
checkdir nodejs/public
checkdir nodejs/public/images
checkdir nodejs/etc
checkdir nodejs/etc/systemd
fi
to --condition AX_USE_NODEJS nodejs/makefile.am <<EOF
${HEADER}EXTRA_DIST = @PACKAGE_NAME@.js package.json.in public routes sockets views
nodejsdir = \${pkgdatadir}/nodejs
sysconfdefaultdir = \${sysconfdir}/default
sysconfinitdir = \${sysconfdir}/init
dist_sysconf_DATA = \${sysconfdir}/@PACKAGE_NAME@.json
dist_sysconfdefault_DATA = \${sysconfdir}/default/@PACKAGE_NAME@
dist_sysconfinit_DATA = \${sysconfdir}/init/@PACKAGE_NAME@.conf
all: node_modules
node_modules: package.json.in
HOME=. npm install
clean-local:
-rm -r node_modules .npm
install-data-hook:
test -d \$(DESTDIR)\${nodejsdir} || mkdir -p \$(DESTDIR)\${nodejsdir}
chmod -R u+w \$(DESTDIR)\${nodejsdir}
cp -r . \$(DESTDIR)\${nodejsdir}
uninstall-local:
-chmod -R u+w \$(DESTDIR)\${nodejsdir}
-rm -rf \$(DESTDIR)\${nodejsdir}
MAINTAINERCLEANFILES = makefile.in
EOF
to --condition AX_USE_NODEJS nodejs/${PACKAGE_NAME}.js <<EOF
${CHEADER}try {
process.on('uncaughtException', function(e) {
console.log("**** UNCAUGHT EXCEPTION ****");
console.log(e);
console.log(e.stack);
process.exit(1);
});
/**
* Module dependencies.
*/
var express = require('express')
, routes = require(__dirname+'/routes');
var app = module.exports = express.createServer();
var io = require('socket.io').listen(app);
var package = require(__dirname+'/package.json');
var config = require(package.path.config);
var authentication = require(__dirname+'/authentication')(config.restrict);
var sockets = require(__dirname+'/sockets')(io, authentication);
// Configuration
process.argv.forEach(function(val, index) {
if (index<2) {return}
if (index!=2 || isNaN(val)) {
console.log("**** ERROR: Unexpected Argument - allowed is only a port number");
process.exit(1);
}
config.port = parseInt(val);
});
if (typeof config.port != 'number') {
console.log("**** WARNING: no valid port given, defaults to 8888");
config.port = 8888;
}
app.configure(function(){
app.set('views', __dirname + '/views');
app.set('view engine', 'ejs');
app.use(express.bodyParser());
app.use(express.methodOverride());
app.use(require('stylus').middleware({ src: __dirname + '/public' }));
app.use(app.router);
app.use(express.static(__dirname + '/public'));
});
app.configure('development', function(){
app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
});
app.configure('production', function(){
app.use(express.errorHandler());
});
// Routes
app.get('/', routes.index);
app.listen(config.port, function() {
console.log("Express server listening on port %d in %s mode",
app.address().port, app.settings.env);
});
} catch (e) {
console.log("**** EXCEPTION ****");
console.log(e);
console.log(e.stack);
process.exit(1);
}
EOF
to --condition AX_USE_NODEJS nodejs/package.json.in <<EOF
{
"name": "@PACKAGE_NAME@",
"version": "@PACKAGE_VERSION@",
"private": true,
"dependencies": {
"express": "~2.5.8",
"stylus": "~0.53.0",
"ejs": ">= 0.0.1",
"socket.io": "~1.4.4",
"socketio-auth": "0.0.5",
"ldapauth": "git+https://github.com/DimensionSoftware/node-ldapauth.git"
},
"description": "@DESCRIPTION@",
"main": "@PACKAGE_NAME@.js",
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "@AUTHOR@",
"license": "@LICENSE@",
"path": {
"prefix": "@PREFIX@",
"sysconf": "@SYSCONFDIR@",
"pkgdata": "@PKGDATADIR@",
"localstate": "@LOCALSTATEDIR@",
"log": "@LOCALSTATEDIR@/log/@PACKAGE_NAME@.log",
"config": "@SYSCONFDIR@/@PACKAGE_NAME@.json",
"nodejs": "@PKGDATADIR@/nodejs"
}
}
EOF
to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
{
"port": 8888,
"restrict": {
"passwords": {
"foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"]
},
"ldap": {
"url": "ldap://dev.marc.waeckerlin.org",
"adminDn": "cn=tmp,ou=system,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
"adminPassword": "secret",
"searchBase": "ou=person,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
"searchFilter": "(uid={{username}})"
}
}
}
EOF
to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF
#EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
#${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME^^}.log"
#${PACKAGE_NAME^^}="${PACKAGE_NAME}"
#${PACKAGE_NAME^^}_PORT="8888"
EOF
to --condition AX_USE_NODEJS nodejs/etc/init/${PACKAGE_NAME}.conf <<EOF
#!upstart
description "$(head -1 README)"
author "$(head -1 AUTHORS)"
start on (local-filesystems and net-device-up)
stop on runlevel [!2345]
respawn
script
echo \$\$ > /var/run/${PACKAGE_NAME}.pid
# there are some useful defaults
# do not edit this file, overwrite values in /etc/default/${PACKAGE_NAME}
EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
${PACKAGE_NAME^^}_USER="${PACKAGE_NAME}"
${PACKAGE_NAME^^}_PORT=""
[ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
if test -n "\${${PACKAGE_NAME^^}_USER}"; then
exec sudo -u "\${${PACKAGE_NAME^^}_USER}" \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
else
exec \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
fi
end script
pre-start script
${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
[ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
# Date format same as (new Date()).toISOString() for consistency
echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> \${${PACKAGE_NAME^^}_LOG}
end script
pre-stop script
${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
[ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
rm /var/run/${PACKAGE_NAME}.pid
echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> \${${PACKAGE_NAME^^}_LOG}
end script
EOF
to --condition AX_USE_NODEJS nodejs/etc/systemd/system/${PACKAGE_NAME}.service <<EOF
[Unit]
Description=$(head -1 README)
[Service]
ExecStart=/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME} > /var/log/${PACKAGE_NAME}.log
Restart=on-abort
[Install]
WantedBy=multi-user.target
EOF
to --condition AX_USE_NODEJS nodejs/public/javascripts/${PACKAGE_NAME}.js <<EOF
${CHEADER}var socket = null;
function init() {
socket = io.connect();
/*
socket
.io
.on("connect", connect)
.on("reconnect", connect)
.on("disconnect", disconnected)
.on("error", disconnected);
socket
.on("authenticated", authenticated)
.on("unauthorized", unauthorized)
.on("fail", error);
*/
}
/// On Load, Call @ref start
/*
\$(window.onbeforeunload = function() {
return "Are you sure you want to navigate away?";
});
*/
\$(init);
EOF
to --condition AX_USE_NODEJS nodejs/public/stylesheets/style.styl <<EOF
body
padding: 50px
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif
a
color: #00B7FF
EOF
to --condition AX_USE_NODEJS nodejs/routes/index.js <<EOF
${CHEADER}var package = require(__dirname+"/../package.json");
exports.index = function(req, res) {
res.render('index', {
packagename: package.name,
packageversion: package.version
});
};
EOF
to --condition AX_USE_NODEJS nodejs/sockets/index.js <<EOF
module.exports = function(io, authentication) {
var module={};
function broadcast(signal, data) {
console.log("<= signal: "+signal);
io.sockets.emit(signal, data);
}
function fail(txt, data) {
console.log("** "+txt, data);
}
function connection(socket, userdata) {
console.log("=> new connection from "+userdata.username);
function emit(signal, data, info) {
if (typeof data == 'string' && !data.match("\n")) {
console.log("<- signal: "+signal+"("+data+")");
} else {
console.log("<- signal: "+signal);
}
if (info) console.log(info);
socket.emit(signal, data);
}
function fail(txt, data) {
console.log("** "+txt, data);
emit("fail", txt);
}
/*
socket
.on("xxx", xxx)
.on("yyy", yyy;
*/
}
// Handle Connection
require('socketio-auth')(io, {
authenticate: function (socket, data, callback) {
console.log("=> authenticate: ", data.username);
//get credentials sent by the client
var username = data.username;
var password = data.password;
authentication(data.username, data.password,
function() {
console.log("####LOGIN-SUCESS####");
callback(null, true)
},
function() {
console.log("####LOGIN-FAIL####");
callback(new Error("wrong credentials"))
});
},
postAuthenticate: connection,
timeout: "none"
});
return module;
}
EOF
to --condition AX_USE_NODEJS nodejs/views/index.ejs <<EOF
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width initial-scale=1" />
<link href="stylesheets/style.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="javascripts/${PACKAGE_NAME}.js"></script>
<title>$(head -1 README)</title>
</head>
<body>
<h1>$(head -1 README)</h1>
<p>generated by bootstrap, please edit</p>
</body>
</html>
EOF
to --condition AX_USE_NODEJS nodejs/views/layout.ejs <<EOF
<%- body %>
EOF
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition 'AX_USE_DOXYGEN|AX_USE_PERLDOC' doc/makefile.am
if testtag AX_BUILD_TEST; then
to test/runtests.sh < ${0%/*}/test/runtests.sh
@ -1096,15 +1461,15 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
to debian/changelog.in <<EOF
@PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
* Please see ChangeLog of @PACKAGE@
@DEB_CHANGELOG@
-- @AUTHOR@ @BUILD_DATE@
-- @PACKAGER@ @BUILD_DATE@
EOF
BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
to debian/control.in <<EOF
Source: @PACKAGE_NAME@
Priority: extra
Maintainer: @AUTHOR@
Maintainer: @PACKAGER@
Build-Depends: ${BUILD_DEPENDS}
Package: @PACKAGE_NAME@
@ -1171,9 +1536,15 @@ else
fi)
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
BuildRequires: gnupg, ${VCSDEPENDS_RPM} make, automake, autoconf, rpm-build$(
if testtag AX_USE_CXX; then
echo -n ", binutils-devel, gcc-c++"
fi
if testtag AX_USE_LIBTOOL; then
echo -n ", libtool";
fi
if testtag AX_USE_DOXYGEN; then
echo -n ", doxygen, default-jre-headless";
echo -n ", doxygen, java-openjdk";
fi
if testtag AX_USE_PERLDOC; then
echo -n ", libpod-tree-perl";
@ -1182,11 +1553,28 @@ BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
%if 0%{?fedora} != 20
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
BuildRequires: pkgconfig, redhat-lsb$(
if testtag AX_USE_CPPUNIT; then
echo -n ", cppunit-devel";
fi)
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
BuildRequires: which, pkgconfig$(
if testtag AX_USE_LIBTOOL; then
echo -n ", cppunit-devel"
fi
)
%if 0%{?rhel} > 6 || 0%{?rhl} > 6 || 0%{?centos} > 6 || 0%{?fedora} || 0%{?mageia}
BuildRequires: rpm-sign
%endif
%if 0%{?mageia}
BuildRequires: gnupg, lsb-release$(
if testtag AX_USE_LIBTOOL; then
echo -n ", libltdl-devel"
fi
)
%else
BuildRequires: gpg, redhat-lsb$(
if testtag AX_USE_LIBTOOL; then
echo -n ", libtool-ltdl-devel"
fi
)
%endif
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
@ -1212,7 +1600,9 @@ echo
echo This package contains only the shared libraries required at runtime.
fi)
$(if ! testtag 'AX_USE_LIBTOOL|AX_USE_CXX'; then
echo '%global debug_package %{nil}'
fi)
%prep
%setup -q
./configure --prefix=/usr \\
@ -1237,6 +1627,7 @@ else
echo '/usr/bin/*'
echo '/usr/share/applications/*'
fi)
/usr/share/@PACKAGE_NAME@
%doc
$(if testtag AX_USE_LIBTOOL; then
cat <<EOF2
@ -1248,7 +1639,7 @@ $(if testtag AX_USE_LIBTOOL; then
/usr/share/doc/packages/@PACKAGE_NAME@/README
EOF2
else
echo '/usr/share/*'
echo '/usr/share/doc/packages/@PACKAGE_NAME@'
fi)
$(if testtag AX_USE_LIBTOOL; then
@ -1305,7 +1696,7 @@ for d in src test scripts doc examples html; do
done
to --mode "u=rwx,g=rwx,o=rx" autogen.sh <<EOF
#!/bin/bash -e
if test -n "$VCS" -a -d .$VCS -a -e -x $(which ${VCS}2cl); then
if test -n "$VCS" -a -d ".$VCS" -a -e -x "\$(which ${VCS}2cl)"; then
$(case "$VCS" in
(svn) echo " ${VCS}2cl";;
(git) echo " ${VCS}2cl > ChangeLog";;
@ -1347,10 +1738,15 @@ Cflags: -I\${includedir} @CPPFLAGS@
Requires: @PKG_REQUIREMENTS@
EOF
to build-in-docker.conf <<EOF
repos+=("Debian|Ubuntu-precise::::::universe")
repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
envs+=("-e 'HOME=\${HOME}'")
dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
${HEADER}# Use Ubuntu Universe Repository
repos+=("Ubuntu:::universe")
# Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
EOF
#### Cleanup If Makefile Exists ####

@ -1,7 +1,19 @@
repos+=("Debian|Ubuntu-precise::::::universe")
repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
repos+=("https://dev.marc.waeckerlin.org/repository")
## @id $Id$
##
## This file has been added:
## - by bootstrap.sh
## - on Sat, 07 January 2017 15:21:52 +0100
## Feel free to change it or even remove and rebuild it, up to your needs
##
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
# Use Ubuntu Universe Repository
repos+=("Ubuntu:::universe")
# Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
envs+=("-e 'HOME=${HOME}'")
dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
packages+=("Debian-sid:::mrw-c\\+\\+")

@ -2,21 +2,29 @@
set -o errtrace
# build and test everything in a fresh docker installation
mode="apt"
myarch=$(dpkg --print-architecture)
if test "${arch}" = "amd64"; then
myarch="amd64|i386"
fi
mode="deb"
img="ubuntu:latest"
repos=()
keys=()
envs=("-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
dirs=("-v $(pwd):/workdir")
envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
packages=()
targets="all check distcheck"
commands=()
arch=$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)
host=
flags=()
wait=0
if test -e ./build-in-docker.conf; then
# you can preconfigure the variables in file build-in-docker.conf
# if you do so, add the file to EXTRA_DIST in makefile.am
source ./build-in-docker.conf
fi
while test $# -gt 0; do
case "$1" in
(-h|--help)
@ -25,9 +33,12 @@ while test $# -gt 0; do
echo "OPTIONS:"
echo
echo " -h, --help show this help"
echo " -m, --mode <type> mode: apt or yum, default: ${mode}"
echo " -m, --mode <type> mode: deb, rpm, win, default: ${mode}"
echo " -i, --image <image> use given docker image instead of ${img}"
echo " -a, --arch <arch> build for given hardware architecture"
echo " -t, --targets targets specify build targets, default: ${targets}"
echo " --host <target-arch> host for cross compiling, e.g. i686-w64-mingw32"
echo " -f, --flag <flag> add flag to ./bootstrap.sh or ./configure"
echo " -r, --repo <url> add given apt repository"
echo " -k, --key <url> add public key from url"
echo " -e, --env <var>=<val> set environment variable in docker"
@ -37,6 +48,10 @@ while test $# -gt 0; do
echo " -w, --wait on error keep docker container and wait for enter"
echo
echo " The option -i must be after -m, because mode sets a new default image"
echo " The option -m must be after -t, because mode may be auto detected from targets"
echo " The option -m must be after -h, because mode may set a host"
echo " If target is either deb or rpm, mode is set to the same value"
echo " If target is win, host is set to i686-w64-mingw32"
echo
echo " The options -r -k -e -d -p -c can be repeated several times."
echo
@ -67,8 +82,11 @@ while test $# -gt 0; do
(-m|--mode) shift;
mode="$1"
case "$mode" in
(apt) img="ubuntu:latest";;
(deb|apt) img="ubuntu:latest";;
(rpm|zypper) img="opensuse:latest";;
(yum) img="centos:latest";;
(dnf) img="fedora:latest";;
(win) img="ubuntu:latest"; host="${host:---host=i686-w64-mingw32}";;
(*)
echo "**** ERROR: unknown mode '$1', try --help" 1>&2
exit 1
@ -78,10 +96,25 @@ while test $# -gt 0; do
(-i|--image) shift;
img="$1"
;;
(-a|--arch) shift;
arch="$1"
;;
(-t|--targets) shift;
targets="$1"
if test "$1" = "deb" -o "$1" = "rpm"; then
# set mode to same value
set -- "-m" "$@"
continue
fi
;;
(--host) shift;
host="--host=$1"
;;
(-f|--flag) shift;
flags+=("$1")
;;
(-r|--repo) shift;
echo "OPTION: $1"
repos+=("$1")
;;
(-k|--key) shift;
@ -140,7 +173,8 @@ function traperror() {
read
fi
echo -n " ... cleanup docker: "
docker rm -f "${DOCKER_ID}"
docker stop "${DOCKER_ID}" || true
docker rm "${DOCKER_ID}"
echo "returning status: $e"
echo "--->"
exit $e
@ -167,14 +201,14 @@ function ifthenelse() {
os="${arg%%:::*}"
thenpart="${arg#*:::}"
if test "${thenpart/:::/}" = "${thenpart}"; then
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
else
elsepart="${thenpart##*:::}"
thenpart="${thenpart%:::*}"
if test -n "${thenpart}"; then
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
else
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
fi
fi
fi
@ -183,10 +217,25 @@ function ifthenelse() {
set -x
docker pull $img
DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -e HOME="${HOME}" -w /workdir $img sleep infinity)
DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
if ! [[ $arch =~ $myarch ]]; then
docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
fi
docker start "${DOCKER_ID}"
if ! docker exec ${DOCKER_ID} getent group $(id -g) > /dev/null 2>&1; then
docker exec ${DOCKER_ID} groupadd -g $(id -g) $(id -gn)
fi
if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
fi
docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
case $mode in
(apt)
(deb|apt)
if [[ "${img}" =~ "ubuntu" ]]; then
docker exec ${DOCKER_ID} locale-gen ${LANG}
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
fi
OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
@ -199,7 +248,7 @@ case $mode in
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
for repo in "${repos[@]}"; do
ifthenelse "${repo}" "apt-add-repository ARG"
ifthenelse "${repo}" "apt-add-repository 'ARG'"
done
for key in "${keys[@]}"; do
wget -O- "$key" \
@ -214,8 +263,7 @@ case $mode in
done
docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
;;
(yum)
./bootstrap.sh -t dist
(rpm|yum|dnf|zypper|urpmi)
if [[ "$img" =~ "centos" ]]; then
docker exec ${DOCKER_ID} yum install -y redhat-lsb
docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
@ -228,10 +276,29 @@ enabled=1
gpgcheck=0
EOF
fi
docker exec ${DOCKER_ID} yum install -y rpm-build
docker exec ${DOCKER_ID} groupadd -g $(id -g) build
docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget /usr/bin/lsb_release
i=0
for key in "${keys[@]}"; do
wget -Orpm-key "$key"
docker exec -i ${DOCKER_ID} rpm --import rpm-key
rm rpm-key
done
for repo in "${repos[@]}"; do
INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo true))
ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
((++i))
done
docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh
;;
(win)
if [[ "${img}" =~ "ubuntu" ]]; then
docker exec ${DOCKER_ID} locale-gen ${LANG}
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
fi
docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
docker exec ${DOCKER_ID} apt-get install -y mingw-w64
docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
;;
esac
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}"
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} ${flags[@]}

30
debian/control.in vendored

@ -1,28 +1,18 @@
Source: @PACKAGE_NAME@
Priority: extra
Maintainer: @AUTHOR@
Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, doxygen, graphviz, mscgen, default-jre-headless|default-jre, fakeroot, lsb-release, libssl-dev, libpkcs11-helper1-dev | libp11-kit-dev | libgnutls-dev, libpcsclite-dev, mrw-c++-dev, libproxy-dev, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools
Standards-Version: 3.8.1
Section: libs
Homepage: https://dev.marc.waeckerlin.org/projects/libpcscxx
Package: @PACKAGE_NAME@-dev
Section: devel
Architecture: any
Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, subversion, pkg-config, automake, libtool, autotools-dev, doxygen, graphviz, mscgen, lsb-release, libssl-dev, libpkcs11-helper1-dev | libp11-kit-dev | libgnutls-dev, libpcsclite-dev, mrw-c++-dev, libproxy-dev, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools
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@
Maintainer: @PACKAGER@
Build-Depends: debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, libssl-dev, libpkcs11-helper1-dev | libp11-kit-dev | libgnutls-dev, libpcsclite-dev, mrw-c++-dev
Package: @PACKAGE_NAME@
Section: libs
Architecture: any
Depends: @PACKAGE_NAME@ (= ${binary:Version}), ${misc:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: @DESCRIPTION@
@README_DEB@
Package: @PACKAGE_NAME@-dev
Section: libdevel
Architecture: any
Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, libssl-dev, libpkcs11-helper1-dev | libp11-kit-dev | libgnutls-dev, libpcsclite-dev, mrw-c++-dev
Description: @DESCRIPTION@ - Development Package
@README_DEB@

@ -35,7 +35,7 @@ TO_INSTALL=
if test -e debian/control.in -a ! -e debian/control; then
for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then
if test -n "$(${DO} apt-cache policy -q ${f})" && ((! $(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}")); then
TO_INSTALL+=" ${f}"
fi
done

@ -10,35 +10,34 @@
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install -y) || (test -x /usr/bin/dnf && echo dnf install -y) || (test -x /usr/bin/yum && echo yum install -y) || (test -x /usr/sbin/urpmi && echo urpmi --auto))}
SCHROOTNAME="$1"
PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
PKGCONFIGS="${2:-epel-release}" # packages to configure yum
TRAP_CMD=
if test -e ${PACKAGE_NAME}.spec.in -a ! -e ${PACKAGE_NAME}.spec; then
TRAP_CMD+="rm ${PACKAGE_NAME}.spec;"
trap "${TRAP_CMD}" INT TERM EXIT
sed 's,@RPM_DEPEND_IFEXISTS@,,g' ${PACKAGE_NAME}.spec.in | \
sed 's,@[^@]*@, dummytext,g' > ${PACKAGE_NAME}.spec
fi
TGZFILE=$(sed -n '/^Name: */{s///;h};/^Version: */{s///;H;x;s/\n/-/;s/$/.tar.gz/;p}' ${PACKAGE_NAME}.spec)
if ! test -e $TGZFILE; then
TRAP_CMD+="rm ${TGZFILE};"
trap "${TRAP_CMD}" INT TERM EXIT
touch $TGZFILE
fi
if test -n "${SCHROOTNAME}"; then
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
if test -n "${FILES}"; then
FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
if test -n "${FIRST}"; then
schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FIRST} || \
schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FIRST} || \
schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FIRST}
fi
schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FILES} || \
schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FILES} || \
schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES}
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES}
fi
else
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
if test -n "${FILES}"; then
FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
if test -n "${FIRST}"; then
yum install -y ${FIRST} || \
zypper install -y ${FIRST} || \
dnf install -y ${FIRST}
fi
yum install -y ${FILES} || \
zypper install -y ${FILES} || \
dnf install -y ${FILES}
${INSTALL_TOOL} ${FILES}
fi
fi

Loading…
Cancel
Save