diff --git a/ChangeLog b/ChangeLog index ecc7a49..e69de29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4469 +0,0 @@ -2017-02-17 11:05 - - * [r408] build-in-docker.sh: - backup - -2016-10-17 11:53 - - * [r407] ChangeLog, autogen.sh[ADD], ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, bootstrap.sh, - build-in-docker.conf[ADD], build-in-docker.sh, - 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, - src/qbrowserlib/resources/icons/suisseid.png[ADD]: - build fixed - -2016-04-04 14:39 - - * [r406] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - build-in-docker.sh, makefile.am, resolve-debbuilddeps.sh, - src/qbrowserlib/browser.hxx, src/qbrowserlib/browser.ui, - src/qbrowserlib/errorlog.hxx, src/qbrowserlib/resources.qrc, - src/qbrowserlib/resources/icons/128x128[DEL], - src/qbrowserlib/resources/icons/16x16[DEL], - src/qbrowserlib/resources/icons/256x256[DEL], - src/qbrowserlib/resources/icons/32x32[DEL], - src/qbrowserlib/resources/icons/48x48[DEL], - src/qbrowserlib/resources/icons/512x512[DEL], - src/qbrowserlib/resources/icons/PICOL_icon_Zoom_in.svg[ADD], - src/qbrowserlib/resources/icons/PICOL_icon_Zoom_out.svg[ADD], - src/qbrowserlib/resources/surfer.png[DEL], - src/qbrowserlib/settings.hxx, src/qbrowserlib/settings.ui, - src/qbrowserlib/smartcardauth.hxx, surfer-icon.png[CPY], - surfer-logo.png[CPY]: - after migration to new svn server - -2015-11-16 12:37 marc - - * [r405] doc/doxyfile.in: - SVG must not be interactive for embedding in redmine - -2015-11-12 13:38 marc - - * [r404] ax_init_standard_project.m4, bootstrap.sh, configure.ac, - debian/surfer-dev.install[DEL], - debian/surfer-dev.install.in[CPY], sql-to-dot.sed, - surfer.desktop.in[ADD]: - flexible qt plugin path - -2015-11-12 10:45 marc - - * [r403] ChangeLog, bootstrap.sh, debian/surfer-dev.install, - sql-to-dot.sed[ADD]: - add designer plugins to installation - -2015-11-11 15:25 marc - - * [r402] src/qbrowserlib/downloadmanager.hxx: - qt designer crashed when loading WebViewWidget plugin - -2015-11-10 14:42 marc - - * [r401] debian/control.in: - libqt4-webkit is named libqtwebkit-dev in precise - -2015-11-09 13:26 marc - - * [r400] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - debian/control.in, resolve-debbuilddeps.sh: - fixed build dependencies - -2015-11-07 10:47 marc - - * [r399] bootstrap.sh, debian/control.in: - there is no qt4-default - -2015-11-07 09:23 marc - - * [r398] bootstrap.sh, debian/control.in: - there is no qt4-default - -2015-11-06 23:45 marc - - * [r397] ChangeLog, debian/control.in: - updated author with new homepage - -2015-11-05 16:02 marc - - * [r396] bootstrap.sh, debian/control.in: - dependencies fixed - -2015-11-05 10:47 marc - - * [r395] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, - build-in-docker.sh[ADD], resolve-debbuilddeps.sh: - updated build system - -2015-11-05 10:42 marc - - * [r394] ChangeLog, README, configure.ac, debian/control.in, - debian/surfer-dev.install[CPY], debian/surfer.install[CPY], - debian/swisssurfer-dev.install[DEL], - debian/swisssurfer.install[DEL], logo.xcf, src/Info.plist, - src/designer/makefile.am, src/designer/resources.qrc, - src/designer/swisswebview.png[DEL], - src/designer/swisswebwidget.png[DEL], - src/designer/webview.png[CPY], src/designer/webviewwidgetifc.cxx, - src/designer/webviewwidgetifc.hxx, - src/designer/webviewwidgetifc.json, - src/designer/webwidget.png[CPY], src/designer/webwidgetifc.cxx, - src/designer/webwidgetifc.hxx, src/designer/webwidgetifc.json, - src/main.cxx, src/makefile.am, src/qbrowserlib/browser.hxx, - src/qbrowserlib/browser.ui, src/qbrowserlib/makefile.am, - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/resources.qrc, - src/qbrowserlib/resources/icons/128x128/SW_Surfer_128x128x32.png[CPY], - src/qbrowserlib/resources/icons/128x128/SW_SwissSurfer_128x128x32.png[DEL], - src/qbrowserlib/resources/icons/16x16/surfer.png[CPY], - src/qbrowserlib/resources/icons/16x16/swisssurfer.png[DEL], - src/qbrowserlib/resources/icons/256x256/SW_Surfer_256x256x32.png[CPY], - src/qbrowserlib/resources/icons/256x256/SW_SwissSurfer_256x256x32.png[DEL], - src/qbrowserlib/resources/icons/32x32/surfer.png[CPY], - src/qbrowserlib/resources/icons/32x32/swisssurfer.png[DEL], - src/qbrowserlib/resources/icons/48x48/SW_Surfer_48x48x32.png[CPY], - src/qbrowserlib/resources/icons/48x48/SW_SwissSurfer_48x48x32.png[DEL], - src/qbrowserlib/resources/icons/512x512/SW_Surfer_512x512x32.png[CPY], - src/qbrowserlib/resources/icons/512x512/SW_SwissSurfer_512x512x32.png[DEL], - src/qbrowserlib/resources/icons/about.png, - src/qbrowserlib/resources/icons/addbookmark.png, - src/qbrowserlib/resources/icons/clearlocation.png, - src/qbrowserlib/resources/icons/close.png, - src/qbrowserlib/resources/icons/error.png, - src/qbrowserlib/resources/icons/find.png, - src/qbrowserlib/resources/icons/newtab.png, - src/qbrowserlib/resources/icons/newwindow.png, - src/qbrowserlib/resources/icons/print.png, - src/qbrowserlib/resources/icons/printpreview.png, - src/qbrowserlib/resources/icons/settings.png, - src/qbrowserlib/resources/icons/surfer.ico[CPY], - src/qbrowserlib/resources/icons/surfer_32x32x32.png[CPY], - src/qbrowserlib/resources/icons/swisssurfer.ico[DEL], - src/qbrowserlib/resources/icons/swisssurfer.png[DEL], - src/qbrowserlib/resources/icons/swisssurfer_32x32x32.png[DEL], - src/qbrowserlib/resources/icons/usercert.png, - src/qbrowserlib/resources/surfer.png[CPY], - src/qbrowserlib/resources/swisssurfer.png[DEL], - src/qbrowserlib/settings.ui, - src/qbrowserlib/swisswebpage.hxx[DEL], - src/qbrowserlib/swisswebview.hxx[DEL], - src/qbrowserlib/swisswebwidget.hxx[DEL], - src/qbrowserlib/swisswebwidget.ui[DEL], - src/qbrowserlib/webpage.hxx[CPY], - src/qbrowserlib/webview.hxx[CPY], - src/qbrowserlib/webwidget.hxx[CPY], - src/qbrowserlib/webwidget.ui[CPY], src/surfer.desktop[CPY], - src/surfer.icns[CPY], src/surfer.pc.in[CPY], - src/surfer_de.ts[CPY], src/surfer_en.ts[CPY], - src/surfer_fr.ts[CPY], src/surfer_it.ts[CPY], - src/swisssurfer.desktop[DEL], src/swisssurfer.icns[DEL], - src/swisssurfer.pc.in[DEL], src/swisssurfer_de.ts[DEL], - src/swisssurfer_en.ts[DEL], src/swisssurfer_fr.ts[DEL], - src/swisssurfer_it.ts[DEL], surfer.spec.in[CPY], - swisssurfer.spec.in[DEL]: - renamed swisssurfer to surfer - -2015-11-03 22:02 marc - - * [r393] AUTHORS: - AUTHOR updated to new homepage - -2015-10-19 13:03 marc - - * [r392] ax_check_qt.m4, src/languages.qrc[DEL]: - fixed automatic qt-plugins prefix patch - -2015-10-19 08:05 marc - - * [r391] ChangeLog, ax_check_qt.m4, bootstrap.sh, configure.ac, - debian/control.in, examples/filewatch.hxx, - src/authentication.hxx[DEL], src/authentication.ui[DEL], - src/browser.hxx[DEL], src/browser.ui[DEL], - src/certificate.hxx[DEL], src/certificate.ui[DEL], - src/designer/makefile.am, src/designer/resources.qrc[CPY], - src/designer/resources.qrc.in[DEL], - src/designer/webviewwidgetifc.hxx, src/editbookmarks.hxx[DEL], - src/editbookmarks.ui[DEL], src/languages.qrc[ADD], - src/logincertificate.hxx[DEL], src/logincertificate.ui[DEL], - src/main.cxx, src/makefile.am, src/pinentry.hxx[DEL], - src/pinentry.ui[DEL], src/qbrowserlib/authentication.hxx[CPY], - src/qbrowserlib/authentication.ui[CPY], - src/qbrowserlib/browser.hxx[CPY], - src/qbrowserlib/browser.ui[CPY], - src/qbrowserlib/certificate.hxx[CPY], - src/qbrowserlib/certificate.ui[CPY], - src/qbrowserlib/downloadmanager.hxx, - src/qbrowserlib/editbookmarks.hxx[CPY], - src/qbrowserlib/editbookmarks.ui[CPY], - src/qbrowserlib/filestorage.hxx, - src/qbrowserlib/logincertificate.hxx[CPY], - src/qbrowserlib/logincertificate.ui[CPY], - src/qbrowserlib/makefile.am, src/qbrowserlib/pinentry.hxx[CPY], - src/qbrowserlib/pinentry.ui[CPY], src/qbrowserlib/resources[CPY], - src/qbrowserlib/resources.qrc[CPY], - src/qbrowserlib/resources/icons/surfer.png[CPY], - src/qbrowserlib/resources/surfer.png[DEL], - src/qbrowserlib/smartcardauth.hxx[CPY], - src/qbrowserlib/sslclientnetworkmanager.hxx[CPY], - src/qbrowserlib/temporaryfile.hxx, src/resources[DEL], - src/resources.qrc[DEL], src/smartcardauth.hxx[DEL], - src/sslclientnetworkmanager.hxx[DEL], src/version.hxx: - total reorganization: all but the main is now in the browserlib - -2015-10-11 13:47 marc - - * [r390] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, doc/doxyfile.in, resolve-rpmbuilddeps.sh: - documentation without search functionfor better redmine - integration - -2015-09-10 11:52 marc - - * [r389] debian/control.in, debian/swisssurfer-dev.install, - debian/swisssurfer.install: - fixed packaging - -2015-09-09 15:28 marc - - * [r388] src/browser.hxx, src/browser.ui, - src/resources/surfer.png[ADD]: - icons reverted - -2015-09-09 15:01 marc - - * [r387] bootstrap.sh, build-resource-file.sh[ADD], - resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh[ADD], - src/browser.ui, src/resources.qrc: - migrating icons back - -2015-09-09 14:05 marc - - * [r386] debian/swisssurfer-dev.install, - debian/swisssurfer.install, doc, doc/doxyfile.in[ADD], - doc/makefile.am[ADD], makefile.am: - fixed debian build - -2015-09-09 12:53 marc - - * [r385] README, ax_check_qt.m4, configure.ac, debian/control.in, - src/makefile.am, src/qbrowserlib/makefile.am, - swisssurfer.spec.in: - fixed missing resources - -2015-09-09 09:43 marc - - * [r384] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, configure.ac, debian, debian/changelog.in[ADD], - debian/compat[ADD], debian/control.in[ADD], debian/docs[ADD], - debian/rules[ADD], debian/swisssurfer-dev.install[ADD], - debian/swisssurfer.install[ADD], examples/makefile.am, - mac-create-app-bundle.sh[ADD], resolve-debbuilddeps.sh[ADD], - src/makefile.am, src/qbrowserlib/swisswebview.hxx, - swisssurfer.spec.in: - designer widgets removed - has completely changed in qt5 - -2015-07-13 18:48 marc - - * [r383] configure.ac: - pcsclite fails in precise - -2015-07-13 18:14 marc - - * [r382] debian/control.in: - needs pcsclite to build - -2015-07-13 17:25 marc - - * [r381] ChangeLog, configure.ac: - needs pkcs11 - -2015-05-10 16:30 marc - - * [r380] ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, - bootstrap.sh, configure.ac, debian/control.in, debian/rules, - debian/swisssurfer.install, doc/doxyfile.in, doc/makefile.am, - examples[CPY], examples/makefile.am, examples/qmake.pro.in[DEL], - makefile.am, src/makefile.am, src/swisssurfer.pc.in, - src/version.cxx[ADD], src/version.cxx.in[DEL], - src/version.hxx[ADD], test[DEL]: - build should work now - -2015-03-15 22:59 marc - - * [r379] configure.ac: - compatibility with more distributions - -2015-03-15 22:51 marc - - * [r378] configure.ac, src/qbrowserlib/downloadmanager.hxx: - compatibility with more distributions - -2015-03-15 22:05 marc - - * [r377] ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, bootstrap.sh, - debian/swisssurfer-dev.install[ADD], - debian/swisssurfer.install[ADD]: - build fixed - missing resources, translations, test, examples - -2015-03-15 21:58 marc - - * [r376] debian/swisssurfer-dev.install[DEL], - debian/swisssurfer.install[DEL]: - build fixed - missing resources, translations, test, examples - -2015-03-15 21:58 marc - - * [r375] ChangeLog, ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, bootstrap.sh, doc/doxyfile.in[ADD], - doc/makefile.am, src/designer/buttonlineeditwidgetifc.json[ADD], - src/designer/makefile.am, - src/designer/webviewwidgetifc.json[ADD], - src/designer/webwidgetifc.json[ADD], src/makefile.am, - src/qbrowserlib/makefile.am: - build fixed - missing resources, translations, test, examples - -2015-03-15 20:55 marc - - * [r374] README, ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, bootstrap.sh, configure.ac, - debian/control.in, debian/rules, src/browser.hxx, - src/certificate.hxx, src/designer/buttonlineeditwidgetifc.cxx, - src/designer/buttonlineeditwidgetifc.hxx, - src/designer/makefile.am, src/designer/qmake.pro.in[DEL], - src/designer/webviewwidgetifc.cxx, - src/designer/webviewwidgetifc.hxx, src/designer/webwidgetifc.cxx, - src/designer/webwidgetifc.hxx, src/main.cxx, src/makefile.am, - src/pinentry.hxx, src/qbrowserlib/downloadmanager.hxx, - src/qbrowserlib/makefile.am, src/qbrowserlib/pluginfactory.hxx, - src/qbrowserlib/qmake.pro.in[DEL], src/qbrowserlib/settings.hxx, - src/qbrowserlib/swisswebpage.hxx, - src/qbrowserlib/swisswebview.hxx, src/qmake.pro.in[DEL], - src/smartcardauth.hxx, src/swisssurfer.pc.in: - works with new build environment, but still missing resources and - translations - -2015-03-14 16:26 marc - - * [r373] ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4, - ax_init_standard_project.m4, bootstrap.sh, configure.ac, - debian/changelog.in, src/authentication.hxx, src/browser.hxx, - src/certificate.hxx, src/editbookmarks.hxx, - src/logincertificate.hxx, src/main.cxx, src/pinentry.hxx, - src/qbrowserlib/buttonlineedit.hxx, src/qbrowserlib/errorlog.hxx, - src/qbrowserlib/log.hxx, src/qbrowserlib/makefile.am, - src/qbrowserlib/saveorrun.hxx, src/qbrowserlib/settings.hxx, - src/qbrowserlib/swisswebwidget.hxx, src/smartcardauth.hxx, - src/swisssurfer.pc.in: - on the way to compile - -2015-03-14 09:03 marc - - * [r372] AUTHORS, ChangeLog, README, bootstrap.sh, debian[CPY], - debian/control[DEL], debian/control.in[CPY], debian/rules, - src/designer/makefile.am, src/languages.qrc.in, src/qmake.pro.in, - src/version.cxx.in, swisssurfer.spec.in: - some fixes, does not yet compile - -2015-03-13 16:30 marc - - * [r371] ChangeLog, ax_check_qt.m4[ADD], - ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4[ADD], - bootstrap.sh, configure.ac, debian, debian/changelog.in[ADD], - debian/compat[ADD], debian/control.in[ADD], debian/docs[ADD], - debian/rules[ADD], debian/swisssurfer-dev.dirs[ADD], - debian/swisssurfer-dev.install[ADD], - debian/swisssurfer.dirs[ADD], debian/swisssurfer.install[ADD], - doc/doxyfile.in[DEL], doc/makefile.am, examples[ADD], - examples/makefile.am[ADD], makefile.am, src/makefile.am, - src/qbrowserlib/makefile.am, src/swisssurfer.pc.in[ADD], - test/makefile.am: - «bootstrapped» with new build environment - -2015-03-13 10:18 marc - - * [r370] configure.ac[CPY], configure.in[DEL]: - renaming configure.in to configure.ac - -2015-03-08 19:16 marc - - * [r369] README, configure.in, debian/changelog.in, debian/control, - debian/copyright, debian/menu, debian/swissbrowser-dev.dirs[DEL], - debian/swissbrowser-dev.install[DEL], - debian/swissbrowser.dirs[DEL], - debian/swissbrowser.doc-base.EX[DEL], - debian/swissbrowser.install[DEL], - debian/swisssurfer-dev.dirs[CPY], - debian/swisssurfer-dev.install[CPY], - debian/swisssurfer.dirs[CPY], - debian/swisssurfer.doc-base.EX[CPY], - debian/swisssurfer.install[CPY], doc/screenshot.png, - src/Info.plist, src/browser.hxx, src/browser.ui, src/main.cxx, - src/makefile.am, src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/settings.ui, - src/qmake.pro.in, src/resources.qrc, - src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png[DEL], - src/resources/icons/128x128/SW_SwissSurfer_128x128x32.png[CPY], - src/resources/icons/16x16/swissbrowser.png[DEL], - src/resources/icons/16x16/swisssurfer.png[CPY], - src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png[DEL], - src/resources/icons/256x256/SW_SwissSurfer_256x256x32.png[CPY], - src/resources/icons/32x32/swissbrowser.png[DEL], - src/resources/icons/32x32/swisssurfer.png[CPY], - src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png[DEL], - src/resources/icons/48x48/SW_SwissSurfer_48x48x32.png[CPY], - src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png[DEL], - src/resources/icons/512x512/SW_SwissSurfer_512x512x32.png[CPY], - src/resources/icons/about.png, - src/resources/icons/addbookmark.png, - src/resources/icons/clearlocation.png, - src/resources/icons/close.png, src/resources/icons/error.png, - src/resources/icons/find.png, src/resources/icons/newtab.png, - src/resources/icons/newwindow.png, src/resources/icons/print.png, - src/resources/icons/printpreview.png, - src/resources/icons/settings.png, - src/resources/icons/swissbrowser.ico[DEL], - src/resources/icons/swissbrowser.png[DEL], - src/resources/icons/swissbrowser_32x32x32.png[DEL], - src/resources/icons/swisssurfer.ico[CPY], - src/resources/icons/swisssurfer.png[CPY], - src/resources/icons/swisssurfer_32x32x32.png[CPY], - src/resources/icons/usercert.png, - src/resources/swissbrowser.png[DEL], - src/resources/swisssurfer.png[CPY], - src/swissbrowser.desktop[DEL], src/swissbrowser.icns[DEL], - src/swissbrowser_de.ts[DEL], src/swissbrowser_en.ts[DEL], - src/swissbrowser_fr.ts[DEL], src/swissbrowser_it.ts[DEL], - src/swisssurfer.desktop[CPY], src/swisssurfer.icns[CPY], - src/swisssurfer_de.ts[CPY], src/swisssurfer_en.ts[CPY], - src/swisssurfer_fr.ts[CPY], src/swisssurfer_it.ts[CPY], - swissbrowser.spec.in[DEL], swisssurfer.spec.in[CPY]: - renamed swissbrowser to swisssurfer; redo change r367 but without - typo - -2015-03-08 19:14 marc - - * [r368] README, configure.in, debian/changelog.in, debian/control, - debian/copyright, debian/menu, debian/swissbrowser-dev.dirs[CPY], - debian/swissbrowser-dev.install[CPY], - debian/swissbrowser.dirs[CPY], - debian/swissbrowser.doc-base.EX[CPY], - debian/swissbrowser.install[CPY], - debian/swisssurfer-dev.dirs[DEL], - debian/swisssurfer-dev.install[DEL], - debian/swisssurfer.dirs[DEL], - debian/swisssurfer.doc-base.EX[DEL], - debian/swisssurfer.install[DEL], doc/screenshot.png, - src/Info.plist, src/browser.hxx, src/browser.ui, src/main.cxx, - src/makefile.am, src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/settings.ui, - src/qmake.pro.in, src/resources.qrc, - src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png[CPY], - src/resources/icons/128x128/SW_SwissSurfer_128x128x32.png[DEL], - src/resources/icons/16x16/swissbrowser.png[CPY], - src/resources/icons/16x16/swisssurfer.png[DEL], - src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png[CPY], - src/resources/icons/256x256/SW_SwissSurfer_256x256x32.png[DEL], - src/resources/icons/32x32/swissbrowser.png[CPY], - src/resources/icons/32x32/swisssurfer.png[DEL], - src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png[CPY], - src/resources/icons/48x48/SW_SwissSurfer_48x48x32.png[DEL], - src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png[CPY], - src/resources/icons/512x512/SW_SwissSurfer_512x512x32.png[DEL], - src/resources/icons/about.png, - src/resources/icons/addbookmark.png, - src/resources/icons/clearlocation.png, - src/resources/icons/close.png, src/resources/icons/error.png, - src/resources/icons/find.png, src/resources/icons/newtab.png, - src/resources/icons/newwindow.png, src/resources/icons/print.png, - src/resources/icons/printpreview.png, - src/resources/icons/settings.png, - src/resources/icons/swissbrowser.ico[CPY], - src/resources/icons/swissbrowser.png[CPY], - src/resources/icons/swissbrowser_32x32x32.png[CPY], - src/resources/icons/swisssurfer.ico[DEL], - src/resources/icons/swisssurfer.png[DEL], - src/resources/icons/swisssurfer_32x32x32.png[DEL], - src/resources/icons/usercert.png, - src/resources/swissbrowser.png[CPY], - src/resources/swisssurfer.png[DEL], - src/swissbrowser.desktop[CPY], src/swissbrowser.icns[CPY], - src/swissbrowser_de.ts[CPY], src/swissbrowser_en.ts[CPY], - src/swissbrowser_fr.ts[CPY], src/swissbrowser_it.ts[CPY], - src/swisssurfer.desktop[DEL], src/swisssurfer.icns[DEL], - src/swisssurfer_de.ts[DEL], src/swisssurfer_en.ts[DEL], - src/swisssurfer_fr.ts[DEL], src/swisssurfer_it.ts[DEL], - swissbrowser.spec.in[CPY], swisssurfer.spec.in[DEL]: - undo last change r367 due to typo - -2015-03-08 18:59 marc - - * [r367] README, configure.in, debian/changelog.in, debian/control, - debian/copyright, debian/menu, debian/swissbrowser-dev.dirs[DEL], - debian/swissbrowser-dev.install[DEL], - debian/swissbrowser.dirs[DEL], - debian/swissbrowser.doc-base.EX[DEL], - debian/swissbrowser.install[DEL], - debian/swisssurfer-dev.dirs[CPY], - debian/swisssurfer-dev.install[CPY], - debian/swisssurfer.dirs[CPY], - debian/swisssurfer.doc-base.EX[CPY], - debian/swisssurfer.install[CPY], doc/screenshot.png, - src/Info.plist, src/browser.hxx, src/browser.ui, src/main.cxx, - src/makefile.am, src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/settings.ui, - src/qmake.pro.in, src/resources.qrc, - src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png[DEL], - src/resources/icons/128x128/SW_SwissSurfer_128x128x32.png[CPY], - src/resources/icons/16x16/swissbrowser.png[DEL], - src/resources/icons/16x16/swisssurfer.png[CPY], - src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png[DEL], - src/resources/icons/256x256/SW_SwissSurfer_256x256x32.png[CPY], - src/resources/icons/32x32/swissbrowser.png[DEL], - src/resources/icons/32x32/swisssurfer.png[CPY], - src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png[DEL], - src/resources/icons/48x48/SW_SwissSurfer_48x48x32.png[CPY], - src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png[DEL], - src/resources/icons/512x512/SW_SwissSurfer_512x512x32.png[CPY], - src/resources/icons/about.png, - src/resources/icons/addbookmark.png, - src/resources/icons/clearlocation.png, - src/resources/icons/close.png, src/resources/icons/error.png, - src/resources/icons/find.png, src/resources/icons/newtab.png, - src/resources/icons/newwindow.png, src/resources/icons/print.png, - src/resources/icons/printpreview.png, - src/resources/icons/settings.png, - src/resources/icons/swissbrowser.ico[DEL], - src/resources/icons/swissbrowser.png[DEL], - src/resources/icons/swissbrowser_32x32x32.png[DEL], - src/resources/icons/swisssurfer.ico[CPY], - src/resources/icons/swisssurfer.png[CPY], - src/resources/icons/swisssurfer_32x32x32.png[CPY], - src/resources/icons/usercert.png, - src/resources/swissbrowser.png[DEL], - src/resources/swisssurfer.png[CPY], - src/swissbrowser.desktop[DEL], src/swissbrowser.icns[DEL], - src/swissbrowser_de.ts[DEL], src/swissbrowser_en.ts[DEL], - src/swissbrowser_fr.ts[DEL], src/swissbrowser_it.ts[DEL], - src/swisssurfer.desktop[CPY], src/swisssurfer.icns[CPY], - src/swisssurfer_de.ts[CPY], src/swisssurfer_en.ts[CPY], - src/swisssurfer_fr.ts[CPY], src/swisssurfer_it.ts[CPY], - swissbrowser.spec.in[DEL], swisssurfer.spec.in[CPY]: - renamed swissbrowser to swisssurfer - -2015-01-30 14:29 marc.waeckerlin@tech.swisssign.com - - * [r366] src/browser.hxx, src/browser.ui: - new commandline arguments help text; refs #167 - -2014-05-19 11:39 marc.waeckerlin@tech.swisssign.com - - * [r365] swissbrowser.spec.in: - add PKCS11 include path to RPM spec; refs #177 - -2014-05-16 13:07 marc.waeckerlin@tech.swisssign.com - - * [r364] debian/control, debian/rules: - replace libp11-kit-dev by libpkcs11-helper1-dev beacause it's - missing on lucid; refs #177 - -2014-05-08 07:48 marc.waeckerlin@tech.swisssign.com - - * [r363] debian/rules: - new configuration; refs #176 - -2014-04-04 11:29 marc.waeckerlin@tech.swisssign.com - - * [r362] src/browser.hxx, src/main.cxx, src/pinentry.hxx, - src/qbrowserlib/downloadmanager.hxx, src/qbrowserlib/log.cxx, - src/qbrowserlib/log.hxx, src/smartcardauth.hxx, - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - changed for new libpcscxx interface version 3; refs #176 - -2013-11-13 10:24 marc.waeckerlin@tech.swisssign.com - - * [r361] ax_cxx_compile_stdcxx_11.m4[ADD], configure.in: - use C++11 if available; refs #176 - -2013-11-12 13:04 marc.waeckerlin@tech.swisssign.com - - * [r360] src/certificate.hxx, src/designer/qmake.pro.in, - src/qbrowserlib/certs.hxx, src/qbrowserlib/executor.hxx, - src/qbrowserlib/log.hxx, src/qbrowserlib/pluginfactory.hxx, - src/qbrowserlib/qmake.pro.in, src/qbrowserlib/saveorrun.hxx, - src/qbrowserlib/swisswebpage.hxx, - src/qbrowserlib/swisswebview.hxx, src/qmake.pro.in, - src/smartcardauth.hxx, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts: - changes for new libpcscxx, works, but crashes at the end; refs - #176 - -2013-07-11 13:49 marc.waeckerlin@tech.swisssign.com - - * [r359] src/main.cxx, src/swissbrowser.desktop: - rename Post Suisse ID to Suisse ID: all done?; refs #175 - -2013-06-26 07:32 marc.waeckerlin@tech.swisssign.com - - * [r357] src/browser.hxx: - wrong action event for home button; refs #174 - -2013-06-24 11:45 marc.waeckerlin@tech.swisssign.com - - * [r356] src/designer/qmake.pro.in, src/qbrowserlib/qmake.pro.in, - src/qmake.pro.in: - no more 64bit; refs #173 - -2013-06-24 08:28 marc.waeckerlin@tech.swisssign.com - - * [r355] src/qmake.pro.in: - no more -lpcsclite for mac; refs #173 - -2013-06-24 07:39 marc.waeckerlin@tech.swisssign.com - - * [r354] src/qmake.pro.in: - no more -lpcsclite for mac; refs #173 - -2013-06-21 13:32 marc.waeckerlin@tech.swisssign.com - - * [r353] src/designer/qmake.pro.in, src/qbrowserlib/qmake.pro.in, - src/qmake.pro.in: - switch to 64bit; refs #173 - -2013-06-20 11:26 marc.waeckerlin@tech.swisssign.com - - * [r352] src/qmake.pro.in: - switch to 64bit; refs #173 - -2013-06-20 10:41 marc.waeckerlin@tech.swisssign.com - - * [r351] src/qmake.pro.in: - switch to 64bit; refs #173 - -2013-06-20 09:05 marc.waeckerlin@tech.swisssign.com - - * [r350] src/designer/qmake.pro.in, src/qbrowserlib/qmake.pro.in, - src/qmake.pro.in, test/qmake.pro.in: - switch to 64bit; refs #173 - -2013-04-25 08:09 marc.waeckerlin@tech.swisssign.com - - * [r349] src/qbrowserlib/log.cxx, src/qbrowserlib/log.hxx: - (re-) added log to std::clog; refs #169 - -2013-04-18 14:19 marc.waeckerlin@tech.swisssign.com - - * [r348] src/qbrowserlib/log.cxx, src/qbrowserlib/log.hxx, - src/smartcardauth.hxx, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts: - much more debug, back to initial handling; refs #169 - -2013-04-17 12:33 marc.waeckerlin@tech.swisssign.com - - * [r347] src/smartcardauth.hxx, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts: - next try, idea stolen from - https://svn.eesti.ee/projektid/idkaart_public/trunk/qdigidoc/common/QPKCS11.cpp; - refs #169 - -2013-04-17 11:01 marc.waeckerlin@tech.swisssign.com - - * [r346] src/smartcardauth.hxx: - try to simply remove type/size-consistency checks; refs #169 - -2013-04-05 11:46 jenkins@tech.swisssign.com - - * [r345] src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - updated laguage files for swissbrowser; refs #171 - -2013-04-03 09:23 marc.waeckerlin@tech.swisssign.com - - * [r344] src/browser.hxx, src/qbrowserlib/errorlog.hxx, - src/qbrowserlib/settings.hxx: - remove singletons when qt is still initialized; refs #170 - -2013-01-29 15:10 marc - - * [r340] swissbrowser.spec.in: - support for fedora-18 bugs; closes #168 - -2012-11-14 09:42 marc - - * [r336] src/browser.hxx, src/downloadmanager.hxx[DEL], - src/errorlog.hxx[DEL], src/errorlog.ui[DEL], - src/qbrowserlib/downloadmanager.hxx[CPY], - src/qbrowserlib/errorlog.hxx[CPY], - src/qbrowserlib/errorlog.ui[CPY], - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/qmake.pro.in, - src/qbrowserlib/swisswebwidget.hxx, src/qmake.pro.in, - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - moved more to qbrowserlib, added download manager functions; refs - #167 - -2012-11-13 14:50 marc - - * [r335] src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, - src/qbrowserlib/swisswebwidget.hxx: - home; refs #167 - -2012-11-12 10:34 marc - - * [r334] src/browser.hxx, src/qbrowserlib/executor.hxx, - src/qbrowserlib/saveorrun.hxx, src/qbrowserlib/settings.hxx: - qbrowserlib::Settings as singleton; refs #167 - -2012-11-12 08:57 marc - - * [r333] src/browser.hxx, src/designer/webviewwidgetifc.hxx, - src/qbrowserlib/executor.hxx, src/qbrowserlib/pluginfactory.hxx, - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/saveorrun.hxx, - src/qbrowserlib/swisswebpage.hxx, - src/qbrowserlib/swisswebview.hxx, - src/qbrowserlib/swisswebwidget.hxx: - qbrowserlib::Executor as singleton; refs #167 - -2012-11-09 07:20 marc - - * [r332] src/qbrowserlib/swisswebwidget.hxx: - revert order; refs #167 - -2012-11-08 15:14 marc - - * [r331] src/qbrowserlib/swisswebwidget.hxx: - next try; refs #167 - -2012-11-08 14:33 marc - - * [r330] src/qbrowserlib/swisswebwidget.hxx: - next try; refs #167 - -2012-11-08 13:49 marc - - * [r329] src/qbrowserlib/swisswebwidget.hxx, - src/qbrowserlib/swisswebwidget.ui: - next try; refs #167 - -2012-11-08 12:55 marc - - * [r328] src/qbrowserlib/swisswebwidget.hxx: - next try; refs #167 - -2012-11-08 12:45 marc - - * [r327] src/qbrowserlib/swisswebwidget.hxx: - next try; refs #167 - -2012-11-08 11:26 marc - - * [r326] src/qbrowserlib/swisswebwidget.hxx: - from central widget to it parent; refs #167 - -2012-11-08 09:27 marc - - * [r325] src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, - src/qbrowserlib/swisswebwidget.hxx: - verbose; refs #167 - -2012-11-08 08:34 marc - - * [r324] src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, - src/qbrowserlib/swisswebwidget.hxx, - src/qbrowserlib/swisswebwidget.ui: - auto reparent in main window; refs #167 - -2012-11-07 14:32 marc - - * [r323] src/qbrowserlib/swisswebwidget.hxx: - try widget not main window; refs #167 - -2012-11-07 13:07 marc - - * [r322] src/qbrowserlib/qmake.pro.in, - src/qbrowserlib/swisswebwidget.hxx: - more to add; refs #167 - -2012-11-07 12:21 marc - - * [r321] src/designer/webviewwidgetifc.hxx: - incomplete/wrong template; refs #167 - -2012-11-07 11:43 marc - - * [r320] src/browser.hxx, src/designer/webwidgetifc.hxx, - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/qmake.pro.in, - src/qbrowserlib/swisswebview.hxx, - src/qbrowserlib/swisswebwidget.hxx: - incomplete/wrong template; refs #167 - -2012-11-07 11:14 marc - - * [r319] src/designer/makefile.am: - typo :-(; refs #167 - -2012-11-07 10:42 marc - - * [r318] src/designer/resources.qrc.in, - src/designer/swisswebwidget.png[ADD]: - added icon to main browser widget; refs #167 - -2012-11-07 09:57 marc - - * [r317] src/designer/makefile.am, src/designer/qmake.pro.in, - src/designer/webwidgetifc.cxx[ADD], - src/designer/webwidgetifc.hxx[ADD], - src/qbrowserlib/swisswebwidget.hxx[ADD], - src/qbrowserlib/swisswebwidget.ui[ADD]: - new experimental main browser widget; refs #167 - -2012-11-06 09:47 marc - - * [r316] src/designer/buttonlineeditwidgetifc.hxx, - src/designer/webviewwidgetifc.hxx: - restructuring; refs #167 - -2012-11-06 09:33 marc - - * [r315] src/designer/webviewwidgetifc.hxx: - typo; refs #167 - -2012-11-06 07:56 marc - - * [r314] src/browser.hxx: - namespace forgotten; refs #167 - -2012-11-05 13:47 marc - - * [r313] src/browser.hxx: - tabbar does not work, it's private; refs #167 - -2012-11-05 13:39 marc - - * [r312] src/qbrowserlib/buttonlineedit.hxx: - namespace forgotten; refs #167 - -2012-11-05 10:26 marc - - * [r311] src/designer/buttonlineeditwidgetifc.hxx, - src/designer/webviewwidgetifc.hxx: - designer needs namespace prefix - but not in widget name nor in - variable name; refs #167 - -2012-11-05 09:57 marc - - * [r310] src/designer/buttonlineeditwidgetifc.hxx: - designer needs namespace prefix; refs #167 - -2012-11-05 09:50 marc - - * [r309] src/browser.hxx: - Remove Override Cursor; refs #163 - -2012-11-02 09:35 marc - - * [r308] src/designer/buttonlineeditwidgetifc.hxx, - src/designer/webviewwidgetifc.hxx: - designer needs namespace prefix; refs #167 - -2012-10-19 13:15 marc - - * [r307] src/browser.hxx, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts: - show page information in window title; refs #166 - -2012-09-28 08:43 marc - - * [r306] src/downloadmanager.hxx: - removed strong-tag; refs #164 - -2012-09-25 13:29 marc - - * [r305] src/pinentry.hxx, src/pinentry.ui, src/smartcardauth.hxx: - works principially, but also accepts 5, because that's the length - of the transport pin - card is wrongly initialized, but at least - behaviour is standard conform and implementation is generic; refs - #126 - -2012-09-21 13:22 marc - - * [r304] src/browser.hxx: - connect proxy authentication; refs #161 - -2012-09-21 08:26 marc - - * [r303] logo.png, logo.xcf: - smaller logo, height=80px; refs #158 - -2012-09-21 07:14 marc - - * [r302] logo.png, logo.xcf[ADD]: - nice logo; refs #158 - -2012-09-20 12:08 marc - - * [r301] src/browser.hxx: - use QT_VERSION for new features - more; refs #160 - -2012-09-20 11:43 marc - - * [r300] src/qbrowserlib/settings.hxx: - use QT_VERSION for new features - typo; refs #160 - -2012-09-20 11:21 marc - - * [r299] src/qbrowserlib/settings.hxx: - use QT_VERSION for new features; refs #160 - -2012-09-20 10:51 marc - - * [r298] configure.in: - other, non standard path in fedora; refs #157 - -2012-09-18 14:24 marc - - * [r297] swissbrowser.spec.in: - fedora has different package names; refs #159 - -2012-08-17 08:46 marc - - * [r296] logo.png[CPY]: - add logo as copy; refs #158 - -2012-08-17 08:45 marc - - * [r295] logo.png[DEL]: - remove logo; refs #158 - -2012-08-17 08:39 marc - - * [r294] logo.png[ADD]: - add logo in root for - https://dev.swisssign.com/projects/dev/ticket/172; refs #158 - -2012-06-15 13:15 marc - - * [r292] src/qbrowserlib/qmake.pro.in, src/qmake.pro.in: - compile error; refs #157 - -2012-06-15 13:07 marc - - * [r291] src/qbrowserlib/log.hxx: - compile error; refs #157 - -2012-06-15 11:22 marc - - * [r290] debian/rules, src/qbrowserlib/log.hxx: - allow old openssl for debian builds, due to old debian versions; - refs #157 - -2012-06-11 14:39 marc - - * [r289] src/downloadmanager.hxx: - there's a qt bug, ignore wrong ssl errors; refs #130 - -2012-06-11 13:41 marc - - * [r288] src/downloadmanager.hxx, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts: - check if self signed certs are really unknown (debugging): refs - #130 - -2012-06-11 10:00 marc - - * [r287] src/browser.hxx, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts: - OpenSSL does not work any more on Mac, check status in about; - refs #130 - -2012-05-16 14:40 marc - - * [r286] src/makefile.am: - use timer to check filesystem; refs #155 - -2012-05-16 14:31 marc - - * [r285] src/makefile.am: - use timer to check filesystem; refs #155 - -2012-05-16 14:27 marc - - * [r284] test/qmake.pro.in: - use timer to check filesystem; refs #155 - -2012-05-16 12:45 marc - - * [r283] src/qbrowserlib/filestorage.hxx, src/qbrowserlib/log.hxx, - test/filewatch.cxx, test/qmake.pro.in: - use timer to check filesystem; refs #155 - -2012-05-16 12:04 marc - - * [r282] src/qbrowserlib/filestorage.hxx: - use timer to check filesystem; refs #155 - -2012-05-16 10:56 marc - - * [r281] src/makefile.am, src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts: - add logging for kimmo; refs #155 - -2012-05-16 10:47 marc - - * [r280] src/makefile.am: - add logging for kimmo; refs #155 - -2012-05-16 10:40 marc - - * [r279] src/makefile.am: - add logging for kimmo; refs #155 - -2012-05-16 09:49 marc - - * [r278] src/qbrowserlib/filestorage.hxx, src/smartcardauth.hxx, - test/qmake.pro.in: - add logging for kimmo; refs #155 - -2012-05-14 13:45 marc - - * [r277] src/qbrowserlib/saveorrun.ui: - Better text: «Open File», there's no «in Folder»; refs #145 - -2012-05-14 13:40 marc - - * [r276] src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/saveorrun.hxx, - src/qbrowserlib/saveorrun.ui: - Removed «Open in External Application», added button «Open File - in Folder» and enlargened the width; refs #145 - -2012-05-11 08:33 marc - - * [r275] src/main.cxx: - still works - next test: remove cout-lib-path; refs #130 - -2012-05-11 08:03 marc - - * [r274] src/main.cxx: - still works - next test: remove for-loop; refs #130 - -2012-05-11 07:36 marc - - * [r273] src/main.cxx: - test: remove else-abort; refs #130 - -2012-05-10 13:59 marc - - * [r272] src/browser.hxx, src/main.cxx, - src/qbrowserlib/filestorage.hxx: - now again does not work anymore WHY??? + trace filename; refs - #130 - -2012-05-10 12:14 marc - - * [r271] src/pinentry.hxx: - less is more: updating the outmost parent is enough; refs #149 - -2012-05-10 11:41 marc - - * [r270] src/certificate.hxx: - less is more: updating the outmost parent is enough; refs #149 - -2012-05-10 10:21 marc - - * [r269] src/pinentry.hxx: - now even fails the first time - next try; refs #149 - -2012-05-10 09:56 marc - - * [r268] src/certificate.hxx, src/pinentry.hxx: - does not work - reverse the order; refs #149 - -2012-05-10 09:22 marc - - * [r267] src/certificate.hxx, src/pinentry.hxx: - adjust size of all childre; refs #149 - -2012-05-10 09:14 marc - - * [r266] src/browser.hxx, src/editbookmarks.hxx: - second problem resolved: adding bookmars is ignored if url is - empty; refs #147 - -2012-05-10 09:08 marc - - * [r265] src/browser.hxx: - first problem resolved: url bar is no more red if bookmarkfile is - empty, and empty or duplicate bookmarks are removed from the - list; refs #147 - -2012-05-09 14:26 marc - - * [r264] src/browser.hxx, src/browser.ui, - src/designer/buttonlineeditwidgetifc.hxx, - src/designer/webviewwidgetifc.hxx, src/downloadmanager.hxx, - src/errorlog.hxx, src/logincertificate.hxx, src/main.cxx, - src/pinentry.hxx, src/qbrowserlib/buttonlineedit.hxx, - src/qbrowserlib/executor.hxx, src/qbrowserlib/log.cxx[ADD], - src/qbrowserlib/log.hxx[ADD], src/qbrowserlib/log.ui[ADD], - src/qbrowserlib/pluginfactory.hxx, - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/qmake.pro.in, - src/qbrowserlib/saveorrun.hxx, src/qbrowserlib/settings.hxx, - src/qbrowserlib/swisswebpage.hxx, src/smartcardauth.hxx, - src/sslclientnetworkmanager.hxx, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts: - new option --debug to enable debugging and debug window in info; - refs #153 - -2012-05-09 08:49 marc - - * [r263] src/browser.hxx, src/main.cxx, - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/saveorrun.hxx, - src/qbrowserlib/saveorrun.ui, src/qbrowserlib/settings.hxx, - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - save as dialog cleanups, #refs 145; rearrangements for debug; - refs #153 - -2012-05-09 07:56 marc - - * [r262] src/main.cxx, src/qbrowserlib/saveorrun.ui, - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - re-added debug output; refs #130 - -2012-05-08 14:01 marc - - * [r261] src/browser.hxx, src/designer/webviewwidgetifc.hxx, - src/qbrowserlib/executor.hxx[ADD], - src/qbrowserlib/pluginfactory.hxx, - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/qmake.pro.in, - src/qbrowserlib/saveorrun.hxx, src/qbrowserlib/saveorrun.ui, - src/qbrowserlib/settings.hxx[CPY], - src/qbrowserlib/settings.ui[CPY], - src/qbrowserlib/swisswebpage.hxx, - src/qbrowserlib/swisswebview.hxx, - src/qbrowserlib/temporaryfile.hxx[CPY], src/qmake.pro.in, - src/settings.hxx[DEL], src/settings.ui[DEL], - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts, - src/temporaryfile.hxx[DEL]: - Unknown filetypes show a dialog where the user can choose between - «save as» and «open with». If there is a plugin handler, we catch - it and decide whether to pass to the plugin-handler or to handle - it ourself (we do so, if the mime type is registered, otherwise - we pass to the plugin handler). If the mimetype is known and - registered, we launch the configured application, otherwise we - show th edialog mentioned above.; refs #79 - -2012-05-07 12:58 marc - - * [r260] test/makefile.am: - added a test that watches test/testfile which can be given the - browser as bookmark file - it work's; refs - https://dev.swisssign.com/projects/swissstick/ticket/980; refs - #150 - -2012-05-07 12:52 marc - - * [r259] configure.in, src/qbrowserlib/filestorage.hxx, test[ADD], - test/filewatch.cxx[ADD], test/filewatch.hxx[ADD], - test/makefile.am[ADD], test/qmake.pro.in[ADD]: - added a test that watches test/testfile which can be given the - browser as bookmark file - it work's; refs - https://dev.swisssign.com/projects/swissstick/ticket/980; refs - #150 - -2012-05-07 09:44 marc - - * [r258] src/main.cxx: - done ... set plugin path, abort if env variable is not set; refs - #130 - -2012-05-07 08:40 marc - - * [r257] src/main.cxx: - TEST - set plugin path, abort if env variable is not set; refs - #130 - -2012-05-07 08:28 marc - - * [r256] src/main.cxx: - TEST - set plugin path, abort if env variable is not set; refs - #130 - -2012-05-07 08:25 marc - - * [r255] src/main.cxx: - TEST - set plugin path, abort if env variable is not set; refs - #130 - -2012-05-07 08:18 marc - - * [r254] src/main.cxx: - TEST - set plugin path, abort if env variable is not set; refs - #130 - -2012-05-04 13:08 marc - - * [r253] src/browser.hxx: - autoremove file only if configured to clean up; refs #119 - -2012-05-04 12:26 marc - - * [r252] src/browser.hxx: - load now sets url field to page url; refs #141 - -2012-05-04 12:10 marc - - * [r251] src/browser.hxx: - call unsupportedcontent only once; probably also fixes #119; refs - #146 - -2012-05-04 10:28 marc - - * [r250] src/browser.hxx: - more size policy improvements; refs #142 - -2012-05-04 10:21 marc - - * [r249] src/browser.hxx: - size policy for progress only for horizontal, not vertical; refs - #142 - -2012-05-04 09:33 marc - - * [r248] src/browser.hxx: - size policy for progress only for horizontal, not vertical; refs - #142 - -2012-05-04 08:33 marc - - * [r247] src/browser.hxx: - try without ticks; refs #142 - -2012-05-04 08:14 marc - - * [r246] src/browser.hxx: - try without ticks; refs #142 - -2012-05-04 08:03 marc - - * [r245] src/browser.hxx: - undone [229], but disabled URL label with respect to #129; refs - #140 - -2012-05-03 14:45 marc - - * [r244] src/browser.hxx, src/pinentry.hxx: - fixed bookmar-load error; clear pin; refs #131, #137 - -2012-05-03 14:23 marc - - * [r243] src/browser.hxx: - show bookmarks also if settings are disabled; refs #138 - -2012-05-03 09:29 marc - - * [r242] src/browser.hxx: - no add-bookmark in kiosk-mode; refs #137 - -2012-05-03 09:17 marc - - * [r241] src/browser.hxx: - re-added save-as connector; refs #133 - -2012-04-27 09:03 marc - - * [r240] src/designer/qmake.pro.in, src/qmake.pro.in: - fifth try; refs #143 - -2012-04-27 09:03 marc - - * [r239] src/qbrowserlib/qmake.pro.in: - fifth try; refs #143 - -2012-04-27 08:46 marc - - * [r238] src/qbrowserlib/certs.cxx: - fourth try; refs #143 - -2012-04-26 12:46 marc - - * [r237] src/qbrowserlib/certs.cxx[ADD]: - third try; refs #143 - -2012-04-26 12:45 marc - - * [r236] src/qbrowserlib/certs.hxx, src/qbrowserlib/qmake.pro.in: - second try; refs #143 - -2012-04-26 12:12 marc - - * [r235] src/qbrowserlib/certs.hxx[ADD], - src/qbrowserlib/qmake.pro.in: - first try; refs #143 - -2012-04-20 12:53 marc - - * [r234] src/qbrowserlib/makefile.am: - also install .a file on windozw; refs #134 - -2012-04-19 07:24 marc - - * [r233] src/browser.ui, src/resources.qrc: - added icon 49; refs #121 - -2012-04-19 06:49 marc - - * [r232] debian/swissbrowser-dev.install, - src/resources/icons/16x16/butt16_49.png[ADD], - src/resources/icons/32x32/butt32_49.png[ADD]: - don't install lib*.a; refs #119 - -2012-04-18 14:45 marc - - * [r231] src/browser.hxx: - changed labels to buttons; shall I really spend my time on this - tosh instead of solving real functional problems?; refs #128 - -2012-04-18 14:32 marc - - * [r230] src/browser.hxx: - toolbar-flexibility disabled in quirks-mode; shall I really spend - my time on this tosh instead of solving real functional - problems?; refs #127 - -2012-04-18 14:27 marc - - * [r229] src/browser.hxx: - is now QLabel; shall I really spend my time on this tosh instead - of solving real functional problems?; refs #129 - -2012-04-18 14:10 marc - - * [r228] src/pinentry.hxx: - set modal; refs #123 - -2012-04-18 14:01 marc - - * [r227] src/resources/swissbrowser.png[CPY]: - cleanup the mess; no idea, what the ico-files sould be used for; - added swisssbrowser.png as app-icon; app-icon should be in - resources; refs #125 #122 - -2012-04-18 13:57 marc - - * [r226] src/browser.ui, src/main.cxx, src/resources.qrc, - src/resources/SW_SwissBrowser.icns[DEL], - src/resources/SW_SwissBrowser.ico[DEL], - src/resources/SW_SwissBrowser_128x128x32.png[DEL], - src/resources/SW_SwissBrowser_16x16x32.png[DEL], - src/resources/SW_SwissBrowser_256x256x32.png[DEL], - src/resources/SW_SwissBrowser_32x32x32.png[DEL], - src/resources/SW_SwissBrowser_48x48x32.png[DEL], - src/resources/SW_SwissBrowser_512x512x32.png[DEL], - src/resources/favicon_16x16.ico[DEL], - src/resources/favicon_32x32.ico[DEL], - src/resources/icons/128x128[ADD], - src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png[CPY], - src/resources/icons/16x16/favicon.ico[CPY], - src/resources/icons/16x16/swissbrowser.png[CPY], - src/resources/icons/256x256[ADD], - src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png[CPY], - src/resources/icons/32x32/favicon.ico[CPY], - src/resources/icons/32x32/swissbrowser.png[CPY], - src/resources/icons/48x48[ADD], - src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png[CPY], - src/resources/icons/512x512[ADD], - src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png[CPY], - src/resources/icons/swissbrowser.ico[CPY], - src/resources/icons/swissbrowser.png[CPY], - src/resources/swissbrowser.png[DEL], src/swissbrowser.icns[CPY]: - cleanup the mess; no idea, what the ico-files sould be used for; - added swisssbrowser.png as app-icon; refs #125 #122 - -2012-04-18 13:16 marc - - * [r225] debian/swissbrowser-dev.install, swissbrowser.spec.in: - install headers ... also on rpm/deb; refs #119 - -2012-04-18 12:31 marc - - * [r224] src/makefile.am: - install headers; refs #119 - -2012-04-18 12:26 marc - - * [r223] src/browser.hxx, src/main.cxx, src/makefile.am, - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - install headers; refs #119 - -2012-04-18 11:33 marc - - * [r222] src/qbrowserlib/filestorage.hxx: - documented; refs #116 - -2012-04-18 09:40 marc - - * [r221] src/browser.hxx, src/editbookmarks.ui, - src/qbrowserlib/filestorage.hxx: - tested except for the changed event; refs #116 - -2012-04-18 06:03 frekai - - * [r220] src/swissbrowser.icns: - SwissBrowser seems not taking the ico from the SwissStick ISO - folder refs #125 - -2012-04-17 14:50 marc - - * [r219] src/browser.hxx, src/editbookmarks.hxx, src/main.cxx, - src/qbrowserlib/filestorage.hxx[ADD], - src/qbrowserlib/qbrowserlib_de.ts, - src/qbrowserlib/qbrowserlib_en.ts, - src/qbrowserlib/qbrowserlib_fr.ts, - src/qbrowserlib/qbrowserlib_it.ts, src/qbrowserlib/qmake.pro.in, - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - support bookmark-file; refs #116 - -2012-04-16 05:39 frekai - - * [r218] src/resources/SW_SwissBrowser.icns[ADD], - src/resources/SW_SwissBrowser.ico[ADD], - src/resources/SW_SwissBrowser_128x128x32.png[ADD], - src/resources/SW_SwissBrowser_16x16x32.png[ADD], - src/resources/SW_SwissBrowser_256x256x32.png[ADD], - src/resources/SW_SwissBrowser_32x32x32.png[ADD], - src/resources/SW_SwissBrowser_48x48x32.png[ADD], - src/resources/SW_SwissBrowser_512x512x32.png[ADD], - src/resources/favicon_16x16.ico[ADD], - src/resources/favicon_32x32.ico[ADD], - src/resources/icons/swissbrowser_32x32x32.png, - src/resources/swissbrowser.png: - SwissBrowser icons refs #125 #122 - -2012-04-11 13:05 marc - - * [r217] src/browser.ui: - remove unneded icon in menu; refs #116 - -2012-03-15 09:59 marc - - * [r216] src/qbrowserlib/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 13:50 marc - - * [r215] src/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 13:36 marc - - * [r214] src/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 13:29 marc - - * [r213] src/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 13:16 marc - - * [r212] src/designer/makefile.am, src/qbrowserlib/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 13:15 marc - - * [r211] src/makefile.am, src/qbrowserlib/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 13:07 marc - - * [r210] src/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 13:04 marc - - * [r209] src/qbrowserlib/qmake.pro.in: - GRMPF!!!; refs #115 - -2012-03-14 12:57 marc - - * [r208] src/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 12:52 marc - - * [r207] src/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 10:28 marc - - * [r206] src/designer/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 10:24 marc - - * [r205] src/qbrowserlib/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 10:22 marc - - * [r204] src/qbrowserlib/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 10:17 marc - - * [r203] src/qmake.pro.in: - GRMPF!!!; refs #115 - -2012-03-14 10:11 marc - - * [r202] src/designer/qmake.pro.in, src/qbrowserlib/qmake.pro.in, - src/qmake.pro.in: - GRMPF!!!; refs #115 - -2012-03-14 10:09 marc - - * [r201] src/designer/qmake.pro.in: - GRMPF!!!; refs #115 - -2012-03-14 10:06 marc - - * [r200] src/designer/qmake.pro.in: - GRMPF!!!; refs #115 - -2012-03-14 10:05 marc - - * [r199] src/designer/qmake.pro.in: - GRMPF!!!; refs #115 - -2012-03-14 10:03 marc - - * [r198] src/designer/qmake.pro.in, src/qbrowserlib/qmake.pro.in, - src/qmake.pro.in: - GRMPF!!!; refs #115 - -2012-03-14 09:53 marc - - * [r197] src/qbrowserlib/makefile.am: - GRMPF!!!; refs #115 - -2012-03-14 08:52 marc - - * [r196] configure.in: - GRMPF!!!; refs #115 - -2012-03-05 13:40 marc - - * [r195] src/browser.hxx, src/editbookmarks.hxx: - signal-bug fixed; refs #115 - -2012-02-28 08:44 marc - - * [r194] src/designer/makefile.am, src/designer/qmake.pro.in, - src/makefile.am, src/qbrowserlib/makefile.am, - src/qbrowserlib/qmake.pro.in: - create win-dlls; refs #115 - -2012-02-24 07:32 marc - - * [r193] src/qbrowserlib/swisswebview.hxx: - build error on win; refs #116 - -2012-02-23 15:32 marc - - * [r192] src/designer/qmake.pro.in, src/qbrowserlib/qmake.pro.in: - no more c++11; refs #116 - -2012-02-23 14:58 marc - - * [r191] src/browser.hxx, src/editbookmarks.hxx, src/qmake.pro.in: - better way to sync bookmarks; no more c++11; refs #116 - -2012-02-22 08:12 marc - - * [r190] src/editbookmarks.ui: - after design-check with Pascal Leu, design is approved now; - removed icons for add/remove bookmark; refs #116 - -2012-02-14 12:21 marc - - * [r189] src/browser.hxx: - more features hidden in kiosk/no-settings mode; refs #109 - -2012-02-14 12:03 marc - - * [r188] src/browser.hxx: - set cursor position to 0 also in non-kiosk-mode; refs #106 - -2012-02-14 12:00 marc - - * [r187] src/browser.hxx: - set cursor position to 0 in kiosk-mode; refs #106 - -2012-02-14 10:48 marc - - * [r186] src/pinentry.hxx, src/pinentry.ui: - point 3) resolved; refs #108 - -2012-02-13 15:29 marc - - * [r185] src/browser.hxx, src/designer/buttonlineedit.png[ADD], - src/designer/buttonlineeditwidgetifc.cxx[ADD], - src/designer/buttonlineeditwidgetifc.hxx[ADD], - src/designer/makefile.am, src/designer/qmake.pro.in, - src/designer/resources.qrc.in, - src/designer/swisswebview.png[CPY], - src/designer/webview.png[DEL], src/designer/webviewwidgetifc.hxx, - src/main.cxx, src/qbrowserlib/buttonlineedit.hxx[ADD], - src/qbrowserlib/makefile.am, src/qbrowserlib/pluginfactory.hxx, - src/qbrowserlib/qmake.pro.in, src/qbrowserlib/saveorrun.hxx, - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - done point 1) in refs #108; separated ButtonLineEdit for refs - #115 - -2012-02-09 09:42 marc - - * [r184] src/browser.hxx, src/designer/webviewwidgetifc.cxx, - src/designer/webviewwidgetifc.hxx, src/main.cxx, - src/qbrowserlib/pluginfactory.hxx, src/qbrowserlib/saveorrun.hxx, - src/qbrowserlib/swisswebpage.hxx, - src/qbrowserlib/swisswebview.hxx, - src/sslclientnetworkmanager.hxx: - more documentation; refs #115 - -2012-02-09 09:27 marc - - * [r183] doc/doxyfile.in: - recursive documentation; refs #115 - -2012-02-09 09:22 marc - - * [r182] src/browser.hxx, src/designer/webviewwidgetifc.cxx, - src/designer/webviewwidgetifc.hxx, src/qbrowserlib/qmake.pro.in, - src/qbrowserlib/swisswebpage.hxx[CPY], - src/qbrowserlib/swisswebview.hxx[CPY], - src/qbrowserlib/webpage.hxx[DEL], - src/qbrowserlib/webview.hxx[DEL]: - rename webpage and webview to swisswebpage and swissswebview to - be more specific; refs #115 - -2012-02-09 08:03 marc - - * [r181] src/designer/qmake.pro.in, src/designer/resources.qrc.in, - src/designer/webviewwidgetifc.hxx, src/qbrowserlib/webview.hxx: - designer plugin works; refs #115 - -2012-02-08 13:18 marc - - * [r180] src/makefile.am: - create separate library and designer plugin; refs #115 - -2012-02-08 12:58 marc - - * [r179] src/designer/makefile.am: - create separate library and designer plugin; refs #115 - -2012-02-08 12:43 marc - - * [r178] configure.in: - create separate library and designer plugin; refs #115 - -2012-02-08 12:23 marc - - * [r177] swissbrowser.spec.in: - create separate library and designer plugin; refs #115 - -2012-02-08 12:04 marc - - * [r176] configure.in, debian/rules, debian/swissbrowser-dev.dirs, - debian/swissbrowser-dev.install, debian/swissbrowser.dirs, - debian/swissbrowser.install, src/browser.hxx, src/designer[ADD], - src/designer/makefile.am[ADD], src/designer/qmake.pro.in[ADD], - src/designer/resources.qrc.in[ADD], - src/designer/webview.png[ADD], - src/designer/webviewwidgetifc.cxx[ADD], - src/designer/webviewwidgetifc.hxx[ADD], src/makefile.am, - src/pluginfactory.hxx[DEL], src/qbrowserlib[ADD], - src/qbrowserlib/languages.qrc.in[ADD], - src/qbrowserlib/makefile.am[ADD], - src/qbrowserlib/pluginfactory.hxx[CPY], - src/qbrowserlib/qbrowserlib_de.ts[ADD], - src/qbrowserlib/qbrowserlib_en.ts[ADD], - src/qbrowserlib/qbrowserlib_fr.ts[ADD], - src/qbrowserlib/qbrowserlib_it.ts[ADD], - src/qbrowserlib/qmake.pro.in[ADD], - src/qbrowserlib/saveorrun.hxx[CPY], - src/qbrowserlib/saveorrun.ui[CPY], - src/qbrowserlib/webpage.hxx[CPY], - src/qbrowserlib/webview.hxx[CPY], src/qmake.pro.in, - src/saveorrun.hxx[DEL], src/saveorrun.ui[DEL], - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts, - src/webpage.hxx[DEL], src/webview.hxx[DEL], swissbrowser.spec.in: - create separate library and designer plugin; refs #115 - -2012-02-03 13:04 marc - - * [r175] src/browser.hxx, src/downloadmanager.hxx, - src/pluginfactory.hxx, src/qmake.pro.in, src/swissbrowser_de.ts, - src/swissbrowser_en.ts, src/swissbrowser_fr.ts, - src/swissbrowser_it.ts, src/webpage.cxx[DEL], src/webpage.hxx, - src/webview.hxx[ADD]: - put webview in own class; refs #115 - -2012-01-25 10:12 marc - - * [r174] src/browser.ui: - always use large icons; refs #113 - -2012-01-25 10:05 marc - - * [r173] src/browser.hxx, src/browser.ui, src/resources.qrc, - src/resources/icons/16x16[ADD], - src/resources/icons/16x16/butt16_01.png[ADD], - src/resources/icons/16x16/butt16_02.png[ADD], - src/resources/icons/16x16/butt16_03.png[ADD], - src/resources/icons/16x16/butt16_04.png[ADD], - src/resources/icons/16x16/butt16_05.png[ADD], - src/resources/icons/16x16/butt16_06.png[ADD], - src/resources/icons/16x16/butt16_07.png[ADD], - src/resources/icons/16x16/butt16_08.png[ADD], - src/resources/icons/16x16/butt16_09.png[ADD], - src/resources/icons/16x16/butt16_09_sw.png[ADD], - src/resources/icons/16x16/butt16_10.png[ADD], - src/resources/icons/16x16/butt16_10_sw.png[ADD], - src/resources/icons/16x16/butt16_11.png[ADD], - src/resources/icons/32x32[ADD], - src/resources/icons/32x32/butt32_01.png[ADD], - src/resources/icons/32x32/butt32_02.png[ADD], - src/resources/icons/32x32/butt32_03.png[ADD], - src/resources/icons/32x32/butt32_04.png[ADD], - src/resources/icons/32x32/butt32_05.png[ADD], - src/resources/icons/32x32/butt32_06.png[ADD], - src/resources/icons/32x32/butt32_07.png[ADD], - src/resources/icons/32x32/butt32_08.png[ADD], - src/resources/icons/32x32/butt32_09.png[ADD], - src/resources/icons/32x32/butt32_09_sw.png[ADD], - src/resources/icons/32x32/butt32_10.png[ADD], - src/resources/icons/32x32/butt32_10_sw.png[ADD], - src/resources/icons/32x32/butt32_11.png[ADD], - src/swissbrowser_de.ts, src/swissbrowser_en.ts, - src/swissbrowser_fr.ts, src/swissbrowser_it.ts: - imported icons, see open points in ticket; refs #113 - -2012-01-25 08:44 marc - - * [r172] debian/control, swissbrowser.spec.in: - replace/obsolete in rpm/deb; refs #114 (spent 8h) - -2012-01-24 15:33 marc - - * [r171] README, configure.in, debian/changelog.in, debian/control, - debian/copyright, debian/menu, debian/swissbrowser-dev.dirs[CPY], - debian/swissbrowser-dev.install[CPY], - debian/swissbrowser.dirs[CPY], - debian/swissbrowser.doc-base.EX[CPY], - debian/swissbrowser.install[CPY], - debian/swisssurfer-dev.dirs[DEL], - debian/swisssurfer-dev.install[DEL], - debian/swisssurfer.dirs[DEL], - debian/swisssurfer.doc-base.EX[DEL], - debian/swisssurfer.install[DEL], doc/screenshot.png, - src/Info.plist, src/browser.ui, src/main.cxx, src/makefile.am, - src/qmake.pro.in, src/resources.qrc, - src/resources/icons/about.png, - src/resources/icons/addbookmark.png, - src/resources/icons/clearlocation.png, - src/resources/icons/close.png, src/resources/icons/error.png, - src/resources/icons/find.png, src/resources/icons/newtab.png, - src/resources/icons/newwindow.png, src/resources/icons/print.png, - src/resources/icons/printpreview.png, - src/resources/icons/settings.png, - src/resources/icons/swissbrowser_32x32x32.png[CPY], - src/resources/icons/swisssurfer_32x32x32.png[DEL], - src/resources/icons/usercert.png, - src/resources/swissbrowser.png[CPY], - src/resources/swisssurfer.png[DEL], src/settings.ui, - src/swissbrowser.desktop[CPY], src/swissbrowser.icns[CPY], - src/swissbrowser_de.ts[CPY], src/swissbrowser_en.ts[CPY], - src/swissbrowser_fr.ts[CPY], src/swissbrowser_it.ts[CPY], - src/swisssurfer.desktop[DEL], src/swisssurfer.icns[DEL], - src/swisssurfer_de.ts[DEL], src/swisssurfer_en.ts[DEL], - src/swisssurfer_fr.ts[DEL], src/swisssurfer_it.ts[DEL], - swissbrowser.spec.in[CPY], swisssurfer.spec.in[DEL]: - renaming; refs #114 (spent 8h) - -2012-01-03 13:19 marc - - * [r167] src/makefile.am: - binary again; refs #112 - -2012-01-03 13:14 marc - - * [r166] src/makefile.am: - install binary; refs #112 - -2012-01-03 13:07 marc - - * [r165] swisssurfer.spec.in: - files to install and remove uninstalled files; refs #112 - -2012-01-03 13:00 marc - - * [r164] src/makefile.am: - cleanup makefile; refs #112 - -2011-12-16 08:21 marc - - * [r162] debian/rules: - resolved proxyfave-problem; refs #110 - -2011-12-13 12:15 marc - - * [r160] src/swisssurfer.desktop: - corrected menu entry; refs #110 - -2011-12-13 11:40 marc - - * [r159] src/swisssurfer.desktop: - corrected menu entry; refs #110 - -2011-12-13 09:35 marc - - * [r157] configure.in, debian/control, debian/menu, debian/rules, - doc/doxyfile.in, doc/makefile.am, makefile.am, src/makefile.am, - src/resources/swisssurfer.png[CPY]: - compiles deb, fails at distcheck; refs #110 - -2011-12-13 08:27 marc - - * [r156] debian[ADD], debian/changelog.in[ADD], debian/compat[ADD], - debian/control[ADD], debian/copyright[ADD], - debian/cron.d.ex[ADD], debian/dirs[ADD], debian/docs[ADD], - debian/emacsen-install.ex[ADD], debian/emacsen-remove.ex[ADD], - debian/emacsen-startup.ex[ADD], debian/manpage.1.ex[ADD], - debian/manpage.sgml.ex[ADD], debian/manpage.xml.ex[ADD], - debian/menu[ADD], debian/menu.ex[ADD], debian/postinst.ex[ADD], - debian/postrm.ex[ADD], debian/preinst.ex[ADD], - debian/prerm.ex[ADD], debian/rules[ADD], - debian/shlibs.local.ex[ADD], debian/swisssurfer-dev.dirs[ADD], - debian/swisssurfer-dev.install[ADD], - debian/swisssurfer.dirs[ADD], - debian/swisssurfer.doc-base.EX[ADD], - debian/swisssurfer.install[ADD], debian/watch.ex[ADD], - doc/doxygenlayout.xml[ADD], src/swisssurfer.desktop[ADD], - src/version.cxx.in[ADD], swisssurfer.spec.in[ADD]: - cleanup with template; refs #110 - -2011-12-09 14:53 marc - - * [r155] swisssurfer[DEL]: - moved subdir swisssurfer to root; refs #110 - -2011-12-09 14:51 marc - - * [r154] AUTHORS[CPY], COPYING[CPY], ChangeLog[CPY], INSTALL[CPY], - NEWS[CPY], README[CPY], bootstrap.sh[CPY], configure.in[CPY], - doc[CPY], makefile.am[CPY], src[CPY], swisssurfer/AUTHORS[DEL], - swisssurfer/COPYING[DEL], swisssurfer/ChangeLog[DEL], - swisssurfer/INSTALL[DEL], swisssurfer/NEWS[DEL], - swisssurfer/README[DEL], swisssurfer/bootstrap.sh[DEL], - swisssurfer/configure.in[DEL], swisssurfer/doc[DEL], - swisssurfer/makefile.am[DEL], swisssurfer/src[DEL]: - moved subdir swisssurfer to root; refs #110 - -2011-12-09 14:50 marc - - * [r153] README.txt[DEL], Sample_Executables[DEL], - Test_Qt_Frontend[DEL], actlibrary[DEL], makefile[DEL], - openssl-act-engine[DEL], qt[DEL], - swisssign-openssl-pkcs11-engine[DEL]: - remove unneeded stuff; refs #110 - -2011-12-07 11:36 marc - - * [r152] swisssurfer/src/resources/icons/gg.png[ADD], - swisssurfer/src/resources/icons/tel.png[ADD], - swisssurfer/src/resources/icons/wp.png[ADD]: - Search Bar Icons; refs #107 - -2011-12-07 11:34 marc - - * [r151] swisssurfer/src/browser.hxx, - swisssurfer/src/logincertificate.hxx, - swisssurfer/src/pinentry.hxx, swisssurfer/src/pinentry.ui, - swisssurfer/src/resources.qrc, swisssurfer/src/settings.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - Certificate Info + Search Bar + Bug Fixes; refs #107 - -2011-12-06 14:40 marc - - * [r150] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/certificate.ui, - swisssurfer/src/downloadmanager.hxx, swisssurfer/src/main.cxx, - swisssurfer/src/pinentry.hxx, swisssurfer/src/pinentry.ui, - swisssurfer/src/qmake.pro.in, swisssurfer/src/resources.qrc, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - redesign; refs #107 - -2011-12-02 11:53 frekai - - * [r149] swisssurfer/src/swisssurfer.icns: - Also in swisssurfer project closes #89 - -2011-11-11 12:16 marc - - * [r148] swisssurfer/src/qmake.pro.in: - no poppler; refs #79 - -2011-11-11 12:15 marc - - * [r147] swisssurfer/src/qmake.pro.in: - warnings should not produce errors; refs #79 - -2011-11-11 11:45 marc - - * [r146] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/certificate.hxx, - swisssurfer/src/downloadmanager.hxx, swisssurfer/src/main.cxx, - swisssurfer/src/pinentry.hxx, swisssurfer/src/pluginfactory.hxx, - swisssurfer/src/qmake.pro.in, swisssurfer/src/saveorrun.hxx, - swisssurfer/src/saveorrun.ui, swisssurfer/src/settings.ui, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - massive problems with locking; show before login; handling of - plugins; no c++0x standard on gcc in mac/win yet; extremely - unstable; refs #79; refs #58 - -2011-09-26 11:08 marc - - * [r145] swisssurfer/src/pluginfactory.hxx: - no assertion please, refs #79 - -2011-09-26 10:59 marc - - * [r144] swisssurfer/src/pluginfactory.hxx: - no assertion please, refs #79 - -2011-09-26 10:56 marc - - * [r143] swisssurfer/src/browser.hxx, - swisssurfer/src/certificate.hxx, - swisssurfer/src/pdfdisplay.hpp[ADD], - swisssurfer/src/pluginfactory.hxx[ADD], - swisssurfer/src/qmake.pro.in, swisssurfer/src/saveorrun.hxx[ADD], - swisssurfer/src/saveorrun.ui[ADD], - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts, - swisssurfer/src/temporaryfile.hxx[ADD]: - removed version, refs #101; implemented new temporaryfile handler - and improved save, refs #51; partial changes for refs #79 and - solved #104 - -2011-09-21 12:37 marc - - * [r142] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - cursor is hour-glass during download, on application start, - «launching application ...» is shown for 5s; refs #77 - -2011-09-21 12:00 marc - - * [r141] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - Changed QComboBox to QEditText for kiosk mode - fixed - key-shortcuts + close tab; refs #102 - -2011-09-21 11:51 marc - - * [r140] swisssurfer/src/browser.ui: - Changed QComboBox to QEditText for kiosk mode - bugfix; refs #102 - -2011-09-21 11:42 marc - - * [r139] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/main.cxx, swisssurfer/src/qmake.pro.in, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts, swisssurfer/src/webpage.hxx: - Changed QComboBox to QEditText for kiosk mode; refs #102 - -2011-09-13 13:15 marc - - * [r138] swisssurfer/src/editbookmarks.ui, - swisssurfer/src/main.cxx: - use default constructor for QLocale, not ::system; refs #66 - -2011-08-26 12:39 marc - - * [r137] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - and of course, if my personal feature is public, it must be - restricted in kiosk and no-settings mode; refs #88 - -2011-08-26 12:33 marc - - * [r136] swisssurfer/src/editbookmarks.hxx[ADD], - swisssurfer/src/editbookmarks.ui[ADD]: - added missing files from changes@home that has been accidentally - checked in partially at last commit [135]; refs #88 - -2011-08-25 11:46 marc - - * [r135] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/qmake.pro.in, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts, swisssurfer/src/webpage.hxx: - append $SWISSSURFER_USERAGENT to user agent; refs #88 - -2011-08-23 10:58 marc - - * [r134] swisssurfer/src/browser.hxx, - swisssurfer/src/resources/icons/about.png, - swisssurfer/src/resources/icons/addbookmark.png, - swisssurfer/src/resources/icons/clearlocation.png, - swisssurfer/src/resources/icons/close.png, - swisssurfer/src/resources/icons/error.png, - swisssurfer/src/resources/icons/find.png, - swisssurfer/src/resources/icons/newtab.png, - swisssurfer/src/resources/icons/newwindow.png, - swisssurfer/src/resources/icons/print.png, - swisssurfer/src/resources/icons/printpreview.png, - swisssurfer/src/resources/icons/settings.png, - swisssurfer/src/resources/icons/usercert.png, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - icons are now within the line-edit and background is transparent; - refs #93 - -2011-08-10 07:03 marc - - * [r133] swisssurfer/src/resources.qrc, - swisssurfer/src/resources/icons/about.png[ADD], - swisssurfer/src/resources/icons/addbookmark.png[ADD], - swisssurfer/src/resources/icons/clearlocation.png[ADD], - swisssurfer/src/resources/icons/close.png[ADD], - swisssurfer/src/resources/icons/error.png[ADD], - swisssurfer/src/resources/icons/find.png[ADD], - swisssurfer/src/resources/icons/newtab.png[ADD], - swisssurfer/src/resources/icons/newwindow.png[ADD], - swisssurfer/src/resources/icons/print.png[ADD], - swisssurfer/src/resources/icons/printpreview.png[ADD], - swisssurfer/src/resources/icons/settings.png[ADD], - swisssurfer/src/resources/icons/usercert.png[ADD]: - convertet all SVG files to PNG because SVG seems to be - unavailable on Mac; refs #93 - -2011-07-06 13:39 marc - - * [r132] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - menu enabled in kios mode; refs #90 - -2011-07-06 13:16 marc - - * [r131] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - must test whether _url exists and has edit field; refs #94 - -2011-06-30 13:47 marc - - * [r130] swisssurfer/src/browser.ui, swisssurfer/src/resources.qrc, - swisssurfer/src/resources/icons/about.svg[ADD], - swisssurfer/src/resources/icons/close.svg[ADD], - swisssurfer/src/resources/icons/find.svg[ADD], - swisssurfer/src/resources/icons/newtab.svg[ADD], - swisssurfer/src/resources/icons/newwindow.svg[ADD], - swisssurfer/src/resources/icons/print.svg[ADD], - swisssurfer/src/resources/icons/printpreview.svg[ADD], - swisssurfer/src/resources/icons/settings.svg[ADD], - swisssurfer/src/resources/icons/usercert.svg[ADD], - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - nice icons; closes #92 - -2011-06-30 13:12 marc - - * [r129] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/resources.qrc, - swisssurfer/src/resources/icons/addbookmark.svg[ADD], - swisssurfer/src/resources/icons/clearlocation.svg[ADD], - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - buttons are now actions with images too; url-bar height is now - not minimum but preferred; refs #91 - -2011-06-30 07:45 marc - - * [r128] swisssurfer/src/browser.hxx, swisssurfer/src/errorlog.hxx, - swisssurfer/src/errorlog.ui, swisssurfer/src/resources.qrc, - swisssurfer/src/resources/icons/error.svg[ADD], - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - even smarter error notification; refs #68 - -2011-06-30 07:40 marc - - * [r127] swisssurfer/src/main.cxx: - corrected documentation; refs #88 - -2011-06-29 08:06 marc - - * [r126] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - change url-color to white if page load was successful; closes #68 - -2011-06-29 07:53 marc - - * [r125] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - ignore abort, url-bar red if load fails, better error message and - same for find: red if not found, green if found; closes #68 - -2011-06-29 06:52 marc - - * [r124] swisssurfer/src/browser.hxx, swisssurfer/src/main.cxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts, swisssurfer/src/webpage.hxx: - set SWISSSURFER_USERAGENT e.g. to "Mozilla/5.0 (%Platform%; - %Security%; %Subplatform%; %Locale%) AppleWebKit/%WebKitVersion% - (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"; closes - #88 - -2011-06-21 06:49 marc - - * [r123] swisssurfer/src/pinentry.ui, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #83 - -2011-06-21 06:38 marc - - * [r122] swisssurfer/src/qmake.pro.in: - undo enable debug; closes #85 - -2011-06-21 06:37 marc - - * [r121] swisssurfer/src/browser.hxx, swisssurfer/src/qmake.pro.in: - closes #85 - -2011-06-20 10:01 marc - - * [r120] swisssurfer/configure.in, swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - more version information; refs #85 - -2011-06-17 09:25 marc - - * [r119] swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #82; closes #76 - -2011-06-16 10:05 marc - - * [r118] swisssurfer/src/qmake.pro.in: - don't check-in debug; refs #82 - -2011-06-16 06:39 marc - - * [r117] swisssurfer/src/certificate.hxx, - swisssurfer/src/pinentry.ui, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #83 - -2011-06-16 06:24 marc - - * [r116] swisssurfer/src/browser.hxx, swisssurfer/src/settings.hxx, - swisssurfer/src/settings.ui, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #84 - -2011-06-15 12:00 marc - - * [r115] swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - with change, nothing works any more; refs #82 - -2011-06-15 05:25 frekai - - * [r114] swisssurfer/src/main.cxx: - AutoVerifyPeer refs #75 - -2011-06-14 12:41 marc - - * [r113] swisssurfer/src/main.cxx: - try to accept all protocols; refs #75 - -2011-06-14 12:41 marc - - * [r112] swisssurfer/src/smartcardauth.hxx: - RSA_new_method calls RSA_free, don't free RSA, keep memory leak; - refs #82 - -2011-06-14 07:26 marc - - * [r111] swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - don't free the RSA*, it seems not to properly clean up old - references; refs #82 - -2011-06-09 08:58 marc - - * [r110] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/qmake.pro.in, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #65 - -2011-06-09 08:48 marc - - * [r109] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - using QTemporaryFile::createLocalFile; closes #69 - -2011-06-09 08:46 marc - - * [r108] swisssurfer/src/logincertificate.hxx[ADD]: - closes #71 - -2011-06-09 08:40 marc - - * [r107] swisssurfer/src/logincertificate.ui, - swisssurfer/src/pinentry.ui, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #71 - -2011-06-09 08:23 marc - - * [r106] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/certificate.hxx[ADD], - swisssurfer/src/certificate.ui[ADD], - swisssurfer/src/logincertificate.ui[ADD], - swisssurfer/src/pinentry.hxx, swisssurfer/src/pinentry.ui, - swisssurfer/src/qmake.pro.in, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #71 - -2011-06-08 13:00 marc - - * [r105] swisssurfer/src/browser.hxx, swisssurfer/src/makefile.am, - swisssurfer/src/sslclientnetworkmanager.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #60 - -2011-06-08 12:40 marc - - * [r104] swisssurfer/src/browser.hxx: - closes #64 - -2011-06-08 12:39 marc - - * [r103] swisssurfer/src/browser.hxx: - closes #64 - -2011-06-08 12:32 marc - - * [r102] swisssurfer/src/browser.hxx: - closes #64 - -2011-06-08 12:24 marc - - * [r101] swisssurfer/src/main.cxx, swisssurfer/src/makefile.am: - installation of programs fixed; closes #70 - -2011-06-08 11:37 marc - - * [r100] swisssurfer/configure.in, swisssurfer/src/main.cxx, - swisssurfer/src/makefile.am, swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - additional feature: built in library name; plus: closes #70 - -2011-06-06 13:35 nichan - - * [r99] swisssurfer/src/main.cxx: - corrected typo for icon, refs #44 - -2011-06-06 13:25 nichan - - * [r98] swisssurfer/src/Info.plist[ADD], swisssurfer/src/main.cxx, - swisssurfer/src/qmake.pro.in, swisssurfer/src/resources.qrc, - swisssurfer/src/resources/icons/swisssurfer_32x32x32.png[ADD], - swisssurfer/src/swisssurfer.icns[ADD]: - added window icon for mac and win, refs #44 - -2011-06-03 08:24 marc - - * [r97] swisssurfer/src/pinentry.ui, swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.hxx: - requires pcsclite; refs #37 - -2011-06-03 07:48 marc - - * [r96] swisssurfer/src/qmake.pro.in: - requires pcsclite; refs #37 - -2011-06-03 06:59 marc - - * [r95] swisssurfer/src/pinentry.hxx, swisssurfer/src/pinentry.ui, - swisssurfer/src/qmake.pro.in, swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - show PIN attempts if known, nothing if unknown; refs #37 - -2011-06-01 09:06 marc - - * [r94] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #57 - -2011-06-01 08:57 marc - - * [r93] swisssurfer/src/browser.hxx, swisssurfer/src/main.cxx, - swisssurfer/src/qmake.pro.in, swisssurfer/src/settings.hxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #56; closes #54 - -2011-05-26 08:39 marc - - * [r92] swisssurfer/src/errorlog.hxx[ADD], - swisssurfer/src/errorlog.ui[ADD]: - added missing files; refs #48 - -2011-05-26 06:31 marc - - * [r91] swisssurfer/configure.in, swisssurfer/src/browser.hxx, - swisssurfer/src/browser.ui, swisssurfer/src/downloadmanager.hxx, - swisssurfer/src/qmake.pro.in, swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - done fist implementation of ErrorLog, refs #48; added - AdjustToMinimumContentsLength, closes #52 - -2011-05-24 05:53 marc - - * [r90] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #51, closes #47 - -2011-05-23 11:22 marc - - * [r89] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - not removed, but diabled and smaller; closes #47 - -2011-05-23 09:19 marc - - * [r88] swisssurfer/src/browser.hxx: - url is no more visible in kiosk mode; closes #52 - -2011-05-23 09:16 marc - - * [r87] swisssurfer/src/browser.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - hint: «reduced mode» is --no-settings or -n; closes #35 - -2011-05-23 09:08 marc - - * [r86] swisssurfer/src/browser.hxx, swisssurfer/src/settings.hxx, - swisssurfer/src/settings.ui, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #50 - -2011-05-19 12:58 marc - - * [r85] swisssurfer/src/settings.hxx: - mac has qt 4.7.0; refs #49 - -2011-05-19 12:55 marc - - * [r84] swisssurfer/src/browser.hxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - it works, first cleanup; refs #49 - -2011-05-19 12:29 marc - - * [r83] swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - it works, first try; refs #49 - -2011-05-17 08:14 marc - - * [r82] swisssurfer/COPYING[ADD], swisssurfer/INSTALL[ADD]: - handle mac; refs #43 - -2011-05-17 08:14 marc - - * [r81] swisssurfer/COPYING[DEL], swisssurfer/INSTALL[DEL]: - handle mac; refs #43 - -2011-05-17 08:11 marc.waeckerlin - - * [r80] swisssurfer/src/browser.hxx, - swisssurfer/src/downloadmanager.hxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - to test, ignore all ssl errors; refs #43 - -2011-05-11 13:17 marc - - * [r79] swisssurfer/COPYING, swisssurfer/INSTALL, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - added error from mac to trusted errors as possible workaround; - refs #43 - -2011-05-10 09:13 marc - - * [r78] swisssurfer/src/qmake.pro.in: - is it timing? removed lot of traces; refs #43 - -2011-05-05 13:31 marc.waeckerlin - - * [r77] swisssurfer/COPYING, swisssurfer/INSTALL, - swisssurfer/src/downloadmanager.hxx, swisssurfer/src/main.cxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - try to set CA to Context, but still does not work; refs #43 - -2011-05-04 11:28 marc - - * [r76] swisssurfer/src/main.cxx: - closes #42 - -2011-05-03 11:07 marc - - * [r75] swisssurfer/src/smartcardauth.hxx: - template for engine registry; refs #32 - -2011-05-03 10:21 marc - - * [r74] swisssurfer/configure.in, swisssurfer/src/browser.hxx, - swisssurfer/src/main.cxx, swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - option is noe --login to enable immediate login, otherwise logs - in at first https-access; also works without cryptoki-library; - closes #34 - -2011-05-02 13:07 marc - - * [r73] swisssurfer/src/browser.hxx, swisssurfer/src/main.cxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - Prepared, but problem with GUI and simultanous connections - - Solution: Net option --no-login; refs #34 - -2011-04-27 12:07 marc - - * [r72] swisssurfer/src/browser.hxx, - swisssurfer/src/downloadmanager.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - more debug on ssl error; refs #22 - -2011-04-27 11:56 marc - - * [r71] swisssurfer/src/browser.hxx, - swisssurfer/src/downloadmanager.hxx: - more debug on ssl error; refs #22 - -2011-04-27 11:30 marc - - * [r70] swisssurfer/configure.in, - swisssurfer/src/authentication.hxx, swisssurfer/src/browser.hxx, - swisssurfer/src/browser.ui, swisssurfer/src/main.cxx, - swisssurfer/src/qmake.pro.in, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - added server certificate SWISSSIGN_SERVER_GOLD_CA_2008_G2; allow - reject of authentication; added meaningful about dialog; added - history menu; refs #22 - -2011-04-27 07:33 marc - - * [r69] swisssurfer/src/browser.hxx, - swisssurfer/src/downloadmanager.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - more error tracing; refs #22 - -2011-04-26 12:18 marc - - * [r68] swisssurfer/src/browser.hxx: - log ssl errors; refs #32 - -2011-04-26 11:59 marc - - * [r67] swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.hxx: - log rsa free, new -g option; refs #32 - -2011-04-26 08:35 marc - - * [r66] swisssurfer/src/main.cxx: - proxy; refs #32 - -2011-04-26 07:32 marc - - * [r65] swisssurfer/src/smartcardauth.hxx: - find SuisseID certs; refs #32 - -2011-04-26 07:03 marc - - * [r64] swisssurfer/src/smartcardauth.hxx: - find SuisseID certs; refs #32 - -2011-04-26 07:02 marc - - * [r63] swisssurfer/src/smartcardauth.hxx: - find SuisseID certs; refs #32 - -2011-04-21 07:50 marc - - * [r62] swisssurfer/src/qmake.pro.in: - build on windows; refs #32 - -2011-04-21 06:17 marc - - * [r61] swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.cxx[DEL]: - cleanup old stuff; refs #32 - -2011-04-21 05:48 marc - - * [r60] swisssurfer/README, swisssurfer/src/browser.hxx, - swisssurfer/src/pindialog.cxx[DEL], - swisssurfer/src/pindialog.hxx[DEL], - swisssurfer/src/pinentry.hxx[CPY], swisssurfer/src/pinentry.ui, - swisssurfer/src/qmake.pro.in, swisssurfer/src/smartcardauth.cxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - first working implementaiion; to be improved; refs #32, closes - #28, closes #29 - -2011-02-28 08:34 marc - - * [r59] swisssurfer/src/browser.hxx: - closes #27 - -2011-02-28 08:30 marc - - * [r58] swisssurfer/src/authentication.hxx[ADD], - swisssurfer/src/authentication.ui[ADD], - swisssurfer/src/browser.hxx, swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.cxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts, - swisssurfer/src/webpage.cxx[ADD], - swisssurfer/src/webpage.hxx[ADD]: - closes #26; closes #24 - -2011-02-10 08:47 marc - - * [r57] qt/patch/qt-sources-for-mingw-cross-compile.diff: - WIN2 conditional must always been set; refs #22 - -2011-02-09 14:59 marc - - * [r56] swisssurfer/src/makefile.am: - on mac, app is a directory; refs #22 - -2011-02-09 14:43 marc - - * [r55] openssl-act-engine/configure.in: - WIN2 conditional must always been set; refs #22 - -2011-02-08 06:35 marc - - * [r54] qt/patch/qt-sources-for-mingw-cross-compile.diff: - next try; refs #22 - -2011-02-07 14:58 marc - - * [r53] qt/patch/qt-sources-for-mingw-cross-compile.diff: - next try; refs #22 - -2011-02-07 09:20 marc - - * [r52] openssl-act-engine/configure.in, - openssl-act-engine/src/CertificateList.cpp, - openssl-act-engine/src/engine_sct.cpp, - openssl-act-engine/src/makefile.am, - qt/patch/qt-sources-for-mingw-cross-compile.diff: - next try; refs #22 - -2011-02-04 12:52 marc - - * [r51] qt/patch/qt-sources-for-mingw-cross-compile.diff[ADD]: - patch for cross mingw32 build; refs #22 - -2011-02-02 12:22 marc - - * [r50] openssl-act-engine/src/CertificateList.cpp, - openssl-act-engine/src/engine_sct.cpp, qt/makefile, - swisssurfer/src/makefile.am, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - const or not const that is the question, whether we're on mac or - on a different system; refs #22 - -2011-02-02 12:04 marc.waeckerlin - - * [r49] openssl-act-engine/configure.in, - openssl-act-engine/src/CertificateList.cpp, - openssl-act-engine/src/engine_sct.cpp, - openssl-act-engine/src/makefile.am, - openssl-act-engine/src/test_engine.cpp, - swisssurfer/src/qmake.pro.in: - compiled on Mac; refs #22 - -2011-01-31 08:50 marc - - * [r48] swisssurfer/src/browser.hxx: - improve find, remove QWebPage::HighlightAllOccurrences; refs #23 - -2011-01-28 06:14 marc - - * [r47] qt/makefile: - build 32bit QT; refs #22 - -2011-01-27 12:06 marc - - * [r46] qt/makefile, swisssurfer/src/browser.hxx: - build 32bit QT; refs #22 - -2011-01-27 10:40 marc - - * [r45] qt/makefile: - build 32bit QT; refs #22 - -2011-01-27 10:38 marc - - * [r44] qt/makefile: - build 32bit QT; refs #22 - -2011-01-27 10:03 marc - - * [r43] qt/makefile: - build 32bit QT; refs #22 - -2011-01-27 09:40 marc - - * [r42] qt/makefile: - refs #22 - -2011-01-27 09:31 marc - - * [r41] openssl-act-engine/configure.in, - swisssurfer/src/browser.hxx, swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - refs #22 - -2011-01-27 06:35 marc - - * [r40] makefile[ADD], openssl-act-engine/configure.in, - qt/makefile[ADD], swisssurfer/configure.in, - swisssurfer/doc/makefile.am, swisssurfer/src/makefile.am, - swisssurfer/src/smartcardauth.cxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - refs #22 - -2011-01-21 13:35 marc - - * [r39] qt/patch/qt-sources-patch.diff: - patch was defect; refs #22 - -2011-01-21 13:32 marc - - * [r38] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/main.cxx, swisssurfer/src/pinentry.ui[ADD], - swisssurfer/src/settings.hxx, swisssurfer/src/settings.ui, - swisssurfer/src/smartcardauth.cxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - ready for weekend; several changes; refs #22 - -2011-01-19 15:04 marc - - * [r37] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/main.cxx, swisssurfer/src/qmake.pro.in, - swisssurfer/src/settings.hxx[ADD], - swisssurfer/src/settings.ui[ADD], - swisssurfer/src/sslclientnetworkmanager.hxx[ADD], - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #20, closes #21, closes #17 - -2011-01-18 14:40 marc - - * [r36] swisssurfer/README, swisssurfer/src/browser.hxx, - swisssurfer/src/browser.ui, - swisssurfer/src/downloadmanager.hxx[ADD], - swisssurfer/src/main.cxx, swisssurfer/src/qmake.pro.in, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #9; closes #10; closes #13 - -2011-01-18 14:39 marc - - * [r35] README.txt, qt/patch/qt-sources-patch.diff, - qt/qt-everywhere-opensource-src-4.6.3.tar.gz[DEL], - qt/qt-everywhere-opensource-src-4.7.1.tar.gz[ADD]: - closes #19 - -2011-01-17 13:45 marc - - * [r34] qt/patch/qt-sources-patch.diff: - closes #16 - -2011-01-14 13:39 marc - - * [r33] qt/patch/qt-sources-patch.diff, - swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/smartcardauth.cxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - some slots are disfunctional; refs #13 closes #15 - -2011-01-14 10:11 marc - - * [r32] swisssurfer/src/browser.hxx, swisssurfer/src/browser.ui, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - All in one tyb now, not yet really tabbed; closes #14; refs #13 - -2011-01-14 08:49 marc - - * [r31] qt/patch/qt-sources-patch.diff, - swisssurfer/src/browser.hxx, swisssurfer/src/main.cxx, - swisssurfer/src/qmake.pro.in, swisssurfer/src/smartcardauth.cxx, - swisssurfer/src/smartcardauth.hxx, - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - closes #12 - -2011-01-14 08:47 marc - - * [r30] openssl-act-engine/src/SlotList.h, - openssl-act-engine/src/engine_front.cpp, - openssl-act-engine/src/engine_sct.cpp, - openssl-act-engine/src/engine_sct_internal.h: - closes #11 - -2011-01-13 07:08 marc - - * [r29] Test_Qt_Frontend/QtSslTest.pro, - Test_Qt_Frontend/qtssltest.cpp, - Test_Qt_Frontend/smartcardauth.cpp, - Test_Qt_Frontend/smartcardauth.h, openssl-act-engine/README, - openssl-act-engine/configure.in, openssl-act-engine/makefile.am, - openssl-act-engine/src/engine_sct.cpp, - openssl-act-engine/src/test_engine.cpp, swisssurfer/README, - swisssurfer/configure.in, swisssurfer/src/browser.hxx, - swisssurfer/src/main.cxx, swisssurfer/src/pindialog.cxx[ADD], - swisssurfer/src/pindialog.hxx[ADD], swisssurfer/src/qmake.pro.in, - swisssurfer/src/smartcardauth.cxx[ADD], - swisssurfer/src/smartcardauth.hxx[ADD], - swisssurfer/src/swisssurfer_de.ts, - swisssurfer/src/swisssurfer_en.ts, - swisssurfer/src/swisssurfer_fr.ts, - swisssurfer/src/swisssurfer_it.ts: - it works; closes #8 - -2011-01-11 14:46 marc - - * [r28] openssl-act-engine/src/test_engine.cpp: - some minor changes; refs #8 - -2011-01-11 14:13 marc - - * [r27] openssl-act-engine/src/SyncObject.h: - new SyncObject; refs #8 - -2011-01-11 13:53 marc - - * [r26] openssl-act-engine/src/engine_sct.cpp: - some minor changes; refs #8 - -2011-01-11 12:22 marc - - * [r25] openssl-act-engine/src/test_engine.cpp: - some minor changes; refs #8 - -2011-01-11 12:20 marc - - * [r24] openssl-act-engine/src/makefile.am: - some minor changes; refs #8 - -2011-01-11 12:16 marc - - * [r23] openssl-act-engine/src/makefile.am: - some minor changes; refs #8 - -2011-01-11 12:14 marc - - * [r22] openssl-act-engine/src/test_engine.cpp: - some minor changes; refs #8 - -2011-01-11 12:11 marc - - * [r21] openssl-act-engine/src/makefile.am: - some minor changes; refs #8 - -2011-01-11 12:06 marc - - * [r20] openssl-act-engine/src/makefile.am: - some minor changes; refs #8 - -2011-01-11 12:02 marc - - * [r19] openssl-act-engine/src/engine_front.cpp: - some minor changes; refs #8 - -2011-01-11 11:55 marc - - * [r18] openssl-act-engine/src/engine_front.cpp: - some minor changes; refs #8 - -2011-01-11 11:54 marc - - * [r17] openssl-act-engine/src/engine_front.cpp: - some minor changes; refs #8 - -2011-01-11 11:50 marc - - * [r16] openssl-act-engine/makefile.am[ADD]: - some minor changes; refs #8 - -2011-01-11 11:42 marc - - * [r15] README.txt, Test_Qt_Frontend/QtSslTest.pro, - Test_Qt_Frontend/smartcardauth.cpp, - openssl-act-engine/src/test_engine.cpp: - some minor changes; refs #8 - -2010-10-29 10:54 marc - - * [r14] README.txt, Test_Qt_Frontend/QtSslTest.pro, - Test_Qt_Frontend/pindialog.cpp, Test_Qt_Frontend/pindialog.h, - Test_Qt_Frontend/qtssltest.cpp, - Test_Qt_Frontend/smartcardauth.cpp, - Test_Qt_Frontend/smartcardauth.h, - Test_Qt_Frontend/swsign_interm.pem, - Test_Qt_Frontend/swsign_root.pem, - actlibrary/MacOSX-10.4-ppc/Release/include[DEL], - actlibrary/MacOSX-10.5-x86_64/Release/include[DEL], - actlibrary/MacOSX-10.6-x86_64/Release/include[DEL], - actlibrary/OpenSUSE-11-x86_64/Release/include[DEL], - actlibrary/README.txt, - actlibrary/SLES-10-i686/Release/include[DEL], - actlibrary/SLES-11-i686/Release/include[DEL], - actlibrary/Ubuntu-9-i686/Release/include[DEL], - actlibrary/include[CPY], actlibrary/include/actAlgorithm.h, - actlibrary/include/actAllocator.h, - actlibrary/include/actBasics.h, actlibrary/include/actBlob.h, - actlibrary/include/actBlockCipherKit.h, - actlibrary/include/actBlockCipherModeKit.h, - actlibrary/include/actBlockCipherModeReg.h, - actlibrary/include/actBlockCipherReg.h, - actlibrary/include/actCRL.h, actlibrary/include/actCertificate.h, - actlibrary/include/actCertificateKit.h, - actlibrary/include/actCertificateReg.h, - actlibrary/include/actDate.h, actlibrary/include/actDebug.h, - actlibrary/include/actDefaultRNG.h, - actlibrary/include/actDerivatorKit.h, - actlibrary/include/actDerivatorReg.h, - actlibrary/include/actEMSAKit.h, actlibrary/include/actEMSAReg.h, - actlibrary/include/actEnv.h, actlibrary/include/actException.h, - actlibrary/include/actFactoryReg.h, - actlibrary/include/actHandle.h, actlibrary/include/actHashKit.h, - actlibrary/include/actHashReg.h, - actlibrary/include/actIAccessCondition.h, - actlibrary/include/actIAgreementKey.h, - actlibrary/include/actIAlgorithm.h, - actlibrary/include/actIBlockCipher.h, - actlibrary/include/actIBlockCipherKey.h, - actlibrary/include/actIBlockCipherMode.h, - actlibrary/include/actICBCMACKey.h, actlibrary/include/actICRL.h, - actlibrary/include/actICertificate.h, - actlibrary/include/actIDerivator.h, - actlibrary/include/actIDerivatorWithHash.h, - actlibrary/include/actIEMSAAlg.h, - actlibrary/include/actIEMSAWithHashAlg.h, - actlibrary/include/actIEventHandler.h, - actlibrary/include/actIEventMonitoring.h, - actlibrary/include/actIHashAlg.h, - actlibrary/include/actIHashMACKey.h, - actlibrary/include/actIIESKey.h, actlibrary/include/actIKey.h, - actlibrary/include/actIKeyDerivation.h, - actlibrary/include/actIKeyFactory.h, - actlibrary/include/actIMACKey.h, - actlibrary/include/actIPKCS15Behavior.h, - actlibrary/include/actIPadding.h, actlibrary/include/actIParam.h, - actlibrary/include/actIRNGAlg.h, actlibrary/include/actIRSAKey.h, - actlibrary/include/actIRefCounted.h, - actlibrary/include/actISCardAccess.h, - actlibrary/include/actISCardOS.h, - actlibrary/include/actISCardOSBehavior.h, - actlibrary/include/actISecurityManager.h, - actlibrary/include/actISignatureKey.h, - actlibrary/include/actISlot.h, - actlibrary/include/actISlotMonitor.h, - actlibrary/include/actIStreamCipher.h, - actlibrary/include/actIStreamCipherKey.h, - actlibrary/include/actISubsystem.h, - actlibrary/include/actISubsystemConfig.h, - actlibrary/include/actISynchronize.h, - actlibrary/include/actIToken.h, - actlibrary/include/actITokenAuth.h, - actlibrary/include/actITokenAuthOwner.h, - actlibrary/include/actITokenBlockCipher.h, - actlibrary/include/actITokenBlockCipherKey.h, - actlibrary/include/actITokenConfig.h, - actlibrary/include/actITokenExtension.h, - actlibrary/include/actITokenFile.h, - actlibrary/include/actITokenFileCache.h, - actlibrary/include/actITokenFileOwner.h, - actlibrary/include/actITokenInitializer.h, - actlibrary/include/actITokenKey.h, - actlibrary/include/actITokenPIN.h, - actlibrary/include/actIX509CRL.h, - actlibrary/include/actIX509Certificate.h, - actlibrary/include/actInit.h, - actlibrary/include/actJCAppletKit.h, - actlibrary/include/actJCAppletReg.h, - actlibrary/include/actJCSecureChannelReg.h, - actlibrary/include/actKey.h, actlibrary/include/actKeyKit.h, - actlibrary/include/actKeyReg.h, actlibrary/include/actLogger.h, - actlibrary/include/actMode.h, actlibrary/include/actMove.h, - actlibrary/include/actOID.h, - actlibrary/include/actPKCS15BehaviorKit.h, - actlibrary/include/actPKCS15BehaviorReg.h, - actlibrary/include/actPaddingKit.h, - actlibrary/include/actPaddingReg.h, - actlibrary/include/actProfileGeneratorKit.h, - actlibrary/include/actProfileGeneratorReg.h, - actlibrary/include/actRNGKit.h, - actlibrary/include/actSCardLock.h, - actlibrary/include/actSCardOSKit.h, - actlibrary/include/actSCardOSReg.h, - actlibrary/include/actSCardTokenKit.h, - actlibrary/include/actSCardTokenReg.h, - actlibrary/include/actSCardUtil.h, - actlibrary/include/actSlotManager.h, - actlibrary/include/actSlotMonitorKit.h, - actlibrary/include/actSlotMonitorReg.h, - actlibrary/include/actState.h, - actlibrary/include/actStreamCipherKit.h, - actlibrary/include/actStreamCipherReg.h, - actlibrary/include/actSubsystemKit.h, - actlibrary/include/actSubsystemReg.h, - actlibrary/include/actTokenAuthProtocolKit.h, - actlibrary/include/actTokenAuthProtocolReg.h, - actlibrary/include/actTokenBase.h, - actlibrary/include/actTokenConfig.h, - actlibrary/include/actTokenExtensionKit.h, - actlibrary/include/actTokenExtensionReg.h, - actlibrary/include/actTools.h, actlibrary/include/actToolsECC.h, - actlibrary/include/actToolsRSA.h, - actlibrary/include/actTypeTags.h, - actlibrary/include/actX509Extension.h, - actlibrary/include/actX509KeyReg.h, - actlibrary/include/actX509Kit.h, - actlibrary/include/actX509SignHashReg.h, - actlibrary/include/actX509SignReg.h, - actlibrary/mingw32-i586/Release/include[DEL]: - store headers only once, refs #7 - -2010-09-29 11:19 marc - - * [r13] openssl-act-engine/AUTHORS[ADD], - openssl-act-engine/COPYING[ADD], - openssl-act-engine/CardKey.cpp[DEL], - openssl-act-engine/CardKey.h[DEL], - openssl-act-engine/CardObject.cpp[DEL], - openssl-act-engine/CardObject.h[DEL], - openssl-act-engine/CertificateList.cpp[DEL], - openssl-act-engine/CertificateList.h[DEL], - openssl-act-engine/ChangeLog[ADD], - openssl-act-engine/INSTALL[ADD], - openssl-act-engine/Init_Engine.h[DEL], - openssl-act-engine/Makefile[DEL], openssl-act-engine/NEWS[ADD], - openssl-act-engine/README[ADD], openssl-act-engine/ReadMe.txt, - openssl-act-engine/SecOpGuard.cpp[DEL], - openssl-act-engine/SecOpGuard.h[DEL], - openssl-act-engine/SlotList.cpp[DEL], - openssl-act-engine/SlotList.h[DEL], - openssl-act-engine/SyncObject.h[DEL], - openssl-act-engine/SyncObjectMacOS.h[DEL], - openssl-act-engine/SyncObjectPosix.h[DEL], - openssl-act-engine/SyncObjectSolaris.h[DEL], - openssl-act-engine/SyncObjectWin32.h[DEL], - openssl-act-engine/SyncObjectWinCE.h[DEL], - openssl-act-engine/USING_ENGINE_act.txt, - openssl-act-engine/Warns.h[DEL], - openssl-act-engine/actUtility.h[DEL], - openssl-act-engine/bootstrap.sh[ADD], - openssl-act-engine/configure.in[ADD], - openssl-act-engine/default.vs2008.vsprops, - openssl-act-engine/dllmain.cpp[DEL], openssl-act-engine/doc[ADD], - openssl-act-engine/doc/doxyfile.in[ADD], - openssl-act-engine/doc/makefile.am[ADD], - openssl-act-engine/engine_front.cpp[DEL], - openssl-act-engine/engine_sct.cpp[DEL], - openssl-act-engine/engine_sct.h[DEL], - openssl-act-engine/engine_sct_internal.h[DEL], - openssl-act-engine/engine_securetoken.cpp[DEL], - openssl-act-engine/engine_securetoken.sln, - openssl-act-engine/engine_securetoken.vcproj, - openssl-act-engine/src[ADD], - openssl-act-engine/src/CardKey.cpp[CPY], - openssl-act-engine/src/CardKey.h[CPY], - openssl-act-engine/src/CardObject.cpp[CPY], - openssl-act-engine/src/CardObject.h[CPY], - openssl-act-engine/src/CertificateList.cpp[CPY], - openssl-act-engine/src/CertificateList.h[CPY], - openssl-act-engine/src/Init_Engine.h[CPY], - openssl-act-engine/src/SecOpGuard.cpp[CPY], - openssl-act-engine/src/SecOpGuard.h[CPY], - openssl-act-engine/src/SlotList.cpp[CPY], - openssl-act-engine/src/SlotList.h[CPY], - openssl-act-engine/src/SyncObject.h[CPY], - openssl-act-engine/src/SyncObjectMacOS.h[CPY], - openssl-act-engine/src/SyncObjectPosix.h[CPY], - openssl-act-engine/src/SyncObjectSolaris.h[CPY], - openssl-act-engine/src/SyncObjectWin32.h[CPY], - openssl-act-engine/src/SyncObjectWinCE.h[CPY], - openssl-act-engine/src/Warns.h[CPY], - openssl-act-engine/src/actUtility.h[CPY], - openssl-act-engine/src/dllmain.cpp[CPY], - openssl-act-engine/src/engine_front.cpp[CPY], - openssl-act-engine/src/engine_sct.cpp[CPY], - openssl-act-engine/src/engine_sct.h[CPY], - openssl-act-engine/src/engine_sct_internal.h[CPY], - openssl-act-engine/src/engine_securetoken.cpp[CPY], - openssl-act-engine/src/makefile.am[ADD], - openssl-act-engine/src/stdafx.cpp[CPY], - openssl-act-engine/src/stdafx.h[CPY], - openssl-act-engine/src/targetver.h[CPY], - openssl-act-engine/src/test_engine.cpp[CPY], - openssl-act-engine/stdafx.cpp[DEL], - openssl-act-engine/stdafx.h[DEL], - openssl-act-engine/targetver.h[DEL], - openssl-act-engine/test_engine.cpp[DEL], - openssl-act-engine/win32_win2000.vs2008.vsprops: - first cleanup; still missing: RPM/Debian packages, pkgconfig, - version compiled-in-version-info; refs #7 - -2010-09-23 08:37 carsten.pluntke - - * [r12] README.txt[ADD], actlibrary[ADD], - actlibrary/MacOSX-10.4-ppc[ADD], - actlibrary/MacOSX-10.4-ppc/Release[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actAlgorithm.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actAllocator.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actBasics.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actBlob.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actBlockCipherKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actBlockCipherReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actCRL.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actCertificate.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actCertificateKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actCertificateReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actDate.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actDebug.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actDefaultRNG.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actDerivatorKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actDerivatorReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actEMSAKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actEMSAReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actEnv.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actException.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actFactoryReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actHandle.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actHashKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actHashReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIAccessCondition.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIAgreementKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIAlgorithm.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIBlockCipher.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actICBCMACKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actICRL.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actICertificate.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIDerivator.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIEMSAAlg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIEventHandler.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIEventMonitoring.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIHashAlg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIHashMACKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIIESKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIKeyDerivation.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIKeyFactory.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIMACKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIPadding.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIParam.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIRNGAlg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIRSAKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIRefCounted.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISCardAccess.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISCardOS.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISecurityManager.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISignatureKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISlot.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISlotMonitor.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIStreamCipher.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISubsystem.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISubsystemConfig.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actISynchronize.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIToken.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenAuth.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenConfig.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenExtension.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenFile.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenFileCache.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenFileOwner.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenInitializer.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actITokenPIN.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIX509CRL.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actIX509Certificate.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actInit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actJCAppletKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actJCAppletReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actKey.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actKeyKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actKeyReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actLogger.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actMode.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actMove.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actOID.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actPaddingKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actPaddingReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actRNGKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSCardLock.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSCardOSKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSCardOSReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSCardTokenKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSCardTokenReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSCardUtil.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSlotManager.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actState.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actStreamCipherKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actStreamCipherReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSubsystemKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actSubsystemReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTokenBase.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTokenConfig.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTools.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actToolsECC.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actToolsRSA.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actTypeTags.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actX509Extension.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actX509KeyReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actX509Kit.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actX509SignHashReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/include/actX509SignReg.h[ADD], - actlibrary/MacOSX-10.4-ppc/Release/libact.a[ADD], - actlibrary/MacOSX-10.5-x86_64[ADD], - actlibrary/MacOSX-10.5-x86_64/Release[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actAlgorithm.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actAllocator.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actBasics.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actBlob.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actBlockCipherKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actBlockCipherReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actCRL.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actCertificate.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actCertificateKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actCertificateReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actDate.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actDebug.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actDefaultRNG.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actDerivatorKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actDerivatorReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actEMSAKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actEMSAReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actEnv.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actException.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actFactoryReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actHandle.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actHashKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actHashReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIAccessCondition.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIAgreementKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIAlgorithm.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIBlockCipher.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actICBCMACKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actICRL.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actICertificate.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIDerivator.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIEMSAAlg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIEventHandler.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIEventMonitoring.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIHashAlg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIHashMACKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIIESKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIKeyDerivation.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIKeyFactory.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIMACKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIPadding.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIParam.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIRNGAlg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIRSAKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIRefCounted.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISCardAccess.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISCardOS.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISecurityManager.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISignatureKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISlot.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISlotMonitor.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIStreamCipher.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISubsystem.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISubsystemConfig.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actISynchronize.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIToken.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenAuth.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenConfig.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenExtension.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenFile.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenFileCache.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenFileOwner.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenInitializer.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actITokenPIN.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIX509CRL.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actIX509Certificate.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actInit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actJCAppletKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actJCAppletReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actKey.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actKeyKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actKeyReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actLogger.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actMode.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actMove.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actOID.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actPaddingKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actPaddingReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actRNGKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSCardLock.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSCardOSKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSCardOSReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSCardTokenKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSCardTokenReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSCardUtil.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSlotManager.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actState.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actStreamCipherKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actStreamCipherReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSubsystemKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actSubsystemReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTokenBase.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTokenConfig.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTools.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actToolsECC.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actToolsRSA.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actTypeTags.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actX509Extension.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actX509KeyReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actX509Kit.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actX509SignHashReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/include/actX509SignReg.h[ADD], - actlibrary/MacOSX-10.5-x86_64/Release/libact.a[ADD], - actlibrary/MacOSX-10.6-x86_64[ADD], - actlibrary/MacOSX-10.6-x86_64/Release[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actAlgorithm.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actAllocator.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actBasics.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actBlob.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actBlockCipherKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actBlockCipherReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actCRL.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actCertificate.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actCertificateKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actCertificateReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actDate.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actDebug.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actDefaultRNG.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actDerivatorKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actDerivatorReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actEMSAKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actEMSAReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actEnv.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actException.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actFactoryReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actHandle.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actHashKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actHashReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIAccessCondition.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIAgreementKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIAlgorithm.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIBlockCipher.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actICBCMACKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actICRL.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actICertificate.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIDerivator.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIEMSAAlg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIEventHandler.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIEventMonitoring.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIHashAlg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIHashMACKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIIESKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIKeyDerivation.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIKeyFactory.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIMACKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIPadding.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIParam.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIRNGAlg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIRSAKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIRefCounted.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISCardAccess.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISCardOS.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISecurityManager.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISignatureKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISlot.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISlotMonitor.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIStreamCipher.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISubsystem.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISubsystemConfig.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actISynchronize.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIToken.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenAuth.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenConfig.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenExtension.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenFile.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenFileCache.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenFileOwner.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenInitializer.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actITokenPIN.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIX509CRL.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actIX509Certificate.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actInit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actJCAppletKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actJCAppletReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actKey.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actKeyKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actKeyReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actLogger.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actMode.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actMove.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actOID.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actPaddingKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actPaddingReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actRNGKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSCardLock.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSCardOSKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSCardOSReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSCardTokenKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSCardTokenReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSCardUtil.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSlotManager.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actState.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actStreamCipherKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actStreamCipherReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSubsystemKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actSubsystemReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTokenBase.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTokenConfig.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTools.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actToolsECC.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actToolsRSA.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actTypeTags.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actX509Extension.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actX509KeyReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actX509Kit.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actX509SignHashReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/include/actX509SignReg.h[ADD], - actlibrary/MacOSX-10.6-x86_64/Release/libact.a[ADD], - actlibrary/OpenSUSE-11-x86_64[ADD], - actlibrary/OpenSUSE-11-x86_64/Release[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actAlgorithm.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actAllocator.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actBasics.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actBlob.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actBlockCipherKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actBlockCipherReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actCRL.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actCertificate.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actCertificateKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actCertificateReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actDate.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actDebug.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actDefaultRNG.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actDerivatorKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actDerivatorReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actEMSAKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actEMSAReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actEnv.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actException.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actFactoryReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actHandle.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actHashKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actHashReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIAccessCondition.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIAgreementKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIAlgorithm.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIBlockCipher.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actICBCMACKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actICRL.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actICertificate.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIDerivator.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIEMSAAlg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIEventHandler.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIEventMonitoring.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIHashAlg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIHashMACKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIIESKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIKeyDerivation.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIKeyFactory.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIMACKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIPadding.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIParam.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIRNGAlg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIRSAKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIRefCounted.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISCardAccess.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISCardOS.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISecurityManager.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISignatureKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISlot.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISlotMonitor.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIStreamCipher.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISubsystem.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISubsystemConfig.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actISynchronize.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIToken.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenAuth.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenConfig.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenExtension.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenFile.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenFileCache.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenFileOwner.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenInitializer.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actITokenPIN.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIX509CRL.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actIX509Certificate.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actInit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actJCAppletKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actJCAppletReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actKey.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actKeyKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actKeyReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actLogger.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actMode.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actMove.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actOID.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actPaddingKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actPaddingReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actRNGKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSCardLock.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSCardOSKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSCardOSReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSCardTokenKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSCardTokenReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSCardUtil.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSlotManager.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actState.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actStreamCipherKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actStreamCipherReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSubsystemKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actSubsystemReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTokenBase.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTokenConfig.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTools.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actToolsECC.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actToolsRSA.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actTypeTags.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actX509Extension.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actX509KeyReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actX509Kit.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actX509SignHashReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/include/actX509SignReg.h[ADD], - actlibrary/OpenSUSE-11-x86_64/Release/libact.a[ADD], - actlibrary/README.txt[ADD], actlibrary/SLES-10-i686[ADD], - actlibrary/SLES-10-i686/Release[ADD], - actlibrary/SLES-10-i686/Release/include[ADD], - actlibrary/SLES-10-i686/Release/include/actAlgorithm.h[ADD], - actlibrary/SLES-10-i686/Release/include/actAllocator.h[ADD], - actlibrary/SLES-10-i686/Release/include/actBasics.h[ADD], - actlibrary/SLES-10-i686/Release/include/actBlob.h[ADD], - actlibrary/SLES-10-i686/Release/include/actBlockCipherKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actBlockCipherReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actCRL.h[ADD], - actlibrary/SLES-10-i686/Release/include/actCertificate.h[ADD], - actlibrary/SLES-10-i686/Release/include/actCertificateKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actCertificateReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actDate.h[ADD], - actlibrary/SLES-10-i686/Release/include/actDebug.h[ADD], - actlibrary/SLES-10-i686/Release/include/actDefaultRNG.h[ADD], - actlibrary/SLES-10-i686/Release/include/actDerivatorKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actDerivatorReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actEMSAKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actEMSAReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actEnv.h[ADD], - actlibrary/SLES-10-i686/Release/include/actException.h[ADD], - actlibrary/SLES-10-i686/Release/include/actFactoryReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actHandle.h[ADD], - actlibrary/SLES-10-i686/Release/include/actHashKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actHashReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIAccessCondition.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIAgreementKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIAlgorithm.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIBlockCipher.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/SLES-10-i686/Release/include/actICBCMACKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actICRL.h[ADD], - actlibrary/SLES-10-i686/Release/include/actICertificate.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIDerivator.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIEMSAAlg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIEventHandler.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIEventMonitoring.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIHashAlg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIHashMACKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIIESKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIKeyDerivation.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIKeyFactory.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIMACKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIPadding.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIParam.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIRNGAlg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIRSAKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIRefCounted.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISCardAccess.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISCardOS.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISecurityManager.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISignatureKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISlot.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISlotMonitor.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIStreamCipher.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISubsystem.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISubsystemConfig.h[ADD], - actlibrary/SLES-10-i686/Release/include/actISynchronize.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIToken.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenAuth.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenConfig.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenExtension.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenFile.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenFileCache.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenFileOwner.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenInitializer.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actITokenPIN.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIX509CRL.h[ADD], - actlibrary/SLES-10-i686/Release/include/actIX509Certificate.h[ADD], - actlibrary/SLES-10-i686/Release/include/actInit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actJCAppletKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actJCAppletReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actKey.h[ADD], - actlibrary/SLES-10-i686/Release/include/actKeyKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actKeyReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actLogger.h[ADD], - actlibrary/SLES-10-i686/Release/include/actMode.h[ADD], - actlibrary/SLES-10-i686/Release/include/actMove.h[ADD], - actlibrary/SLES-10-i686/Release/include/actOID.h[ADD], - actlibrary/SLES-10-i686/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actPaddingKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actPaddingReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actRNGKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSCardLock.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSCardOSKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSCardOSReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSCardTokenKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSCardTokenReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSCardUtil.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSlotManager.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actState.h[ADD], - actlibrary/SLES-10-i686/Release/include/actStreamCipherKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actStreamCipherReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSubsystemKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actSubsystemReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTokenBase.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTokenConfig.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTools.h[ADD], - actlibrary/SLES-10-i686/Release/include/actToolsECC.h[ADD], - actlibrary/SLES-10-i686/Release/include/actToolsRSA.h[ADD], - actlibrary/SLES-10-i686/Release/include/actTypeTags.h[ADD], - actlibrary/SLES-10-i686/Release/include/actX509Extension.h[ADD], - actlibrary/SLES-10-i686/Release/include/actX509KeyReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actX509Kit.h[ADD], - actlibrary/SLES-10-i686/Release/include/actX509SignHashReg.h[ADD], - actlibrary/SLES-10-i686/Release/include/actX509SignReg.h[ADD], - actlibrary/SLES-10-i686/Release/libact.a[ADD], - actlibrary/SLES-11-i686[ADD], - actlibrary/SLES-11-i686/Release[ADD], - actlibrary/SLES-11-i686/Release/include[ADD], - actlibrary/SLES-11-i686/Release/include/actAlgorithm.h[ADD], - actlibrary/SLES-11-i686/Release/include/actAllocator.h[ADD], - actlibrary/SLES-11-i686/Release/include/actBasics.h[ADD], - actlibrary/SLES-11-i686/Release/include/actBlob.h[ADD], - actlibrary/SLES-11-i686/Release/include/actBlockCipherKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actBlockCipherReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actCRL.h[ADD], - actlibrary/SLES-11-i686/Release/include/actCertificate.h[ADD], - actlibrary/SLES-11-i686/Release/include/actCertificateKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actCertificateReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actDate.h[ADD], - actlibrary/SLES-11-i686/Release/include/actDebug.h[ADD], - actlibrary/SLES-11-i686/Release/include/actDefaultRNG.h[ADD], - actlibrary/SLES-11-i686/Release/include/actDerivatorKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actDerivatorReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actEMSAKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actEMSAReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actEnv.h[ADD], - actlibrary/SLES-11-i686/Release/include/actException.h[ADD], - actlibrary/SLES-11-i686/Release/include/actFactoryReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actHandle.h[ADD], - actlibrary/SLES-11-i686/Release/include/actHashKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actHashReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIAccessCondition.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIAgreementKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIAlgorithm.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIBlockCipher.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/SLES-11-i686/Release/include/actICBCMACKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actICRL.h[ADD], - actlibrary/SLES-11-i686/Release/include/actICertificate.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIDerivator.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIEMSAAlg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIEventHandler.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIEventMonitoring.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIHashAlg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIHashMACKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIIESKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIKeyDerivation.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIKeyFactory.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIMACKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIPadding.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIParam.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIRNGAlg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIRSAKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIRefCounted.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISCardAccess.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISCardOS.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISecurityManager.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISignatureKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISlot.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISlotMonitor.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIStreamCipher.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISubsystem.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISubsystemConfig.h[ADD], - actlibrary/SLES-11-i686/Release/include/actISynchronize.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIToken.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenAuth.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenConfig.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenExtension.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenFile.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenFileCache.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenFileOwner.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenInitializer.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actITokenPIN.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIX509CRL.h[ADD], - actlibrary/SLES-11-i686/Release/include/actIX509Certificate.h[ADD], - actlibrary/SLES-11-i686/Release/include/actInit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actJCAppletKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actJCAppletReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actKey.h[ADD], - actlibrary/SLES-11-i686/Release/include/actKeyKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actKeyReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actLogger.h[ADD], - actlibrary/SLES-11-i686/Release/include/actMode.h[ADD], - actlibrary/SLES-11-i686/Release/include/actMove.h[ADD], - actlibrary/SLES-11-i686/Release/include/actOID.h[ADD], - actlibrary/SLES-11-i686/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actPaddingKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actPaddingReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actRNGKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSCardLock.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSCardOSKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSCardOSReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSCardTokenKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSCardTokenReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSCardUtil.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSlotManager.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actState.h[ADD], - actlibrary/SLES-11-i686/Release/include/actStreamCipherKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actStreamCipherReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSubsystemKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actSubsystemReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTokenBase.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTokenConfig.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTools.h[ADD], - actlibrary/SLES-11-i686/Release/include/actToolsECC.h[ADD], - actlibrary/SLES-11-i686/Release/include/actToolsRSA.h[ADD], - actlibrary/SLES-11-i686/Release/include/actTypeTags.h[ADD], - actlibrary/SLES-11-i686/Release/include/actX509Extension.h[ADD], - actlibrary/SLES-11-i686/Release/include/actX509KeyReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actX509Kit.h[ADD], - actlibrary/SLES-11-i686/Release/include/actX509SignHashReg.h[ADD], - actlibrary/SLES-11-i686/Release/include/actX509SignReg.h[ADD], - actlibrary/SLES-11-i686/Release/libact.a[ADD], - actlibrary/Ubuntu-9-i686[ADD], - actlibrary/Ubuntu-9-i686/Release[ADD], - actlibrary/Ubuntu-9-i686/Release/include[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actAlgorithm.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actAllocator.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actBasics.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actBlob.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actBlockCipherKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actBlockCipherReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actCRL.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actCertificate.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actCertificateKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actCertificateReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actDate.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actDebug.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actDefaultRNG.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actDerivatorKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actDerivatorReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actEMSAKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actEMSAReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actEnv.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actException.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actFactoryReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actHandle.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actHashKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actHashReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIAccessCondition.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIAgreementKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIAlgorithm.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIBlockCipher.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actICBCMACKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actICRL.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actICertificate.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIDerivator.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIEMSAAlg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIEventHandler.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIEventMonitoring.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIHashAlg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIHashMACKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIIESKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIKeyDerivation.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIKeyFactory.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIMACKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIPadding.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIParam.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIRNGAlg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIRSAKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIRefCounted.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISCardAccess.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISCardOS.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISecurityManager.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISignatureKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISlot.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISlotMonitor.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIStreamCipher.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISubsystem.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISubsystemConfig.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actISynchronize.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIToken.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenAuth.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenConfig.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenExtension.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenFile.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenFileCache.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenFileOwner.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenInitializer.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actITokenPIN.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIX509CRL.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actIX509Certificate.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actInit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actJCAppletKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actJCAppletReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actKey.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actKeyKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actKeyReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actLogger.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actMode.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actMove.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actOID.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actPaddingKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actPaddingReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actRNGKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSCardLock.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSCardOSKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSCardOSReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSCardTokenKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSCardTokenReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSCardUtil.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSlotManager.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actState.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actStreamCipherKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actStreamCipherReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSubsystemKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actSubsystemReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTokenBase.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTokenConfig.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTools.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actToolsECC.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actToolsRSA.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actTypeTags.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actX509Extension.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actX509KeyReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actX509Kit.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actX509SignHashReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/include/actX509SignReg.h[ADD], - actlibrary/Ubuntu-9-i686/Release/libact.a[ADD], - actlibrary/mingw32-i586[ADD], - actlibrary/mingw32-i586/Release[ADD], - actlibrary/mingw32-i586/Release/include[ADD], - actlibrary/mingw32-i586/Release/include/actAlgorithm.h[ADD], - actlibrary/mingw32-i586/Release/include/actAllocator.h[ADD], - actlibrary/mingw32-i586/Release/include/actBasics.h[ADD], - actlibrary/mingw32-i586/Release/include/actBlob.h[ADD], - actlibrary/mingw32-i586/Release/include/actBlockCipherKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actBlockCipherModeKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actBlockCipherModeReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actBlockCipherReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actCRL.h[ADD], - actlibrary/mingw32-i586/Release/include/actCertificate.h[ADD], - actlibrary/mingw32-i586/Release/include/actCertificateKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actCertificateReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actDate.h[ADD], - actlibrary/mingw32-i586/Release/include/actDebug.h[ADD], - actlibrary/mingw32-i586/Release/include/actDefaultRNG.h[ADD], - actlibrary/mingw32-i586/Release/include/actDerivatorKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actDerivatorReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actEMSAKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actEMSAReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actEnv.h[ADD], - actlibrary/mingw32-i586/Release/include/actException.h[ADD], - actlibrary/mingw32-i586/Release/include/actFactoryReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actHandle.h[ADD], - actlibrary/mingw32-i586/Release/include/actHashKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actHashReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actIAccessCondition.h[ADD], - actlibrary/mingw32-i586/Release/include/actIAgreementKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actIAlgorithm.h[ADD], - actlibrary/mingw32-i586/Release/include/actIBlockCipher.h[ADD], - actlibrary/mingw32-i586/Release/include/actIBlockCipherKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actIBlockCipherMode.h[ADD], - actlibrary/mingw32-i586/Release/include/actICBCMACKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actICRL.h[ADD], - actlibrary/mingw32-i586/Release/include/actICertificate.h[ADD], - actlibrary/mingw32-i586/Release/include/actIDerivator.h[ADD], - actlibrary/mingw32-i586/Release/include/actIDerivatorWithHash.h[ADD], - actlibrary/mingw32-i586/Release/include/actIEMSAAlg.h[ADD], - actlibrary/mingw32-i586/Release/include/actIEMSAWithHashAlg.h[ADD], - actlibrary/mingw32-i586/Release/include/actIEventHandler.h[ADD], - actlibrary/mingw32-i586/Release/include/actIEventMonitoring.h[ADD], - actlibrary/mingw32-i586/Release/include/actIHashAlg.h[ADD], - actlibrary/mingw32-i586/Release/include/actIHashMACKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actIIESKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actIKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actIKeyDerivation.h[ADD], - actlibrary/mingw32-i586/Release/include/actIKeyFactory.h[ADD], - actlibrary/mingw32-i586/Release/include/actIMACKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actIPKCS15Behavior.h[ADD], - actlibrary/mingw32-i586/Release/include/actIPadding.h[ADD], - actlibrary/mingw32-i586/Release/include/actIParam.h[ADD], - actlibrary/mingw32-i586/Release/include/actIRNGAlg.h[ADD], - actlibrary/mingw32-i586/Release/include/actIRSAKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actIRefCounted.h[ADD], - actlibrary/mingw32-i586/Release/include/actISCardAccess.h[ADD], - actlibrary/mingw32-i586/Release/include/actISCardOS.h[ADD], - actlibrary/mingw32-i586/Release/include/actISCardOSBehavior.h[ADD], - actlibrary/mingw32-i586/Release/include/actISecurityManager.h[ADD], - actlibrary/mingw32-i586/Release/include/actISignatureKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actISlot.h[ADD], - actlibrary/mingw32-i586/Release/include/actISlotMonitor.h[ADD], - actlibrary/mingw32-i586/Release/include/actIStreamCipher.h[ADD], - actlibrary/mingw32-i586/Release/include/actIStreamCipherKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actISubsystem.h[ADD], - actlibrary/mingw32-i586/Release/include/actISubsystemConfig.h[ADD], - actlibrary/mingw32-i586/Release/include/actISynchronize.h[ADD], - actlibrary/mingw32-i586/Release/include/actIToken.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenAuth.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenAuthOwner.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenBlockCipher.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenBlockCipherKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenConfig.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenExtension.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenFile.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenFileCache.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenFileOwner.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenInitializer.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actITokenPIN.h[ADD], - actlibrary/mingw32-i586/Release/include/actIX509CRL.h[ADD], - actlibrary/mingw32-i586/Release/include/actIX509Certificate.h[ADD], - actlibrary/mingw32-i586/Release/include/actInit.h[ADD], - actlibrary/mingw32-i586/Release/include/actJCAppletKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actJCAppletReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actJCSecureChannelReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actKey.h[ADD], - actlibrary/mingw32-i586/Release/include/actKeyKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actKeyReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actLogger.h[ADD], - actlibrary/mingw32-i586/Release/include/actMode.h[ADD], - actlibrary/mingw32-i586/Release/include/actMove.h[ADD], - actlibrary/mingw32-i586/Release/include/actOID.h[ADD], - actlibrary/mingw32-i586/Release/include/actPKCS15BehaviorKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actPKCS15BehaviorReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actPaddingKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actPaddingReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actProfileGeneratorKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actProfileGeneratorReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actRNGKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actSCardLock.h[ADD], - actlibrary/mingw32-i586/Release/include/actSCardOSKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actSCardOSReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actSCardTokenKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actSCardTokenReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actSCardUtil.h[ADD], - actlibrary/mingw32-i586/Release/include/actSlotManager.h[ADD], - actlibrary/mingw32-i586/Release/include/actSlotMonitorKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actSlotMonitorReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actState.h[ADD], - actlibrary/mingw32-i586/Release/include/actStreamCipherKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actStreamCipherReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actSubsystemKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actSubsystemReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actTokenAuthProtocolKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actTokenAuthProtocolReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actTokenBase.h[ADD], - actlibrary/mingw32-i586/Release/include/actTokenConfig.h[ADD], - actlibrary/mingw32-i586/Release/include/actTokenExtensionKit.h[ADD], - actlibrary/mingw32-i586/Release/include/actTokenExtensionReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actTools.h[ADD], - actlibrary/mingw32-i586/Release/include/actToolsECC.h[ADD], - actlibrary/mingw32-i586/Release/include/actToolsRSA.h[ADD], - actlibrary/mingw32-i586/Release/include/actTypeTags.h[ADD], - actlibrary/mingw32-i586/Release/include/actX509Extension.h[ADD], - actlibrary/mingw32-i586/Release/include/actX509KeyReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actX509Kit.h[ADD], - actlibrary/mingw32-i586/Release/include/actX509SignHashReg.h[ADD], - actlibrary/mingw32-i586/Release/include/actX509SignReg.h[ADD], - actlibrary/mingw32-i586/Release/libact.a[ADD], - openssl-act-engine, openssl-act-engine/CardObject.cpp, - openssl-act-engine/CertificateList.cpp, - openssl-act-engine/Makefile, openssl-act-engine/SlotList.cpp, - openssl-act-engine/USING_ENGINE_act.txt, - openssl-act-engine/actUtility.h[ADD], - openssl-act-engine/engine_securetoken.vcproj: - Initial commit of actLibrary ( see #2 ) , Updates in - openssl-act-engine, extended documentation ( see #6 ) - -2010-09-17 14:02 carsten.pluntke - - * [r11] openssl-act-engine/USING_ENGINE_act.txt[ADD]: - Added a (small) usage howto about the openssl_act engine, based - on the PoC sources, see #6 - -2010-09-03 08:46 carsten.pluntke - - * [r10] openssl-act-engine/default.vs2008.vsprops[ADD], - openssl-act-engine/engine_securetoken.vcproj, - openssl-act-engine/win32_win2000.vs2008.vsprops[ADD]: - Update von Flags und Preprocessor-Defines, see #2 - -2010-09-03 08:35 carsten.pluntke - - * [r9] Test_Qt_Frontend/QtSslTest.pro: - Anpassung Includepfad an den neuen Dateibaum, see #2 - -2010-09-02 15:58 carsten.pluntke - - * [r8] Test_Qt_Frontend[ADD], Test_Qt_Frontend/QtSslTest.pro[ADD], - Test_Qt_Frontend/pindialog.cpp[ADD], - Test_Qt_Frontend/pindialog.h[ADD], - Test_Qt_Frontend/qtssltest.cpp[ADD], - Test_Qt_Frontend/smartcardauth.cpp[ADD], - Test_Qt_Frontend/smartcardauth.h[ADD], - Test_Qt_Frontend/swsign_cert.pem[ADD], - Test_Qt_Frontend/swsign_interm.pem[ADD], - Test_Qt_Frontend/swsign_root.pem[ADD]: - References #2 - -2010-09-02 15:56 carsten.pluntke - - * [r7] Sample_Executables[ADD], Sample_Executables/Win32[ADD], - Sample_Executables/Win32/engine_act.dll[ADD], - openssl-act-engine[ADD], openssl-act-engine/CardKey.cpp[ADD], - openssl-act-engine/CardKey.h[ADD], - openssl-act-engine/CardObject.cpp[ADD], - openssl-act-engine/CardObject.h[ADD], - openssl-act-engine/CertificateList.cpp[ADD], - openssl-act-engine/CertificateList.h[ADD], - openssl-act-engine/Init_Engine.h[ADD], - openssl-act-engine/Makefile[ADD], - openssl-act-engine/ReadMe.txt[ADD], - openssl-act-engine/SecOpGuard.cpp[ADD], - openssl-act-engine/SecOpGuard.h[ADD], - openssl-act-engine/SlotList.cpp[ADD], - openssl-act-engine/SlotList.h[ADD], - openssl-act-engine/SyncObject.h[ADD], - openssl-act-engine/SyncObjectMacOS.h[ADD], - openssl-act-engine/SyncObjectPosix.h[ADD], - openssl-act-engine/SyncObjectSolaris.h[ADD], - openssl-act-engine/SyncObjectWin32.h[ADD], - openssl-act-engine/SyncObjectWinCE.h[ADD], - openssl-act-engine/Warns.h[ADD], - openssl-act-engine/dllmain.cpp[ADD], - openssl-act-engine/engine_front.cpp[ADD], - openssl-act-engine/engine_sct.cpp[ADD], - openssl-act-engine/engine_sct.h[ADD], - openssl-act-engine/engine_sct_internal.h[ADD], - openssl-act-engine/engine_securetoken.cpp[ADD], - openssl-act-engine/engine_securetoken.sln[ADD], - openssl-act-engine/engine_securetoken.vcproj[ADD], - openssl-act-engine/stdafx.cpp[ADD], - openssl-act-engine/stdafx.h[ADD], - openssl-act-engine/targetver.h[ADD], - openssl-act-engine/test_engine.cpp[ADD]: - References #2 - -2010-09-02 12:32 carsten.pluntke - - * [r6] qt/patch/qt-sources-patch.diff[ADD]: - Fixes #2 - -2010-07-12 13:49 marc - - * [r5] swisssign-openssl-pkcs11-engine/COPYING[ADD], - swisssign-openssl-pkcs11-engine/INSTALL[ADD], - swisssign-openssl-pkcs11-engine/configure.in, - swisssign-openssl-pkcs11-engine/doc/makefile.am: - first compilable version, refs #1 - -2010-07-12 13:46 marc - - * [r4] swisssign-openssl-pkcs11-engine[ADD], - swisssign-openssl-pkcs11-engine/AUTHORS[ADD], - swisssign-openssl-pkcs11-engine/ChangeLog[ADD], - swisssign-openssl-pkcs11-engine/NEWS[ADD], - swisssign-openssl-pkcs11-engine/README[ADD], - swisssign-openssl-pkcs11-engine/bootstrap.sh[ADD], - swisssign-openssl-pkcs11-engine/configure.in[ADD], - swisssign-openssl-pkcs11-engine/doc[ADD], - swisssign-openssl-pkcs11-engine/doc/doxyfile.in[ADD], - swisssign-openssl-pkcs11-engine/doc/makefile.am[ADD], - swisssign-openssl-pkcs11-engine/makefile.am[ADD], - swisssign-openssl-pkcs11-engine/src[ADD], - swisssign-openssl-pkcs11-engine/src/main.cxx[ADD], - swisssign-openssl-pkcs11-engine/src/makefile.am[ADD]: - basic subproject structure, see #1 - -2010-07-12 13:45 marc - - * [r3] qt[ADD], qt/patch[ADD], - qt/qt-everywhere-opensource-src-4.6.3.tar.gz[ADD]: - prepared to add qt-patch and build library, see #1 - -2010-07-12 13:43 marc - - * [r2] swisssurfer[ADD], swisssurfer/AUTHORS[ADD], - swisssurfer/COPYING[ADD], swisssurfer/ChangeLog[ADD], - swisssurfer/INSTALL[ADD], swisssurfer/NEWS[ADD], - swisssurfer/README[ADD], swisssurfer/bootstrap.sh[ADD], - swisssurfer/configure.in[ADD], swisssurfer/doc[ADD], - swisssurfer/doc/doxyfile.in[ADD], - swisssurfer/doc/makefile.am[ADD], - swisssurfer/doc/screenshot.png[ADD], - swisssurfer/makefile.am[ADD], swisssurfer/src[ADD], - swisssurfer/src/browser.hxx[ADD], - swisssurfer/src/browser.ui[ADD], - swisssurfer/src/languages.qrc.in[ADD], - swisssurfer/src/main.cxx[ADD], swisssurfer/src/makefile.am[ADD], - swisssurfer/src/qmake.pro.in[ADD], - swisssurfer/src/resources[ADD], - swisssurfer/src/resources.qrc[ADD], - swisssurfer/src/resources/icons[ADD], - swisssurfer/src/resources/icons/back.png[ADD], - swisssurfer/src/resources/icons/forward.png[ADD], - swisssurfer/src/resources/icons/gohome.png[ADD], - swisssurfer/src/resources/icons/reload.png[ADD], - swisssurfer/src/resources/icons/source[ADD], - swisssurfer/src/resources/icons/stop.png[ADD], - swisssurfer/src/resources/icons/up.png[ADD], - swisssurfer/src/swisssurfer_de.ts[ADD], - swisssurfer/src/swisssurfer_en.ts[ADD], - swisssurfer/src/swisssurfer_fr.ts[ADD], - swisssurfer/src/swisssurfer_it.ts[ADD]: - copied swisssurfer from - https://dev.marc.waeckerlin.org/svn/swisssurfer/trunk, version - 15,refs #1 - -2010-07-07 13:36 www-data - - * [r1] .[ADD]: - start - diff --git a/INSTALL b/INSTALL index 7d1c323..2ff81d3 100644 --- a/INSTALL +++ b/INSTALL @@ -1,365 +1,136 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults +Install Software ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. +There are prebuilt software packages in the repositories, look in +https://repository.mrw.sh for your operating system. -Defining Variables -================== +Note: PublicKey has changed on Novmber 1st 2015, please import the new +key. - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +Linux +----- - ./configure CC=/usr/local2/bin/gcc +There are package repositories for most distributions at https://repository.mrw.sh. -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). +### Ubuntu and Debian -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +To accept my signature, install my key: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + wget -O- https://repository.mrw.sh/PublicKey \ + | sudo apt-key add - -`configure' Invocation -====================== +You can install all software using your package manager (`apt`), first install the repository: - `configure' recognizes the following options to control how it -operates. + sudo apt-get install -y wget software-properties-common apt-transport-https + sudo apt-add-repository https://repository.mrw.sh + sudo apt-get update -y +Then you can install any project you wish, e.g. [`webtester`](https://mrw.sh/development/webtester): -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. + sudo apt-get install webtester -y -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. +### OpenSUSE -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. +To accept my signature, install my key: -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. + wget https://repository.mrw.sh/PublicKey + rpm --import PublicKey -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. +You can use your packagemanager (`zypper` or _YaST_). First install the repostitory: -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). + zypper ar https://repository.mrw.sh/opensuse/marc-waeckerlin.repo -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. +Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester): -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. + zypper install webtester -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. +In case of trouble: Check if your version of OpenSUSE is supported, +use `lsb_release -rs` to get the version of your OpenSUSE: +https://drepository.mrw.sh/opensuse -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +### Fedora +To accept my signature, install my key: + + wget https://repository.mrw.sh/PublicKey + rpm --import PublicKey + +You can use your packagemanager (`dnf`). First install the repository: + + dnf install 'dnf-command(config-manager)' + dnf config-manager --add-repo https://repository.mrw.sh/fedora/marc-waeckerlin.repo + +Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester): + + dnf install webtester + +In case of trouble: Check if your version of Fedora is supported, use `lsb_release -rs` to get the version of your Fedora: https://repository.mrw.sh/fedora + +### CentOS + +To accept my signature, install my key: + + wget https://repository.mrw.sh/PublicKey + rpm --import PublicKey + +You can use your packagemanager (`yum`). First install the repository: + + yum install wget + wget -O/etc/yum.repos.d/marc-waeckerlin.repo https://repository.mrw.sh/centos/marc-waeckerlin.repo + +Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester): + + yum install webtester + +In case of trouble: Check if your version of CentOS is supported, use lsb_release -rs to get the version of your CentOS: https://repository.mrw.sh/centos + +### Mageia + +To accept my signature, install my key: + + wget https://repository.mrw.sh/PublicKey + rpm --import PublicKey + +You can use your packagemanager (`dnf`). First install the repository: + + dnf install 'dnf-command(config-manager)' + dnf config-manager --add-repo https://repository.mrw.sh/mageia/marc-waeckerlin.repo + +Then install packages from the repository, e.g. [`webtester`](https://mrw.sh/development/webtester): + + dnf install webtester + +### Other Linux Distributions + +Either use the nearest possible distribution, or use alien to convert from another distribution to your preferred package format, or compile the project yourself (see below). + +Windows +------- + +Download from https://repository.mrw.sh/windows + +MacOSX +------ + +You need e.g. Mac Ports to compile. Install the following dependencies: + + sudo port install subversion svn2cl doxygen graphviz cppunit libtool boost log4cxx qt5-mac + +Fix libtool-bug: + + sudo ln -s /opt/local/bin/glibtoolize /opt/local/bin/libtoolize + +Compile from Source +------------------- + +For all unsupported operating systems, including MacOSX. + +To compile, please download the tar-sources from: https://repository.mrw.sh/sources + +Then untar the package and use the common commands, e.g. for version `1.0.2` of a project named project, that means: + + tar xzf project-1.0.2.tar.gz + cd project-1.0.2 + ./bootstrap.sh + ./configure + make + sudo make install \ No newline at end of file diff --git a/ax_check_qt.m4 b/ax_check_qt.m4 index 7ba286f..58627ee 100644 --- a/ax_check_qt.m4 +++ b/ax_check_qt.m4 @@ -119,10 +119,17 @@ AC_DEFUN([AX_CHECK_QT], [ AC_DEFINE([HAVE_$1]) QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core) qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core) - if test -d "${qt_host_bins}"; then - QT_PLUGIN_PATH=${qt_host_bins}/../plugins - else - QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins + qt_libdir=$(${PKG_CONFIG} --variable=libdir Qt5Core) + if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/plugins" + elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins" + elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then + QT_PLUGIN_PATH="${qt_host_bins}/../plugins" + elif test -d "${QTDIR}/plugins; then + QT_PLUGIN_PATH="${QTDIR}/plugins" + elif test -d "${QTDIR}/share/qt5/plugins; then + QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins" fi MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" [$1]_CPPFLAGS="${[$1]5_CFLAGS}" @@ -166,10 +173,17 @@ AC_DEFUN([AX_CHECK_QT], [ AC_DEFINE([HAVE_$1]) QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore) qt_host_bins=$(${PKG_CONFIG} --variable=host_bins QtCore) - if test -d "${qt_host_bins}"; then - QT_PLUGIN_PATH=${qt_host_bins}/../plugins - else - QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins + qt_libdir=$(${PKG_CONFIG} --variable=libdir QtCore) + if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/plugins" + elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then + QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins" + elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then + QT_PLUGIN_PATH="${qt_host_bins}/../plugins" + elif test -d "${QTDIR}/plugins; then + QT_PLUGIN_PATH="${QTDIR}/plugins" + elif test -d "${QTDIR}/share/qt5/plugins; then + QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins" fi MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}" [$1]_CPPFLAGS="${[$1]_CFLAGS}" @@ -214,9 +228,6 @@ AC_DEFUN([AX_CHECK_QT], [ AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag]) fi test "x$prefix" = xNONE && prefix=$ac_default_prefix - if test "${QT_PLUGIN_PATH}" = "${QT_PLUGIN_PATH#${prefix}}"; then - QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr} - fi AC_ARG_WITH([qt-plugin-path], [AS_HELP_STRING([--with-qt-plugin-path=PATH], [define a different qt plugin path, current @<:@default=check@:>@])], @@ -230,6 +241,7 @@ AC_DEFUN([AX_CHECK_QT], [ AC_SUBST(CXXFLAGS) AC_SUBST(PKG_REQUIREMENTS) AX_ADDITIONAL_QT_RULES_HACK=' +#### Begin: Appended by $0 LANGUAGE_FILE_BASE ?= translations @@ -241,7 +253,6 @@ moc_%.cxx: %.hxx qrc_%.cxx: %.qrc $(RCC) -o [$][@] -name ${<:%.qrc=%} $< - AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK) #%.qrc: % # cwd=$$(pwd) && cd $< && $(RCC) -project -o $${cwd}/[$][@] @@ -249,12 +260,15 @@ qrc_%.cxx: %.qrc %.qm: %.ts ${LRELEASE} $< -qm [$][@] -%.ts: ${LANGUAGE_FILES:%=%} +%.ts: ${LANGUAGE_FILES} ${LUPDATE} -no-obsolete \ - -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \ - -ts [$][@] $< + -target-language [$]{@:${LANGUAGE_FILE_BASE}_%.ts=%} \ + [$][^] \ + -ts [$][@] -']) +#### End: $0 +' +]) AC_DEFUN([AX_REQUIRE_QT], [ AX_CHECK_QT([$1], [$2], [$3], [$4]) @@ -269,3 +283,13 @@ AC_DEFUN([AX_REQUIRE_QT], [ AC_DEFUN([AX_QT_NO_KEYWORDS], [ CPPFLAGS+=" -DQT_NO_KEYWORDS" ]) + +AC_DEFUN([AX_INIT_QT], [ + if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then + for f in $(find test examples src -name makefile.in); do + test -f "$f" && cat >> "$f" < +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# Copyright (c) 2016, 2018 Krzesimir Nowak +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], + [$1], [14], [ax_cxx_compile_alternatives="14 1y"], + [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], + [$3], [optional], [ax_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) +]) + + +dnl Test body for checking C++11 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + + +dnl Test body for checking C++14 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Tests for new features in C++11 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#else + +namespace cxx14 +{ + + namespace test_polymorphic_lambdas + { + + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + + } + + namespace test_binary_literals + { + + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + + } + + namespace test_generalized_constexpr + { + + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + + } + + namespace test_lambda_init_capture + { + + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + + } + + namespace test_digit_separators + { + + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + + } + + namespace test_return_type_deduction + { + + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same::value, ""); + static_assert(is_same::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201703L + +#error "This is not a C++17 compiler" + +#else + +#include +#include +#include + +namespace cxx17 +{ + + namespace test_constexpr_lambdas + { + + constexpr int foo = [](){return 42;}(); + + } + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + + template + int multiply(Args... args) + { + return (args * ... * 1); + } + + template + bool all(Args... args) + { + return (args && ...); + } + + } + + namespace test_extended_static_assert + { + + static_assert (true); + + } + + namespace test_auto_brace_init_list + { + + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same, decltype(foo)>::value); + static_assert(std::is_same::value); + } + + namespace test_typename_in_template_template_parameter + { + + template typename X> struct D; + + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + + } + + namespace test_extended_aggregate_initialization + { + + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + + } + + namespace test_general_range_based_for_loop + { + + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + + } + + namespace test_lambda_capture_asterisk_this_by_value + { + + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + + } + + namespace test_enum_class_construction + { + + enum class byte : unsigned char + {}; + + byte foo {42}; + + } + + namespace test_constexpr_if + { + + template + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + + } + + namespace test_selection_statement_with_initializer + { + + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + + } + + namespace test_template_argument_deduction_for_class_templates + { + + template + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + + } + + namespace test_non_type_auto_template_parameters + { + + template + struct B + {}; + + B<5> b1; + B<'a'> b2; + + } + + namespace test_structured_bindings + { + + int arr[2] = { 1, 2 }; + std::pair pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + + } + + namespace test_exception_spec_type_system + { + + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template + Bad + f(T*, T*); + + template + Good + f(T1*, T2*); + + static_assert (std::is_same_v); + + } + + namespace test_inline_variables + { + + template void f(T) + {} + + template inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + + } + +} // namespace cxx17 + +#endif // __cplusplus < 201703L + +]]) diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 8ce3d18..369f3b2 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -1,4 +1,4 @@ -## @id $Id$ +## @id $Id: ax_init_standard_project.m4 204 2016-09-29 18:29:53Z marc $ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -13,12 +13,12 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], mrw_esyscmd_s([ VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" for path in . .. ../.. ../../..; do - if test -d .svn; then - svn upgrade 1>&2 > /dev/null || true + if test -d ${path}/.svn; then + (cd $path; svn upgrade 1>&2 > /dev/null || true) VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') if test -n "${VCS_REVISION}"; then break; fi - elif test -d .git; then - VCS_REVISION=$(git rev-list --all --count) + elif test -d ${path}/.git; then + VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count) if test -n "${VCS_REVISION}"; then break; fi fi done @@ -26,12 +26,12 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], ]), mrw_esyscmd_s([ VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" for path in . .. ../.. ../../..; do - if test -d .svn; then - svn upgrade 1>&2 > /dev/null || true + if test -d ${path}/.svn; then + (cd $path; svn upgrade 1>&2 > /dev/null || true) VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') if test -n "${VCS_REVISION}"; then break; fi - elif test -d .git; then - VCS_REVISION=$(git rev-list --all --count) + elif test -d ${path}/.git; then + VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count) if test -n "${VCS_REVISION}"; then break; fi fi done @@ -44,12 +44,12 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([ VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" for path in . .. ../.. ../../..; do - if test -d .svn; then - svn upgrade 1>&2 > /dev/null || true + if test -d ${path}/.svn; then + (cd $path; svn upgrade 1>&2 > /dev/null || true) VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') if test -n "${VCS_REVISION}"; then break; fi - elif test -d .git; then - VCS_REVISION=$(git rev-list --all --count) + elif test -d ${path}/.git; then + VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count) if test -n "${VCS_REVISION}"; then break; fi fi; done @@ -90,7 +90,7 @@ dnl refers to ${prefix}. Thus we have to use `eval' twice. # $3 = filename of makefile.in AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ sh_add_makefile_target_dep() { - sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}" + sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'"${1}"':.*$/& '"${2}"'/' "${srcdir}/${3}" if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then echo "${1}: ${2}" >> "${srcdir}/${3}" fi @@ -170,9 +170,11 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_SUBST(NUMBERS) AX_SUBST(HOME) if test -f README.md; then + README_FILE=README.md README=$(tail -n +3 README.md) - DESCRIPTION=$(head -1 README.md) + DESCRIPTION=$(head -1 README.md | sed 's,^#\+ *,,;s, *#\+$,,') else + README_FILE=README README=$(tail -n +3 README) DESCRIPTION=$(head -1 README) fi @@ -182,6 +184,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ else README_HTML="${README}" fi + AX_SUBST(README_FILE) AX_SUBST(README) _AM_SUBST_NOTMAKE([README]) AX_SUBST(README_ESCAPED) @@ -218,13 +221,25 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ 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}}" + PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}" + for path in . .. ../.. ../../..; do + if test -d ${path}/.svn; then + PROJECT_URL="$(LANG= svn info | sed -n 's,^Repository Root: ,,p')" + break + elif test -d ${path}/.git; then + PROJECT_URL="$(git remote get-url origin)" + break + fi + done + SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${PROJECT_URL}}" 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) + if test "${DISTRO}" = "n/a"; then + DISTRO="${VENDOR}_$(lsb_release -sr 2>/dev/null | tr ' ' '_')" + fi AX_SUBST(DISTRO) ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm)) AX_SUBST(ARCH) @@ -317,7 +332,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) test -f makefile.in && cat >> makefile.in <> nodejs/makefile.in <> html/makefile.in <> doc/makefile.in < +# special name for the RPM development package +# - DEV_DEB_DIST_PKG= +# special name for the debian development package +# - DEV_DIST_PKG= +# if the name of the development package is different # # uses PKG_CHECK_MODULES to test for a module # then, if given, looks for the header file @@ -802,8 +849,6 @@ AC_DEFUN([AX_PKG_REQUIRE], [ AC_MSG_ERROR([Feature $1 not found please install module $secondpar]) fi fi - AX_DEB_DEPEND([${$1_found}]) - AX_RPM_DEPEND([${$1_found}]) [$1]_CPPFLAGS="${$1_CFLAGS}" [$1]_CXXFLAGS="${$1_CFLAGS}" AC_SUBST([$1]_CPPFLAGS) @@ -816,118 +861,33 @@ AC_DEFUN([AX_PKG_REQUIRE], [ else AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS]) fi -]) - -# require a specific development package, with fallback: test for a header -# - parameter: -# $1 = unique id (no special characters) -# $2 = module name (optional, if different from id) -# $3 = a header file to find (optional) -# $4 = alternative module names (space separated, optional) -# $5 = optional flags: -# manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged -# -# uses PKG_CHECK_MODULES to test for a module -# then, if given, looks for the header file -# if header file is not found, searches in alternative modules -# sets all flags, so that the module can be used everywhere -# fails if not found -AC_DEFUN([AX_PKG_REQUIRE_DEV], [ - PKG_PROG_PKG_CONFIG - optional_flags="$5" - $1_found=no - secondpar="m4_default([$2], [$1])" - PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ - $1_found=$secondpar - PKG_REQUIREMENTS+=" $secondpar" - ], [ - if test -n "$4"; then - AC_MSG_WARN([Recommended package $secondpar for feature $1 not installed, trying $4]) - for pkg in $4; do - PKG_CHECK_MODULES([$1], [$pkg], [ - PKG_REQUIREMENTS+=" $pkg" - $1_found=$pkg - break; - ], [ - AC_MSG_WARN([Recommended package $pkg for feature $1 not installed]) - ]) - done - fi - ]) - AC_SUBST(CPPFLAGS) - AC_SUBST(CXXFLAGS) - AC_SUBST(PKG_REQUIREMENTS) - if test -n "$3"; then - if test "${$1_found}" = "no"; then - tmp_package="yes" - else - tmp_package=${$1_found} - fi - $1_found=no - old_CPPFLAGS=${CPPFLAGS} - CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}" - AC_CHECK_HEADER([$3], [ - $1_found=${tmp_package} - ], [ - for x in ${$1_CFLAGS}; do - AC_MSG_NOTICE([search for $3 in ${x[#]-I}]) - for f in $(find ${x[#]-I} -name "$3" 2> /dev/null); do - if test -f "$f"; then - $1_found=${tmp_package} - $1_CFLAGS+=" -I${f%/*}" - AC_MSG_NOTICE([added path ${f%/*}]) - break; - fi - done - if test "${$1_found}" != "no"; then - break; - fi - done - if test "${$1_found}" = "no"; then - tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package) - for x in ${tmp_includedir}; do - AC_MSG_NOTICE([search for $3 in $x]) - for f in $(find ${x} -name "$3" 2> /dev/null); do - if test -f "$f"; then - $1_found=${tmp_package} - $1_CFLAGS+=" -I${f%/*}" - AC_MSG_NOTICE([added path ${f%/*}]) - break; - fi - done - if test "${$1_found}" != "no"; then - break; - fi - done + + DEV_DEB_DIST_PKG= + DEV_RPM_DIST_PKG= + DEV_DIST_PKG= + pkg=m4_default([$2], [$1]) + $6 + deb_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev} + rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel} + if test -n "$4"; then + for f in $pkg $4; do + if test -n "$(apt-cache policy -q ${f}-dev 2> /dev/null)"; then + deb_pkg=${f}-dev + break fi - ]) - CPPFLAGS=${old_CPPFLAGS} - fi - if test "${$1_found}" = "no"; then - if test -n "$3"; then - if test -n "$4"; then - AC_MSG_ERROR([Feature $1 not found, need header $3 in modules $secondpar or $4]) - else - AC_MSG_ERROR([Feature $1 not found, need header $3 in module $secondpar]) + done + for f in $pkg $4; do + if (test -x /usr/bin/zypper && zypper search -x "${f}-devel" 1>&2 > /dev/null) || \ + (test -x /usr/bin/dnf && dnf list -q "${f}-devel" 1>&2 > /dev/null) || \ + (test -x /usr/bin/yum && yum list -q "${f}-devel" 1>&2 > /dev/null) || \ + (test -x /usr/sbin/urpmq && urpmq "${f}-devel" 1>&2 > /dev/null); then + rpm_pkg=${f}-devel + break fi - else - AC_MSG_ERROR([Feature $1 not found please install module $secondpar]) - fi - fi - AX_DEB_BUILD_DEPEND([${$1_found}-dev]) - AX_RPM_BUILD_DEPEND([${$1_found}-devel]) - [$1]_CPPFLAGS="${$1_CFLAGS}" - [$1]_CXXFLAGS="${$1_CFLAGS}" - AC_SUBST([$1]_CPPFLAGS) - AC_SUBST([$1]_CXXFLAGS) - if test "${optional_flags/manualflags/}" = "${optional_flags}"; then - CPPFLAGS+=" ${$1_CPPFLAGS}" - CXXFLAGS+=" ${$1_CXXFLAGS}" - LIBS+=" ${$1_LIBS}" - AC_MSG_NOTICE([Adding flags for $1]) - else - AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS]) + done fi + AX_DEB_BUILD_DEPEND([$deb_pkg]) + AX_RPM_BUILD_DEPEND([$rpm_pkg]) ]) # check if a specific package exists @@ -936,6 +896,13 @@ AC_DEFUN([AX_PKG_REQUIRE_DEV], [ # $2 = module name (optional, if different from id) # $3 = optional flags: # manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged +# $4 = optional parameters, allowed are (evaluated in this order): +# - DEV_RPM_DIST_PKG= +# special name for the RPM development package +# - DEV_DEB_DIST_PKG= +# special name for the debian development package +# - DEV_DIST_PKG= +# if the name of the development package is different # # uses PKG_CHECK_MODULES to test for a module # sets automake conditional HAVE_$1 to 0 (not found) or 1 (found) @@ -965,57 +932,28 @@ AC_DEFUN([AX_PKG_CHECK], [ ], [ HAVE_$1=0 ]) - AX_DEB_BUILD_DEPEND(m4_default([$2], [$1])) - AX_RPM_BUILD_DEPEND(m4_default([$2], [$1])) - AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) - AC_SUBST(HAVE_$1) - AC_SUBST(CPPFLAGS) - AC_SUBST(CXXFLAGS) - AC_SUBST(PKG_REQUIREMENTS) -]) - -# check if a specific development package exists -# - parameter: -# $1 = unique id (no special characters) -# $2 = module name (optional, if different from id) -# $3 = optional flags: -# manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged -# -# uses PKG_CHECK_MODULES to test for a module -# sets automake conditional HAVE_$1 to 0 (not found) or 1 (found) -# sets all flags, so that the module can be used everywhere -AC_DEFUN([AX_PKG_CHECK_DEV], [ - optional_flags="$3" - PKG_PROG_PKG_CONFIG - PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ - HAVE_$1=1 - [$1]_CPPFLAGS="${$1_CFLAGS}" - [$1]_CXXFLAGS="${$1_CFLAGS}" - AC_SUBST([$1]_CPPFLAGS) - AC_SUBST([$1]_CXXFLAGS) - if test "${optional_flags/manualflags/}" = "${optional_flags}"; then - CPPFLAGS+=" ${$1_CPPFLAGS}" - CXXFLAGS+=" ${$1_CXXFLAGS}" - LIBS+=" ${$1_LIBS}" - AC_MSG_NOTICE([Adding flags for $1]) - else - AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS]) - fi - if test -z "$PKG_REQUIREMENTS"; then - PKG_REQUIREMENTS="m4_default([$2], [$1])" - else - PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, m4_default([$2], [$1])" - fi - ], [ - HAVE_$1=0 - ]) - AX_DEB_BUILD_DEPEND(m4_default([$2], [$1])-dev) - AX_RPM_BUILD_DEPEND(m4_default([$2], [$1])-devel) AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) AC_SUBST(HAVE_$1) AC_SUBST(CPPFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(PKG_REQUIREMENTS) + + DEV_DEB_DIST_PKG= + DEV_RPM_DIST_PKG= + DEV_DIST_PKG= + pkg=m4_default([$2], [$1]) + $4 + dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev} + rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel} + if test -n "$(apt-cache policy -q ${deb_pkg} 2> /dev/null)"; then + AX_DEB_BUILD_DEPEND([$deb_pkg]) + fi + if (test -x /usr/bin/zypper && zypper search -x "$rpm_pkg" 1>&2 > /dev/null) || \ + (test -x /usr/bin/dnf && dnf list -q "$rpm_pkg" 1>&2 > /dev/null) || \ + (test -x /usr/bin/yum && yum list -q "$rpm_pkg" 1>&2 > /dev/null) || \ + (test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then + AX_RPM_BUILD_DEPEND([$rpm_pkg]) + fi ]) # make sure, a specific header exists @@ -1024,8 +962,8 @@ AC_DEFUN([AX_PKG_CHECK_DEV], [ # $2 = pathes to search for AC_DEFUN([AX_REQUIRE_HEADER], [ AC_CHECK_HEADER($1, [], [ + found=0 if test -n "$2"; then - found=0 for d in $2; do if test -f "${d}/$1"; then AC_MSG_NOTICE([found file ${d}/$1]) @@ -1138,37 +1076,37 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [ # Check if a package exists in the current distribution, if yes, require it # in debian/control.in append @DEB_DEPEND_IFEXISTS@ to Build-Depends +# if you pass a list, it will require the first matching, if any matches # - parameter: -# $1 = package name +# $1 = space separated list of package names AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [ - pkg="$1" - if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then - DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}" - fi + for pkg in $1; do + if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then + DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}" + break + fi + done ]) # require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends # - parameter: # $1 = package name AC_DEFUN([AX_DEB_BUILD_DEPEND], [ - pkg="$1" - DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}" + DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, $1" ]) # require package in debian/control.in append @DEB_DEPEND@ to Depends # - parameter: # $1 = package name AC_DEFUN([AX_DEB_DEPEND], [ - pkg="$1" - DEB_DEPEND="${DEB_DEPEND}, ${pkg}" + DEB_DEPEND="${DEB_DEPEND}, $1" ]) # require package in debian/control.in append @DEB_DEPEND@ to Depends # - parameter: # $1 = package name AC_DEFUN([AX_DEB_SECTION], [ - pkg="$1" - DEB_SECTION="${pkg}" + DEB_SECTION="$1" ]) # call after setting debian dependencies @@ -1181,36 +1119,36 @@ AC_DEFUN([AX_DEB_RESOLVE], [ # Check if a package exists in the current distribution, if yes, require it # in .spec.in append @RPM_DEPEND_IFEXISTS@ to Build-Depends +# if you pass a list, it will require the first matching, if any matches # - parameter: -# $1 = package name +# $1 = space separated package names AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [ - pkg="$1" - - if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \ - (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \ - (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \ - (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then - RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}" - fi + for pkg in $1; do + if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \ + (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \ + (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \ + (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then + RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}" + break + fi + done ]) # require package in .spec.in append @RPM_BUILD_DEPEND@ to Build-Depends # - parameter: # $1 = package name AC_DEFUN([AX_RPM_BUILD_DEPEND], [ - pkg="$1" - RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}" + RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, $1" ]) # require package in .spec.in append @RPM_DEPEND@ to Depends # - parameter: # $1 = package name AC_DEFUN([AX_RPM_DEPEND], [ - pkg="$1" if test -z "${RPM_DEPEND}"; then - RPM_DEPEND="${pkg}" + RPM_DEPEND="$1" else - RPM_DEPEND="${RPM_DEPEND}, ${pkg}" + RPM_DEPEND="${RPM_DEPEND}, $1" fi ]) @@ -1218,8 +1156,7 @@ AC_DEFUN([AX_RPM_DEPEND], [ # - parameter: # $1 = package name AC_DEFUN([AX_RPM_GROUP], [ - pkg="$1" - RPM_GROUP="${pkg}" + RPM_GROUP="$1" ]) # call after setting rpmian dependencies @@ -1232,36 +1169,23 @@ AC_DEFUN([AX_RPM_RESOLVE], [ # Check if a package exists in the current distribution, if yes, require it # in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends +# if you pass a list, it will require the first matching, if any matches # - parameter: -# $1 = package name +# $1 = space separated list of package names AC_DEFUN([AX_ALL_DEPEND_IFEXISTS], [ - pkg="$1" - if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then - DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}" - fi - if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \ - (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \ - (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \ - (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then - RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}" - fi + AX_DEB_DEPEND_IFEXISTS([$1]) + AX_RPM_DEPEND_IFEXISTS([$1]) ]) # Check if a package exists in the current distribution, if yes, require it # in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends +# if you pass a list, it will require the first matching, if any matches # - parameter: # $1 = package name AC_DEFUN([AX_ALL_DEPEND_IFEXISTS_DEV], [ - pkg="$1" - if test -n "$(apt-cache policy -q ${pkg}-dev 2> /dev/null)"; then - DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}-dev" - fi - if (test -x /usr/bin/zypper && zypper search -x "$pkg"-devel 1>&2 > /dev/null) || \ - (test -x /usr/bin/dnf && dnf list -q "$pkg"-devel 1>&2 > /dev/null) || \ - (test -x /usr/bin/yum && yum list -q "$pkg"-devel 1>&2 > /dev/null) || \ - (test -x /usr/sbin/urpmq && urpmq "$pkg"-devel 1>&2 > /dev/null); then - RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}-devel" - fi + pkgs="$1" + AX_DEB_DEPEND_IFEXISTS([${pkgs// /-dev }-dev]) + AX_RPM_DEPEND_IFEXISTS([${pkgs// /-devel }-devel]) ]) # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends @@ -1273,13 +1197,22 @@ AC_DEFUN([AX_ALL_BUILD_DEPEND], [ RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}" ]) +# require package in .spec.in and control.in, append to runtime depends +# - parameter: +# $1 = package name +AC_DEFUN([AX_ALL_DEPEND], [ + pkg="$1" + DEB_DEPEND="${DEB_DEPEND}, ${pkg}" + RPM_DEPEND="${RPM_DEPEND}, ${pkg}" +]) + # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends # - parameter: # $1 = package name AC_DEFUN([AX_ALL_BUILD_DEPEND_DEV], [ pkg="$1" - DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}-dev" - RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}-devel" + DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg// /-dev}-dev" + RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg// /-devel}-devel" ]) # require package in .spec.in append @ALL_DEPEND@ to Depends @@ -1295,8 +1228,11 @@ AC_DEFUN([AX_ALL_DEPEND], [ fi ]) +# finish configuration - to be called instead of AC_OUTPUT AC_DEFUN([AX_OUTPUT], [ + AX_INIT_QT AX_DEB_RESOLVE AX_RPM_RESOLVE AC_OUTPUT + AC_MSG_NOTICE([configured for ${PACKAGE_NAME}-${VERSION}]) ]) diff --git a/bootstrap.sh b/bootstrap.sh index 1559eac..66c2b96 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,7 +1,7 @@ #! /bin/bash ## @file ## -## $Id$ +## $Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $ ## ## $Date: 2004/08/31 15:57:19 $ ## $Author: marc $ @@ -31,8 +31,9 @@ while test $# -gt 0; do (--configure|-c) configure=1;; (--docker|-d) docker=1;; (--build|-b) configure=1; build=1; buildtarget+=" distcheck";; - (--all|-a) shift; configure=1; build=1; buildtarget+=" all";; - (--clean) shift; configure=1; build=1; buildtarget+=" maintainer-clean";; + (--all|-a) configure=1; build=1; buildtarget+=" all";; + (--install|-i) configure=1; build=1; buildtarget+=" all install";; + (--clean) configure=1; build=1; buildtarget+=" maintainer-clean";; (--target|-t) shift; configure=1; build=1; buildtarget+=" $1";; (--overwrite|-o) overwrite=1;; (--rebuild|-r) rebuild=1;; @@ -40,7 +41,7 @@ while test $# -gt 0; do (--no-vcs|-n) novcs=1;; (--exclude-vcs|-x) shift; excludevcs+=("$1");; (--version|-v) - echo "$Id$"; + echo "$Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $"; exit;; (--help|-h) less < same as -b, but specify target instead of distcheck --overwrite, -o overwrite all basic files (bootstrap.sh, m4-macros) @@ -86,7 +88,7 @@ DESCRIPTION ${DEFAULT_PROJECT_NAME} as the project name for your project in ${PROJECT_PATH}. In the first run, you should call ${MY_NAME} from a checked out the bootstrap-build-environment from - https://dev.marc.waeckerlin.org/, and the path from where you call + https://mrw.sh/, and the path from where you call ${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to your newly created project. Please note that your project must be a checked out subversion or git repository, since this build @@ -96,7 +98,7 @@ DESCRIPTION subversion on https:/path/to/your/new-project: cd ~/svn - svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\ + svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\ bootstrap-build-environment svn co https:/path/to/your/new-project/trunk new-project cd new-project @@ -106,7 +108,7 @@ DESCRIPTION git on https:/path/to/your/new-project: cd ~/svn - svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\ + svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\ bootstrap-build-environment cd ~/git git clone https:/path/to/your/new-project @@ -127,9 +129,8 @@ GENERATED FILES * ${MY_NAME} * autogen.sh - just the basics to initialize auto tools and create configure * ax_init_standard_project.m4 - auxiliary macro definition file - * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file + * ax_cxx_compile_stdcxx.m4 - auxiliary macro definition file * ax_check_qt.m4 - auxiliary macro definition file - * makefile_test.inc.am - makefile to be included in tests * resolve-debbuilddeps.sh - script to install debian package dependencies * resolve-rpmbuilddeps.sh - script to install RPM package dependencies * build-in-docker.sh - script to build the project encapsulated in a docker container @@ -138,10 +139,12 @@ GENERATED FILES * build-resource-file.sh - build resource.qrc file from a resource directory * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle + * dependency-graph.sh - script to draw project dependencies + * template.sh - generic template for bash scripts * test/runtests.sh - template file to run test scripts, i.e. docker based * AUTHORS - replace your name in AUTHORS before first run * NEWS - empty file add your project's news - * README - add project description (first line is header, followed by an empty line) + * README (or README.md) - add project description (first line: header, followed by empty line) * configure.ac - global configuration file template * makefile.am - global makefile template * ${DEFAULT_PROJECT_NAME}.desktop.in - linux desktop file @@ -270,7 +273,7 @@ FILES * Enable C++ testing using CppUnit: AX_USE_CPPUNIT * Enable other tests: AX_BUILD_TEST * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES - * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4) + * Require C++17 support: AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) (see ax_cxx_compile_stdcxx.m4) * Require a QT module: AX_REQUIRE_QT (see ax_check_qt.m4) * Optionally use a QT module: AX_CHECK_QT (see ax_check_qt.m4) * Require a module: AX_PKG_REQUIRE (see ax_init_standard_project.m4) @@ -300,21 +303,110 @@ EOF shift; done -echo -en "\e[1m-> checking:\e[0m for version control system ..." +# check if stdout is a terminal... +if test -t 1; then + + # see if it supports colors... + ncolors=$(tput colors) + + if test -n "$ncolors" && test $ncolors -ge 8; then + bold="$(tput bold)" + underline="$(tput smul)" + standout="$(tput smso)" + normal="$(tput sgr0)" + black="$(tput setaf 0)" + red="$(tput setaf 1)" + green="$(tput setaf 2)" + yellow="$(tput setaf 3)" + blue="$(tput setaf 4)" + magenta="$(tput setaf 5)" + cyan="$(tput setaf 6)" + white="$(tput setaf 7)" + fi +fi + +notice() { + echo "${yellow}→ notice: ${bold}$*${normal}" +} + +running() { + echo -n "${bold}${blue}→ running: ${bold}${white}$*${normal} … " +} + +checking() { + echo -n "${bold}${blue}→ checking: ${bold}${white}$*${normal} … " +} + +generating() { + echo -n "${bold}${blue}→ generating: ${bold}${white}$*${normal} … " +} + +configuring() { + echo -n "${bold}${blue}→ configuring ${bold}${white}$1${normal}:" + shift + echo -n "${white}$*${normal} … " +} + +ignored() { + echo "${bold}${yellow}ignored $*${normal}" +} + +success() { + echo "${bold}${green}success $*${normal}" +} + +error() { + echo "${bold}${red}→ error: $1${normal}" + shift + if test -n "$*"; then + echo "${bold}$*${normal}" + fi + exit 1 +} + +run() { + check=1 + while test $# -gt 0; do + case "$1" in + (--no-check) check=0;; + (*) break;; + esac + shift; + done + running $* + result=$($* 2>&1) + res=$? + if test $res -ne 0; then + if test $check -eq 1; then + error "Failed with return code: $res" "$result" + else + ignored + fi + else + success + fi +} + +checking for version control system VCS="" VCSDEPENDS="" -if test -d .svn; then - VCS="svn" - 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_DEB="git2cl, git," - VCSDEPENDS_RPM="git," - echo -e " \e[32msuccess\e[0m detected ${VCS}" -else - echo -e " \e[33mignored\e[0m" +for path in . .. ../.. ../../..; do + if test -d ${path}/.svn; then + VCS="svn" + VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools," + VCSDEPENDS_RPM="subversion, " + success detected ${VCS} + break + elif test -d ${path}/.git; then + VCS="git" + VCSDEPENDS_DEB="git2cl, git," + VCSDEPENDS_RPM="git, " + success detected ${VCS} + break + fi +done +if test -z "$VCS"; then + ignored fi HEADER='## @id '"\$Id\$"' @@ -342,38 +434,6 @@ CHEADER='/** @id '"\$Id\$"' ' -notice() { - echo -e "\e[1;33m$*\e[0m" -} - -run() { - check=1 - while test $# -gt 0; do - case "$1" in - (--no-check) check=0;; - (*) break;; - esac - shift; - done - echo -en "\e[1m-> running:\e[0m $* ..." - result=$($* 2>&1) - res=$? - if test $res -ne 0; then - if test $check -eq 1; then - echo -e " \e[31merror\e[0m" - echo -e "\e[1m*** Failed with return code: $res\e[0m" - if test -n "$result"; then - echo "$result" - fi - exit 1 - else - echo -e " \e[33mignored\e[0m" - fi - else - echo -e " \e[32msuccess\e[0m" - fi -} - testtag() { local IFS="|" egrep -q '^ *'"($*)"' *(\(.*)? *$' configure.ac @@ -389,7 +449,7 @@ checkdir() { if ! test -d "$1"; then # create path run mkdir -p "$1" if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then - run ${VCS} add "$1" + run --no-check ${VCS} add "$1" fi fi } @@ -426,23 +486,18 @@ to() { return 1 fi checkdir "$(dirname ${1})" - echo -en "\e[1m-> generating:\e[0m $1 ..." + generating $1 result=$(cat > "$1" 2>&1) res=$? if test $res -ne 0; then - echo -e " \e[31merror\e[0m" - echo -e "\e[1m*** Failed with return code: $res\e[0m" - if test -n "$result"; then - echo "$result" - fi - exit 1 + error "Failed with return code: $res" "$result" else - echo -e " \e[32msuccess\e[0m" + success fi run chmod $mode $1 if test $exists -eq 0; then if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then - run ${VCS} add "$1" + run --no-check ${VCS} add "$1" if test "${VCS}" = "svn"; then run svn propset svn:keywords "Id" "$1" fi @@ -467,10 +522,14 @@ copy() { if test "${1%/*}" != "$1"; then test -d "${1%/*}" || svn mkdir "${1%/*}" fi + if ! test -e "${source}"; then + ignored "$1" not found + return + fi run cp "${source}" "$1" if test $exists -eq 0; then if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then - run ${VCS} add "$1" + run --no-check ${VCS} add "$1" if test "${VCS}" = "svn"; then run svn propset svn:keywords "Id" "$1" fi @@ -479,24 +538,20 @@ copy() { } doxyreplace() { - echo -en "\e[1m-> doxyfile:\e[0m configure $1 ..." + configuring doxyfile $1 if sed -i 's|\(^'"$1"' *=\) *.*|\1'" $2"'|g' doc/doxyfile.in; then - echo -e " \e[32msuccess\e[0m" + success else - echo -e " \e[31merror\e[0m" - echo -e "\e[1m**** command: $0 $*\e[0m" - exit 1 + error $0 $* fi } doxyadd() { - echo -en "\e[1m-> doxyfile:\e[0m configure $1 ..." + configuring doxyfile $1 if sed -i '/^'"$1"' *=/a'"$1"' += '"$2" doc/doxyfile.in; then - echo -e " \e[32msuccess\e[0m" + success else - echo -e " \e[31merror\e[0m" - echo -e "\e[1m**** command: $0 $*\e[0m" - exit 1 + error $0 $* fi } @@ -507,18 +562,23 @@ vcs2cl() { else touch "ChangeLog" fi + if test -x $(which timeout); then + local TIMEOUT="timeout 10" + else + local TIMEOUT= + fi if test -x $(which ${VCS}2cl); then if test "${VCS}" = "git"; then - ${VCS}2cl > ChangeLog + $TIMEOUT ${VCS}2cl || true > ChangeLog elif test "${VCS}" = "svn"; then - ${VCS}2cl --break-before-msg -a -i + $TIMEOUT ${VCS}2cl --break-before-msg -a -i || true elif test -n "${VCS}"; then - ${VCS}2cl + $TIMEOUT ${VCS}2cl || true fi fi if test $exists -eq 0; then if test -n "${VCS}" -a $novcs -eq 0 && ! contains "ChangeLog" "${excludevcs[@]}"; then - run ${VCS} add ChangeLog + run --no-check ${VCS} add ChangeLog fi fi } @@ -534,9 +594,8 @@ fi # Initialize the environment: copy ${MY_NAME} copy ax_init_standard_project.m4 -copy ax_cxx_compile_stdcxx_11.m4 +copy ax_cxx_compile_stdcxx.m4 copy ax_check_qt.m4 -copy makefile_test.inc.am copy resolve-debbuilddeps.sh copy resolve-rpmbuilddeps.sh copy build-in-docker.sh @@ -544,6 +603,8 @@ copy rpmsign.exp copy build-resource-file.sh copy sql-to-dot.sed copy mac-create-app-bundle.sh +copy dependency-graph.sh +copy template.sh AUTHOR=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[ultimate\] *\)\?,,p' | head -1) if test -z "${AUTHOR}"; then AUTHOR="FIRSTNAME LASTNAME (URL) " @@ -554,11 +615,18 @@ EOF to NEWS < /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="" + EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}" + ${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log" + ${PACKAGE_NAME_UPPER}_USER="${PACKAGE_NAME}" + ${PACKAGE_NAME_UPPER}_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 + if test -n "\${${PACKAGE_NAME_UPPER}_USER}"; then + exec sudo -u "\${${PACKAGE_NAME_UPPER}_USER}" \${EXEC_${PACKAGE_NAME_UPPER}} \${${PACKAGE_NAME_UPPER}_PORT} >> \${${PACKAGE_NAME_UPPER}_LOG} 2>&1 else - exec \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1 + exec \${EXEC_${PACKAGE_NAME_UPPER}} \${${PACKAGE_NAME_UPPER}_PORT} >> \${${PACKAGE_NAME_UPPER}_LOG} 2>&1 fi end script pre-start script - ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log" + ${PACKAGE_NAME_UPPER}_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} + echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> \${${PACKAGE_NAME_UPPER}_LOG} end script pre-stop script - ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log" + ${PACKAGE_NAME_UPPER}_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} + echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> \${${PACKAGE_NAME_UPPER}_LOG} end script EOF to --condition AX_USE_NODEJS nodejs/etc/systemd/system/${PACKAGE_NAME}.service < - $(head -1 README) + $DESCRIPTION -

$(head -1 README)

+

$DESCRIPTION

generated by bootstrap, please edit

@@ -1284,6 +1354,9 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs LDADD = -l${PACKAGE_NAME#lib} +exampledir = \${docdir}/examples +example_DATA = + MAINTAINERCLEANFILES = makefile.in EOF to --condition AX_BUILD_HTML_NPM html/package.json.in < 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) -%else -$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt-devel"; fi) -%endif -%else%if 0%{?suse_version} || 0%{?sles_version} -BuildRequires: pkg-config, lsb-release$( - if testtag AX_USE_CPPUNIT; then - echo -n ", libcppunit-devel"; + +#### os dependent definitions #### +%if 0%{?suse_version} || 0%{?sles_version} +BuildRequires: lsb-release$( + if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then + echo -n ", libqt5-qtbase-devel, libqt5-qttools, libqt5-linguist-devel, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel"; fi) -%if 0%{?suse_version} < 1200 || 0%{?sles_version} < 1200 -$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi) %else -$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi) +%if 0%{?mageia} +BuildRequires: rpm-sign, lsb-release +$( + if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then + echo -n "BuildRequires: qtbase5-common-devel, qttools5, lib64qt5webkit-devel, lib64qt5webkitwidgets-devel"; + fi) +%else +$( + if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then + echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel"; + fi) +BuildRequires: rpm-sign, redhat-lsb +%global debug_package %{nil} %endif -%endif%endif +%endif +$( + if testtag AX_USE_DOXYGEN; then cat < /dev/null; then + run libtoolize --force; +elif which glibtoolize > /dev/null; then + run glibtoolize --force; +else + echo "error: libtoolize not found" 1>&2 + exit 1 +fi +EOF1 +fi) automake -a autoconf EOF @@ -1792,15 +1874,25 @@ ${HEADER}SUBDIRS =${SUBDIRS} desktopdir = \${datadir}/applications desktop_DATA = @PACKAGE_DESKTOP@ -dist_pkgdata_DATA = @PACKAGE_ICON@ ax_check_qt.m4 bootstrap.sh \\ - resolve-rpmbuilddeps.sh autogen.sh \\ - ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh \\ +dist_pkgdata_DATA = @PACKAGE_ICON@ +dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh \\ + resolve-rpmbuilddeps.sh autogen.sh \\ + ax_cxx_compile_stdcxx.m4 build-in-docker.sh \\ build-resource-file.sh \\ ax_init_standard_project.m4 \\ mac-create-app-bundle.sh resolve-debbuilddeps.sh \\ + dependency-graph.sh template.sh \\ sql-to-dot.sed -dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog +dist_doc_DATA = AUTHORS NEWS $README COPYING INSTALL ChangeLog +$(if test -e README.md -a ! -e README; then +cat < /dev/null; then + run libtoolize --force; + elif which glibtoolize > /dev/null; then + run glibtoolize --force; + else + error libtoolize not found + fi + fi + run automake -a + run autoconf + + #### Run Configure If User Requires #### + if test "$configure" -eq 1; then + ./configure $* || exit 1 + fi + + #### Run Make If User Requires #### + if test "$build" -eq 1; then + make $buildtarget || exit 1 + fi + fi diff --git a/build-in-docker.conf b/build-in-docker.conf index 02876c9..24c01c9 100644 --- a/build-in-docker.conf +++ b/build-in-docker.conf @@ -9,11 +9,11 @@ ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 # Use Ubuntu Universe Repository -repos+=("Ubuntu:::universe") +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") +# Use Marc Wäckerlin's Repository, see https://repository.mrw.sh +repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/@CODENAME@ marc-waeckerlin") +keys+=("https://repository.mrw.sh/PublicKey") + +# centos requires epel-release for some packages, such as Qt WebKit +packages+=("centos:::epel-release") diff --git a/build-in-docker.sh b/build-in-docker.sh index 607fe82..4e51e98 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -6,10 +6,11 @@ myarch=$(dpkg --print-architecture) if test "${arch}" = "amd64"; then myarch="amd64|i386" fi -mode="deb" -img="ubuntu:latest" +mode= +img= repos=() keys=() +dns=() 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=() @@ -19,6 +20,10 @@ arch=$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || ech host= flags=() wait=0 +commit= +nopull=0 +prepare=0 +clean= 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 @@ -27,76 +32,121 @@ fi while test $# -gt 0; do case "$1" in - (-h|--help) - echo "$0 [OPTIONS]" - echo - echo "OPTIONS:" - echo - echo " -h, --help show this help" - echo " -m, --mode mode: deb, rpm, win, default: ${mode}" - echo " -i, --image use given docker image instead of ${img}" - echo " -a, --arch build for given hardware architecture" - echo " -t, --targets targets specify build targets, default: ${targets}" - echo " --host host for cross compiling, e.g. i686-w64-mingw32" - echo " -f, --flag add flag to ./bootstrap.sh or ./configure" - echo " -r, --repo add given apt repository" - echo " -k, --key add public key from url" - echo " -e, --env = set environment variable in docker" - echo " -d, --dir access given directory read only" - echo " -p, --package install extra debian packages" - echo " -c, --cmd execute commands as root in docker" - 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 - echo " The options -r -p -c allow an if-then-else contruct" - echo " depending on the operating system:" - echo " ::::::" - echo " :::" - echo " Read as: On linux type use else use " - echo " That means: If the distributer ID or codename in lsb_release" - echo " matches regular expression , then is replaced, else is replaced." - echo " The three colons are for splitting from and part." - echo " E.g.: Install package curl on wheezy and npm on olter systems:" - echo " $0 -p Debian|precise:::curl:::npm" - echo - echo "EXAMPLE:" - echo - echo "$0 -i mwaeckerlin/ubuntu:trusty-i386 \\" - echo " -t deb \\" - echo " -e ANDROID_HOME=/opt/local/android \\" - echo " -d /opt/local/android \\" - echo " -r universe \\" - echo " -r https://dev.marc.waeckerlin.org/repository \\" - echo " -k https://dev.marc.waeckerlin.org/repository/PublicKey \\" - echo " -p mrw-c++" - echo + (-h|--help) cat < mode: deb, rpm, win, default: ${mode} + -i, --image use given docker image instead of ${img} + -a, --arch build for given hardware architecture + -t, --targets targets specify build targets, default: ${targets} + --host host for cross compiling, e.g. i686-w64-mingw32 + -f, --flag add flag to ./bootstrap.sh or ./configure + -r, --repo add given apt repository + -k, --key add public key from url + -n, --dns add ip as dns server + -e, --env = set environment variable in docker + -d, --dir access given directory read only + -p, --package install extra debian packages + -c, --cmd execute commands as root in docker + -w, --wait on error keep docker container and wait for enter + --clean run maintainer-clean before build + --commit commit the container as image after setup, then exit + --no-pull do not pull image before start (use local image) + --prepare only prepare the image, then wait + + The option -i must be after -m, because mode sets a new default image + The option -m must be after -t, because mode may be auto detected from targets + The option -m must be after -h, because mode may set a host + If target is either deb or rpm, mode is set to the same value + If target is win, host is set to i686-w64-mingw32 + + The options -r -k -e -d -p -c can be repeated several times. + + The options -r -p -c allow an if-then-else contruct + depending on the operating system: + :::::: + ::: + Read as: On linux type use else use + That means: If the distributer ID or codename in lsb_release + matches regular expression , then is replaced, else is replaced. + The three colons are for splitting from and part. + E.g.: Install package curl on wheezy and npm on olter systems: + $0 -p Debian|precise:::curl:::npm + +PERFORMANCE + + Each build starts with an empty image and first installs all + dependencies. You can speed up the build process by using an image, + where all dependencies are already installed. The disadvantage of + this approach is, that missing dependencies are not detected, so + installing all dependencies into an empty image is a test for the + dependency specification. + + Create an image from ubuntu:trusty that contains all dependencies: + + $0 -i ubuntu:trusty --tag my/trusty + + Now you can use the image my/trusty, but since it is not stored in a + repository, you have to either push it to a repository (here my is + your name in docker hub), or simply use it local only and add the + flag --no-pull: + + $0 -i my/trusty -t all + + As long as you work with my/trusty, the dependencies don't need to + be donwloaded in each build. + +TESTING + + When you want to experiment with your builds, i.e. to trace a build + problem, then option --prepare comes handy. It just starts an image + with all dependencies, then waits and gives you information on how + you can enter the image for manual tests in a temporary + container. As soon as you hit the enter key, it cleans up the + temporary container. + + $0 -i ubuntu:trusty --prepare + +EXAMPLE + + $0 -i mwaeckerlin/ubuntu:trusty-i386 \\ + -t deb \\ + -e ANDROID_HOME=/opt/local/android \\ + -d /opt/local/android \\ + -r universe \\ + -r https://repository.mrw.sh \\ + -k https://repository.mrw.sh/PublicKey \\ + -p mrw-c++ + +EOF exit 0 ;; - (-m|--mode) shift; + (-m|--mode) + shift; mode="$1" - case "$mode" in - (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}" - targets="all install" - flags+=("--prefix=/workdir/usr") - packages1=("mingw-w64") - ;; - (*) - echo "**** ERROR: unknown mode '$1', try --help" 1>&2 - exit 1 - ;; - esac + if test -z "$img"; then + case "$mode" in + (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}" + targets="all install" + flags+=("--prefix=/workdir/usr") + packages+=("mingw-w64") + ;; + (*) + echo "**** ERROR: unknown mode '$1', try --help" 1>&2 + exit 1 + ;; + esac + fi ;; (-i|--image) shift; img="$1" @@ -128,6 +178,9 @@ while test $# -gt 0; do (-e|--env) shift; envs+=("-e $1") ;; + (-n|--dns) shift; + dns+=("--dns $1") + ;; (-d|--dirs) shift; dirs+=("-v $1:$1:ro") ;; @@ -140,6 +193,18 @@ while test $# -gt 0; do (-w|--wait) wait=1 ;; + (--clean) + clean="--clean -c" + ;; + (--commit) shift; + commit="$1" + ;; + (--no-pull) + nopull=1 + ;; + (--prepare) + prepare=1 + ;; (*) echo "**** ERROR: unknown option '$1', try --help" 1>&2 exit 1 @@ -152,6 +217,15 @@ while test $# -gt 0; do shift done +function waitforinput() { + set +x + echo " ... now you can access the docker container as root or user:" + echo " docker exec -it ${DOCKER_ID} bash" + echo " docker exec -u $(id -u) -it ${DOCKER_ID} bash" + echo -n " ... press enter to cleanup: " + read +} + function traperror() { set +x local DOCKER_ID="$1" @@ -172,10 +246,7 @@ function traperror() { echo fi if [ "$wait" -eq 1 ]; then - echo " ... now you can access the docker container:" - echo " docker exec -u $(id -u) -it ${DOCKER_ID} bash" - echo -n " ... press enter to cleanup: " - read + waitforinput fi echo -n " ... cleanup docker: " docker stop "${DOCKER_ID}" || true @@ -185,13 +256,7 @@ function traperror() { exit $e fi done - if [ "$wait" -eq 1 ]; then - echo " ... now you can access the docker container:" - echo " docker exec -u $(id -u) -it ${DOCKER_ID} bash" - echo -n " ... press enter to cleanup: " - read - fi - echo -n " SUCCESS ... cleanup docker: " + echo -n "SUCCESS ... cleanup docker: " docker rm -f "${DOCKER_ID}" exit 0 } @@ -200,29 +265,54 @@ function ifthenelse() { arg="$1" shift cmd="$*" + DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,;s,.*,\L&,g') + CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs) + ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64) + case "$DISTRIBUTOR" in + (opensuse) # code name may be not available, then set leap or tumbleweed + if test "$CODENAME" = "n/a"; then + CODENAME=$(docker exec ${DOCKER_ID} lsb_release -ds | sed "s,\($(docker exec ${DOCKER_ID} lsb_release -si | sed 's, ,\\|,g')\) *,,"';s, .*,,g;s,",,g;s,.*,\L&,g') + fi + ;; + (fedora|mageia) # numeric code name + CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs) + ;; + (centos) # only look at major number in centos + CODENAME=$(docker exec ${DOCKER_ID} lsb_release -rs | sed 's,\..*,,') + ;; + esac if test "${arg/:::/}" = "${arg}"; then - docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg}}" + cmd_tmp="${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}" + docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}" else os="${arg%%:::*}" thenpart="${arg#*:::}" - if test "${thenpart/:::/}" = "${thenpart}"; then - 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= + if test "${thenpart/:::/}" != "${thenpart}"; then elsepart="${thenpart##*:::}" - thenpart="${thenpart%:::*}" + thenpart="${thenpart%%:::*}" + fi + if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then if test -n "${thenpart}"; then - 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)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi' - fi + cmd_tmp="${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" + docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}" + fi + else + if test -n "${elsepart}"; then + cmd_tmp="${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" + docker exec ${DOCKER_ID} bash -c "${cmd_tmp//@CODENAME@/${CODENAME}}" + fi fi fi } set -x -docker pull $img -DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity) +if test -z "$img"; then + img="ubuntu:latest" +fi +test $nopull -eq 1 || docker pull $img +DOCKER_ID=$(docker create ${dns[@]} ${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" @@ -235,30 +325,42 @@ 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 +if test -z "$mode"; then + case "$targets" in + (*deb*) mode=deb;; + (*rpm*) mode=rpm;; + (*) case "$img" in + (*deb*|*ubuntu*|*debian*|*mint*) mode=deb;; + (*rpm*|*fedora*|*centos*|*mageia*) mode=rpm;; + (*mingw*|*win*) mode=win;; + (*) mode=deb;; + esac;; + esac +fi +case "$mode" in (deb|apt|win) + OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends' + docker exec ${DOCKER_ID} apt-get update ${OPTIONS} + #docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget; if [[ "${img}" =~ "ubuntu" ]]; then + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} locales 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" - docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" - docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" - done - docker exec ${DOCKER_ID} apt-get update ${OPTIONS} - docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} - docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \ - 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; + if test -n "${keys[*]}"; then # fix dependency bug in cosmic and stretch + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} gnupg + for key in "${keys[@]}"; do + wget -O- "$key" \ + | docker exec -i ${DOCKER_ID} apt-key add - + done + fi for repo in "${repos[@]}"; do ifthenelse "${repo}" "apt-add-repository 'ARG'" done - for key in "${keys[@]}"; do - wget -O- "$key" \ - | docker exec -i ${DOCKER_ID} apt-key add - - done + docker exec ${DOCKER_ID} apt-get update ${OPTIONS} for package in "${packages[@]}"; do ifthenelse "${package}" "apt-get install ${OPTIONS} ARG" @@ -270,7 +372,7 @@ case $mode in ;; (rpm|yum|dnf|zypper|urpmi) if [[ "$img" =~ "centos" ]]; then - docker exec ${DOCKER_ID} yum install -y redhat-lsb + docker exec ${DOCKER_ID} yum install -y redhat-lsb epel-release docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' < /dev/null 2> /dev/null; then + docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} /workdir/*.deb" + fi +fi +if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then + if ls *.rpm > /dev/null 2> /dev/null; then + docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm" + fi +fi +echo "done." diff --git a/configure.ac b/configure.ac index 7651425..e1d25da 100644 --- a/configure.ac +++ b/configure.ac @@ -18,8 +18,8 @@ AX_INIT_STANDARD_PROJECT AX_USE_CXX AX_USE_LIBTOOL AX_USE_DOXYGEN -AX_USE_DEBIAN_PACKAGING -AX_USE_RPM_PACKAGING +AX_USE_DEBIAN_PACKAGING(web) +AX_USE_RPM_PACKAGING(Applications/Internet) #AX_USE_CPPUNIT AX_BUILD_EXAMPLES @@ -39,11 +39,13 @@ AC_ARG_ENABLE(pkcs11-download, fi ]) -AX_REQUIRE_QT([QT], [QtCore QtNetwork QtWebKit QtDesigner], +#QtDesigner +AX_ALL_BUILD_DEPEND_DEV(libqt5webkit5) +AX_ALL_BUILD_DEPEND_DEV(libqt5svg5) +AX_REQUIRE_QT([QT], [QtCore QtNetwork QtWebKit], [QtWidgets QtWebKitWidgets QtPrintSupport]) AX_QT_NO_KEYWORDS -AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [libpkcs11-helper-1]) AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h]) AX_PKG_REQUIRE([libpcscxx]) @@ -54,14 +56,11 @@ AC_CONFIG_FILES([src/languages.qrc]) AC_CONFIG_FILES([src/qbrowserlib/languages.qrc]) AC_CONFIG_FILES([src/qbrowserlib/makefile]) AC_CONFIG_FILES([src/designer/makefile]) -AC_CONFIG_FILES([debian/surfer-dev.install]) -AX_DEB_SECTION(web) AX_DEB_BUILD_DEPEND(libpkcs11-helper1-dev|libp11-kit-dev) AX_DEB_BUILD_DEPEND(mrw-c++-dev) AX_DEB_BUILD_DEPEND(libpcsclite-dev) AX_DEB_BUILD_DEPEND(libssl-dev) -AX_DEB_RESOLVE # create output -AC_OUTPUT +AX_OUTPUT diff --git a/debian/control.in b/debian/control.in index fa07e95..3dc925b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,14 +1,11 @@ Source: @PACKAGE_NAME@ Priority: extra 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 @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@ +Build-Depends: debhelper, fakeroot, git2cl, git, 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 | qt4-dev, @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@ Package: @PACKAGE_NAME@ -Section: web +Section: libs Architecture: any -Provides: swissbrowser, swisssurfer -Conflicts: swissbrowser, swisssurfer -Replaces: swissbrowser, swisssurfer Depends: ${shlibs:Depends}, ${misc:Depends} @DEB_DEPEND@ Description: @DESCRIPTION@ @README_DEB@ @@ -16,9 +13,6 @@ Description: @DESCRIPTION@ Package: @PACKAGE_NAME@-dev Section: libdevel Architecture: any -Provides: swissbrowser-dev, swisssurfer-dev -Conflicts: swissbrowser-dev, swisssurfer-dev -Replaces: swissbrowser-dev, swisssurfer-dev -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 @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@ +Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, fakeroot, git2cl, git, 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 | qt4-dev @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@ Description: @DESCRIPTION@ - Development Package @README_DEB@ diff --git a/debian/rules b/debian/rules index bbfb329..e3bd791 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ ## ## This file has been added: ## - by bootstrap.sh -## - on Tue, 11 April 2017 15:40:48 +0200 +## - on Wed, 25 July 2018 14:05:18 +0200 ## Feel free to change it or even remove and rebuild it, up to your needs ## ## 1 2 3 4 5 6 7 8 diff --git a/debian/surfer-dev.install.in b/debian/surfer-dev.install similarity index 84% rename from debian/surfer-dev.install.in rename to debian/surfer-dev.install index b92f38e..8fe8e46 100644 --- a/debian/surfer-dev.install.in +++ b/debian/surfer-dev.install @@ -4,4 +4,3 @@ usr/lib/lib*.so usr/lib/pkgconfig/* usr/lib/*.la usr/share/doc/surfer/html -@QT_PLUGIN_PATH@/* diff --git a/dependency-graph.sh b/dependency-graph.sh new file mode 100755 index 0000000..e7b77bc --- /dev/null +++ b/dependency-graph.sh @@ -0,0 +1,171 @@ +#!/bin/bash -e + +# template for bash scripts + +# internal use only +append_msg() { + if test $# -ne 0; then + echo -en ":\e[0m \e[1m$*" + fi + echo -e "\e[0m" +} + +# write a notice +notice() { + if test $# -eq 0; then + return + fi + echo -e "\e[1m$*\e[0m" 1>&3 +} + +# write error message +error() { + echo -en "\e[1;31merror" 1>&2 + append_msg $* 1>&2 +} + +# write a warning message +warning() { + echo -en "\e[1;33mwarning" 1>&2 + append_msg $* 1>&2 +} + +# write a success message +success() { + echo -en "\e[1;32msuccess" 1>&2 + append_msg $* 1>&2 +} + +# commandline parameter evaluation +files=${0%/*}/configure.ac +short=0 +while test $# -gt 0; do + case "$1" in + (--short|-s) short=1;; + (--help|-h) less < + +OPTIONS + + --help, -h show this help + --short, -s short graph with no external dependencies + + list of zero or more configure.ac files + (default: ${files}) + +DESCRIPTION + + Evaluates dependencies of all the given configure.ac file. By + default takes the local configure.ac. Outputs a graphwiz dot file + with the dependencies. Solid lines are required dependencies, dotted + lines are optional dependencies. + +EXAMPLE + + Evaluate all dependencies between all local subversion and git + projects, if they are in the path ~/svn and ~/git: + + $0 ~/svn/*/configure.ac ~/git/*/configure.ac + +EOF + exit;; + (*) files=$*; break;; + esac + if test $# -eq 0; then + error "missing parameter, try $0 --help"; exit 1 + fi + shift; +done + +# run a command, print the result and abort in case of error +# option: --no-check: ignore the result, continue in case of error +run() { + check=1 + while test $# -gt 0; do + case "$1" in + (--no-check) check=0;; + (*) break;; + esac + shift; + done + echo -en "\e[1m-> running:\e[0m $* ..." + result=$($* 2>&1) + res=$? + if test $res -ne 0; then + if test $check -eq 1; then + error "failed with return code: $res" + if test -n "$result"; then + echo "$result" + fi + exit 1 + else + warning "ignored return code: $res" + fi + else + success + fi +} + +# error handler +function traperror() { + set +x + local err=($1) # error status + local line="$2" # LINENO + local linecallfunc="$3" + local command="$4" + local funcstack="$5" + for e in ${err[@]}; do + if test -n "$e" -a "$e" != "0"; then + error "line $line - command '$command' exited with status: $e (${err[@]})" + if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then + echo -n " ... error at ${funcstack} " + if [ "$linecallfunc" != "" ]; then + echo -n "called at line $linecallfunc" + fi + echo + fi + exit $e + fi + done + success + exit 0 +} + +# catch errors +trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' ERR SIGINT INT TERM EXIT + +########################################################################################## + +filter() { + if test $short -eq 1; then + all=$(cat) + allowed=$(sed -n '/"\(.*\)" \[style=solid\];/{s//\1/;H};${x;s/\n//;s/\n/\\|/gp}' <<<"${all}") + sed -n '/"\('"${allowed}"'\)" -> "\('"${allowed}"'\)"/p' <<<"${all}" + else + cat + fi +} + +echo "digraph G {" +if test $short -eq 0; then + echo "node [style=dashed];" +fi +( + for file in $files; do + if ! test -e $file; then + error "file $file not found"; exit 1 + fi + sed -n ' + /^ *m4_define(x_package_name, */ {s//"/;s/ *).*/"/;h;s/.*/& [style=solid];/p} + /^ *AX_REQUIRE_QT/ {s/.*/"qt" -> /;G;s/\n//;s/.*/&;/p} + /^ *AX_PKG_REQUIRE(\[\?\([^],)]\+\)\]\?, \[\?\([^],)]\+\)\]\?.*/ {s//"\2" -> /;G;s/\n//;s/.*/&;/p} + /^ *AX_PKG_REQUIRE(\[\?\([^],)]\+\)\]\?.*/ {s//"\1" -> /;G;s/\n//;s/.*/&;/p} + /^ *AX_CHECK_QT/ {s/.*/"qt" -> /;G;s/\n//;s/.*/& [style=dashed];/p} + /^ *AX_PKG_CHECK(\[\?\([^],)]\+\)\]\?, \[\?\([^],)]\+\)\]\?.*/ {s//"\2" -> /;G;s/\n//;s/.*/& [style=dotted];/p} + /^ *AX_PKG_CHECK(\[\?\([^],)]\+\)\]\?.*/ {s//"\1" -> /;G;s/\n//;s/.*/& [style=dotted];/p} + ' $file + done +) | filter +echo "}" diff --git a/doc/doxyfile.in b/doc/doxyfile.in index 461ea5c..41ba88c 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -1,4 +1,4 @@ -# Doxyfile 1.8.6 +# Doxyfile 1.8.11 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -46,12 +46,12 @@ PROJECT_NUMBER = @PACKAGE_VERSION@ PROJECT_BRIEF = @DESCRIPTION@ -# With the PROJECT_LOGO tag one can specify an logo or icon that is included in -# the documentation. The maximum height of the logo should not exceed 55 pixels -# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo -# to the output directory. +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. -PROJECT_LOGO = @PROJECT_LOGO@ +PROJECT_LOGO = @top_srcdir@/@PACKAGE_LOGO@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -60,7 +60,7 @@ PROJECT_LOGO = @PROJECT_LOGO@ OUTPUT_DIRECTORY = -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and # will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where @@ -70,6 +70,14 @@ OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. @@ -85,14 +93,14 @@ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member # descriptions after the members that are listed in the file and class # documentation (similar to Javadoc). Set to NO to disable this. # The default value is: YES. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief # description of a member or function before the detailed description # # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the @@ -127,7 +135,7 @@ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = YES -# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path # before files name in the file list and in the header files. If set to NO the # shortest path that makes the file name unique will be used # The default value is: YES. @@ -197,9 +205,9 @@ MULTILINE_CPP_IS_BRIEF = YES INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a -# new page for each member. If set to NO, the documentation of a member will be -# part of the file/class/namespace that contains it. +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. # The default value is: NO. SEPARATE_MEMBER_PAGES = NO @@ -221,11 +229,15 @@ TAB_SIZE = 2 # newlines. ALIASES = "id=\par File-ID\n" +ALIASES += "author=@AUTHOR_NAME@" +ALIASES += "readme=@README_HTML@" +ALIASES += "description=@DESCRIPTION@" +ALIASES += "api=\xrefitem api \"API Call\" \"\"" ALIASES += "mutex=\par Reentrant:\nAccess is locked with mutex @c " ALIASES += "instancemutex=\par Reentrant:\nAccess is locked with per instance mutex @c " ALIASES += "classmutex=\par Reentrant:\nAccess is locked with class static mutex @c " ALIASES += "license=\par License\n" -ALIASES += "copy=\par Copyright\n" +ALIASES += "copy=\par Copyright by @AUTHOR_NAME@\n" # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding "class=itcl::class" @@ -266,11 +278,14 @@ OPTIMIZE_OUTPUT_VHDL = NO # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and # language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make -# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C -# (default is Fortran), use: inc=Fortran f=C. +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. # -# Note For files without extension you can use no_extension as a placeholder. +# Note: For files without extension you can use no_extension as a placeholder. # # Note that for custom extensions you also need to set FILE_PATTERNS otherwise # the files are not read by doxygen. @@ -289,8 +304,8 @@ MARKDOWN_SUPPORT = YES # When enabled doxygen tries to link words that correspond to documented # classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by by putting a % sign in front of the word -# or globally by setting AUTOLINK_SUPPORT to NO. +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. AUTOLINK_SUPPORT = YES @@ -330,13 +345,20 @@ SIP_SUPPORT = NO IDL_PROPERTY_SUPPORT = YES # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first +# tag is set to YES then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. # The default value is: NO. DISTRIBUTE_GROUP_DOC = YES +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + # Set the SUBGROUPING tag to YES to allow class member groups of the same type # (for instance a group of public functions) to be put as a subgroup of that # type (e.g. under the Public Functions section). Set it to NO to prevent @@ -395,7 +417,7 @@ LOOKUP_CACHE_SIZE = 0 # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in # documentation are documented, even if no documentation was available. Private # class members and static file members will be hidden unless the # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. @@ -405,35 +427,35 @@ LOOKUP_CACHE_SIZE = 0 EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will # be included in the documentation. # The default value is: NO. EXTRACT_PRIVATE = YES -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # scope will be included in the documentation. # The default value is: NO. EXTRACT_PACKAGE = YES -# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be # included in the documentation. # The default value is: NO. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, # only classes defined in header files are included. Does not have any effect # for Java sources. # The default value is: YES. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local methods, +# This flag is only useful for Objective-C code. If set to YES, local methods, # which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO only methods in the interface are +# included in the documentation. If set to NO, only methods in the interface are # included. # The default value is: NO. @@ -458,21 +480,21 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set -# to NO these classes will be included in the various overviews. This option has -# no effect if EXTRACT_ALL is enabled. +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO these declarations will be +# (class|struct|union) declarations. If set to NO, these declarations will be # included in the documentation. # The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO these +# documentation blocks found inside the body of a function. If set to NO, these # blocks will be appended to the function's detailed documentation block. # The default value is: NO. @@ -486,7 +508,7 @@ HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES upper-case letters are also +# names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. @@ -495,12 +517,19 @@ INTERNAL_DOCS = NO CASE_SENSE_NAMES = YES # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES the +# their full class and namespace scopes in the documentation. If set to YES, the # scope will be hidden. # The default value is: NO. HIDE_SCOPE_NAMES = NO +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of # the files that are included by a file in the documentation of that file. # The default value is: YES. @@ -528,14 +557,14 @@ INLINE_INFO = YES # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the # (detailed) documentation of file and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. +# name. If set to NO, the members will appear in declaration order. # The default value is: YES. SORT_MEMBER_DOCS = YES # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief # descriptions of file, namespace and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. Note that +# name. If set to NO, the members will appear in declaration order. Note that # this will also influence the order of the classes in the class list. # The default value is: NO. @@ -580,27 +609,25 @@ SORT_BY_SCOPE_NAME = NO STRICT_PROTO_MATCHING = NO -# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the -# todo list. This list is created by putting \todo commands in the -# documentation. +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. # The default value is: YES. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the -# test list. This list is created by putting \test commands in the -# documentation. +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. # The default value is: YES. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug # list. This list is created by putting \bug commands in the documentation. # The default value is: YES. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) # the deprecated list. This list is created by putting \deprecated commands in # the documentation. # The default value is: YES. @@ -625,8 +652,8 @@ ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES the list -# will mention the files that were used to generate the documentation. +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. # The default value is: YES. SHOW_USED_FILES = YES @@ -674,8 +701,7 @@ LAYOUT_FILE = # to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. Do not use file names with spaces, bibtex cannot handle them. See -# also \cite for info how to create references. +# search path. See also \cite for info how to create references. CITE_BIB_FILES = @@ -691,7 +717,7 @@ CITE_BIB_FILES = QUIET = NO # The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES # this implies that the warnings are on. # # Tip: Turn warnings on while writing the documentation. @@ -699,7 +725,7 @@ QUIET = NO WARNINGS = YES -# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag # will automatically be disabled. # The default value is: YES. @@ -716,12 +742,18 @@ WARN_IF_DOC_ERROR = YES # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that # are documented, but have no documentation for their parameters or return -# value. If set to NO doxygen will only warn about wrong or incomplete parameter -# documentation, but not about the absence of documentation. +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. # The default value is: NO. WARN_NO_PARAMDOC = NO +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which # will be replaced by the file and line number from which the warning originated @@ -745,7 +777,7 @@ WARN_LOGFILE = doxygen.errors # The INPUT tag is used to specify the files and/or directories that contain # documented source files. You may enter file names like myfile.cpp or # directories like /usr/src/myproject. Separate the files or directories with -# spaces. +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. INPUT = @top_srcdir@/src @@ -761,14 +793,19 @@ INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank the -# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, -# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, -# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, -# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, -# *.qsf, *.as and *.js. +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl, +# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js. -FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt +FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql # The RECURSIVE tag can be used to specify whether or not subdirectories should # be searched for input files as well. @@ -799,7 +836,7 @@ EXCLUDE_SYMLINKS = NO # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = moc_* uic_* qrc_* +EXCLUDE_PATTERNS = moc_* uic_* qrc_* version.[ch]xx # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the @@ -852,6 +889,10 @@ IMAGE_PATH = # Note that the filter must not add or remove lines; it is applied before the # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. INPUT_FILTER = @@ -861,11 +902,15 @@ INPUT_FILTER = # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how # filters are used. If the FILTER_PATTERNS tag is empty or if none of the # patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. -FILTER_PATTERNS = *.wt=doxygen-webtester.sed +FILTER_PATTERNS = *.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER ) will also be used to filter the input files that are used for +# INPUT_FILTER) will also be used to filter the input files that are used for # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). # The default value is: NO. @@ -925,7 +970,7 @@ REFERENCED_BY_RELATION = NO REFERENCES_RELATION = NO # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# to YES then the hyperlinks from functions in REFERENCES_RELATION and # REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will # link to the documentation. # The default value is: YES. @@ -972,6 +1017,25 @@ USE_HTAGS = NO VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse-libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -1002,7 +1066,7 @@ IGNORE_PREFIX = # Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output # The default value is: YES. GENERATE_HTML = YES @@ -1040,7 +1104,7 @@ HTML_FILE_EXTENSION = .html # of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_HEADER = +HTML_HEADER = header.html # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each # generated HTML page. If the tag is left blank doxygen will generate a standard @@ -1050,7 +1114,7 @@ HTML_HEADER = # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = +HTML_FOOTER = footer.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of @@ -1064,16 +1128,18 @@ HTML_FOOTER = HTML_STYLESHEET = -# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user- -# defined cascading style sheet that is included after the standard style sheets +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets # created by doxygen. Using this option one can overrule certain style aspects. # This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefor more robust against future updates. -# Doxygen will copy the style sheet file to the output directory. For an example -# see the documentation. +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_STYLESHEET = +HTML_EXTRA_STYLESHEET = style.css # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note @@ -1086,7 +1152,7 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the stylesheet and background images according to +# will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see # http://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 @@ -1117,11 +1183,12 @@ HTML_COLORSTYLE_GAMMA = 80 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML # page will contain the date and time when the page was generated. Setting this -# to NO can help when comparing the output of multiple runs. -# The default value is: YES. +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_TIMESTAMP = YES +HTML_TIMESTAMP = NO # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the @@ -1129,7 +1196,7 @@ HTML_TIMESTAMP = YES # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_DYNAMIC_SECTIONS = NO +HTML_DYNAMIC_SECTIONS = YES # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries # shown in the various tree structured indices initially; the user can expand @@ -1214,28 +1281,29 @@ GENERATE_HTMLHELP = NO CHM_FILE = # The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# including file name) of the HTML help compiler (hhc.exe). If non-empty, # doxygen will try to run the HTML help compiler on the generated index.hhp. # The file has to be specified with full path. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. HHC_LOCATION = -# The GENERATE_CHI flag controls if a separate .chi index file is generated ( -# YES) or that it should be included in the master .chm file ( NO). +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) # and project file content. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_INDEX_ENCODING = -# The BINARY_TOC flag controls whether a binary table of contents is generated ( -# YES) or a normal table of contents ( NO) in the .chm file. +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. @@ -1348,7 +1416,7 @@ DISABLE_INDEX = NO # index structure (just like the one that is generated for HTML Help). For this # to work a browser that supports JavaScript, DHTML, CSS and frames is required # (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can # further fine-tune the look of the index. As an example, the default style # sheet generated by doxygen has an example that shows how to put an image at # the root of the tree instead of the PROJECT_NAME. Since the tree basically has @@ -1357,7 +1425,7 @@ DISABLE_INDEX = NO # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. -GENERATE_TREEVIEW = NO +GENERATE_TREEVIEW = YES # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that # doxygen will group on one line in the generated HTML documentation. @@ -1376,7 +1444,7 @@ ENUM_VALUES_PER_LINE = 4 TREEVIEW_WIDTH = 250 -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to # external symbols imported via tag files in a separate window. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1405,7 +1473,7 @@ FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see # http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path # to it using the MATHJAX_RELPATH option. @@ -1475,11 +1543,11 @@ SEARCHENGINE = NO # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a web server instead of a web client using Javascript. There -# are two flavours of web server based searching depending on the -# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for -# searching and an index file used by the script. When EXTERNAL_SEARCH is -# enabled the indexing and searching needs to be provided by external tools. See -# the section "External Indexing and Searching" for details. +# are two flavors of web server based searching depending on the EXTERNAL_SEARCH +# setting. When disabled, doxygen will generate a PHP script for searching and +# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing +# and searching needs to be provided by external tools. See the section +# "External Indexing and Searching" for details. # The default value is: NO. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1491,7 +1559,7 @@ SERVER_BASED_SEARCH = NO # external search engine pointed to by the SEARCHENGINE_URL option to obtain the # search results. # -# Doxygen ships with an example indexer ( doxyindexer) and search engine +# Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library # Xapian (see: http://xapian.org/). # @@ -1504,7 +1572,7 @@ EXTERNAL_SEARCH = NO # The SEARCHENGINE_URL should point to a search engine hosted by a web server # which will return the search results when EXTERNAL_SEARCH is enabled. # -# Doxygen ships with an example indexer ( doxyindexer) and search engine +# Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library # Xapian (see: http://xapian.org/). See the section "External Indexing and # Searching" for details. @@ -1542,7 +1610,7 @@ EXTRA_SEARCH_MAPPINGS = # Configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output. +# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output. # The default value is: YES. GENERATE_LATEX = NO @@ -1573,7 +1641,7 @@ LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX +# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX # documents. This may be useful for small projects and may help to save some # trees in general. # The default value is: NO. @@ -1591,9 +1659,12 @@ COMPACT_LATEX = NO PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names -# that should be included in the LaTeX output. To get the times font for -# instance you can specify -# EXTRA_PACKAGES=times +# that should be included in the LaTeX output. The package can be specified just +# by its name or with the correct syntax as to be used with the LaTeX +# \usepackage command. To get the times font for instance you can specify : +# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times} +# To use the option intlimits with the amsmath package you can specify: +# EXTRA_PACKAGES=[intlimits]{amsmath} # If left blank no extra packages will be included. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1607,23 +1678,36 @@ EXTRA_PACKAGES = # # Note: Only use a user-defined header if you know what you are doing! The # following commands have a special meaning inside the header: $title, -# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will -# replace them by respectively the title of the page, the current date and time, -# only the current date, the version number of doxygen, the project name (see -# PROJECT_NAME), or the project number (see PROJECT_NUMBER). +# $datetime, $date, $doxygenversion, $projectname, $projectnumber, +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty +# string, for the replacement values of the other commands the user is referred +# to HTML_HEADER. # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_HEADER = # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the # generated LaTeX document. The footer should contain everything after the last -# chapter. If it is left blank doxygen will generate a standard footer. +# chapter. If it is left blank doxygen will generate a standard footer. See +# LATEX_HEADER for more information on how to generate a default footer and what +# special commands can be used inside the footer. # # Note: Only use a user-defined footer if you know what you are doing! # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_FOOTER = +# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# LaTeX style sheets that are included after the standard style sheets created +# by doxygen. Using this option one can overrule certain style aspects. Doxygen +# will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_STYLESHEET = + # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the LATEX_OUTPUT output # directory. Note that the files will be copied as-is; there are no commands or @@ -1641,8 +1725,8 @@ LATEX_EXTRA_FILES = PDF_HYPERLINKS = YES -# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate -# the PDF file directly from the LaTeX files. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate +# the PDF file directly from the LaTeX files. Set this option to YES, to get a # higher quality PDF documentation. # The default value is: YES. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1683,11 +1767,19 @@ LATEX_SOURCE_CODE = NO LATEX_BIB_STYLE = plain +# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_TIMESTAMP = NO + #--------------------------------------------------------------------------- # Configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The +# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The # RTF output is optimized for Word 97 and may not look too pretty with other RTF # readers/editors. # The default value is: NO. @@ -1702,7 +1794,7 @@ GENERATE_RTF = NO RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF +# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF # documents. This may be useful for small projects and may help to save some # trees in general. # The default value is: NO. @@ -1739,11 +1831,21 @@ RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = +# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code +# with syntax highlighting in the RTF output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_SOURCE_CODE = NO + #--------------------------------------------------------------------------- # Configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for +# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for # classes and files. # The default value is: NO. @@ -1767,6 +1869,13 @@ MAN_OUTPUT = man MAN_EXTENSION = .3 +# The MAN_SUBDIR tag determines the name of the directory created within +# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by +# MAN_EXTENSION with the initial . removed. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_SUBDIR = + # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it # will generate one additional man file for each entity documented in the real # man page(s). These additional files only source the real man page, but without @@ -1780,7 +1889,7 @@ MAN_LINKS = NO # Configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that +# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that # captures the structure of the code including all documentation. # The default value is: NO. @@ -1794,19 +1903,7 @@ GENERATE_XML = NO XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify a XML DTD, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program +# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program # listings (including syntax highlighting and cross-referencing information) to # the XML output. Note that enabling this will significantly increase the size # of the XML output. @@ -1819,7 +1916,7 @@ XML_PROGRAMLISTING = YES # Configuration options related to the DOCBOOK output #--------------------------------------------------------------------------- -# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files +# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files # that can be used to generate PDF. # The default value is: NO. @@ -1833,14 +1930,23 @@ GENERATE_DOCBOOK = NO DOCBOOK_OUTPUT = docbook +# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the +# program listings (including syntax highlighting and cross-referencing +# information) to the DOCBOOK output. Note that enabling this will significantly +# increase the size of the DOCBOOK output. +# The default value is: NO. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_PROGRAMLISTING = NO + #--------------------------------------------------------------------------- # Configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen -# Definitions (see http://autogen.sf.net) file that captures the structure of -# the code including all documentation. Note that this feature is still -# experimental and incomplete at the moment. +# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an +# AutoGen Definitions (see http://autogen.sf.net) file that captures the +# structure of the code including all documentation. Note that this feature is +# still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO @@ -1849,7 +1955,7 @@ GENERATE_AUTOGEN_DEF = NO # Configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module +# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module # file that captures the structure of the code including all documentation. # # Note that this feature is still experimental and incomplete at the moment. @@ -1857,7 +1963,7 @@ GENERATE_AUTOGEN_DEF = NO GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary +# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI # output from the Perl module output. # The default value is: NO. @@ -1865,9 +1971,9 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely +# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely # formatted so it can be parsed by a human reader. This is useful if you want to -# understand what is going on. On the other hand, if this tag is set to NO the +# understand what is going on. On the other hand, if this tag is set to NO, the # size of the Perl module output will be much smaller and Perl will parse it # just the same. # The default value is: YES. @@ -1887,14 +1993,14 @@ PERLMOD_MAKEVAR_PREFIX = # Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all +# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all # C-preprocessor directives found in the sources and include files. # The default value is: YES. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names -# in the source code. If set to NO only conditional compilation will be +# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names +# in the source code. If set to NO, only conditional compilation will be # performed. Macro expansion can be done in a controlled way by setting # EXPAND_ONLY_PREDEF to YES. # The default value is: NO. @@ -1910,7 +2016,7 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES the includes files in the +# If the SEARCH_INCLUDES tag is set to YES, the include files in the # INCLUDE_PATH will be searched if a #include is found. # The default value is: YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. @@ -1953,9 +2059,9 @@ PREDEFINED += "NAMESPACE=@PACKAGE_NAME@" EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will -# remove all refrences to function-like macros that are alone on a line, have an -# all uppercase name, and do not end with a semicolon. Such function macros are -# typically used for boiler-plate code, and will confuse the parser if not +# remove all references to function-like macros that are alone on a line, have +# an all uppercase name, and do not end with a semicolon. Such function macros +# are typically used for boiler-plate code, and will confuse the parser if not # removed. # The default value is: YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. @@ -1975,7 +2081,7 @@ SKIP_FUNCTION_MACROS = YES # where loc1 and loc2 can be relative or absolute paths or URLs. See the # section "Linking to external documentation" for more information about the use # of tag files. -# Note: Each tag file must have an unique name (where the name does NOT include +# Note: Each tag file must have a unique name (where the name does NOT include # the path). If a tag file is not located in the directory in which doxygen is # run, you must also specify the path to the tagfile here. @@ -1987,20 +2093,21 @@ TAGFILES = GENERATE_TAGFILE = @PACKAGE_NAME@.doxytag -# If the ALLEXTERNALS tag is set to YES all external class will be listed in the -# class index. If set to NO only the inherited external classes will be listed. +# If the ALLEXTERNALS tag is set to YES, all external class will be listed in +# the class index. If set to NO, only the inherited external classes will be +# listed. # The default value is: NO. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in -# the modules index. If set to NO, only the current project's groups will be +# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will be # listed. # The default value is: YES. EXTERNAL_GROUPS = YES -# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in +# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in # the related pages index. If set to NO, only the current project's pages will # be listed. # The default value is: YES. @@ -2017,7 +2124,7 @@ PERL_PATH = /usr/bin/perl # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram +# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram # (in HTML and LaTeX) for classes with base or super classes. Setting the tag to # NO turns the diagrams off. Note that this option also works with HAVE_DOT # disabled, but it is recommended to install and use dot, since it yields more @@ -2042,7 +2149,7 @@ MSCGEN_PATH = DIA_PATH = -# If set to YES, the inheritance and collaboration graphs will hide inheritance +# If set to YES the inheritance and collaboration graphs will hide inheritance # and usage relations if the target is undocumented or is not a class. # The default value is: YES. @@ -2053,7 +2160,7 @@ HIDE_UNDOC_RELATIONS = NO # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent # Bell Labs. The other options in this section have no effect if this option is # set to NO -# The default value is: NO. +# The default value is: YES. HAVE_DOT = YES @@ -2067,7 +2174,7 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font n the dot files that doxygen +# When you want a differently looking font in the dot files that doxygen # generates you can specify the font name using DOT_FONTNAME. You need to make # sure dot is able to find the font, which can be done by putting it in a # standard location or by setting the DOTFONTPATH environment variable or by @@ -2115,7 +2222,7 @@ COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and # collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. # The default value is: NO. @@ -2167,7 +2274,8 @@ INCLUDED_BY_GRAPH = YES # # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. +# functions only using the \callgraph command. Disabling a call graph can be +# accomplished by means of the command \hidecallgraph. # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2178,7 +2286,8 @@ CALL_GRAPH = NO # # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. +# functions only using the \callergraph command. Disabling a caller graph can be +# accomplished by means of the command \hidecallergraph. # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2201,11 +2310,17 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. +# generated by dot. For an explanation of the image formats see the section +# output formats in the documentation of the dot tool (Graphviz (see: +# http://www.graphviz.org/)). # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order # to make the SVG files visible in IE 9+ (other browsers do not have this # requirement). -# Possible values are: png, jpg, gif and svg. +# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd, +# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo, +# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo, +# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and +# png:gdiplus:gdiplus. # The default value is: png. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2248,6 +2363,19 @@ MSCFILE_DIRS = DIAFILE_DIRS = +# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the +# path where java can find the plantuml.jar file. If left blank, it is assumed +# PlantUML is not used or called during a preprocessing step. Doxygen will +# generate a warning when it encounters a \startuml command in this case and +# will not generate output for the diagram. + +PLANTUML_JAR_PATH = "@top_srcdir@/doc/plantuml.jar" + +# When using plantuml, the specified paths are searched for files specified by +# the !include statement in a plantuml block. + +PLANTUML_INCLUDE_PATH = + # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes # that will be shown in the graph. If the number of nodes in a graph becomes # larger than this value, doxygen will truncate the graph, which is visualized @@ -2284,14 +2412,14 @@ MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = YES -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support # this, this feature is disabled by default. # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_MULTI_TARGETS = YES +DOT_MULTI_TARGETS = NO # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated @@ -2301,7 +2429,7 @@ DOT_MULTI_TARGETS = YES GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot +# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot # files that are used to generate the various graphs. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/doc/makefile.am b/doc/makefile.am index 7486a87..425aaf0 100644 --- a/doc/makefile.am +++ b/doc/makefile.am @@ -1,8 +1,10 @@ ## @id $Id$ -# -# This file has been added by bootstrap.sh on Wed, 09 September 2015 15:45:15 +0200 -# Feel free to change it or even remove and rebuild it, up to your needs -# +## +## This file has been added: +## - by bootstrap.sh +## - on Wed, 25 July 2018 14:05:18 +0200 +## Feel free to change it or even remove and rebuild it, up to your needs +## ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 diff --git a/doc/plantuml.jar b/doc/plantuml.jar index 9502c23..2fcafa0 100644 Binary files a/doc/plantuml.jar and b/doc/plantuml.jar differ diff --git a/mac-create-app-bundle.sh b/mac-create-app-bundle.sh index d1f41a6..e517657 100755 --- a/mac-create-app-bundle.sh +++ b/mac-create-app-bundle.sh @@ -7,7 +7,7 @@ ## Parameters: ## $1: name of the app-target ## $2: name of the project -## $3: installation source +## $3: package installation target ## ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -16,30 +16,33 @@ if test "$(uname -s)" != "Darwin"; then echo "**** ERROR: run on Mac OS-X: $0" exit 1 fi -test -n "$1" -test -n "$2" -test -d "$3" -target="$(pwd)/${1}/Contents/MacOS" + +project=${2:-$(sed -n 's/ *m4_define *( *x_package_name, *\(.*\) *).*/\1/p' $(pwd)/configure.ac)} +apptarget=${1:-${project}.app} +sources=${3:-$(pwd)/tmp} +! test -e "$apptarget" || rm -rf "$apptarget" +test -n "$project" +test -d "$sources" +target="$(pwd)/${apptarget}/Contents/MacOS" + +echo "Creating $apptarget for $project from $sources" # Step 1: create and fill app directory structure -mkdir -p ${1}/Contents/{Resources,MacOS} -! test -d ${3}/bin || \ - find ${3}/bin -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \; -executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1) -! test -d ${3}/lib || \ - find ${3}/lib -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \; -! test -d ${3}/share/${2} || \ - find ${3}/share/${2} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \; -! test -d ${3}/share/${2} || rmdir ${3}/share/${2} -! test -d ${3}/share || \ - find ${3}/share -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \; -! test -d ${3}/bin || rmdir ${3}/bin -! test -d ${3}/lib || rmdir ${3}/lib -! test -d ${3}/share || rmdir ${3}/share -! test -d ${3} || \ - find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \; -! test -d ${3} || rmdir ${3} -! test -d ${1}/tmp || rm -r ${1}/tmp +mkdir -p ${apptarget}/Contents/{Resources,MacOS} +! test -d ${sources}/bin || \ + find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \; +! test -d ${sources}/scripts || \ + find ${sources}/scripts -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \; +executablefile=${apptarget}/Contents/MacOS/${project} +test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | head -1) +! test -d ${sources}/lib || \ + find ${sources}/lib -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \; +! test -d ${sources}/share/${project} || \ + find ${sources}/share/${project} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \; +! test -d ${sources}/share || \ + find ${sources}/share -mindepth 1 -maxdepth 1 -name ${project} -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \; +! test -d ${sources} || \ + find ${sources} -mindepth 1 -maxdepth 1 -name share -o -name bin -o -name lib -o -name scripts -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \; # Step 2: copy qt plugins, if necessary for f in ${QT_PLUGINS}; do @@ -56,7 +59,7 @@ while [ $found -ne 0 ]; do cd "${target}" for file in $(find . -type f); do for lib in $(otool -L ${file} | tail -n +2 \ - | egrep '/opt/local/|'"${HOME}" \ + | egrep '/usr/local/|/opt/local/|/opt/X11/|'"${HOME}" \ | grep -v $file | awk '{print $1}'); do found=1 test -f ${lib##*/} \ @@ -78,25 +81,24 @@ if test -n "${QTDIR}"; then MENU_NIB=$(find ${QTDIR} -name .svn -o -name .git -prune -o -name qt_menu.nib -print \ | head -1) if test -e "${MENU_NIB}"; then - rsync -r "${MENU_NIB}" ${1}/Contents/Resources/ - test -d ${1}/Contents/Resources/qt_menu.nib + rsync -r "${MENU_NIB}" ${apptarget}/Contents/Resources/ + test -d ${apptarget}/Contents/Resources/qt_menu.nib fi fi -# Step 5: copy or create info.plist -infoplist=$(find ${1}/Contents/Resources -name Info.plist) -if test -f "${infoplist}"; then - mv "${infoplist}" ${1}/Contents/Info.plist +# Step 5: copy local or create new info.plist +if test -f Info.plist; then + cp -a Info.plist ${apptarget}/Contents/Info.plist else - cat > ${1}/Contents/Info.plist < ${apptarget}/Contents/Info.plist < - + CFBundleIdentifier - ${2} + ${project} CFBundleExecutable - ${executablefile##/} + ${executablefile##*/} EOF diff --git a/makefile.am b/makefile.am index b080bf4..86b2c73 100644 --- a/makefile.am +++ b/makefile.am @@ -2,7 +2,7 @@ ## ## This file has been added: ## - by bootstrap.sh -## - on Mon, 04 January 2016 10:52:26 +0100 +## - on Wed, 25 July 2018 14:05:18 +0200 ## Feel free to change it or even remove and rebuild it, up to your needs ## ## 1 2 3 4 5 6 7 8 @@ -13,6 +13,14 @@ SUBDIRS = src doc examples desktopdir = ${datadir}/applications desktop_DATA = @PACKAGE_DESKTOP@ dist_pkgdata_DATA = @PACKAGE_ICON@ +dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh \ + resolve-rpmbuilddeps.sh autogen.sh \ + ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh \ + build-resource-file.sh \ + ax_init_standard_project.m4 \ + mac-create-app-bundle.sh resolve-debbuilddeps.sh \ + dependency-graph.sh template.sh \ + sql-to-dot.sed dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog MAINTAINERCLEANFILES = makefile.in diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh index 4358e29..e7663eb 100755 --- a/resolve-debbuilddeps.sh +++ b/resolve-debbuilddeps.sh @@ -24,7 +24,7 @@ else fi function install() { - if ${SUDO} apt-get -y install $*; then + if ${SUDO} apt-get install -y --force-yes --no-install-suggests --no-install-recommends $*; then return 0 else return 1 @@ -35,13 +35,53 @@ TO_INSTALL= DEPS= if test -e debian/control.in -a ! -e debian/control; then + function pkg_exists() { + test -n "$(${DO} apt-cache policy -q ${1})" + } + function AX_PKG_CHECK() { + local DEV_DEB_DIST_PKG= + local DEV_DIST_PKG= + local pkg= + eval $4 + if test -z "$2"; then + pkg=$1 + else + pkg=$2 + fi + pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev} + if pkg_exists "${pkg}"; then + echo $pkg + fi + } + function AX_PKG_REQUIRE() { + local DEV_DEB_DIST_PKG= + local DEV_DIST_PKG= + local pkg= + eval $6 + if test -z "$2"; then + pkg=$1 + else + pkg=$2 + fi + if test -n "$4"; then + for f in $pkg $4; do + if pkg_exists "${f}-dev"; then + pkg=$f + break + fi + done + fi + echo ${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev} + } + DEPS+=" $(eval $(sed -n '/^ *AX_PKG_REQUIRE/{s,^ *\(AX_PKG_REQUIRE\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))" + DEPS+=" $(eval $(sed -n '/^ *AX_PKG_CHECK/{s,^ *\(AX_PKG_CHECK\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))" for f in $(sed -n 's, *AX_\(DEB\|ALL\)_DEPEND_IFEXISTS(\([^)]*\)).*,\2,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 pkg_exists "${f}"; then DEPS+=" ${f}" fi done for f in $(sed -n 's, *AX_\(DEB\|ALL\)_DEPEND_IFEXISTS_DEV(\([^)]*\)).*,\2,p' configure.ac); do - if test -n "$(${DO} apt-cache policy -q ${f}-dev)" && ((! $(${DO} apt-cache policy ${f}-dev 2>&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}-dev")); then + if pkg_exists "${f}-dev"; then DEPS+=" ${f}-dev" fi done @@ -57,10 +97,11 @@ if test -e debian/control.in -a ! -e debian/control; then fi install dpkg-dev + DEPS+=" $(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')" for pa in ${DEPS}; do - if test ${pa//|/} = ${pa}; then + if test "${pa//|/}" = "${pa}"; then TO_INSTALL+=" ${pa}" continue; fi @@ -83,4 +124,10 @@ if test -n "${TO_INSTALL}" && ! install ${TO_INSTALL}; then exit 1 fi +FILES="$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')" +if test -n "${FILES}"; then + echo "**** ERROR: Cannot install: " $FILES + exit 1 +fi + echo "**** Success: All Dependencies Resolved" diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh index dd565a6..08b4645 100755 --- a/resolve-rpmbuilddeps.sh +++ b/resolve-rpmbuilddeps.sh @@ -14,7 +14,7 @@ INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install - SCHROOTNAME="$1" PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac) -TRAP_CMD= +TRAP_CMD="sleep ${SLEEP:-0};" DEPS= for f in BUILD BUILDROOT RPMS SPECS SRPMS; do if ! test -d $f; then @@ -23,19 +23,56 @@ for f in BUILD BUILDROOT RPMS SPECS SRPMS; do fi done if test -e ${PACKAGE_NAME}.spec.in -a ! -e ${PACKAGE_NAME}.spec; then + function pkg_exists() { + (test -x /usr/bin/zypper && zypper search -x "$1" 1>&2 > /dev/null) || \ + (test -x /usr/bin/dnf && dnf list -q "$1" 1>&2 > /dev/null) || \ + (test -x /usr/bin/yum && yum list -q "$1" 1>&2 > /dev/null) || \ + (test -x /usr/sbin/urpmq && urpmq "$1" 1>&2 > /dev/null) + } + function AX_PKG_CHECK() { + local DEV_RPM_DIST_PKG= + local DEV_DIST_PKG= + local pkg= + eval $4 + if test -z "$2"; then + pkg=$1 + else + pkg=$2 + fi + pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel} + if pkg_exists "${pkg}"; then + echo ${pkg} + fi + } + function AX_PKG_REQUIRE() { + local DEV_RPM_DIST_PKG= + local DEV_DIST_PKG= + local pkg= + eval $6 + if test -z "$2"; then + pkg=$1 + else + pkg=$2 + fi + if test -n "$4"; then + for f in $pkg $4; do + if pkg_exists "${f}-devel"; then + pkg=$f + break + fi + done + fi + echo ${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel} + } + DEPS+=" $(eval $(sed -n '/^ *AX_PKG_REQUIRE/{s,^ *\(AX_PKG_REQUIRE\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))" + DEPS+=" $(eval $(sed -n '/^ *AX_PKG_CHECK/{s,^ *\(AX_PKG_CHECK\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))" for f in $(sed -n 's, *AX_\(RPM\|ALL\)_DEPEND_IFEXISTS(\([^)]*\)).*,\2,p' configure.ac); do - if (test -x /usr/bin/zypper && zypper search -x "$f" 1>&2 > /dev/null) || \ - (test -x /usr/bin/dnf && dnf list -q "$f" 1>&2 > /dev/null) || \ - (test -x /usr/bin/yum && yum list -q "$f" 1>&2 > /dev/null) || \ - (test -x /usr/sbin/urpmq && urpmq "$f" 1>&2 > /dev/null); then + if pkg_exists "${f}"; then DEPS+=" ${f}" fi done for f in $(sed -n 's, *AX_\(RPM\|ALL\)_DEPEND_IFEXISTS_DEV(\([^)]*\)).*,\2,p' configure.ac); do - if (test -x /usr/bin/zypper && zypper search -x "$f"-devel 1>&2 > /dev/null) || \ - (test -x /usr/bin/dnf && dnf list -q "$f"-devel 1>&2 > /dev/null) || \ - (test -x /usr/bin/yum && yum list -q "$f"-devel 1>&2 > /dev/null) || \ - (test -x /usr/sbin/urpmq && urpmq "$f"-devel 1>&2 > /dev/null); then + if pkg_exists "${f}-devel"; then DEPS+=" ${f}-devel" fi done @@ -48,7 +85,7 @@ 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,@\(\(ALL\|RPM\)_DEPEND_IFEXISTS\|\(ALL\|RPM\)_BUILD_DEPEND\|\(ALL\|RPM\)_DEPEND\)@,,g' ${PACKAGE_NAME}.spec.in | \ - sed 's,@[^@]*@, dummytext,g' > ${PACKAGE_NAME}.spec + 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) @@ -60,15 +97,24 @@ 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 + if test -n "${FILES// /}${DEPS// /}"; then schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS} 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 + if test -n "${FILES// /}${DEPS// /}"; then ${INSTALL_TOOL} ${FILES} ${DEPS} fi 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') +else + FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') +fi +if test -n "${FILES// /}"; then + echo "**** ERROR: Cannot install: " $FILES + exit 1 +fi echo "**** Success: All Dependencies Resolved" diff --git a/rpmsign.exp b/rpmsign.exp new file mode 100755 index 0000000..dc29d94 --- /dev/null +++ b/rpmsign.exp @@ -0,0 +1,14 @@ +#!/usr/bin/expect -f + +set key [lindex $argv 0] +set password [lindex $argv 1] +set files [lrange $argv 2 end] + +### rpm-sign.exp -- Sign RPMs by sending the passphrase. +spawn rpmsign --define "_gpg_name $key" --addsign {*}$files +expect { + "Enter pass phrase: " { + send -- "$password\r" + exp_continue + } eof +} diff --git a/src/main.cxx b/src/main.cxx index bba4929..6069360 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -141,8 +141,8 @@ int main(int argv, char** argc) try { QString bookmarks; bool editbookmarks(false); QStringList args(app.arguments()); - std::auto_ptr settings - (std::auto_ptr(new QSettings("Sign", "Surfer"))); + std::unique_ptr settings + (std::unique_ptr(new QSettings("Sign", "Surfer"))); for (QStringList::iterator it(args.begin()); ++it!=args.end();) if (*it=="-h" || *it=="--help" || *it=="-help" || *it=="/?") { std::cout< + settings = std::unique_ptr (new QSettings(*it, QSettings::IniFormat)); } else if ((*it=="-c" || *it=="--cert") && ++it!=args.end()) { QFile file(*it); diff --git a/src/makefile.am b/src/makefile.am index 0e7f100..0a82eff 100644 --- a/src/makefile.am +++ b/src/makefile.am @@ -6,7 +6,8 @@ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -SUBDIRS = qbrowserlib designer +SUBDIRS = qbrowserlib +# designer → to be fixed bin_PROGRAMS = surfer LANGUAGE_FILE_BASE = surfer diff --git a/src/qbrowserlib/browser.hxx b/src/qbrowserlib/browser.hxx index 811e196..c732326 100644 --- a/src/qbrowserlib/browser.hxx +++ b/src/qbrowserlib/browser.hxx @@ -153,7 +153,7 @@ class Browser: public QMainWindow, protected Ui::Browser { (actionClearLocation); } _editbookmarks = - std::auto_ptr(new EditBookmarks(combo, this)); + std::unique_ptr(new EditBookmarks(combo, this)); assert(connect(_editbookmarks.get(), SIGNAL(startEdit(bool)), actionAddBookmark, SLOT(setDisabled(bool)))); assert(connect(_editbookmarks.get(), SIGNAL(endEdit(bool)), @@ -1564,7 +1564,7 @@ class Browser: public QMainWindow, protected Ui::Browser { LoginCertificate _logincertificate; gui::Proxy _proxy; QPushButton* _showErrorLog; - std::auto_ptr _editbookmarks; + std::unique_ptr _editbookmarks; bool _startUrl; bool _quirks; qbrowserlib::ButtonLineEdit* _search; diff --git a/src/qbrowserlib/qbrowserlib_de.ts b/src/qbrowserlib/qbrowserlib_de.ts index 315910b..69c0729 100644 --- a/src/qbrowserlib/qbrowserlib_de.ts +++ b/src/qbrowserlib/qbrowserlib_de.ts @@ -1,7 +1,384 @@ - -UTF-8 + + + Authentication + + + Authorization + + + + + Authentication required for: + + + + + realm + + + + + Username: + + + + + Password: + + + + + Browser + + + Surfer + + + + + toolBar + + + + + &File + + + + + Edit + + + + + History + + + + + Info + + + + + Bookmarks + + + + + neu laden + + + + + F5 + + + + + stoppen + + + + + + Esc + + + + + zurückkehren + + + + + Alt+Left + + + + + weitergehen + + + + + Alt+Right + + + + + Startseite + + + + + Ctrl+Home + + + + + &New Browser + + + + + New Browser Window + + + + + Ctrl+N + + + + + &Quit + + + + + &Proxy... + + + + + Print ... + + + + + Print Pre&view ... + + + + + Quick &Print + + + + + Ctrl+P + + + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + + + + Shift+Left + + + + + New Tab + + + + + Add New Tab + + + + + Ctrl+T + + + + + Find + + + + + find in page + + + + + Ctrl+F + + + + + Close Find + + + + + &About + + + + + &Settings ... + + + + + &Reverse Find + + + + + Ctrl+R + + + + + Error Log + + + + + show error logs + + + + + User Login Certificate + + + + + &Proxy ... + + + + + Clear Location + + + + + clear location bar + + + + + Add Bookmark + + + + + add bookmark to location bar + + + + + Ctrl+D + + + + + &Bookmarks + + + + + Clear Find + + + + + clear find bar + + + + + &Close Tab + + + + + Ctrl+W + + + + + Sa&ve Session + + + + + &Load Session + + + + + Search + + + + + Clear Search + + + + + Debug Log + + + + + Commandline + + + + + Certificate + + + Form + + + + + Attribute + + + + + Value + + + + + EditBookmarks + + + Edit Bookmarks + + + + + + + + + + + - + + + + + Use Drag/Drop to move, double-click to edit. + + + ErrorLog @@ -65,6 +442,82 @@ + + LoginCertificate + + + User Login Certificate + + + + + PinEntry + + + Certificate PIN Entry + + + + + Please enter your PIN to unlock Certificate + + + + + PIN: + + + + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + + %1 PIN attempts left + + + + + bad or locked certificate + + + + + Show Certificate Details + + + + + QMessageBox + + + Wrong PIN + + + + + Authentication failed, please try again. + + + SaveOrRun @@ -538,12 +991,14 @@ p, li { white-space: pre-wrap; } + + + - @@ -579,7 +1034,8 @@ p, li { white-space: pre-wrap; } - save window state when opened withiut URL + save window state when opened without URL + save window state when opened withiut URL @@ -587,6 +1043,31 @@ p, li { white-space: pre-wrap; } close mimetype helper applications on exit + + + SuisseID + + + + + Use SuisseID + + + + + PKCS#11 Library Path: + + + + + libcvP11.so + + + + + Servers that are allowed to require SuisseID + + WebWidget @@ -637,134 +1118,463 @@ p, li { white-space: pre-wrap; } + + qbrowserlib::Browser + + + SSL Not Supported + + + + + SSL is not supported on your system + + + + + Checking: %1 + + + + + Forbidden: %1 + + + + + Access Denied + + + + + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. + + + + + Reading: %1 + + + + + Illegal URL: %1 + + + + + New Tab + + + + + gg + + + + + http://www.google.com/search?hl=%2&q=%1 + + + + + Error Loading SuisseID: %1 + + + + + Error Loading SuisseID + + + + + Zoom: %1% + + + + + opening new window + + + + + Print Document + + + + + %1 - %2 + statusbar actionBack_hovered %1=url %2=title + + + + + %1 - %2 + statusbar actionForward_hovered %1=url %2=title + + + + + + background-color: white + neutral find + + + + + + background-color: #ADA + text found + + + + + + background-color: #F77 + text not found + + + + + Commandline Arguments + + + + + About + + + + + %8 +Version: %1 +Builddate: %2 +Libraries: +%3 +%4 +qt-%5 (%6) +openssl-%7 (%9) %10 + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) + +This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) + + + + + %1 + + + + + [%1] - %2 - Surfer (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + + Surfer + window title with no tab + + + + + Info: %1 + + + + + done. + + + + + %1 + statusbar for hovered link %1=url + + + + + handling content ... + + + + + errors + show error log + + + + + + background-color: #F77 + invalid url + + + + + + background-color: white + valid url + + + + + authentication required + + + + + ssl error + + + + + qbrowserlib::Certificate + + + Valid Since + + + + + Valid Until + + + + + SuisseID Number + + + + + Certificate Serial Number + + + + + Subject Info + + + + + Alternate Subject + + + + + Issuer Info + + + + + E-Mail + + + + + URL + + + + + error + unknown certificate subject alternate name + + + + + Organization + + + + + Common Name + + + + + Locality + + + + + Organizational Unit + + + + + Country + + + + + State or Province + + + + + error + unknown certificate subject info + + + qbrowserlib::DownloadManager - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - + The connection to the proxy server was refused (the proxy server is not accepting requests). - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + Unknown network error (code: %1). - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + + qbrowserlib::PinEntry + + + SuisseID Number: + + + + + Postzertifikat: + title for postzertificate serial number + + + + + there are %1 PIN attempts left + + + + + minimum PIN length: %1 + + + + + maximum PIN length: %1 + + + qbrowserlib::SaveOrRun diff --git a/src/qbrowserlib/qbrowserlib_en.ts b/src/qbrowserlib/qbrowserlib_en.ts index c2ed0b7..9cbefca 100644 --- a/src/qbrowserlib/qbrowserlib_en.ts +++ b/src/qbrowserlib/qbrowserlib_en.ts @@ -1,7 +1,384 @@ - -UTF-8 + + + Authentication + + + Authorization + + + + + Authentication required for: + + + + + realm + + + + + Username: + + + + + Password: + + + + + Browser + + + Surfer + + + + + toolBar + + + + + &File + + + + + Edit + + + + + History + + + + + Info + + + + + Bookmarks + + + + + neu laden + + + + + F5 + + + + + stoppen + + + + + + Esc + + + + + zurückkehren + + + + + Alt+Left + + + + + weitergehen + + + + + Alt+Right + + + + + Startseite + + + + + Ctrl+Home + + + + + &New Browser + + + + + New Browser Window + + + + + Ctrl+N + + + + + &Quit + + + + + &Proxy... + + + + + Print ... + + + + + Print Pre&view ... + + + + + Quick &Print + + + + + Ctrl+P + + + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + + + + Shift+Left + + + + + New Tab + + + + + Add New Tab + + + + + Ctrl+T + + + + + Find + + + + + find in page + + + + + Ctrl+F + + + + + Close Find + + + + + &About + + + + + &Settings ... + + + + + &Reverse Find + + + + + Ctrl+R + + + + + Error Log + + + + + show error logs + + + + + User Login Certificate + + + + + &Proxy ... + + + + + Clear Location + + + + + clear location bar + + + + + Add Bookmark + + + + + add bookmark to location bar + + + + + Ctrl+D + + + + + &Bookmarks + + + + + Clear Find + + + + + clear find bar + + + + + &Close Tab + + + + + Ctrl+W + + + + + Sa&ve Session + + + + + &Load Session + + + + + Search + + + + + Clear Search + + + + + Debug Log + + + + + Commandline + + + + + Certificate + + + Form + + + + + Attribute + + + + + Value + + + + + EditBookmarks + + + Edit Bookmarks + + + + + + + + + + + - + + + + + Use Drag/Drop to move, double-click to edit. + + + ErrorLog @@ -65,6 +442,82 @@ + + LoginCertificate + + + User Login Certificate + + + + + PinEntry + + + Certificate PIN Entry + + + + + Please enter your PIN to unlock Certificate + + + + + PIN: + + + + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + + %1 PIN attempts left + + + + + bad or locked certificate + + + + + Show Certificate Details + + + + + QMessageBox + + + Wrong PIN + + + + + Authentication failed, please try again. + + + SaveOrRun @@ -538,12 +991,14 @@ p, li { white-space: pre-wrap; } + + + - @@ -579,7 +1034,8 @@ p, li { white-space: pre-wrap; } - save window state when opened withiut URL + save window state when opened without URL + save window state when opened withiut URL @@ -587,6 +1043,31 @@ p, li { white-space: pre-wrap; } close mimetype helper applications on exit + + + SuisseID + + + + + Use SuisseID + + + + + PKCS#11 Library Path: + + + + + libcvP11.so + + + + + Servers that are allowed to require SuisseID + + WebWidget @@ -637,134 +1118,463 @@ p, li { white-space: pre-wrap; } + + qbrowserlib::Browser + + + SSL Not Supported + + + + + SSL is not supported on your system + + + + + Checking: %1 + + + + + Forbidden: %1 + + + + + Access Denied + + + + + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. + + + + + Reading: %1 + + + + + Illegal URL: %1 + + + + + New Tab + + + + + gg + + + + + http://www.google.com/search?hl=%2&q=%1 + + + + + Error Loading SuisseID: %1 + + + + + Error Loading SuisseID + + + + + Zoom: %1% + + + + + opening new window + + + + + Print Document + + + + + %1 - %2 + statusbar actionBack_hovered %1=url %2=title + + + + + %1 - %2 + statusbar actionForward_hovered %1=url %2=title + + + + + + background-color: white + neutral find + + + + + + background-color: #ADA + text found + + + + + + background-color: #F77 + text not found + + + + + Commandline Arguments + + + + + About + + + + + %8 +Version: %1 +Builddate: %2 +Libraries: +%3 +%4 +qt-%5 (%6) +openssl-%7 (%9) %10 + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) + +This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) + + + + + %1 + + + + + [%1] - %2 - Surfer (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + + Surfer + window title with no tab + + + + + Info: %1 + + + + + done. + + + + + %1 + statusbar for hovered link %1=url + + + + + handling content ... + + + + + errors + show error log + + + + + + background-color: #F77 + invalid url + + + + + + background-color: white + valid url + + + + + authentication required + + + + + ssl error + + + + + qbrowserlib::Certificate + + + Valid Since + + + + + Valid Until + + + + + SuisseID Number + + + + + Certificate Serial Number + + + + + Subject Info + + + + + Alternate Subject + + + + + Issuer Info + + + + + E-Mail + + + + + URL + + + + + error + unknown certificate subject alternate name + + + + + Organization + + + + + Common Name + + + + + Locality + + + + + Organizational Unit + + + + + Country + + + + + State or Province + + + + + error + unknown certificate subject info + + + qbrowserlib::DownloadManager - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - + The connection to the proxy server was refused (the proxy server is not accepting requests). - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + Unknown network error (code: %1). - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + + qbrowserlib::PinEntry + + + SuisseID Number: + + + + + Postzertifikat: + title for postzertificate serial number + + + + + there are %1 PIN attempts left + + + + + minimum PIN length: %1 + + + + + maximum PIN length: %1 + + + qbrowserlib::SaveOrRun diff --git a/src/qbrowserlib/qbrowserlib_fr.ts b/src/qbrowserlib/qbrowserlib_fr.ts index 243588e..d14001e 100644 --- a/src/qbrowserlib/qbrowserlib_fr.ts +++ b/src/qbrowserlib/qbrowserlib_fr.ts @@ -1,7 +1,384 @@ - -UTF-8 + + + Authentication + + + Authorization + + + + + Authentication required for: + + + + + realm + + + + + Username: + + + + + Password: + + + + + Browser + + + Surfer + + + + + toolBar + + + + + &File + + + + + Edit + + + + + History + + + + + Info + + + + + Bookmarks + + + + + neu laden + + + + + F5 + + + + + stoppen + + + + + + Esc + + + + + zurückkehren + + + + + Alt+Left + + + + + weitergehen + + + + + Alt+Right + + + + + Startseite + + + + + Ctrl+Home + + + + + &New Browser + + + + + New Browser Window + + + + + Ctrl+N + + + + + &Quit + + + + + &Proxy... + + + + + Print ... + + + + + Print Pre&view ... + + + + + Quick &Print + + + + + Ctrl+P + + + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + + + + Shift+Left + + + + + New Tab + + + + + Add New Tab + + + + + Ctrl+T + + + + + Find + + + + + find in page + + + + + Ctrl+F + + + + + Close Find + + + + + &About + + + + + &Settings ... + + + + + &Reverse Find + + + + + Ctrl+R + + + + + Error Log + + + + + show error logs + + + + + User Login Certificate + + + + + &Proxy ... + + + + + Clear Location + + + + + clear location bar + + + + + Add Bookmark + + + + + add bookmark to location bar + + + + + Ctrl+D + + + + + &Bookmarks + + + + + Clear Find + + + + + clear find bar + + + + + &Close Tab + + + + + Ctrl+W + + + + + Sa&ve Session + + + + + &Load Session + + + + + Search + + + + + Clear Search + + + + + Debug Log + + + + + Commandline + + + + + Certificate + + + Form + + + + + Attribute + + + + + Value + + + + + EditBookmarks + + + Edit Bookmarks + + + + + + + + + + + - + + + + + Use Drag/Drop to move, double-click to edit. + + + ErrorLog @@ -65,6 +442,82 @@ + + LoginCertificate + + + User Login Certificate + + + + + PinEntry + + + Certificate PIN Entry + + + + + Please enter your PIN to unlock Certificate + + + + + PIN: + + + + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + + %1 PIN attempts left + + + + + bad or locked certificate + + + + + Show Certificate Details + + + + + QMessageBox + + + Wrong PIN + + + + + Authentication failed, please try again. + + + SaveOrRun @@ -538,12 +991,14 @@ p, li { white-space: pre-wrap; } + + + - @@ -579,7 +1034,8 @@ p, li { white-space: pre-wrap; } - save window state when opened withiut URL + save window state when opened without URL + save window state when opened withiut URL @@ -587,6 +1043,31 @@ p, li { white-space: pre-wrap; } close mimetype helper applications on exit + + + SuisseID + + + + + Use SuisseID + + + + + PKCS#11 Library Path: + + + + + libcvP11.so + + + + + Servers that are allowed to require SuisseID + + WebWidget @@ -637,134 +1118,463 @@ p, li { white-space: pre-wrap; } + + qbrowserlib::Browser + + + SSL Not Supported + + + + + SSL is not supported on your system + + + + + Checking: %1 + + + + + Forbidden: %1 + + + + + Access Denied + + + + + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. + + + + + Reading: %1 + + + + + Illegal URL: %1 + + + + + New Tab + + + + + gg + + + + + http://www.google.com/search?hl=%2&q=%1 + + + + + Error Loading SuisseID: %1 + + + + + Error Loading SuisseID + + + + + Zoom: %1% + + + + + opening new window + + + + + Print Document + + + + + %1 - %2 + statusbar actionBack_hovered %1=url %2=title + + + + + %1 - %2 + statusbar actionForward_hovered %1=url %2=title + + + + + + background-color: white + neutral find + + + + + + background-color: #ADA + text found + + + + + + background-color: #F77 + text not found + + + + + Commandline Arguments + + + + + About + + + + + %8 +Version: %1 +Builddate: %2 +Libraries: +%3 +%4 +qt-%5 (%6) +openssl-%7 (%9) %10 + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) + +This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) + + + + + %1 + + + + + [%1] - %2 - Surfer (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + + Surfer + window title with no tab + + + + + Info: %1 + + + + + done. + + + + + %1 + statusbar for hovered link %1=url + + + + + handling content ... + + + + + errors + show error log + + + + + + background-color: #F77 + invalid url + + + + + + background-color: white + valid url + + + + + authentication required + + + + + ssl error + + + + + qbrowserlib::Certificate + + + Valid Since + + + + + Valid Until + + + + + SuisseID Number + + + + + Certificate Serial Number + + + + + Subject Info + + + + + Alternate Subject + + + + + Issuer Info + + + + + E-Mail + + + + + URL + + + + + error + unknown certificate subject alternate name + + + + + Organization + + + + + Common Name + + + + + Locality + + + + + Organizational Unit + + + + + Country + + + + + State or Province + + + + + error + unknown certificate subject info + + + qbrowserlib::DownloadManager - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - + The connection to the proxy server was refused (the proxy server is not accepting requests). - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + Unknown network error (code: %1). - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + + qbrowserlib::PinEntry + + + SuisseID Number: + + + + + Postzertifikat: + title for postzertificate serial number + + + + + there are %1 PIN attempts left + + + + + minimum PIN length: %1 + + + + + maximum PIN length: %1 + + + qbrowserlib::SaveOrRun diff --git a/src/qbrowserlib/qbrowserlib_it.ts b/src/qbrowserlib/qbrowserlib_it.ts index 93d843c..17a10fe 100644 --- a/src/qbrowserlib/qbrowserlib_it.ts +++ b/src/qbrowserlib/qbrowserlib_it.ts @@ -1,7 +1,384 @@ - -UTF-8 + + + Authentication + + + Authorization + + + + + Authentication required for: + + + + + realm + + + + + Username: + + + + + Password: + + + + + Browser + + + Surfer + + + + + toolBar + + + + + &File + + + + + Edit + + + + + History + + + + + Info + + + + + Bookmarks + + + + + neu laden + + + + + F5 + + + + + stoppen + + + + + + Esc + + + + + zurückkehren + + + + + Alt+Left + + + + + weitergehen + + + + + Alt+Right + + + + + Startseite + + + + + Ctrl+Home + + + + + &New Browser + + + + + New Browser Window + + + + + Ctrl+N + + + + + &Quit + + + + + &Proxy... + + + + + Print ... + + + + + Print Pre&view ... + + + + + Quick &Print + + + + + Ctrl+P + + + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + + + + Shift+Left + + + + + New Tab + + + + + Add New Tab + + + + + Ctrl+T + + + + + Find + + + + + find in page + + + + + Ctrl+F + + + + + Close Find + + + + + &About + + + + + &Settings ... + + + + + &Reverse Find + + + + + Ctrl+R + + + + + Error Log + + + + + show error logs + + + + + User Login Certificate + + + + + &Proxy ... + + + + + Clear Location + + + + + clear location bar + + + + + Add Bookmark + + + + + add bookmark to location bar + + + + + Ctrl+D + + + + + &Bookmarks + + + + + Clear Find + + + + + clear find bar + + + + + &Close Tab + + + + + Ctrl+W + + + + + Sa&ve Session + + + + + &Load Session + + + + + Search + + + + + Clear Search + + + + + Debug Log + + + + + Commandline + + + + + Certificate + + + Form + + + + + Attribute + + + + + Value + + + + + EditBookmarks + + + Edit Bookmarks + + + + + + + + + + + - + + + + + Use Drag/Drop to move, double-click to edit. + + + ErrorLog @@ -65,6 +442,82 @@ + + LoginCertificate + + + User Login Certificate + + + + + PinEntry + + + Certificate PIN Entry + + + + + Please enter your PIN to unlock Certificate + + + + + PIN: + + + + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + + %1 PIN attempts left + + + + + bad or locked certificate + + + + + Show Certificate Details + + + + + QMessageBox + + + Wrong PIN + + + + + Authentication failed, please try again. + + + SaveOrRun @@ -538,12 +991,14 @@ p, li { white-space: pre-wrap; } + + + - @@ -579,7 +1034,8 @@ p, li { white-space: pre-wrap; } - save window state when opened withiut URL + save window state when opened without URL + save window state when opened withiut URL @@ -587,6 +1043,31 @@ p, li { white-space: pre-wrap; } close mimetype helper applications on exit + + + SuisseID + + + + + Use SuisseID + + + + + PKCS#11 Library Path: + + + + + libcvP11.so + + + + + Servers that are allowed to require SuisseID + + WebWidget @@ -637,134 +1118,463 @@ p, li { white-space: pre-wrap; } + + qbrowserlib::Browser + + + SSL Not Supported + + + + + SSL is not supported on your system + + + + + Checking: %1 + + + + + Forbidden: %1 + + + + + Access Denied + + + + + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. + + + + + Reading: %1 + + + + + Illegal URL: %1 + + + + + New Tab + + + + + gg + + + + + http://www.google.com/search?hl=%2&q=%1 + + + + + Error Loading SuisseID: %1 + + + + + Error Loading SuisseID + + + + + Zoom: %1% + + + + + opening new window + + + + + Print Document + + + + + %1 - %2 + statusbar actionBack_hovered %1=url %2=title + + + + + %1 - %2 + statusbar actionForward_hovered %1=url %2=title + + + + + + background-color: white + neutral find + + + + + + background-color: #ADA + text found + + + + + + background-color: #F77 + text not found + + + + + Commandline Arguments + + + + + About + + + + + %8 +Version: %1 +Builddate: %2 +Libraries: +%3 +%4 +qt-%5 (%6) +openssl-%7 (%9) %10 + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) + +This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) + + + + + %1 + + + + + [%1] - %2 - Surfer (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + + Surfer + window title with no tab + + + + + Info: %1 + + + + + done. + + + + + %1 + statusbar for hovered link %1=url + + + + + handling content ... + + + + + errors + show error log + + + + + + background-color: #F77 + invalid url + + + + + + background-color: white + valid url + + + + + authentication required + + + + + ssl error + + + + + qbrowserlib::Certificate + + + Valid Since + + + + + Valid Until + + + + + SuisseID Number + + + + + Certificate Serial Number + + + + + Subject Info + + + + + Alternate Subject + + + + + Issuer Info + + + + + E-Mail + + + + + URL + + + + + error + unknown certificate subject alternate name + + + + + Organization + + + + + Common Name + + + + + Locality + + + + + Organizational Unit + + + + + Country + + + + + State or Province + + + + + error + unknown certificate subject info + + + qbrowserlib::DownloadManager - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - + The connection to the proxy server was refused (the proxy server is not accepting requests). - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + Unknown network error (code: %1). - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + + qbrowserlib::PinEntry + + + SuisseID Number: + + + + + Postzertifikat: + title for postzertificate serial number + + + + + there are %1 PIN attempts left + + + + + minimum PIN length: %1 + + + + + maximum PIN length: %1 + + + qbrowserlib::SaveOrRun diff --git a/src/qbrowserlib/smartcardauth.hxx b/src/qbrowserlib/smartcardauth.hxx index c5eb64c..d0eb8f7 100644 --- a/src/qbrowserlib/smartcardauth.hxx +++ b/src/qbrowserlib/smartcardauth.hxx @@ -14,6 +14,7 @@ #include #include +#include #include @@ -33,6 +34,12 @@ class CryptokiEngine: public QObject, public openssl::Engine { TRC; } + virtual ~CryptokiEngine() noexcept try { + TRC; + } catch (...) { + // ignore + } + operator bool() { TRC; LOG<<"Status of CryptokiEngine: " <<(_privateKey.get() @@ -42,7 +49,7 @@ class CryptokiEngine: public QObject, public openssl::Engine { void cert(cryptoki::Object& privateKey, const std::string& certVal) { TRC; - _privateKey = std::auto_ptr + _privateKey = std::unique_ptr (new cryptoki::Object(privateKey)); try { // new QSslConfiguration sslConfig(QSslConfiguration::defaultConfiguration()); @@ -63,6 +70,8 @@ class CryptokiEngine: public QObject, public openssl::Engine { "IbUmHIXt6oHLJmoGFX46bCcfil5eE5FXfiaw7Q9iPw==\n" "-----END RSA PRIVATE KEY-----\n"); QSslKey privkey(pem, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey); + /// @todo FIX OpenSSL 1.0 → 1.1 + /* RSA* rsa((RSA*)privkey.handle()); if (!ENGINE_init(_e)) return; rsa->engine=_e; @@ -80,6 +89,7 @@ class CryptokiEngine: public QObject, public openssl::Engine { set(rsa->dmq1, privateKey, CKA_EXPONENT_2, "CKA_EXPONENT_2"); set(rsa->iqmp, privateKey, CKA_COEFFICIENT, "CKA_COEFFICIENT"); rsa->flags |= RSA_FLAG_SIGN_VER; // don't emulate with encrypt/decrypt + */ assert(!privkey.isNull()); LOG<<"Setup RSA finished"; sslConfig.setPrivateKey(privkey); @@ -169,7 +179,7 @@ class CryptokiEngine: public QObject, public openssl::Engine { private: - std::auto_ptr _privateKey; + std::unique_ptr _privateKey; }; diff --git a/src/qbrowserlib/sslclientnetworkmanager.hxx b/src/qbrowserlib/sslclientnetworkmanager.hxx index bae6f09..6e55ea3 100644 --- a/src/qbrowserlib/sslclientnetworkmanager.hxx +++ b/src/qbrowserlib/sslclientnetworkmanager.hxx @@ -30,7 +30,7 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager { } void scAuth(SmartCardAuth* auth) { - _scAuth = std::auto_ptr(auth); + _scAuth = std::unique_ptr(auth); } Q_SIGNALS: @@ -56,7 +56,7 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager { private: - std::auto_ptr _scAuth; + std::unique_ptr _scAuth; }; diff --git a/src/qbrowserlib/webview.hxx b/src/qbrowserlib/webview.hxx index f07c1fd..0ea499a 100644 --- a/src/qbrowserlib/webview.hxx +++ b/src/qbrowserlib/webview.hxx @@ -40,7 +40,7 @@ namespace qbrowserlib { WebView(QWidget *parent=0, QNetworkAccessManager* net=0): QWebView(parent) { if (!net) net = (_fallbackNetworkAccessManager = - std::auto_ptr + std::unique_ptr (new QNetworkAccessManager)).get(); //! @bugfix, gcc does not yet support constructor calling x(new WebPage(net, this)); @@ -71,7 +71,7 @@ namespace qbrowserlib { private: - std::auto_ptr _fallbackNetworkAccessManager; + std::unique_ptr _fallbackNetworkAccessManager; }; } diff --git a/src/surfer_de.ts b/src/surfer_de.ts index 1778422..358c770 100644 --- a/src/surfer_de.ts +++ b/src/surfer_de.ts @@ -1,789 +1,20 @@ - -UTF-8 - - Authentication - - - Authentication required for: - - - - - Authorization - - - - - Password: - - - - - Username: - - - - - realm - - - - - Browser - - - %1 - - - - - &About - - - - - &Bookmarks - - - - - &Close Tab - - - - - &File - - - - - &Load Session - - - - - &New Browser - - - - - &Proxy ... - - - - - &Proxy... - - - - - &Quit - - - - - &Reverse Find - - - - - &Settings ... - - - - - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - - - - - %1 - %2 - statusbar actionBack_hovered %1=url %2=title - - - - - %1 - %2 - statusbar actionForward_hovered %1=url %2=title - - - - - - background-color: white - neutral find - - - - - - background-color: #ADA - text found - - - - - - background-color: #F77 - text not found - - - - - About - - - - - %8 -Version: %1 -Builddate: %2 -Libraries: -%3 -%4 -qt-%5 (%6) -openssl-%7 (%9) %10 - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) - -This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) - - - - - errors - show error log - - - - - - background-color: #F77 - invalid url - - - - - - background-color: white - valid url - - - - - Access Denied - - - - - Add Bookmark - - - - - Add New Tab - - - - - Alt+Left - - - - - Alt+Right - - - - - Bookmarks - - - - - Checking: %1 - - - - - Clear Find - - - - - Clear Location - - - - - Clear Search - - - - - Close Find - - - - - Ctrl+D - - - - - Ctrl+F - - - - - Ctrl+Home - - - - - Ctrl+N - - - - - Ctrl+P - - - - - Ctrl+R - - - - - Ctrl+T - - - - - Ctrl+W - - - - - Debug Log - - - - - Edit - - - - - Error Log - - - - - - Esc - - - - - F5 - - - - - Find - - - - - Forbidden: %1 - - - - - History - - - - - Illegal URL: %1 - - - - - Info - - - - - Info: %1 - - - - - New Browser Window - - - - - - New Tab - - - - - Next Tab - - - - - Previous Tab - - - - - Print ... - - - - - Print Document - - - - - Print Pre&view ... - - - - - Quick &Print - - - - - Reading: %1 - - - - - SSL Not Supported - - - - - SSL is not supported on your system - - - - - Sa&ve Session - - - - - Search - - - - - Shift+Left - - - - - Shift+Right - - - - - Startseite - - - - - Surfer - - - - - User Login Certificate - - - - - Zoom: %1% - - - - - add bookmark to location bar - - - - - authentication required - - - - - clear find bar - - - - - clear location bar - - - - - done. - - - - - find in page - - - - - gg - - - - - [%1] - %2 - Surfer (%3) - main window title %1 = host name %2 = page title %3 = number of open tabs - - - - - Surfer - window title with no tab - - - - - %1 - statusbar for hovered link %1=url - - - - - handling content ... - - - - - http://www.google.com/search?hl=%2&q=%1 - - - - - neu laden - - - - - opening new window - - - - - show error logs - - - - - ssl error - - - - - stoppen - - - - - toolBar - - - - - weitergehen - - - - - zurückkehren - - - - - Certificate - - - Alternate Subject - - - - - Attribute - - - - - Certificate Serial Number - - - - - error - unknown certificate subject alternate name - - - - - Common Name - - - - - Country - - - - - error - unknown certificate subject info - - - - - E-Mail - - - - - Form - - - - - Issuer Info - - - - - Locality - - - - - Organization - - - - - Organizational Unit - - - - - State or Province - - - - - Subject Info - - - - - SuisseID Number - - - - - URL - - - - - Valid Since - - - - - Valid Until - - - - - Value - - - - - EditBookmarks - - - + - - - - - - - - - - - Edit Bookmarks - - - - - Use Drag/Drop to move, double-click to edit. - - - - - LoginCertificate - - - User Login Certificate - - - - - PinEntry - - - %1 PIN attempts left - - - - - Certificate PIN Entry - - - - - E-Mail: - - - - - Name: - - - - - PIN: - - - - - Please enter your PIN to unlock Certificate - - - - - Show Certificate Details - - - - - - SuisseID Number: - - - - - - - TextLabel - - - - - bad or locked certificate - - - - - Postzertifikat: - title for postzertificate serial number - - - - - there are %1 PIN attempts left - - - - - minimum PIN length: %1 - - - - - maximum PIN length: %1 - - - - - QMessageBox - - - Authentication failed, please try again. - - - - - Wrong PIN - - - + QObject - + Cannot read PEM RSA key from file: %1 - + Cannot read PEM certificate from file: %1 - - Surfer - application name - - - - - Read PEM certificates from file: %1 - - - - - Read private key from file: %1 - - - - - Too few arguments. -Try: %1 --help - - - - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -812,9 +43,29 @@ Environment: PROXY_TYPE "http" or "socks" or "" (actual: %2) PROXY_PORT proxy port number (actual: %3) PROXY_HOST proxy host name (actual: %4) - _USERAGENT fake user agent (actual: %6) - QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) + _USERAGENT fake user agent (actual: %6) + + + + + Surfer + application name + + + + + Read PEM certificates from file: %1 + + + + + Read private key from file: %1 + + + + + Too few arguments. +Try: %1 --help diff --git a/src/surfer_en.ts b/src/surfer_en.ts index 97a3bb3..e40f259 100644 --- a/src/surfer_en.ts +++ b/src/surfer_en.ts @@ -1,789 +1,20 @@ - -UTF-8 - - Authentication - - - Authentication required for: - - - - - Authorization - - - - - Password: - - - - - Username: - - - - - realm - - - - - Browser - - - %1 - - - - - &About - - - - - &Bookmarks - - - - - &Close Tab - - - - - &File - - - - - &Load Session - - - - - &New Browser - - - - - &Proxy ... - - - - - &Proxy... - - - - - &Quit - - - - - &Reverse Find - - - - - &Settings ... - - - - - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - - - - - %1 - %2 - statusbar actionBack_hovered %1=url %2=title - - - - - %1 - %2 - statusbar actionForward_hovered %1=url %2=title - - - - - - background-color: white - neutral find - - - - - - background-color: #ADA - text found - - - - - - background-color: #F77 - text not found - - - - - About - - - - - %8 -Version: %1 -Builddate: %2 -Libraries: -%3 -%4 -qt-%5 (%6) -openssl-%7 (%9) %10 - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) - -This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) - - - - - errors - show error log - - - - - - background-color: #F77 - invalid url - - - - - - background-color: white - valid url - - - - - Access Denied - - - - - Add Bookmark - - - - - Add New Tab - - - - - Alt+Left - - - - - Alt+Right - - - - - Bookmarks - - - - - Checking: %1 - - - - - Clear Find - - - - - Clear Location - - - - - Clear Search - - - - - Close Find - - - - - Ctrl+D - - - - - Ctrl+F - - - - - Ctrl+Home - - - - - Ctrl+N - - - - - Ctrl+P - - - - - Ctrl+R - - - - - Ctrl+T - - - - - Ctrl+W - - - - - Debug Log - - - - - Edit - - - - - Error Log - - - - - - Esc - - - - - F5 - - - - - Find - - - - - Forbidden: %1 - - - - - History - - - - - Illegal URL: %1 - - - - - Info - - - - - Info: %1 - - - - - New Browser Window - - - - - - New Tab - - - - - Next Tab - - - - - Previous Tab - - - - - Print ... - - - - - Print Document - - - - - Print Pre&view ... - - - - - Quick &Print - - - - - Reading: %1 - - - - - SSL Not Supported - - - - - SSL is not supported on your system - - - - - Sa&ve Session - - - - - Search - - - - - Shift+Left - - - - - Shift+Right - - - - - Startseite - - - - - Surfer - - - - - User Login Certificate - - - - - Zoom: %1% - - - - - add bookmark to location bar - - - - - authentication required - - - - - clear find bar - - - - - clear location bar - - - - - done. - - - - - find in page - - - - - gg - - - - - [%1] - %2 - Surfer (%3) - main window title %1 = host name %2 = page title %3 = number of open tabs - - - - - Surfer - window title with no tab - - - - - %1 - statusbar for hovered link %1=url - - - - - handling content ... - - - - - http://www.google.com/search?hl=%2&q=%1 - - - - - neu laden - - - - - opening new window - - - - - show error logs - - - - - ssl error - - - - - stoppen - - - - - toolBar - - - - - weitergehen - - - - - zurückkehren - - - - - Certificate - - - Alternate Subject - - - - - Attribute - - - - - Certificate Serial Number - - - - - error - unknown certificate subject alternate name - - - - - Common Name - - - - - Country - - - - - error - unknown certificate subject info - - - - - E-Mail - - - - - Form - - - - - Issuer Info - - - - - Locality - - - - - Organization - - - - - Organizational Unit - - - - - State or Province - - - - - Subject Info - - - - - SuisseID Number - - - - - URL - - - - - Valid Since - - - - - Valid Until - - - - - Value - - - - - EditBookmarks - - - + - - - - - - - - - - - Edit Bookmarks - - - - - Use Drag/Drop to move, double-click to edit. - - - - - LoginCertificate - - - User Login Certificate - - - - - PinEntry - - - %1 PIN attempts left - - - - - Certificate PIN Entry - - - - - E-Mail: - - - - - Name: - - - - - PIN: - - - - - Please enter your PIN to unlock Certificate - - - - - Show Certificate Details - - - - - - SuisseID Number: - - - - - - - TextLabel - - - - - bad or locked certificate - - - - - Postzertifikat: - title for postzertificate serial number - - - - - there are %1 PIN attempts left - - - - - minimum PIN length: %1 - - - - - maximum PIN length: %1 - - - - - QMessageBox - - - Authentication failed, please try again. - - - - - Wrong PIN - - - + QObject - + Cannot read PEM RSA key from file: %1 - + Cannot read PEM certificate from file: %1 - - Surfer - application name - - - - - Read PEM certificates from file: %1 - - - - - Read private key from file: %1 - - - - - Too few arguments. -Try: %1 --help - - - - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -812,9 +43,29 @@ Environment: PROXY_TYPE "http" or "socks" or "" (actual: %2) PROXY_PORT proxy port number (actual: %3) PROXY_HOST proxy host name (actual: %4) - _USERAGENT fake user agent (actual: %6) - QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) + _USERAGENT fake user agent (actual: %6) + + + + + Surfer + application name + + + + + Read PEM certificates from file: %1 + + + + + Read private key from file: %1 + + + + + Too few arguments. +Try: %1 --help diff --git a/src/surfer_fr.ts b/src/surfer_fr.ts index 5ed441e..125bb64 100644 --- a/src/surfer_fr.ts +++ b/src/surfer_fr.ts @@ -1,789 +1,20 @@ - -UTF-8 - - Authentication - - - Authentication required for: - - - - - Authorization - - - - - Password: - - - - - Username: - - - - - realm - - - - - Browser - - - %1 - - - - - &About - - - - - &Bookmarks - - - - - &Close Tab - - - - - &File - - - - - &Load Session - - - - - &New Browser - - - - - &Proxy ... - - - - - &Proxy... - - - - - &Quit - - - - - &Reverse Find - - - - - &Settings ... - - - - - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - - - - - %1 - %2 - statusbar actionBack_hovered %1=url %2=title - - - - - %1 - %2 - statusbar actionForward_hovered %1=url %2=title - - - - - - background-color: white - neutral find - - - - - - background-color: #ADA - text found - - - - - - background-color: #F77 - text not found - - - - - About - - - - - %8 -Version: %1 -Builddate: %2 -Libraries: -%3 -%4 -qt-%5 (%6) -openssl-%7 (%9) %10 - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) - -This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) - - - - - errors - show error log - - - - - - background-color: #F77 - invalid url - - - - - - background-color: white - valid url - - - - - Access Denied - - - - - Add Bookmark - - - - - Add New Tab - - - - - Alt+Left - - - - - Alt+Right - - - - - Bookmarks - - - - - Checking: %1 - - - - - Clear Find - - - - - Clear Location - - - - - Clear Search - - - - - Close Find - - - - - Ctrl+D - - - - - Ctrl+F - - - - - Ctrl+Home - - - - - Ctrl+N - - - - - Ctrl+P - - - - - Ctrl+R - - - - - Ctrl+T - - - - - Ctrl+W - - - - - Debug Log - - - - - Edit - - - - - Error Log - - - - - - Esc - - - - - F5 - - - - - Find - - - - - Forbidden: %1 - - - - - History - - - - - Illegal URL: %1 - - - - - Info - - - - - Info: %1 - - - - - New Browser Window - - - - - - New Tab - - - - - Next Tab - - - - - Previous Tab - - - - - Print ... - - - - - Print Document - - - - - Print Pre&view ... - - - - - Quick &Print - - - - - Reading: %1 - - - - - SSL Not Supported - - - - - SSL is not supported on your system - - - - - Sa&ve Session - - - - - Search - - - - - Shift+Left - - - - - Shift+Right - - - - - Startseite - - - - - Surfer - - - - - User Login Certificate - - - - - Zoom: %1% - - - - - add bookmark to location bar - - - - - authentication required - - - - - clear find bar - - - - - clear location bar - - - - - done. - - - - - find in page - - - - - gg - - - - - [%1] - %2 - Surfer (%3) - main window title %1 = host name %2 = page title %3 = number of open tabs - - - - - Surfer - window title with no tab - - - - - %1 - statusbar for hovered link %1=url - - - - - handling content ... - - - - - http://www.google.com/search?hl=%2&q=%1 - - - - - neu laden - - - - - opening new window - - - - - show error logs - - - - - ssl error - - - - - stoppen - - - - - toolBar - - - - - weitergehen - - - - - zurückkehren - - - - - Certificate - - - Alternate Subject - - - - - Attribute - - - - - Certificate Serial Number - - - - - error - unknown certificate subject alternate name - - - - - Common Name - - - - - Country - - - - - error - unknown certificate subject info - - - - - E-Mail - - - - - Form - - - - - Issuer Info - - - - - Locality - - - - - Organization - - - - - Organizational Unit - - - - - State or Province - - - - - Subject Info - - - - - SuisseID Number - - - - - URL - - - - - Valid Since - - - - - Valid Until - - - - - Value - - - - - EditBookmarks - - - + - - - - - - - - - - - Edit Bookmarks - - - - - Use Drag/Drop to move, double-click to edit. - - - - - LoginCertificate - - - User Login Certificate - - - - - PinEntry - - - %1 PIN attempts left - - - - - Certificate PIN Entry - - - - - E-Mail: - - - - - Name: - - - - - PIN: - - - - - Please enter your PIN to unlock Certificate - - - - - Show Certificate Details - - - - - - SuisseID Number: - - - - - - - TextLabel - - - - - bad or locked certificate - - - - - Postzertifikat: - title for postzertificate serial number - - - - - there are %1 PIN attempts left - - - - - minimum PIN length: %1 - - - - - maximum PIN length: %1 - - - - - QMessageBox - - - Authentication failed, please try again. - - - - - Wrong PIN - - - + QObject - + Cannot read PEM RSA key from file: %1 - + Cannot read PEM certificate from file: %1 - - Surfer - application name - - - - - Read PEM certificates from file: %1 - - - - - Read private key from file: %1 - - - - - Too few arguments. -Try: %1 --help - - - - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -812,9 +43,29 @@ Environment: PROXY_TYPE "http" or "socks" or "" (actual: %2) PROXY_PORT proxy port number (actual: %3) PROXY_HOST proxy host name (actual: %4) - _USERAGENT fake user agent (actual: %6) - QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) + _USERAGENT fake user agent (actual: %6) + + + + + Surfer + application name + + + + + Read PEM certificates from file: %1 + + + + + Read private key from file: %1 + + + + + Too few arguments. +Try: %1 --help diff --git a/src/surfer_it.ts b/src/surfer_it.ts index 7d7c2b1..374aa59 100644 --- a/src/surfer_it.ts +++ b/src/surfer_it.ts @@ -1,789 +1,20 @@ - -UTF-8 - - Authentication - - - Authentication required for: - - - - - Authorization - - - - - Password: - - - - - Username: - - - - - realm - - - - - Browser - - - %1 - - - - - &About - - - - - &Bookmarks - - - - - &Close Tab - - - - - &File - - - - - &Load Session - - - - - &New Browser - - - - - &Proxy ... - - - - - &Proxy... - - - - - &Quit - - - - - &Reverse Find - - - - - &Settings ... - - - - - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - - - - - %1 - %2 - statusbar actionBack_hovered %1=url %2=title - - - - - %1 - %2 - statusbar actionForward_hovered %1=url %2=title - - - - - - background-color: white - neutral find - - - - - - background-color: #ADA - text found - - - - - - background-color: #F77 - text not found - - - - - About - - - - - %8 -Version: %1 -Builddate: %2 -Libraries: -%3 -%4 -qt-%5 (%6) -openssl-%7 (%9) %10 - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) - -This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) - - - - - errors - show error log - - - - - - background-color: #F77 - invalid url - - - - - - background-color: white - valid url - - - - - Access Denied - - - - - Add Bookmark - - - - - Add New Tab - - - - - Alt+Left - - - - - Alt+Right - - - - - Bookmarks - - - - - Checking: %1 - - - - - Clear Find - - - - - Clear Location - - - - - Clear Search - - - - - Close Find - - - - - Ctrl+D - - - - - Ctrl+F - - - - - Ctrl+Home - - - - - Ctrl+N - - - - - Ctrl+P - - - - - Ctrl+R - - - - - Ctrl+T - - - - - Ctrl+W - - - - - Debug Log - - - - - Edit - - - - - Error Log - - - - - - Esc - - - - - F5 - - - - - Find - - - - - Forbidden: %1 - - - - - History - - - - - Illegal URL: %1 - - - - - Info - - - - - Info: %1 - - - - - New Browser Window - - - - - - New Tab - - - - - Next Tab - - - - - Previous Tab - - - - - Print ... - - - - - Print Document - - - - - Print Pre&view ... - - - - - Quick &Print - - - - - Reading: %1 - - - - - SSL Not Supported - - - - - SSL is not supported on your system - - - - - Sa&ve Session - - - - - Search - - - - - Shift+Left - - - - - Shift+Right - - - - - Startseite - - - - - Surfer - - - - - User Login Certificate - - - - - Zoom: %1% - - - - - add bookmark to location bar - - - - - authentication required - - - - - clear find bar - - - - - clear location bar - - - - - done. - - - - - find in page - - - - - gg - - - - - [%1] - %2 - Surfer (%3) - main window title %1 = host name %2 = page title %3 = number of open tabs - - - - - Surfer - window title with no tab - - - - - %1 - statusbar for hovered link %1=url - - - - - handling content ... - - - - - http://www.google.com/search?hl=%2&q=%1 - - - - - neu laden - - - - - opening new window - - - - - show error logs - - - - - ssl error - - - - - stoppen - - - - - toolBar - - - - - weitergehen - - - - - zurückkehren - - - - - Certificate - - - Alternate Subject - - - - - Attribute - - - - - Certificate Serial Number - - - - - error - unknown certificate subject alternate name - - - - - Common Name - - - - - Country - - - - - error - unknown certificate subject info - - - - - E-Mail - - - - - Form - - - - - Issuer Info - - - - - Locality - - - - - Organization - - - - - Organizational Unit - - - - - State or Province - - - - - Subject Info - - - - - SuisseID Number - - - - - URL - - - - - Valid Since - - - - - Valid Until - - - - - Value - - - - - EditBookmarks - - - + - - - - - - - - - - - Edit Bookmarks - - - - - Use Drag/Drop to move, double-click to edit. - - - - - LoginCertificate - - - User Login Certificate - - - - - PinEntry - - - %1 PIN attempts left - - - - - Certificate PIN Entry - - - - - E-Mail: - - - - - Name: - - - - - PIN: - - - - - Please enter your PIN to unlock Certificate - - - - - Show Certificate Details - - - - - - SuisseID Number: - - - - - - - TextLabel - - - - - bad or locked certificate - - - - - Postzertifikat: - title for postzertificate serial number - - - - - there are %1 PIN attempts left - - - - - minimum PIN length: %1 - - - - - maximum PIN length: %1 - - - - - QMessageBox - - - Authentication failed, please try again. - - - - - Wrong PIN - - - + QObject - + Cannot read PEM RSA key from file: %1 - + Cannot read PEM certificate from file: %1 - - Surfer - application name - - - - - Read PEM certificates from file: %1 - - - - - Read private key from file: %1 - - - - - Too few arguments. -Try: %1 --help - - - - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -812,9 +43,29 @@ Environment: PROXY_TYPE "http" or "socks" or "" (actual: %2) PROXY_PORT proxy port number (actual: %3) PROXY_HOST proxy host name (actual: %4) - _USERAGENT fake user agent (actual: %6) - QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) + _USERAGENT fake user agent (actual: %6) + + + + + Surfer + application name + + + + + Read PEM certificates from file: %1 + + + + + Read private key from file: %1 + + + + + Too few arguments. +Try: %1 --help diff --git a/surfer.spec.in b/surfer.spec.in index 66c48f7..101fdd4 100644 --- a/surfer.spec.in +++ b/surfer.spec.in @@ -1,40 +1,38 @@ Summary: @DESCRIPTION@ Name: @PACKAGE_NAME@ Version: @VERSION@ -Release: @BUILD_NUMBER@%{?dist} +Release: @BUILD_NUMBER@.@DISTRO@ License: LGPL Group: Development/Libraries/C++ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gnupg, expect, subversion, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, libtool, doxygen, java-openjdk @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ -%if 0%{?fedora} != 20 -BuildRequires: graphviz +BuildRequires: which, pkgconfig, gnupg, expect, git, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, doxygen, graphviz, java-openjdk @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ + +#### os dependent definitions #### +%if 0%{?suse_version} || 0%{?sles_version} +BuildRequires: lsb-release, libqt5-qtbase-devel, libqt5-qttools, libqt5-linguist-devel, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel +%else +%if 0%{?mageia} +BuildRequires: rpm-sign, lsb-release +BuildRequires: qtbase5-common-devel, qttools5, lib64qt5webkit-devel, lib64qt5webkitwidgets-devel +%else +BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel +BuildRequires: rpm-sign, redhat-lsb +%global debug_package %{nil} +%endif +%endif +%if ! 0%{?centos} +BuildRequires: mscgen +%if ! 0%{?mageia} +BuildRequires: pandoc %endif -%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia} -BuildRequires: which, pkgconfig, cppunit-devel -%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, libltdl-devel +BuildRequires: libtool, libltdl-devel %else -BuildRequires: gpg, redhat-lsb, libtool-ltdl-devel +BuildRequires: libtool, libtool-ltdl-devel %endif -%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} ) -BuildRequires: mscgen -BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel -%else -BuildRequires: qt-devel -%endif -%else%if 0%{?suse_version} || 0%{?sles_version} -BuildRequires: pkg-config, lsb-release -%if 0%{?suse_version} < 1200 || 0%{?sles_version} < 1200 -BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel -%else -BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel -%endif -%endif%endif %description @README@ @@ -61,14 +59,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) /usr/%_lib/*.so.* +/usr/share/@PACKAGE_NAME@ %doc -/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS -/usr/share/doc/packages/@PACKAGE_NAME@/COPYING -/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog -/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL -/usr/share/doc/packages/@PACKAGE_NAME@/NEWS -/usr/share/doc/packages/@PACKAGE_NAME@/README +/usr/share/doc %package devel Summary: @DESCRIPTION@ diff --git a/template.sh b/template.sh new file mode 100755 index 0000000..05e5e67 --- /dev/null +++ b/template.sh @@ -0,0 +1,161 @@ +#!/bin/bash -e + +# documentation: run with option --help + +########################################################################################## +#### template for bash scripts #### START BELOW ########################################## +########################################################################################## + +############################################################################ begin logging +# check if stdout is a terminal... +if test -t 1; then + + # see if it supports colors... + ncolors=$(tput colors) + + if test -n "$ncolors" && test $ncolors -ge 8; then + bold="$(tput bold)" + underline="$(tput smul)" + standout="$(tput smso)" + normal="$(tput sgr0)" + black="$(tput setaf 0)" + red="$(tput setaf 1)" + green="$(tput setaf 2)" + yellow="$(tput setaf 3)" + blue="$(tput setaf 4)" + magenta="$(tput setaf 5)" + cyan="$(tput setaf 6)" + white="$(tput setaf 7)" + fi +fi + +append_msg() { + if test $# -ne 0; then + echo -n ": ${bold}$*" + fi + echo "${normal}" +} + +# write a message +message() { + if test $# -eq 0; then + return + fi + echo "${bold}${white}$*${normal}" 1>&2 +} + +# write a success message +success() { + echo -n "${bold}${green}success" 1>&2 + append_msg "$*" 1>&2 +} + +# write a notice +notice() { + echo -n "${bold}${yellow}notice" 1>&2 + append_msg "$*" 1>&2 +} + +# write a warning message +warning() { + echo -en "${bold}${red}warning" 1>&2 + append_msg "$*" 1>&2 +} + +# write error message +error() { + echo -en "${bold}${red}error" 1>&2 + append_msg "$*" 1>&2 +} + +# run a command, print the result and abort in case of error +# option: --ignore: ignore the result, continue in case of error +run() { + ignore=1 + while test $# -gt 0; do + case "$1" in + (--ignore) ignore=0;; + (*) break;; + esac + shift; + done + echo -n "${bold}${yellow}running:${white} $*${normal} … " + set +e + result=$($* 2>&1) + res=$? + set -e + if test $res -ne 0; then + if test $ignore -eq 1; then + error "failed with return code: $res" + if test -n "$result"; then + echo "$result" + fi + exit 1 + else + warning "ignored return code: $res" + return 0 + fi + else + return 1 + fi +} + +############################################################################ error handler +function traperror() { + set +x + local err=($1) # error status + local line="$2" # LINENO + local linecallfunc="$3" + local command="$4" + local funcstack="$5" + IFS=" " + for e in ${err[@]}; do + if test -n "$e" -a "$e" != "0"; then + error "line $line - command '$command' exited with status: $e (${err[@]})" + if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then + echo -n " ... error at ${funcstack} " 1>&2 + if [ "$linecallfunc" != "" ]; then + echo -n "called at line $linecallfunc" 1>&2 + fi + echo + fi + exit $e + fi + done + exit 0 +} + +# catch errors +trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' ERR SIGINT INT TERM EXIT + + + +########################################################################################## +#### START HERE ########################################################################## +########################################################################################## + +######################################################### commandline parameter evaluation +while test $# -gt 0; do + case "$1" in + (--help|-h) cat <