summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--configure.ac2
-rwxr-xr-xcontrib/ci/jobs/4-deb-package/version.sh4
-rw-r--r--debian/changelog13
-rw-r--r--debian/control12
-rw-r--r--doc/doxygen/sync.doxy2
m---------doc/prebuilt0
-rw-r--r--src/sync/sync-httpd_backup_post.c2
-rw-r--r--src/sync/sync-httpd_config.c70
9 files changed, 89 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c7f29f..97aa8d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,22 @@
+Fri Apr 12 10:43:41 AM CEST 2024
+ Releasing sync 0.10.1. -CG
+
Sun 08 Aug 2021 08:44:35 PM CEST
- Update to latest Taler APIs.
- Releasing sync 0.8.2. -CG
+ Update to latest Taler APIs.
+ Releasing sync 0.8.2. -CG
Tue 10 Nov 2020 01:11:02 PM CET
- Update to latest Taler APIs.
- Releasing sync 0.8.1. -CG
+ Update to latest Taler APIs.
+ Releasing sync 0.8.1. -CG
Sat 03 Oct 2020 04:37:37 PM CEST
- Releasing sync 0.8.0. -CG
+ Releasing sync 0.8.0. -CG
Tue 31 Mar 2020 03:44:33 PM CEST
- Releasing sync 0.7.0. -CG
+ Releasing sync 0.7.0. -CG
Tue 24 Dec 2019 11:01:21 PM CET
- Releasing sync 0.6.0. -CG
+ Releasing sync 0.6.0. -CG
Wed Nov 13 15:01:09 2019 +0100
- Initial project setup. -CG
+ Initial project setup. -CG
diff --git a/configure.ac b/configure.ac
index 5489d6b..46cd31b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# This configure file is in the public domain
AC_PREREQ([2.69])
-AC_INIT([sync],[0.9.4a],[taler-bug@gnu.org])
+AC_INIT([sync],[0.10.1],[taler-bug@gnu.org])
AC_CONFIG_SRCDIR([src/sync/sync-httpd.c])
AC_CONFIG_HEADERS([sync_config.h])
# support for non-recursive builds
diff --git a/contrib/ci/jobs/4-deb-package/version.sh b/contrib/ci/jobs/4-deb-package/version.sh
index d264778..52031b2 100755
--- a/contrib/ci/jobs/4-deb-package/version.sh
+++ b/contrib/ci/jobs/4-deb-package/version.sh
@@ -7,10 +7,10 @@ if [ -z "${BRANCH}" ]; then
else
# "Unshallow" our checkout, but only our current branch, and exclude the submodules.
git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}"
- RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --always --abbrev=0 HEAD || exit 1)
+ RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --exclude '*-dev*' --always --abbrev=0 HEAD || exit 1)
commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
if [ "${commits}" = "0" ]; then
- git describe --tag HEAD || exit 1
+ git describe --tag HEAD | sed -r 's/^v//' || exit 1
else
echo $(echo ${RECENT_VERSION_TAG} | sed -r 's/^v//')-${commits}-$(git rev-parse --short=8 HEAD)
fi
diff --git a/debian/changelog b/debian/changelog
index 9dc7285..ca93df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+sync (0.10.1) unstable; urgency=low
+
+ * Updating man page submodule.
+
+ -- Christian Grothoff <grothoff@gnu.org> Fri, 12 Apr 2024 09:50:12 +0200
+
+sync (0.10.0) unstable; urgency=low
+
+ * Fix spelling issues
+ * Make drop.sql more robust to future changes
+
+ -- Christian Grothoff <grothoff@gnu.org> Tue, 9 Apr 2024 09:50:12 +0200
+
sync (0.9.4-2) unstable; urgency=low
* v0.9.4a bugfix release.
diff --git a/debian/control b/debian/control
index fe86c2d..4f02003 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends:
debhelper-compat (= 12),
gettext,
libgnunet-dev (>=0.21),
- libtalerexchange-dev (>= 0.9.4),
- libtalermerchant-dev (>= 0.9.4),
+ libtalerexchange-dev (>= 0.10.2),
+ libtalermerchant-dev (>= 0.10.2),
libpq-dev (>=14.0),
pkg-config,
po-debconf,
@@ -42,8 +42,8 @@ Architecture: any
Pre-Depends:
${misc:Pre-Depends}
Depends:
- libtalerexchange (>= 0.9.4),
- libtalermerchant (>= 0.9.4),
+ libtalerexchange (>= 0.10.2),
+ libtalermerchant (>= 0.10.2),
libgnutls30 (>= 3.7.1),
adduser,
lsb-base,
@@ -64,8 +64,8 @@ Package: libsync-dev
Section: libdevel
Architecture: any
Depends:
- libtalermerchant-dev (>= 0.9.4),
- libtalerexchange-dev (>= 0.9.4),
+ libtalermerchant-dev (>= 0.10.2),
+ libtalerexchange-dev (>= 0.10.2),
libgnunet-dev (>=0.21),
${misc:Depends},
${shlibs:Depends}
diff --git a/doc/doxygen/sync.doxy b/doc/doxygen/sync.doxy
index 98609bc..a224fdf 100644
--- a/doc/doxygen/sync.doxy
+++ b/doc/doxygen/sync.doxy
@@ -38,7 +38,7 @@ PROJECT_NAME = "GNU Taler: Sync"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 0.9.4
+PROJECT_NUMBER = 0.10.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject af8c69dfe397ff4bed7abca98ed8f3b2ed70541
+Subproject b8d2d2fa2ed2a771880f451725176f256583cb2
diff --git a/src/sync/sync-httpd_backup_post.c b/src/sync/sync-httpd_backup_post.c
index fcf5ae4..f4bb2da 100644
--- a/src/sync/sync-httpd_backup_post.c
+++ b/src/sync/sync-httpd_backup_post.c
@@ -380,7 +380,7 @@ ongoing_payment_cb (void *cls,
(void) amount;
if (0 != TALER_amount_cmp (amount,
&SH_annual_fee))
- return; /* can't re-use, fees changed */
+ return; /* can't reuse, fees changed */
if ( (NULL == bc->existing_order_id) ||
(GNUNET_TIME_timestamp_cmp (bc->existing_order_timestamp,
<,
diff --git a/src/sync/sync-httpd_config.c b/src/sync/sync-httpd_config.c
index 886f2af..c1c40ca 100644
--- a/src/sync/sync-httpd_config.c
+++ b/src/sync/sync-httpd_config.c
@@ -1,6 +1,6 @@
/*
This file is part of Sync
- Copyright (C) 2020 Taler Systems SA
+ Copyright (C) 2020,2024 Taler Systems SA
Sync is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software
@@ -38,21 +38,59 @@ SH_handler_config (struct SH_RequestHandler *rh,
const char *upload_data,
size_t *upload_data_size)
{
- return TALER_MHD_REPLY_JSON_PACK (
- connection,
- MHD_HTTP_OK,
- GNUNET_JSON_pack_string ("name",
- "sync"),
- GNUNET_JSON_pack_string ("implementation",
- "urn:net:taler:specs:sync:c-reference"),
- GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes",
- SH_upload_limit_mb),
- TALER_JSON_pack_amount ("liability_limit",
- &SH_insurance),
- TALER_JSON_pack_amount ("annual_fee",
- &SH_annual_fee),
- GNUNET_JSON_pack_string ("version",
- "2:1:0"));
+ static struct MHD_Response *response;
+ static struct GNUNET_TIME_Absolute a;
+
+ (void) connection_cls;
+ (void) upload_data;
+ (void) upload_data_size;
+ if ( (GNUNET_TIME_absolute_is_past (a)) &&
+ (NULL != response) )
+ {
+ MHD_destroy_response (response);
+ response = NULL;
+ }
+ if (NULL == response)
+ {
+ struct GNUNET_TIME_Timestamp km;
+ char dat[128];
+
+ a = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_DAYS);
+ /* Round up to next full day to ensure the expiration
+ time does not become a fingerprint! */
+ a = GNUNET_TIME_absolute_round_down (a,
+ GNUNET_TIME_UNIT_DAYS);
+ a = GNUNET_TIME_absolute_add (a,
+ GNUNET_TIME_UNIT_DAYS);
+ /* => /config response stays at most 48h in caches! */
+ km = GNUNET_TIME_absolute_to_timestamp (a);
+ TALER_MHD_get_date_string (km.abs_time,
+ dat);
+ response = TALER_MHD_MAKE_JSON_PACK (
+ GNUNET_JSON_pack_string ("name",
+ "sync"),
+ GNUNET_JSON_pack_string ("implementation",
+ "urn:net:taler:specs:sync:c-reference"),
+ GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes",
+ SH_upload_limit_mb),
+ TALER_JSON_pack_amount ("liability_limit",
+ &SH_insurance),
+ TALER_JSON_pack_amount ("annual_fee",
+ &SH_annual_fee),
+ GNUNET_JSON_pack_string ("version",
+ "2:2:0"));
+ GNUNET_break (MHD_YES ==
+ MHD_add_response_header (response,
+ MHD_HTTP_HEADER_EXPIRES,
+ dat));
+ GNUNET_break (MHD_YES ==
+ MHD_add_response_header (response,
+ MHD_HTTP_HEADER_CACHE_CONTROL,
+ "public,max-age=21600")); /* 6h */
+ }
+ return MHD_queue_response (connection,
+ MHD_HTTP_OK,
+ response);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 14:49:25 +0000