From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 4 Sep 2019 16:11:37 +0200 Subject: [PATCH 1/2] Adapt test script for PROJ 6.2 EPSG database (fixes #22) --- libgeotiff/test/testlistgeo | 8 +++++++- libgeotiff/test/testlistgeo_out.dist | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libgeotiff/test/testlistgeo b/libgeotiff/test/testlistgeo index 7fb4a2f..571f5d0 100755 --- a/test/testlistgeo +++ b/test/testlistgeo @@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT} $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT} echo "" >>${OUT} +# Normalize for results depending on the exact version of PROJ / EPSG database +sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp +mv ${OUT}.tmp ${OUT} + +sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp # do 'diff' with distribution results echo "diff ${OUT} with testlistgeo_out.dist" -diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist +diff -u ${OUT} testlistgeo_out.dist.tmp if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURRED" @@ -224,6 +229,7 @@ else echo "TEST OK" echo "test file ${OUT} removed" echo + rm testlistgeo_out.dist.tmp /bin/rm -f ${OUT} exit 0 fi diff --git a/libgeotiff/test/testlistgeo_out.dist b/libgeotiff/test/testlistgeo_out.dist index 68a948c..c157f00 100644 --- a/test/testlistgeo_out.dist +++ b/test/testlistgeo_out.dist @@ -1738,11 +1738,11 @@ Geotiff_Information: Keyed_Information: GTModelTypeGeoKey (Short,1): ModelTypeProjected GTRasterTypeGeoKey (Short,1): RasterPixelIsArea - ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe) + ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe) End_Of_Keys. End_Of_Geotiff. -PCS = 3035 (ETRS89 / LAEA Europe) +PCS = 3035 (ETRS89-extended / LAEA Europe) Projection = 19986 (Europe Equal Area 2001) Projection Method: CT_LambertAzimEqualArea ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N) From 15af10648c4cb7b4c55cbe08caaf9884c1d156d9 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 4 Sep 2019 19:13:11 +0200 Subject: [PATCH 2/2] appveyor.yml: build vcpkg from source to fix issue with VS2015 iv>
AgeCommit message (Expand)Author
2020-09-29secret-service: Add proper logging procedure and log to syslog....* gnu/build/secret-service.scm (log): New macro. (secret-service-send-secrets, secret-service-receive-secrets): Use it instead of raw 'format' calls. Ludovic Courtès
2020-09-29services: secret-service: Add initial client/server handshake....This allows the client running on the host to know when it's actually connect to the server running in the guest. Failing that, the client would connect right away to QEMU and send secrets even though the server is not running yet in the guest, which is unreliable. * gnu/build/secret-service.scm (secret-service-send-secrets): Add #:handshake-timeout. Read from SOCK an initial message from the server. Return #f on error. (secret-service-receive-secrets): Send 'secret-service-server' message to the client. Close SOCK upon timeout. * gnu/services/virtualization.scm (hurd-vm-shepherd-service): 'start' method returns #f when 'secret-service-send-secrets' returns #f. Ludovic Courtès
2020-09-29secret-service: Fix file port leak in 'secret-service-send-secrets'....* gnu/build/secret-service.scm (secret-service-send-secrets): Use 'call-with-input-file' instead of 'open-input-file'. Ludovic Courtès
2020-09-29secret-service: Add a timeout when waiting for a client....* gnu/build/secret-service.scm (secret-service-receive-secrets) [wait-for-client]: Call 'select' with a 60s timeout before 'accept'. Return #f upon timeout. [read-secrets]: Return FILES on success. Adjust caller of 'wait-for-client' to handle #f. Ludovic Courtès
2020-09-29secret-service: Clarify the origin of messages....* gnu/build/secret-service.scm (secret-service-send-secrets) (secret-service-receive-secrets): Prefix messages by "secret service". Ludovic Courtès
2020-09-01services: Add secret-service-type....This adds a "secret-service" that can be added to a Childhurd VM to receive out-of-band secrets (keys) sent from the host. Co-authored-by: Ludovic Courtès <ludo@gnu.org> * gnu/services/virtualization.scm (secret-service-activation): New procedure. (secret-service-type): New variable. * gnu/build/secret-service.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Jan (janneke) Nieuwenhuizen