Date: Sat, 7 Dec 2013 02:18:26 GMT From: Stephen Hurd <shurd@sasktel.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/184554: [PATCH] update comms/trustedqsl to latest release Message-ID: <201312070218.rB72IQJL062492@oldred.freebsd.org> Resent-Message-ID: <201312070220.rB72K0qw030569@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184554
>Category: ports
>Synopsis: [PATCH] update comms/trustedqsl to latest release
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 07 02:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Stephen Hurd
>Release: 9.2-RELEASE-p1
>Organization:
>Environment:
FreeBSD portable 9.2-RELEASE-p1 FreeBSD 9.2-RELEASE-p1 #0: Sat Nov 2 11:56:43 PDT 2013 admin@portable:/usr/obj/usr/src/sys/NOCDCE amd64
>Description:
New version of TrustedQSL release
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nr trustedqsl.orig/Makefile trustedqsl/Makefile
4c4
< PORTVERSION= 1.14.2
---
> PORTVERSION= 2.0
6,7c6,8
< MASTER_SITES= SF/${PORTNAME}/TrustedQSL/v1.14.2/
< DISTNAME= tqsl-1.14.2
---
> MASTER_SITES= SF/${PORTNAME}/TrustedQSL/v${PORTVERSION}/
> DISTNAME= tqsl-${PORTVERSION}
> EXTRACT_SUFX= .tgz
19c20
< MAN5= trustedqsl.5
---
> MAN5= tqsl.5
diff -Nr trustedqsl.orig/distinfo trustedqsl/distinfo
1,2c1,2
< SHA256 (tqsl-1.14.2.tar.gz) = 7644a8236493035848c3f10df5f05929bca35a7b65df2a3eea39a1a8f7de3466
< SIZE (tqsl-1.14.2.tar.gz) = 796754
---
> SHA256 (tqsl-2.0.tgz) = eb1982da44b4d8c17c78b72eacb3fe3b9e94005d1b2da153685827da2e07cfaa
> SIZE (tqsl-2.0.tgz) = 2626483
diff -Nr trustedqsl.orig/files/patch-apps_CMakeLists.txt trustedqsl/files/patch-apps_CMakeLists.txt
1,3c1,4
< --- apps/CMakeLists.txt.orig 2013-06-25 20:03:58.000000000 -0500
< +++ apps/CMakeLists.txt 2013-06-25 20:05:42.000000000 -0500
< @@ -101,5 +101,9 @@
---
> --- apps/CMakeLists.txt.orig 2013-12-06 17:42:11.000000000 -0800
> +++ apps/CMakeLists.txt 2013-12-06 17:43:12.000000000 -0800
> @@ -121,6 +121,10 @@
> add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"")
5d5
< install(TARGETS tqslcert DESTINATION bin)
7c7
< -install(FILES trustedqsl.5 DESTINATION share/man/man5)
---
> -install(FILES tqsl.5 DESTINATION share/man/man5)
9c9
< + install(FILES trustedqsl.5 DESTINATION man/man5)
---
> + install(FILES tqsl.5 DESTINATION man/man5)
11c11
< + install(FILES trustedqsl.5 DESTINATION share/man/man5)
---
> + install(FILES tqsl.5 DESTINATION share/man/man5)
12a13
> install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png)
diff -Nr trustedqsl.orig/files/patch-apps_tqsl.cpp trustedqsl/files/patch-apps_tqsl.cpp
0a1,11
> --- apps/tqsl.cpp.orig 2013-12-06 17:34:01.000000000 -0800
> +++ apps/tqsl.cpp 2013-12-06 17:34:12.000000000 -0800
> @@ -71,7 +71,7 @@
> #endif
> #include <zlib.h>
> #include <openssl/opensslv.h> // only for version info!
> -#include <db.h> //only for version info!
> +#include <db5/db.h> //only for version info!
> #include "tqslwiz.h"
> #include "qsodatadialog.h"
> #include "tqslerrno.h"
diff -Nr trustedqsl.orig/pkg-plist trustedqsl/pkg-plist
2,7d1
< bin/tqslcert
< lib/libtqsllib.so
< share/TrustedQSL/config.xml
< include/tqsllib.h
< include/tqslerrno.h
< include/cabrillo.h
8a3
> include/cabrillo.h
9a5,8
> include/tqslerrno.h
> include/tqsllib.h
> lib/libtqsllib.so
> share/TrustedQSL/config.xml
15a15,16
> share/TrustedQSL/help/tqslapp/about.bmp
> share/TrustedQSL/help/tqslapp/addcert1.bmp
18d18
< share/TrustedQSL/help/tqslapp/addcont.bmp
20d19
< share/TrustedQSL/help/tqslapp/addstnl.bmp
22c21
< share/TrustedQSL/help/tqslapp/adifdial.bmp
---
> share/TrustedQSL/help/tqslapp/backuprestore.htm
24a24,25
> share/TrustedQSL/help/tqslapp/certaccept1.bmp
> share/TrustedQSL/help/tqslapp/certaccept2.bmp
25a27,28
> share/TrustedQSL/help/tqslapp/certreq1.bmp
> share/TrustedQSL/help/tqslapp/certs-icons.htm
29a33,37
> share/TrustedQSL/help/tqslapp/crq0.htm
> share/TrustedQSL/help/tqslapp/crq1.htm
> share/TrustedQSL/help/tqslapp/crq2.htm
> share/TrustedQSL/help/tqslapp/crq3.htm
> share/TrustedQSL/help/tqslapp/crq4.htm
31a40,41
> share/TrustedQSL/help/tqslapp/deletecert.htm
> share/TrustedQSL/help/tqslapp/diagmode.htm
33a44
> share/TrustedQSL/help/tqslapp/expiration.bmp
34a46
> share/TrustedQSL/help/tqslapp/expired.bmp
39a52,54
> share/TrustedQSL/help/tqslapp/loadcert.htm
> share/TrustedQSL/help/tqslapp/login.htm
> share/TrustedQSL/help/tqslapp/logopstab.bmp
43c58,60
< share/TrustedQSL/help/tqslapp/pref-adi.bmp
---
> share/TrustedQSL/help/tqslapp/netproxy.htm
> share/TrustedQSL/help/tqslapp/newp12pw.bmp
> share/TrustedQSL/help/tqslapp/newpw.bmp
45c62,64
< share/TrustedQSL/help/tqslapp/pref-cab.bmp
---
> share/TrustedQSL/help/tqslapp/pref-adi1.bmp
> share/TrustedQSL/help/tqslapp/pref-adi2.bmp
> share/TrustedQSL/help/tqslapp/pref-adi3.bmp
46a66,68
> share/TrustedQSL/help/tqslapp/pref-cab1.bmp
> share/TrustedQSL/help/tqslapp/pref-cab2.bmp
> share/TrustedQSL/help/tqslapp/pref-cab3.bmp
52a75,78
> share/TrustedQSL/help/tqslapp/renewing1.bmp
> share/TrustedQSL/help/tqslapp/renewing2.bmp
> share/TrustedQSL/help/tqslapp/replaced.bmp
> share/TrustedQSL/help/tqslapp/save.htm
54a81
> share/TrustedQSL/help/tqslapp/sign1.bmp
58a86
> share/TrustedQSL/help/tqslapp/signupload1.bmp
60a89,95
> share/TrustedQSL/help/tqslapp/stnloc1.bmp
> share/TrustedQSL/help/tqslapp/stnloc1.htm
> share/TrustedQSL/help/tqslapp/stnloc2.bmp
> share/TrustedQSL/help/tqslapp/stnloc2.htm
> share/TrustedQSL/help/tqslapp/stnloc3.bmp
> share/TrustedQSL/help/tqslapp/stnloc4.bmp
> share/TrustedQSL/help/tqslapp/stnloc5.bmp
63a99,100
> share/TrustedQSL/help/tqslapp/unlock.bmp
> share/TrustedQSL/help/tqslapp/unlock.htm
65,102c102,108
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/broken-cert.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/contents.hhc
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq0.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq0.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq1.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq1.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq2.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq2.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq3.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq3.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq4.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq4.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/crqsend.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/glossary.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/lcf.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/lcf0.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/lcf0.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/lcf1.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/lcf1.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/lcf2.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/loadcert.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/main.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/newp12pw.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/newpw.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/nocert.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/props.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/save.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/tqsl.htm
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/tqslcert.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/tqslcert.hhp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/unlock.bmp
< %%PORTDOCS%%share/TrustedQSL/help/tqslcert/unlock.htm
< %%PORTDOCS%%@dirrm share/TrustedQSL/help/tqslcert
< %%PORTDOCS%%@dirrm share/TrustedQSL/help/tqslapp
< %%PORTDOCS%%@dirrm share/TrustedQSL/help
< %%PORTDOCS%%@dirrm share/TrustedQSL
---
> share/TrustedQSL/help/tqslapp/update1.bmp
> share/TrustedQSL/help/tqslapp/update2.bmp
> share/pixmaps/TrustedQSL.png
> @dirrm share/TrustedQSL/help/tqslapp
> @dirrm share/TrustedQSL/help
> @dirrm share/TrustedQSL
> @dirrmtry share/pixmaps
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312070218.rB72IQJL062492>