From 20e4ab9d032c104ccb3a62ad93e9bedebe3068dd Mon Sep 17 00:00:00 2001 From: mef Date: Sun, 11 Oct 2015 02:59:07 +0000 Subject: (pkgsrc) - (patch-openssl__cert.cpp) Add patch to define MAX_PATH macro - Unable to package with x11/wxGTK30 yet (upstream) - Udate 2.0.3 to 2.1.2 ----------- TQSL-2.1.2 The following links are pointers to TrustedQSL (TQSL) V2.1.2, which is a bug fix for the official TQSL 2.1 release. Release Notes TrustedQSL-2-1-release.pdf http://www.rickmurphy.net/lotw/TrustedQSL-2-1-release.pdf --- ham/trustedQSL/Makefile | 10 ++++---- ham/trustedQSL/PLIST | 29 ++++++++++++++++++++---- ham/trustedQSL/distinfo | 13 ++++++----- ham/trustedQSL/patches/patch-apps_CMakeLists.txt | 15 ++++++------ ham/trustedQSL/patches/patch-apps_tqsl_cpp | 10 ++++---- ham/trustedQSL/patches/patch-openssl__cert.cpp | 16 +++++++++++++ 6 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 ham/trustedQSL/patches/patch-openssl__cert.cpp diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile index d19311d3eb8..b794262f339 100644 --- a/ham/trustedQSL/Makefile +++ b/ham/trustedQSL/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2015/06/12 10:50:14 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2015/10/11 02:59:07 mef Exp $ -DISTNAME= tqsl-2.0.3 -PKGREVISION= 2 +DISTNAME= tqsl-2.1.2 CATEGORIES= ham -MASTER_SITES= http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.0.3/ +MASTER_SITES= http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.1.2/ MAINTAINER= makoto@ki.nu HOMEPAGE= http://sourceforge.net/projects/trustedqsl/ @@ -39,6 +38,9 @@ post-install: (cd ${WRKSRC} ;\ ${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \ ) + # Conflicting PLIST with wxGTK28-2.8.12nb8: + ${RM} ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo + .include "../../textproc/expat/buildlink3.mk" .include "../../databases/db5/buildlink3.mk" .include "../../x11/wxGTK28/buildlink3.mk" diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST index 269334147ca..c40957fc14d 100644 --- a/ham/trustedQSL/PLIST +++ b/ham/trustedQSL/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/06/13 11:38:03 mef Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/10/11 02:59:07 mef Exp $ bin/tqsl include/adif.h include/cabrillo.h @@ -8,10 +8,13 @@ include/tqsllib.h lib/libtqsllib.so man/man5/tqsl.5 share/TrustedQSL/LICENSE.txt -share/TrustedQSL/ca-bundle.crt share/TrustedQSL/config.xml +share/TrustedQSL/help/tqslapp/CertProp.bmp +share/TrustedQSL/help/tqslapp/EnterPassword.bmp +share/TrustedQSL/help/tqslapp/LoTWCerts.bmp share/TrustedQSL/help/tqslapp/P12.bmp share/TrustedQSL/help/tqslapp/Pending.bmp +share/TrustedQSL/help/tqslapp/RenewUpload.bmp share/TrustedQSL/help/tqslapp/TQ5.bmp share/TrustedQSL/help/tqslapp/TQ6.bmp share/TrustedQSL/help/tqslapp/TQ8.bmp @@ -27,6 +30,10 @@ share/TrustedQSL/help/tqslapp/cabrillo.htm share/TrustedQSL/help/tqslapp/certaccept.htm share/TrustedQSL/help/tqslapp/certaccept1.bmp share/TrustedQSL/help/tqslapp/certaccept2.bmp +share/TrustedQSL/help/tqslapp/certificateproperties.htm +share/TrustedQSL/help/tqslapp/certificatesecurity.htm +share/TrustedQSL/help/tqslapp/certificatevalidity.htm +share/TrustedQSL/help/tqslapp/certreplace.htm share/TrustedQSL/help/tqslapp/certreq.htm share/TrustedQSL/help/tqslapp/certreq1.bmp share/TrustedQSL/help/tqslapp/certs-icons.htm @@ -53,7 +60,9 @@ share/TrustedQSL/help/tqslapp/files-icons.htm share/TrustedQSL/help/tqslapp/glossary.htm share/TrustedQSL/help/tqslapp/index.htm share/TrustedQSL/help/tqslapp/installation.htm -share/TrustedQSL/help/tqslapp/loadcert.htm +share/TrustedQSL/help/tqslapp/key-concepts.htm +share/TrustedQSL/help/tqslapp/load-certificate.htm +share/TrustedQSL/help/tqslapp/localization.htm share/TrustedQSL/help/tqslapp/login.htm share/TrustedQSL/help/tqslapp/logopstab.bmp share/TrustedQSL/help/tqslapp/lotw.htm @@ -73,15 +82,20 @@ share/TrustedQSL/help/tqslapp/pref-cab3.bmp share/TrustedQSL/help/tqslapp/pref-opt.bmp share/TrustedQSL/help/tqslapp/pref-opt.htm share/TrustedQSL/help/tqslapp/primary.htm +share/TrustedQSL/help/tqslapp/promptforcall.bmp share/TrustedQSL/help/tqslapp/qsodata.bmp share/TrustedQSL/help/tqslapp/qsodata.htm share/TrustedQSL/help/tqslapp/renewing.htm share/TrustedQSL/help/tqslapp/renewing1.bmp share/TrustedQSL/help/tqslapp/renewing2.bmp share/TrustedQSL/help/tqslapp/replaced.bmp -share/TrustedQSL/help/tqslapp/save.htm +share/TrustedQSL/help/tqslapp/restoredeletedcert.htm +share/TrustedQSL/help/tqslapp/restoredeletedstnloc.htm +share/TrustedQSL/help/tqslapp/save-certificate.htm share/TrustedQSL/help/tqslapp/savestnl.bmp share/TrustedQSL/help/tqslapp/secondarycertops.htm +share/TrustedQSL/help/tqslapp/secondarystnlocops.htm +share/TrustedQSL/help/tqslapp/selectlanguage.htm share/TrustedQSL/help/tqslapp/sign1.bmp share/TrustedQSL/help/tqslapp/signconf.bmp share/TrustedQSL/help/tqslapp/signdone.bmp @@ -90,6 +104,7 @@ share/TrustedQSL/help/tqslapp/signupload.htm share/TrustedQSL/help/tqslapp/signupload1.bmp share/TrustedQSL/help/tqslapp/stnloc.bmp share/TrustedQSL/help/tqslapp/stnloc.htm +share/TrustedQSL/help/tqslapp/stnloc0.bmp share/TrustedQSL/help/tqslapp/stnloc1.bmp share/TrustedQSL/help/tqslapp/stnloc1.htm share/TrustedQSL/help/tqslapp/stnloc2.bmp @@ -105,4 +120,10 @@ share/TrustedQSL/help/tqslapp/unlock.htm share/TrustedQSL/help/tqslapp/update.htm share/TrustedQSL/help/tqslapp/update1.bmp share/TrustedQSL/help/tqslapp/update2.bmp +share/locale/de/LC_MESSAGES/tqslapp.mo +share/locale/es/LC_MESSAGES/tqslapp.mo +share/locale/fr/LC_MESSAGES/tqslapp.mo +share/locale/it/LC_MESSAGES/tqslapp.mo +share/locale/ja/LC_MESSAGES/tqslapp.mo +share/locale/pt/LC_MESSAGES/tqslapp.mo share/pixmaps/TrustedQSL.png diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo index 349e2f9766d..0c33a5a3dcc 100644 --- a/ham/trustedQSL/distinfo +++ b/ham/trustedQSL/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.9 2014/07/18 02:40:21 mef Exp $ +$NetBSD: distinfo,v 1.10 2015/10/11 02:59:07 mef Exp $ -SHA1 (tqsl-2.0.3.tar.gz) = d1ded1c8e55dcacc194db79a32c9e8fab6995af7 -RMD160 (tqsl-2.0.3.tar.gz) = eebe99ef2fecaefaaa1a29768da70cfb72896712 -Size (tqsl-2.0.3.tar.gz) = 2764308 bytes -SHA1 (patch-apps_CMakeLists.txt) = eed3a7eb926cfe6c384b10a3488f8b6e47ef3795 -SHA1 (patch-apps_tqsl_cpp) = 7feb48d6070abdccd59c404ffadf1e507cebd9d4 +SHA1 (tqsl-2.1.2.tar.gz) = b84416aba4736ddc39f638da74fb1fd8b3a52aaf +RMD160 (tqsl-2.1.2.tar.gz) = cdf040eb24c4ad29785c360b8d93600ffcb67f75 +Size (tqsl-2.1.2.tar.gz) = 3442792 bytes +SHA1 (patch-apps_CMakeLists.txt) = e685f6dba817c783dfe18796b714785923c42982 +SHA1 (patch-apps_tqsl_cpp) = fc6d0fc61b8002945d73b9275ffe5fe163c2dda1 +SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896 diff --git a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt index 69876ba091b..ec5b162b0c4 100644 --- a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt +++ b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt @@ -1,11 +1,11 @@ -$NetBSD: patch-apps_CMakeLists.txt,v 1.3 2014/06/13 11:38:03 mef Exp $ +$NetBSD: patch-apps_CMakeLists.txt,v 1.4 2015/10/11 02:59:07 mef Exp $ (1) Avoid ${WRKSRC} included in RPATH. (2) WARN: PLIST:105: Man pages should be installed into man/, not share/man/. ---- apps/CMakeLists.txt.orig 2014-01-12 23:39:24.000000000 +0900 -+++ apps/CMakeLists.txt 2014-01-14 00:13:12.000000000 +0900 -@@ -115,8 +115,8 @@ if(APPLE) +--- apps/CMakeLists.txt.orig 2015-09-20 09:15:24.000000000 +0900 ++++ apps/CMakeLists.txt 2015-10-11 00:57:52.000000000 +0900 +@@ -120,8 +120,8 @@ if(APPLE) endif() if(NOT WIN32) #rpath setup @@ -16,11 +16,12 @@ $NetBSD: patch-apps_CMakeLists.txt,v 1.3 2014/06/13 11:38:03 mef Exp $ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") endif() -@@ -144,6 +144,6 @@ if(NOT APPLE AND NOT WIN32) +@@ -148,7 +148,7 @@ if(NOT APPLE AND NOT WIN32) + add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"") install(TARGETS tqsl DESTINATION bin) install(DIRECTORY help DESTINATION share/TrustedQSL) - install(FILES ca-bundle.crt DESTINATION share/TrustedQSL) - install(FILES tqsl.5 DESTINATION share/man/man5) + install(FILES tqsl.5 DESTINATION man/man5) install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png) - endif() + install(FILES lang/de/tqslapp.mo DESTINATION share/locale/de/LC_MESSAGES) + install(FILES lang/de/wxstd.mo DESTINATION share/locale/de/LC_MESSAGES) diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp index 9c6641abe61..9e53ac30b15 100644 --- a/ham/trustedQSL/patches/patch-apps_tqsl_cpp +++ b/ham/trustedQSL/patches/patch-apps_tqsl_cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-apps_tqsl_cpp,v 1.2 2014/06/13 11:38:03 mef Exp $ +$NetBSD: patch-apps_tqsl_cpp,v 1.3 2015/10/11 02:59:07 mef Exp $ (1) Avoid following error (interim, only valid with db5) @@ -10,8 +10,8 @@ gmake[1]: *** [apps/CMakeFiles/tqsl.dir/all] Error 2 tqsl-2.0.1/apps/tqsl.cpp:2963:10: error: #pragma GCC diagnostic not allowed inside functions tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed inside functions ---- apps/tqsl.cpp.orig 2014-02-27 03:07:41.000000000 +0900 -+++ apps/tqsl.cpp 2014-02-27 20:21:11.000000000 +0900 +--- apps/tqsl.cpp.orig 2015-09-20 09:15:24.000000000 +0900 ++++ apps/tqsl.cpp 2015-10-11 01:19:49.000000000 +0900 @@ -55,7 +55,7 @@ #endif #include @@ -30,8 +30,8 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #endif void -@@ -3192,7 +3192,7 @@ MyFrame::DoCheckForUpdates(bool silent, - DoCheckExpiringCerts(noGUI); +@@ -3632,7 +3632,7 @@ MyFrame::DoCheckForUpdates(bool silent, + DoCheckExpiringCerts(noGUI); return; } -#if !defined(__APPLE__) && !defined(_WIN32) diff --git a/ham/trustedQSL/patches/patch-openssl__cert.cpp b/ham/trustedQSL/patches/patch-openssl__cert.cpp new file mode 100644 index 00000000000..3d57e948519 --- /dev/null +++ b/ham/trustedQSL/patches/patch-openssl__cert.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-openssl__cert.cpp,v 1.1 2015/10/11 02:59:07 mef Exp $ + +error: 'PATH_MAX' was not declared in this scope + +--- src/openssl_cert.cpp.orig 2015-09-20 09:15:24.000000000 +0900 ++++ src/openssl_cert.cpp 2015-10-11 01:10:26.000000000 +0900 +@@ -131,6 +131,9 @@ + + #define TQSLLIB_DEF + ++#ifdef __NetBSD__ ++# include "sys/syslimits.h" ++#endif + + #include + #include -- cgit v1.2.3