summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-07-29 11:00:51 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2021-07-29 18:43:54 +0200
commitf1ca8285f8375760d2fa651e125a99120e5050d4 (patch)
treebbe3ca8241160a4b72fdaa674cabd8803d3acfa0
parent80aff364dbd8d78392582124b51b46b556db7e4c (diff)
The package should know its release date to generate a doap description
-rw-r--r--Makefile.am8
-rw-r--r--ci.scm4
-rw-r--r--configure.ac1
-rwxr-xr-xget-release21
-rw-r--r--guix/vkraus/packages/webid-oidc.scm4
-rw-r--r--man/Makefile.am10
-rw-r--r--po/fr.po233
-rw-r--r--po/webid-oidc.pot223
-rw-r--r--src/inst/webid-oidc/Makefile.am3
-rw-r--r--src/pre-inst/webid-oidc/Makefile.am3
-rw-r--r--src/scm/webid-oidc/program.scm43
-rw-r--r--update-channel.scm4
12 files changed, 334 insertions, 223 deletions
diff --git a/Makefile.am b/Makefile.am
index 6bb43a9..42e27ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,13 +36,17 @@ include src/Makefile.am
include doc/Makefile.am
include tests/Makefile.am
-EXTRA_DIST += $(top_srcdir)/.version
-BUILT_SOURCES += $(top_srcdir)/.version
+EXTRA_DIST += $(top_srcdir)/.version $(top_srcdir)/.release-date
+BUILT_SOURCES += $(top_srcdir)/.version $(top_srcdir)/.release-date
$(top_srcdir)/.version:
echo $(VERSION) > $@-t
@mv $@-t $@
+$(top_srcdir)/.release-date:
+ echo $(RELEASE_DATE) > $@-t
+ @mv $@-t $@
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
+ echo $(RELEASE_DATE) > $(distdir)/.tarball-release-date
.PHONY: check-indented
diff --git a/ci.scm b/ci.scm
index e8a1459..46a32fe 100644
--- a/ci.scm
+++ b/ci.scm
@@ -61,6 +61,10 @@
"-c"
(format #f "~a describe ~a --tags --always > ~a/.tarball-version"
git (or ref "") tmp-dirname))
+ (invoke bash
+ "-c"
+ (format #f "~a show -s --format=%cI ~a > ~a/.tarball-release-date"
+ git (or ref "") tmp-dirname))
(let ((interned
(run-with-store
(open-connection)
diff --git a/configure.ac b/configure.ac
index cce3239..d1a37aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ AM_SILENT_RULES([yes])
AC_ARG_ENABLE([--enable-indent-check],
[When running tests, also check that the source code is indented])
+AC_SUBST([RELEASE_DATE], m4_esyscmd([bash ./get-release]))
AM_CONDITIONAL([INDENT_CHECK_ENABLED], [test "x$enable_indent_check" = "xyes"])
AC_PROG_CC
diff --git a/get-release b/get-release
new file mode 100755
index 0000000..57d952d
--- /dev/null
+++ b/get-release
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# webid-oidc, implementation of the Solid specification
+# Copyright (C) 2021 Vivien Kraus
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TARBALL_RELEASE_DATE=$(cat .tarball-release-date 2>/dev/null || date -Iseconds)
+
+printf "%s" $TARBALL_RELEASE_DATE
diff --git a/guix/vkraus/packages/webid-oidc.scm b/guix/vkraus/packages/webid-oidc.scm
index 902903c..f120df3 100644
--- a/guix/vkraus/packages/webid-oidc.scm
+++ b/guix/vkraus/packages/webid-oidc.scm
@@ -129,7 +129,7 @@
(variable "LTDL_LIBRARY_PATH")
(files '("lib")))))))
-(define-public (webid-oidc-release version commit hash)
+(define-public (webid-oidc-release version release-date commit hash)
(package
(inherit webid-oidc-snapshot)
(name "webid-oidc")
@@ -145,6 +145,8 @@
`(begin
(with-output-to-file ".tarball-version"
(lambda _ (format #t "~a~%" ,version)))
+ (with-output-to-file ".tarball-release-date"
+ (lambda _ (format #t "~a~%" ,release-date)))
#t))))))
(define-public (webid-oidc-htmlize webid-oidc)
diff --git a/man/Makefile.am b/man/Makefile.am
index 05e8bb7..2e3a7d4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -16,7 +16,7 @@
dist_man8_MANS = webid-oidc.man webid-oidc-example-app.man
-EXTRA_DIST = ./reset-env
+EXTRA_DIST = ./reset-env project
webid-oidc.man: ../src/scm/webid-oidc/program.scm ../configure.ac
$(AM_V_GEN) ../pre-inst-env ./reset-env $(HELP2MAN) $(srcdir)/../src/webid-oidc > $@-t
@@ -25,3 +25,11 @@ webid-oidc.man: ../src/scm/webid-oidc/program.scm ../configure.ac
webid-oidc-example-app.man: ../src/scm/webid-oidc/example-app.scm ../configure.ac
$(AM_V_GEN) ../pre-inst-env ./reset-env $(HELP2MAN) $(srcdir)/../src/webid-oidc-example-app > $@-t
mv $@-t $(srcdir)/$@
+
+install-html-local: project
+ $(INSTALL_DATA) $(srcdir)/$< $(DESTDIR)$(htmldir)/webid-oidc.html
+
+
+project: ../src/scm/webid-oidc/program.scm ../configure
+ $(AM_V_GEN) ../pre-inst-env $(GUILE) $(srcdir)/../src/webid-oidc --describe-project > $@-t
+ mv $@-t $(srcdir)/$@
diff --git a/po/fr.po b/po/fr.po
index c9d910c..a2c3820 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: webid-oidc 0.0.0\n"
"Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-07-28 16:56+0200\n"
-"PO-Revision-Date: 2021-07-28 16:58+0200\n"
+"POT-Creation-Date: 2021-07-29 12:34+0200\n"
+"PO-Revision-Date: 2021-07-29 12:34+0200\n"
"Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
"Language-Team: French <vivien@planete-kraus.eu>\n"
"Language: fr\n"
@@ -1016,11 +1016,11 @@ msgstr "Avertissement : ~a\n"
msgid "command-line|version"
msgstr "version"
-#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:219
+#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:221
msgid "command-line|complete-corresponding-source"
msgstr "code-source-correspondant-complet"
-#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:221
+#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:223
msgid "command-line|help"
msgstr "aide"
@@ -1028,11 +1028,11 @@ msgstr "aide"
msgid "command-line|port"
msgstr "port"
-#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:251
+#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:253
msgid "command-line|log-file"
msgstr "fichier-journal"
-#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:253
+#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:255
msgid "command-line|error-file"
msgstr "fichier-erreur"
@@ -1091,12 +1091,12 @@ msgstr ""
" redirige la sortie d’erreur du programme vers ce fichier.\n"
#: src/scm/webid-oidc/hello-world.scm:103
-#: src/scm/webid-oidc/example-app.scm:159 src/scm/webid-oidc/program.scm:568
+#: src/scm/webid-oidc/example-app.scm:159
#, scheme-format
msgid "~a version ~a\n"
msgstr "~a version ~a\n"
-#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:576
+#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:607
msgid ""
"You are legally required to link to the complete corresponding source code.\n"
msgstr ""
@@ -1292,68 +1292,72 @@ msgstr "~a : ~a"
msgid "(there was an error: ~a)"
msgstr "(il y a eu une erreur : ~a)"
-#: src/scm/webid-oidc/program.scm:223
+#: src/scm/webid-oidc/program.scm:219
+msgid "command-line|describe-project"
+msgstr "décrire-projet"
+
+#: src/scm/webid-oidc/program.scm:225
msgid "command-line|server|port"
msgstr "port"
-#: src/scm/webid-oidc/program.scm:225
+#: src/scm/webid-oidc/program.scm:227
msgid "command-line|server|server-name"
msgstr "nom-du-serveur"
-#: src/scm/webid-oidc/program.scm:227
+#: src/scm/webid-oidc/program.scm:229
msgid "command-line|server|reverse-proxy|backend-uri"
msgstr "uri-arrière-plan"
-#: src/scm/webid-oidc/program.scm:229
+#: src/scm/webid-oidc/program.scm:231
msgid "command-line|server|reverse-proxy|header"
msgstr "en-tête"
-#: src/scm/webid-oidc/program.scm:231
+#: src/scm/webid-oidc/program.scm:233
msgid "command-line|server|issuer|key-file"
msgstr "fichier-clé"
-#: src/scm/webid-oidc/program.scm:233
+#: src/scm/webid-oidc/program.scm:235
msgid "command-line|server|issuer|subject"
msgstr "sujet"
-#: src/scm/webid-oidc/program.scm:235
+#: src/scm/webid-oidc/program.scm:237
msgid "command-line|server|issuer|encrypted-password"
msgstr "mot-de-passe-chiffré"
-#: src/scm/webid-oidc/program.scm:237
+#: src/scm/webid-oidc/program.scm:239
msgid "command-line|server|issuer|jwks-uri"
msgstr "uri-jwks"
-#: src/scm/webid-oidc/program.scm:239
+#: src/scm/webid-oidc/program.scm:241
msgid "command-line|server|issuer|authorization-endpoint-uri"
msgstr "uri-terminal-autorisation"
-#: src/scm/webid-oidc/program.scm:241
+#: src/scm/webid-oidc/program.scm:243
msgid "command-line|server|issuer|token-endpoint-uri"
msgstr "uri-terminal-jeton"
-#: src/scm/webid-oidc/program.scm:243
+#: src/scm/webid-oidc/program.scm:245
msgid "command-line|server|client-id"
msgstr "id-client"
-#: src/scm/webid-oidc/program.scm:245
+#: src/scm/webid-oidc/program.scm:247
msgid "command-line|server|redirect-uri"
msgstr "uri-redirection"
-#: src/scm/webid-oidc/program.scm:247
+#: src/scm/webid-oidc/program.scm:249
msgid "command-line|server|client-name"
msgstr "nom-client"
-#: src/scm/webid-oidc/program.scm:249
+#: src/scm/webid-oidc/program.scm:251
msgid "command-line|server|client-uri"
msgstr "uri-client"
-#: src/scm/webid-oidc/program.scm:278
+#: src/scm/webid-oidc/program.scm:284
#, scheme-format
msgid "Usage: ~a COMMAND [OPTIONS]...\n"
msgstr "Utilisation : ~a COMMANDE [OPTIONS]...\n"
-#: src/scm/webid-oidc/program.scm:282
+#: src/scm/webid-oidc/program.scm:288
msgid ""
"\n"
"Run the webid-oidc COMMAND."
@@ -1361,7 +1365,7 @@ msgstr ""
"\n"
"Exécute la COMMANDE webid-oidc."
-#: src/scm/webid-oidc/program.scm:285
+#: src/scm/webid-oidc/program.scm:291
msgid ""
"\n"
"This program is covered by the GNU Affero GPL, version 3 or\n"
@@ -1377,7 +1381,7 @@ msgstr ""
"code source complet correspondant (avec vos modifications) sans\n"
"frais. Le serveur ajoute un en-tête « Source: » à toutes les réponses."
-#: src/scm/webid-oidc/program.scm:292
+#: src/scm/webid-oidc/program.scm:298
msgid ""
"\n"
"Available commands:"
@@ -1385,7 +1389,7 @@ msgstr ""
"\n"
"Commandes disponibles :"
-#: src/scm/webid-oidc/program.scm:294
+#: src/scm/webid-oidc/program.scm:300
#, scheme-format
msgid ""
"\n"
@@ -1396,12 +1400,12 @@ msgstr ""
" ~a :\n"
" exécute le proxy inverse authentifiant."
-#: src/scm/webid-oidc/program.scm:297 src/scm/webid-oidc/program.scm:480
-#: src/scm/webid-oidc/program.scm:649
+#: src/scm/webid-oidc/program.scm:303 src/scm/webid-oidc/program.scm:491
+#: src/scm/webid-oidc/program.scm:680
msgid "command-line|command|reverse-proxy"
msgstr "proxy-inversé"
-#: src/scm/webid-oidc/program.scm:298
+#: src/scm/webid-oidc/program.scm:304
#, scheme-format
msgid ""
"\n"
@@ -1412,12 +1416,12 @@ msgstr ""
" ~a :\n"
" exécute un fournisseur d’identité."
-#: src/scm/webid-oidc/program.scm:301 src/scm/webid-oidc/program.scm:505
-#: src/scm/webid-oidc/program.scm:671
+#: src/scm/webid-oidc/program.scm:307 src/scm/webid-oidc/program.scm:516
+#: src/scm/webid-oidc/program.scm:702
msgid "command-line|command|identity-provider"
msgstr "fournisseur-identité"
-#: src/scm/webid-oidc/program.scm:302
+#: src/scm/webid-oidc/program.scm:308
#, scheme-format
msgid ""
"\n"
@@ -1428,12 +1432,12 @@ msgstr ""
" ~a :\n"
" sert les pages d’une application publique."
-#: src/scm/webid-oidc/program.scm:305 src/scm/webid-oidc/program.scm:526
-#: src/scm/webid-oidc/program.scm:715
+#: src/scm/webid-oidc/program.scm:311 src/scm/webid-oidc/program.scm:537
+#: src/scm/webid-oidc/program.scm:746
msgid "command-line|command|client-service"
msgstr "service-client"
-#: src/scm/webid-oidc/program.scm:306
+#: src/scm/webid-oidc/program.scm:312
#, scheme-format
msgid ""
"\n"
@@ -1446,12 +1450,12 @@ msgstr ""
" exécute un serveur complet, avec un fournisseur d’identité et\n"
" une fonction de stockage de ressources."
-#: src/scm/webid-oidc/program.scm:310 src/scm/webid-oidc/program.scm:552
-#: src/scm/webid-oidc/program.scm:744
+#: src/scm/webid-oidc/program.scm:316 src/scm/webid-oidc/program.scm:563
+#: src/scm/webid-oidc/program.scm:775
msgid "command-line|command|server"
msgstr "serveur"
-#: src/scm/webid-oidc/program.scm:312
+#: src/scm/webid-oidc/program.scm:318
msgid ""
"\n"
"General options:"
@@ -1459,7 +1463,7 @@ msgstr ""
"\n"
"Options générales :"
-#: src/scm/webid-oidc/program.scm:314
+#: src/scm/webid-oidc/program.scm:320
#, scheme-format
msgid ""
"\n"
@@ -1473,7 +1477,7 @@ msgstr ""
" correspondant. Par exemple, MOYEN serait une URI pointant vers\n"
" l’archive de code."
-#: src/scm/webid-oidc/program.scm:319
+#: src/scm/webid-oidc/program.scm:325
#, scheme-format
msgid ""
"\n"
@@ -1484,18 +1488,29 @@ msgstr ""
" -h, --~a :\n"
" affiche un court message d’aide et quitte."
-#: src/scm/webid-oidc/program.scm:323
+#: src/scm/webid-oidc/program.scm:329
#, scheme-format
msgid ""
"\n"
" -v, --~a:\n"
-" display the version information (~a) and exit."
+" display the version information (~a, released ~a) and exit."
msgstr ""
"\n"
" -v, --~a :\n"
-" affiche le numéro de version (~a) et quitte."
+" affiche le numéro de version (~a, publiée le ~a) et quitte."
-#: src/scm/webid-oidc/program.scm:328
+#: src/scm/webid-oidc/program.scm:335
+#, scheme-format
+msgid ""
+"\n"
+" --~a:\n"
+" describe the project in the DOAP vocabulary and exit."
+msgstr ""
+"\n"
+" --~a :\n"
+" décrit le projet dans le vocabulaire DOAP et quitte."
+
+#: src/scm/webid-oidc/program.scm:339
#, scheme-format
msgid ""
"\n"
@@ -1506,7 +1521,7 @@ msgstr ""
" -l FICHIER.journal, --~a=FICHIER.journal :\n"
" redirige la sortie standard du programme vers FICHIER.journal."
-#: src/scm/webid-oidc/program.scm:332
+#: src/scm/webid-oidc/program.scm:343
#, scheme-format
msgid ""
"\n"
@@ -1517,7 +1532,7 @@ msgstr ""
" -e FICHIER.erreurs, --~a=FICHIER.erreurs :\n"
" redirige les erreurs du programme vers FICHIER.erreurs."
-#: src/scm/webid-oidc/program.scm:337
+#: src/scm/webid-oidc/program.scm:348
msgid ""
"\n"
"General server-side options:"
@@ -1525,7 +1540,7 @@ msgstr ""
"\n"
"Options générales pour un serveur :"
-#: src/scm/webid-oidc/program.scm:339
+#: src/scm/webid-oidc/program.scm:350
#, scheme-format
msgid ""
"\n"
@@ -1536,7 +1551,7 @@ msgstr ""
" -p PORT, --~a=PORT :\n"
" définit le port à lier, 8080 par défaut."
-#: src/scm/webid-oidc/program.scm:343
+#: src/scm/webid-oidc/program.scm:354
#, scheme-format
msgid ""
"\n"
@@ -1548,7 +1563,7 @@ msgstr ""
" définit l’URI publique du serveur (schéma, identifiant de\n"
" l’utilisateur, hôte et port)."
-#: src/scm/webid-oidc/program.scm:348
+#: src/scm/webid-oidc/program.scm:359
msgid ""
"\n"
"Options for the resource server:"
@@ -1556,7 +1571,7 @@ msgstr ""
"\n"
"Options pour le serveur de ressources :"
-#: src/scm/webid-oidc/program.scm:350
+#: src/scm/webid-oidc/program.scm:361
#, scheme-format
msgid ""
"\n"
@@ -1571,7 +1586,7 @@ msgstr ""
" authentifié, XXX-Agent par défaut. Pour un serveur complet, ceci\n"
" désactive l’authentification par webid-oidc."
-#: src/scm/webid-oidc/program.scm:356
+#: src/scm/webid-oidc/program.scm:367
#, scheme-format
msgid ""
"\n"
@@ -1584,7 +1599,7 @@ msgstr ""
" définit l’URI sortante du proxy inversé, seulement pour la\n"
" commande proxy-inversé."
-#: src/scm/webid-oidc/program.scm:362
+#: src/scm/webid-oidc/program.scm:373
msgid ""
"\n"
"Options for the identity provider:"
@@ -1592,7 +1607,7 @@ msgstr ""
"\n"
"Options du fournisseur d’identité :"
-#: src/scm/webid-oidc/program.scm:364
+#: src/scm/webid-oidc/program.scm:375
#, scheme-format
msgid ""
"\n"
@@ -1606,7 +1621,7 @@ msgstr ""
" nouvelle clé sera générée. Le serveur n’offre pas de service\n"
" HTTPS."
-#: src/scm/webid-oidc/program.scm:369
+#: src/scm/webid-oidc/program.scm:380
#, scheme-format
msgid ""
"\n"
@@ -1617,7 +1632,7 @@ msgstr ""
" -s WEBID, --~a=WEBID :\n"
" définit l'identité du sujet."
-#: src/scm/webid-oidc/program.scm:373
+#: src/scm/webid-oidc/program.scm:384
#, scheme-format
msgid ""
"\n"
@@ -1628,7 +1643,7 @@ msgstr ""
" -w MOT_DE_PASSE_CHIFFRÉ, --~a=MOT_DE_PASSE_CHIFFRÉ :\n"
" définit le mot de passe chiffré pour reconnaître l’utilisateur."
-#: src/scm/webid-oidc/program.scm:377
+#: src/scm/webid-oidc/program.scm:388
#, scheme-format
msgid ""
"\n"
@@ -1639,7 +1654,7 @@ msgstr ""
" -j URI, --~a=URI :\n"
" définit l’URI pour requêter les clés du serveur."
-#: src/scm/webid-oidc/program.scm:381
+#: src/scm/webid-oidc/program.scm:392
#, scheme-format
msgid ""
"\n"
@@ -1651,7 +1666,7 @@ msgstr ""
" définit l'URI du terminal d'autorisation de l’émetteur\n"
" d’identité."
-#: src/scm/webid-oidc/program.scm:385
+#: src/scm/webid-oidc/program.scm:396
#, scheme-format
msgid ""
"\n"
@@ -1662,7 +1677,7 @@ msgstr ""
" -t URI, --~a=URI :\n"
" définit le terminal de jeton de l’émetteur d’identité."
-#: src/scm/webid-oidc/program.scm:390
+#: src/scm/webid-oidc/program.scm:401
msgid ""
"\n"
"Options for the client service:"
@@ -1670,7 +1685,7 @@ msgstr ""
"\n"
"Options pour le service associé à un client :"
-#: src/scm/webid-oidc/program.scm:392
+#: src/scm/webid-oidc/program.scm:403
#, scheme-format
msgid ""
"\n"
@@ -1683,7 +1698,7 @@ msgstr ""
" définit l’identifiant web de l’application client, qui est\n"
" déréférencé pour une ressource sémantique."
-#: src/scm/webid-oidc/program.scm:397
+#: src/scm/webid-oidc/program.scm:408
#, scheme-format
msgid ""
"\n"
@@ -1697,7 +1712,7 @@ msgstr ""
" d’autorisation. La page de redirection affiche le code à coller\n"
" dans l’application."
-#: src/scm/webid-oidc/program.scm:402
+#: src/scm/webid-oidc/program.scm:413
#, scheme-format
msgid ""
"\n"
@@ -1709,7 +1724,7 @@ msgstr ""
" définit le nom de l’application visible par l’utilisateur (peut\n"
" être trompeur…)."
-#: src/scm/webid-oidc/program.scm:406
+#: src/scm/webid-oidc/program.scm:417
#, scheme-format
msgid ""
"\n"
@@ -1722,7 +1737,7 @@ msgstr ""
" définit l’URI présentant plus d’informations à propos de\n"
" l’application (peut aussi être trompeur)."
-#: src/scm/webid-oidc/program.scm:412
+#: src/scm/webid-oidc/program.scm:423
msgid ""
"\n"
"Environment variables:"
@@ -1730,7 +1745,7 @@ msgstr ""
"\n"
"Variables d’environnement :"
-#: src/scm/webid-oidc/program.scm:414
+#: src/scm/webid-oidc/program.scm:425
msgid ""
"\n"
" XML_CATALOG_FILES: the server will fetch resources on the web. By\n"
@@ -1749,9 +1764,9 @@ msgstr ""
" fichiers depuis le système de fichiers, parce qu’il n’y a pas de\n"
" moyen de spécifier le type de contenu."
-#: src/scm/webid-oidc/program.scm:422 src/scm/webid-oidc/program.scm:429
-#: src/scm/webid-oidc/program.scm:438 src/scm/webid-oidc/program.scm:446
-#: src/scm/webid-oidc/program.scm:454
+#: src/scm/webid-oidc/program.scm:433 src/scm/webid-oidc/program.scm:440
+#: src/scm/webid-oidc/program.scm:449 src/scm/webid-oidc/program.scm:457
+#: src/scm/webid-oidc/program.scm:465
#, scheme-format
msgid ""
"the-environment-variable|\n"
@@ -1760,7 +1775,7 @@ msgstr ""
" \n"
" Elle vaut actuellement ~s."
-#: src/scm/webid-oidc/program.scm:425
+#: src/scm/webid-oidc/program.scm:436
msgid ""
"\n"
" LANG: set the locale of the user interface (for the server commands,\n"
@@ -1770,7 +1785,7 @@ msgstr ""
" LANG : définit la locale de l’interface utilisateur (pour les\n"
" commandes serveur, l’utilisateur est l’administrateur système)."
-#: src/scm/webid-oidc/program.scm:432
+#: src/scm/webid-oidc/program.scm:443
msgid ""
"\n"
" XDG_DATA_HOME: where the program stores persistent data. The\n"
@@ -1785,7 +1800,7 @@ msgstr ""
" ici. Pour un service système, il est recommandé d’utiliser\n"
" /var/lib."
-#: src/scm/webid-oidc/program.scm:441
+#: src/scm/webid-oidc/program.scm:452
msgid ""
"\n"
" XDG_CACHE_HOME: where the program stores and updates the seed file,\n"
@@ -1798,7 +1813,7 @@ msgstr ""
" supprimer ce dossier n’importe quand. Le fichier de graine sera\n"
" initialisé à partir de /dev/random."
-#: src/scm/webid-oidc/program.scm:449
+#: src/scm/webid-oidc/program.scm:460
msgid ""
"\n"
" HOME: if XDG_DATA_HOME or XDG_CACHE_HOME is not set, they are\n"
@@ -1810,7 +1825,7 @@ msgstr ""
" valeur est calculée à partir de la variable d’environnement\n"
" HOME. Elle n’est pas utilisée autrement."
-#: src/scm/webid-oidc/program.scm:458
+#: src/scm/webid-oidc/program.scm:469
msgid ""
"\n"
"Running a reverse proxy"
@@ -1818,7 +1833,7 @@ msgstr ""
"\n"
"Exécution d’un proxy inversé"
-#: src/scm/webid-oidc/program.scm:460
+#: src/scm/webid-oidc/program.scm:471
msgid ""
"\n"
"Suppose that you operate data.provider.com. You want to run an\n"
@@ -1840,7 +1855,7 @@ msgstr ""
"authentifié. https://private.data.provider.com ne doit accepter que\n"
"les requêtes depuis ce proxy inversé."
-#: src/scm/webid-oidc/program.scm:470
+#: src/scm/webid-oidc/program.scm:481
#, scheme-format
msgid ""
"\n"
@@ -1864,7 +1879,7 @@ msgstr ""
" --~a '/var/log/proxy.log' \\\n"
" --~a '/var/log/proxy.err'"
-#: src/scm/webid-oidc/program.scm:485
+#: src/scm/webid-oidc/program.scm:496
msgid ""
"\n"
"Running an identity provider"
@@ -1872,7 +1887,7 @@ msgstr ""
"\n"
"Exécution d’un fournisseur d’identité"
-#: src/scm/webid-oidc/program.scm:487
+#: src/scm/webid-oidc/program.scm:498
msgid ""
"\n"
"The identity provider running at webid-oidc-demo.planete-kraus.eu is\n"
@@ -1883,7 +1898,7 @@ msgstr ""
"webid-oidc-demo.planete-kraus.eu est invoqué avec les options\n"
"suivantes :"
-#: src/scm/webid-oidc/program.scm:491
+#: src/scm/webid-oidc/program.scm:502
#, scheme-format
msgid ""
"\n"
@@ -1917,7 +1932,7 @@ msgstr ""
" --~a 'https://webid-oidc-demo.planete-kraus.eu/token' \\\n"
" --~a $PORT"
-#: src/scm/webid-oidc/program.scm:511
+#: src/scm/webid-oidc/program.scm:522
msgid ""
"\n"
"Running the public pages for an application"
@@ -1925,7 +1940,7 @@ msgstr ""
"\n"
"Service des pages publiques pour une application"
-#: src/scm/webid-oidc/program.scm:513
+#: src/scm/webid-oidc/program.scm:524
msgid ""
"\n"
"The example client application pages for\n"
@@ -1935,7 +1950,7 @@ msgstr ""
"Les pages de l’application client d’exemple pour\n"
"webid-oidc-demo.planete-kraus.eu sont servies de cette façon :"
-#: src/scm/webid-oidc/program.scm:517
+#: src/scm/webid-oidc/program.scm:528
#, scheme-format
msgid ""
"\n"
@@ -1963,7 +1978,7 @@ msgstr ""
"html#Running-a-client' \\\n"
" --~a $PORT"
-#: src/scm/webid-oidc/program.scm:531
+#: src/scm/webid-oidc/program.scm:542
msgid ""
"\n"
"Running a full server"
@@ -1971,7 +1986,7 @@ msgstr ""
"\n"
"Exécution d’un serveur complet"
-#: src/scm/webid-oidc/program.scm:534
+#: src/scm/webid-oidc/program.scm:545
msgid ""
"\n"
"To run the server with identity provider and\n"
@@ -1983,7 +1998,7 @@ msgstr ""
"un serveur de ressources pour un utilisateur particulier, vous devez\n"
"combiner les options des parties."
-#: src/scm/webid-oidc/program.scm:538
+#: src/scm/webid-oidc/program.scm:549
#, scheme-format
msgid ""
"\n"
@@ -2017,7 +2032,7 @@ msgstr ""
" --~a 'https://data.planete-kraus.eu/token' \\\n"
" --~a '...port...'"
-#: src/scm/webid-oidc/program.scm:563
+#: src/scm/webid-oidc/program.scm:574
#, scheme-format
msgid ""
"\n"
@@ -2026,27 +2041,32 @@ msgstr ""
"\n"
"Si vous trouvez une erreur, veuillez en envoyer un rapport à ~a."
-#: src/scm/webid-oidc/program.scm:583
+#: src/scm/webid-oidc/program.scm:579
+#, scheme-format
+msgid "~a version ~a, released ~a\n"
+msgstr "~a version ~a, publiée le ~a\n"
+
+#: src/scm/webid-oidc/program.scm:614
#, scheme-format
msgid "The --~a argument must be a number, not ~s.\n"
msgstr "L’argument de --~a doit être un nombre, pas ~s.\n"
-#: src/scm/webid-oidc/program.scm:589
+#: src/scm/webid-oidc/program.scm:620
#, scheme-format
msgid "The --~a argument must be an integer, not ~s.\n"
msgstr "L’argument de --~a doit être un entier, pas ~s.\n"
-#: src/scm/webid-oidc/program.scm:595
+#: src/scm/webid-oidc/program.scm:626
#, scheme-format
msgid "The --~a argument must be positive, ~s is invalid.\n"
msgstr "L’argument de --~a doit être positif, ~s est invalide.\n"
-#: src/scm/webid-oidc/program.scm:600
+#: src/scm/webid-oidc/program.scm:631
#, scheme-format
msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
msgstr "L’argument de --~a doit être inférieur à 65536, ~s est invalide.\n"
-#: src/scm/webid-oidc/program.scm:642
+#: src/scm/webid-oidc/program.scm:673
#, scheme-format
msgid ""
"Usage: ~a COMMAND [OPTIONS]...\n"
@@ -2055,18 +2075,18 @@ msgstr ""
"Utilisation : ~a COMMANDE [OPTIONS]...\n"
"Voir --~a (-h).\n"
-#: src/scm/webid-oidc/program.scm:652 src/scm/webid-oidc/program.scm:674
-#: src/scm/webid-oidc/program.scm:746
+#: src/scm/webid-oidc/program.scm:683 src/scm/webid-oidc/program.scm:705
+#: src/scm/webid-oidc/program.scm:777
#, scheme-format
msgid "You must pass --~a to set the server name.\n"
msgstr "Vous devez passer --~a pour définir le nom du serveur.\n"
-#: src/scm/webid-oidc/program.scm:656
+#: src/scm/webid-oidc/program.scm:687
#, scheme-format
msgid "You must pass --~a to set the backend URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI du service d’arrière-plan.\n"
-#: src/scm/webid-oidc/program.scm:678 src/scm/webid-oidc/program.scm:750
+#: src/scm/webid-oidc/program.scm:709 src/scm/webid-oidc/program.scm:781
#, scheme-format
msgid ""
"You must pass --~a to set the file where to store the identity provider "
@@ -2075,59 +2095,59 @@ msgstr ""
"Vous devez passer --~a pour définir le nom du fichier pour sauvegarder\n"
"la clé du fournisseur d’identité.\n"
-#: src/scm/webid-oidc/program.scm:682 src/scm/webid-oidc/program.scm:754
+#: src/scm/webid-oidc/program.scm:713 src/scm/webid-oidc/program.scm:785
#, scheme-format
msgid "You must pass --~a to set the subject of the identity provider.\n"
msgstr ""
"Vous devez passer --~a pour définir le sujet du fournisseur d’identité.\n"
-#: src/scm/webid-oidc/program.scm:686 src/scm/webid-oidc/program.scm:758
+#: src/scm/webid-oidc/program.scm:717 src/scm/webid-oidc/program.scm:789
#, scheme-format
msgid "You must pass --~a to set the subject’s encrypted password.\n"
msgstr ""
"Vous devez passer --~a pour définir le mot de passe chiffré du sujet.\n"
-#: src/scm/webid-oidc/program.scm:690 src/scm/webid-oidc/program.scm:762
+#: src/scm/webid-oidc/program.scm:721 src/scm/webid-oidc/program.scm:793
#, scheme-format
msgid "You must pass --~a to set the JWKS URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI du JWKS.\n"
-#: src/scm/webid-oidc/program.scm:694 src/scm/webid-oidc/program.scm:766
+#: src/scm/webid-oidc/program.scm:725 src/scm/webid-oidc/program.scm:797
#, scheme-format
msgid "You must pass --~a to set the authorization endpoint URI.\n"
msgstr ""
"Vous devez passer --~a pour définir l'URI du terminal d'autorisation.\n"
-#: src/scm/webid-oidc/program.scm:698 src/scm/webid-oidc/program.scm:770
+#: src/scm/webid-oidc/program.scm:729 src/scm/webid-oidc/program.scm:801
#, scheme-format
msgid "You must pass --~a to set the token endpoint URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI du terminal de jeton.\n"
-#: src/scm/webid-oidc/program.scm:718
+#: src/scm/webid-oidc/program.scm:749
#, scheme-format
msgid "You must pass --~a to set the application web ID.\n"
msgstr ""
"Vous devez passer --~a pour définir l'identifiant web de l’application.\n"
-#: src/scm/webid-oidc/program.scm:722
+#: src/scm/webid-oidc/program.scm:753
#, scheme-format
msgid "You must pass --~a to set the redirection URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI de redirection.\n"
-#: src/scm/webid-oidc/program.scm:726
+#: src/scm/webid-oidc/program.scm:757
#, scheme-format
msgid "You must pass --~a to set the informative client name.\n"
msgstr ""
"Vous devez passer --~a pour donner un nom pour l’application à titre "
"informatif.\n"
-#: src/scm/webid-oidc/program.scm:730
+#: src/scm/webid-oidc/program.scm:761
#, scheme-format
msgid "You must pass --~a to set the informative client URI.\n"
msgstr ""
"Vous devez passer --~a pour définir l'URI du client, à titre informatif.\n"
-#: src/scm/webid-oidc/program.scm:817
+#: src/scm/webid-oidc/program.scm:848
#, scheme-format
msgid "Unknown command ~s\n"
msgstr "Commande inconnue ~s\n"
@@ -2599,9 +2619,6 @@ msgstr "Commande inconnue ~s\n"
#~ msgid "comand-line|key-file"
#~ msgstr "fichier-clé"
-#~ msgid "comand-line|subject"
-#~ msgstr "sujet"
-
#~ msgid "comand-line|password"
#~ msgstr "mot-de-passe"
diff --git a/po/webid-oidc.pot b/po/webid-oidc.pot
index 94c0247..f189555 100644
--- a/po/webid-oidc.pot
+++ b/po/webid-oidc.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: webid-oidc SNAPSHOT\n"
"Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-07-28 16:56+0200\n"
+"POT-Creation-Date: 2021-07-29 12:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -973,11 +973,11 @@ msgstr ""
msgid "command-line|version"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:219
+#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:221
msgid "command-line|complete-corresponding-source"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:221
+#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:223
msgid "command-line|help"
msgstr ""
@@ -985,11 +985,11 @@ msgstr ""
msgid "command-line|port"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:251
+#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:253
msgid "command-line|log-file"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:253
+#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:255
msgid "command-line|error-file"
msgstr ""
@@ -1023,12 +1023,12 @@ msgid ""
msgstr ""
#: src/scm/webid-oidc/hello-world.scm:103
-#: src/scm/webid-oidc/example-app.scm:159 src/scm/webid-oidc/program.scm:568
+#: src/scm/webid-oidc/example-app.scm:159
#, scheme-format
msgid "~a version ~a\n"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:576
+#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:607
msgid ""
"You are legally required to link to the complete corresponding source code.\n"
msgstr ""
@@ -1179,74 +1179,78 @@ msgstr ""
msgid "(there was an error: ~a)"
msgstr ""
-#: src/scm/webid-oidc/program.scm:223
-msgid "command-line|server|port"
+#: src/scm/webid-oidc/program.scm:219
+msgid "command-line|describe-project"
msgstr ""
#: src/scm/webid-oidc/program.scm:225
-msgid "command-line|server|server-name"
+msgid "command-line|server|port"
msgstr ""
#: src/scm/webid-oidc/program.scm:227
-msgid "command-line|server|reverse-proxy|backend-uri"
+msgid "command-line|server|server-name"
msgstr ""
#: src/scm/webid-oidc/program.scm:229
-msgid "command-line|server|reverse-proxy|header"
+msgid "command-line|server|reverse-proxy|backend-uri"
msgstr ""
#: src/scm/webid-oidc/program.scm:231
-msgid "command-line|server|issuer|key-file"
+msgid "command-line|server|reverse-proxy|header"
msgstr ""
#: src/scm/webid-oidc/program.scm:233
-msgid "command-line|server|issuer|subject"
+msgid "command-line|server|issuer|key-file"
msgstr ""
#: src/scm/webid-oidc/program.scm:235
-msgid "command-line|server|issuer|encrypted-password"
+msgid "command-line|server|issuer|subject"
msgstr ""
#: src/scm/webid-oidc/program.scm:237
-msgid "command-line|server|issuer|jwks-uri"
+msgid "command-line|server|issuer|encrypted-password"
msgstr ""
#: src/scm/webid-oidc/program.scm:239
-msgid "command-line|server|issuer|authorization-endpoint-uri"
+msgid "command-line|server|issuer|jwks-uri"
msgstr ""
#: src/scm/webid-oidc/program.scm:241
-msgid "command-line|server|issuer|token-endpoint-uri"
+msgid "command-line|server|issuer|authorization-endpoint-uri"
msgstr ""
#: src/scm/webid-oidc/program.scm:243
-msgid "command-line|server|client-id"
+msgid "command-line|server|issuer|token-endpoint-uri"
msgstr ""
#: src/scm/webid-oidc/program.scm:245
-msgid "command-line|server|redirect-uri"
+msgid "command-line|server|client-id"
msgstr ""
#: src/scm/webid-oidc/program.scm:247
-msgid "command-line|server|client-name"
+msgid "command-line|server|redirect-uri"
msgstr ""
#: src/scm/webid-oidc/program.scm:249
+msgid "command-line|server|client-name"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:251
msgid "command-line|server|client-uri"
msgstr ""
-#: src/scm/webid-oidc/program.scm:278
+#: src/scm/webid-oidc/program.scm:284
#, scheme-format
msgid "Usage: ~a COMMAND [OPTIONS]...\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:282
+#: src/scm/webid-oidc/program.scm:288
msgid ""
"\n"
"Run the webid-oidc COMMAND."
msgstr ""
-#: src/scm/webid-oidc/program.scm:285
+#: src/scm/webid-oidc/program.scm:291
msgid ""
"\n"
"This program is covered by the GNU Affero GPL, version 3 or\n"
@@ -1256,13 +1260,13 @@ msgid ""
"to all responses."
msgstr ""
-#: src/scm/webid-oidc/program.scm:292
+#: src/scm/webid-oidc/program.scm:298
msgid ""
"\n"
"Available commands:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:294
+#: src/scm/webid-oidc/program.scm:300
#, scheme-format
msgid ""
"\n"
@@ -1270,12 +1274,12 @@ msgid ""
" run an authenticating reverse proxy."
msgstr ""
-#: src/scm/webid-oidc/program.scm:297 src/scm/webid-oidc/program.scm:480
-#: src/scm/webid-oidc/program.scm:649
+#: src/scm/webid-oidc/program.scm:303 src/scm/webid-oidc/program.scm:491
+#: src/scm/webid-oidc/program.scm:680
msgid "command-line|command|reverse-proxy"
msgstr ""
-#: src/scm/webid-oidc/program.scm:298
+#: src/scm/webid-oidc/program.scm:304
#, scheme-format
msgid ""
"\n"
@@ -1283,12 +1287,12 @@ msgid ""
" run an identity provider."
msgstr ""
-#: src/scm/webid-oidc/program.scm:301 src/scm/webid-oidc/program.scm:505
-#: src/scm/webid-oidc/program.scm:671
+#: src/scm/webid-oidc/program.scm:307 src/scm/webid-oidc/program.scm:516
+#: src/scm/webid-oidc/program.scm:702
msgid "command-line|command|identity-provider"
msgstr ""
-#: src/scm/webid-oidc/program.scm:302
+#: src/scm/webid-oidc/program.scm:308
#, scheme-format
msgid ""
"\n"
@@ -1296,12 +1300,12 @@ msgid ""
" serve the pages for a public application."
msgstr ""
-#: src/scm/webid-oidc/program.scm:305 src/scm/webid-oidc/program.scm:526
-#: src/scm/webid-oidc/program.scm:715
+#: src/scm/webid-oidc/program.scm:311 src/scm/webid-oidc/program.scm:537
+#: src/scm/webid-oidc/program.scm:746
msgid "command-line|command|client-service"
msgstr ""
-#: src/scm/webid-oidc/program.scm:306
+#: src/scm/webid-oidc/program.scm:312
#, scheme-format
msgid ""
"\n"
@@ -1310,18 +1314,18 @@ msgid ""
" facility."
msgstr ""
-#: src/scm/webid-oidc/program.scm:310 src/scm/webid-oidc/program.scm:552
-#: src/scm/webid-oidc/program.scm:744
+#: src/scm/webid-oidc/program.scm:316 src/scm/webid-oidc/program.scm:563
+#: src/scm/webid-oidc/program.scm:775
msgid "command-line|command|server"
msgstr ""
-#: src/scm/webid-oidc/program.scm:312
+#: src/scm/webid-oidc/program.scm:318
msgid ""
"\n"
"General options:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:314
+#: src/scm/webid-oidc/program.scm:320
#, scheme-format
msgid ""
"\n"
@@ -1330,7 +1334,7 @@ msgid ""
" code. For instance, this would be an URI pointing to a tarball."
msgstr ""
-#: src/scm/webid-oidc/program.scm:319
+#: src/scm/webid-oidc/program.scm:325
#, scheme-format
msgid ""
"\n"
@@ -1338,15 +1342,23 @@ msgid ""
" display a short help message and exit."
msgstr ""
-#: src/scm/webid-oidc/program.scm:323
+#: src/scm/webid-oidc/program.scm:329
#, scheme-format
msgid ""
"\n"
" -v, --~a:\n"
-" display the version information (~a) and exit."
+" display the version information (~a, released ~a) and exit."
msgstr ""
-#: src/scm/webid-oidc/program.scm:328
+#: src/scm/webid-oidc/program.scm:335
+#, scheme-format
+msgid ""
+"\n"
+" --~a:\n"
+" describe the project in the DOAP vocabulary and exit."
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:339
#, scheme-format
msgid ""
"\n"
@@ -1354,7 +1366,7 @@ msgid ""
" redirect the program standard output to FILE.log."
msgstr ""
-#: src/scm/webid-oidc/program.scm:332
+#: src/scm/webid-oidc/program.scm:343
#, scheme-format
msgid ""
"\n"
@@ -1362,13 +1374,13 @@ msgid ""
" redirect the program errors to FILE.err."
msgstr ""
-#: src/scm/webid-oidc/program.scm:337
+#: src/scm/webid-oidc/program.scm:348
msgid ""
"\n"
"General server-side options:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:339
+#: src/scm/webid-oidc/program.scm:350
#, scheme-format
msgid ""
"\n"
@@ -1376,7 +1388,7 @@ msgid ""
" set the server port to bind, 8080 by default."
msgstr ""
-#: src/scm/webid-oidc/program.scm:343
+#: src/scm/webid-oidc/program.scm:354
#, scheme-format
msgid ""
"\n"
@@ -1384,13 +1396,13 @@ msgid ""
" set the public server URI (scheme, userinfo, host, and port)."
msgstr ""
-#: src/scm/webid-oidc/program.scm:348
+#: src/scm/webid-oidc/program.scm:359
msgid ""
"\n"
"Options for the resource server:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:350
+#: src/scm/webid-oidc/program.scm:361
#, scheme-format
msgid ""
"\n"
@@ -1400,7 +1412,7 @@ msgid ""
" authentication."
msgstr ""
-#: src/scm/webid-oidc/program.scm:356
+#: src/scm/webid-oidc/program.scm:367
#, scheme-format
msgid ""
"\n"
@@ -1409,13 +1421,13 @@ msgid ""
" reverse-proxy command."
msgstr ""
-#: src/scm/webid-oidc/program.scm:362
+#: src/scm/webid-oidc/program.scm:373
msgid ""
"\n"
"Options for the identity provider:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:364
+#: src/scm/webid-oidc/program.scm:375
#, scheme-format
msgid ""
"\n"
@@ -1424,7 +1436,7 @@ msgid ""
" key is generated. The server does not offer an HTTPS service."
msgstr ""
-#: src/scm/webid-oidc/program.scm:369
+#: src/scm/webid-oidc/program.scm:380
#, scheme-format
msgid ""
"\n"
@@ -1432,7 +1444,7 @@ msgid ""
" set the identity of the subject."
msgstr ""
-#: src/scm/webid-oidc/program.scm:373
+#: src/scm/webid-oidc/program.scm:384
#, scheme-format
msgid ""
"\n"
@@ -1440,7 +1452,7 @@ msgid ""
" set the encrypted password to recognize the user."
msgstr ""
-#: src/scm/webid-oidc/program.scm:377
+#: src/scm/webid-oidc/program.scm:388
#, scheme-format
msgid ""
"\n"
@@ -1448,7 +1460,7 @@ msgid ""
" set the URI to query the key of the server."
msgstr ""
-#: src/scm/webid-oidc/program.scm:381
+#: src/scm/webid-oidc/program.scm:392
#, scheme-format
msgid ""
"\n"
@@ -1456,7 +1468,7 @@ msgid ""
" set the authorization endpoint of the issuer."
msgstr ""
-#: src/scm/webid-oidc/program.scm:385
+#: src/scm/webid-oidc/program.scm:396
#, scheme-format
msgid ""
"\n"
@@ -1464,13 +1476,13 @@ msgid ""
" set the token endpoint of the issuer."
msgstr ""
-#: src/scm/webid-oidc/program.scm:390
+#: src/scm/webid-oidc/program.scm:401
msgid ""
"\n"
"Options for the client service:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:392
+#: src/scm/webid-oidc/program.scm:403
#, scheme-format
msgid ""
"\n"
@@ -1479,7 +1491,7 @@ msgid ""
" dereferenced to a semantic resource."
msgstr ""
-#: src/scm/webid-oidc/program.scm:397
+#: src/scm/webid-oidc/program.scm:408
#, scheme-format
msgid ""
"\n"
@@ -1488,7 +1500,7 @@ msgid ""
" page is presented with the code to paste in the application."
msgstr ""
-#: src/scm/webid-oidc/program.scm:402
+#: src/scm/webid-oidc/program.scm:413
#, scheme-format
msgid ""
"\n"
@@ -1496,7 +1508,7 @@ msgid ""
" set the user-visible application name (may be misleading...)."
msgstr ""
-#: src/scm/webid-oidc/program.scm:406
+#: src/scm/webid-oidc/program.scm:417
#, scheme-format
msgid ""
"\n"
@@ -1505,13 +1517,13 @@ msgid ""
" application (again, may be misleading)."
msgstr ""
-#: src/scm/webid-oidc/program.scm:412
+#: src/scm/webid-oidc/program.scm:423
msgid ""
"\n"
"Environment variables:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:414
+#: src/scm/webid-oidc/program.scm:425
msgid ""
"\n"
" XML_CATALOG_FILES: the server will fetch resources on the web. By\n"
@@ -1522,23 +1534,23 @@ msgid ""
" content-type."
msgstr ""
-#: src/scm/webid-oidc/program.scm:422 src/scm/webid-oidc/program.scm:429
-#: src/scm/webid-oidc/program.scm:438 src/scm/webid-oidc/program.scm:446
-#: src/scm/webid-oidc/program.scm:454
+#: src/scm/webid-oidc/program.scm:433 src/scm/webid-oidc/program.scm:440
+#: src/scm/webid-oidc/program.scm:449 src/scm/webid-oidc/program.scm:457
+#: src/scm/webid-oidc/program.scm:465
#, scheme-format
msgid ""
"the-environment-variable|\n"
" It is currently set to ~s."
msgstr ""
-#: src/scm/webid-oidc/program.scm:425
+#: src/scm/webid-oidc/program.scm:436
msgid ""
"\n"
" LANG: set the locale of the user interface (for the server commands,\n"
" the user is the system administrator)."
msgstr ""
-#: src/scm/webid-oidc/program.scm:432
+#: src/scm/webid-oidc/program.scm:443
msgid ""
"\n"
" XDG_DATA_HOME: where the program stores persistent data. The\n"
@@ -1547,7 +1559,7 @@ msgid ""
" recommended to set it to /var/lib."
msgstr ""
-#: src/scm/webid-oidc/program.scm:441
+#: src/scm/webid-oidc/program.scm:452
msgid ""
"\n"
" XDG_CACHE_HOME: where the program stores and updates the seed file,\n"
@@ -1555,7 +1567,7 @@ msgid ""
" time. The seed file will be initialized from /dev/random."
msgstr ""
-#: src/scm/webid-oidc/program.scm:449
+#: src/scm/webid-oidc/program.scm:460
msgid ""
"\n"
" HOME: if XDG_DATA_HOME or XDG_CACHE_HOME is not set, they are\n"
@@ -1563,13 +1575,13 @@ msgid ""
" not used otherwise."
msgstr ""
-#: src/scm/webid-oidc/program.scm:458
+#: src/scm/webid-oidc/program.scm:469
msgid ""
"\n"
"Running a reverse proxy"
msgstr ""
-#: src/scm/webid-oidc/program.scm:460
+#: src/scm/webid-oidc/program.scm:471
msgid ""
"\n"
"Suppose that you operate data.provider.com. You want to run an\n"
@@ -1582,7 +1594,7 @@ msgid ""
"from this reverse proxy."
msgstr ""
-#: src/scm/webid-oidc/program.scm:470
+#: src/scm/webid-oidc/program.scm:481
#, scheme-format
msgid ""
"\n"
@@ -1596,20 +1608,20 @@ msgid ""
" --~a '/var/log/proxy.err'"
msgstr ""
-#: src/scm/webid-oidc/program.scm:485
+#: src/scm/webid-oidc/program.scm:496
msgid ""
"\n"
"Running an identity provider"
msgstr ""
-#: src/scm/webid-oidc/program.scm:487
+#: src/scm/webid-oidc/program.scm:498
msgid ""
"\n"
"The identity provider running at webid-oidc-demo.planete-kraus.eu is\n"
"invoked with the following options:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:491
+#: src/scm/webid-oidc/program.scm:502
#, scheme-format
msgid ""
"\n"
@@ -1628,20 +1640,20 @@ msgid ""
" --~a $PORT"
msgstr ""
-#: src/scm/webid-oidc/program.scm:511
+#: src/scm/webid-oidc/program.scm:522
msgid ""
"\n"
"Running the public pages for an application"
msgstr ""
-#: src/scm/webid-oidc/program.scm:513
+#: src/scm/webid-oidc/program.scm:524
msgid ""
"\n"
"The example client application pages for\n"
"webid-oidc-demo.planete-kraus.eu are served this way:"
msgstr ""
-#: src/scm/webid-oidc/program.scm:517
+#: src/scm/webid-oidc/program.scm:528
#, scheme-format
msgid ""
"\n"
@@ -1657,13 +1669,13 @@ msgid ""
" --~a $PORT"
msgstr ""
-#: src/scm/webid-oidc/program.scm:531
+#: src/scm/webid-oidc/program.scm:542
msgid ""
"\n"
"Running a full server"
msgstr ""
-#: src/scm/webid-oidc/program.scm:534
+#: src/scm/webid-oidc/program.scm:545
msgid ""
"\n"
"To run the server with identity provider and\n"
@@ -1671,7 +1683,7 @@ msgid ""
"options for the parts."
msgstr ""
-#: src/scm/webid-oidc/program.scm:538
+#: src/scm/webid-oidc/program.scm:549
#, scheme-format
msgid ""
"\n"
@@ -1690,104 +1702,109 @@ msgid ""
" --~a '...port...'"
msgstr ""
-#: src/scm/webid-oidc/program.scm:563
+#: src/scm/webid-oidc/program.scm:574
#, scheme-format
msgid ""
"\n"
"If you find a bug, then please send a report to ~a."
msgstr ""
-#: src/scm/webid-oidc/program.scm:583
+#: src/scm/webid-oidc/program.scm:579
+#, scheme-format
+msgid "~a version ~a, released ~a\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:614
#, scheme-format
msgid "The --~a argument must be a number, not ~s.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:589
+#: src/scm/webid-oidc/program.scm:620
#, scheme-format
msgid "The --~a argument must be an integer, not ~s.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:595
+#: src/scm/webid-oidc/program.scm:626
#, scheme-format
msgid "The --~a argument must be positive, ~s is invalid.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:600
+#: src/scm/webid-oidc/program.scm:631
#, scheme-format
msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:642
+#: src/scm/webid-oidc/program.scm:673
#, scheme-format
msgid ""
"Usage: ~a COMMAND [OPTIONS]...\n"
"See --~a (-h).\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:652 src/scm/webid-oidc/program.scm:674
-#: src/scm/webid-oidc/program.scm:746
+#: src/scm/webid-oidc/program.scm:683 src/scm/webid-oidc/program.scm:705
+#: src/scm/webid-oidc/program.scm:777
#, scheme-format
msgid "You must pass --~a to set the server name.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:656
+#: src/scm/webid-oidc/program.scm:687
#, scheme-format
msgid "You must pass --~a to set the backend URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:678 src/scm/webid-oidc/program.scm:750
+#: src/scm/webid-oidc/program.scm:709 src/scm/webid-oidc/program.scm:781
#, scheme-format
msgid ""
"You must pass --~a to set the file where to store the identity provider "
"key.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:682 src/scm/webid-oidc/program.scm:754
+#: src/scm/webid-oidc/program.scm:713 src/scm/webid-oidc/program.scm:785
#, scheme-format
msgid "You must pass --~a to set the subject of the identity provider.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:686 src/scm/webid-oidc/program.scm:758
+#: src/scm/webid-oidc/program.scm:717 src/scm/webid-oidc/program.scm:789
#, scheme-format
msgid "You must pass --~a to set the subject’s encrypted password.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:690 src/scm/webid-oidc/program.scm:762
+#: src/scm/webid-oidc/program.scm:721 src/scm/webid-oidc/program.scm:793
#, scheme-format
msgid "You must pass --~a to set the JWKS URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:694 src/scm/webid-oidc/program.scm:766
+#: src/scm/webid-oidc/program.scm:725 src/scm/webid-oidc/program.scm:797
#, scheme-format
msgid "You must pass --~a to set the authorization endpoint URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:698 src/scm/webid-oidc/program.scm:770
+#: src/scm/webid-oidc/program.scm:729 src/scm/webid-oidc/program.scm:801
#, scheme-format
msgid "You must pass --~a to set the token endpoint URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:718
+#: src/scm/webid-oidc/program.scm:749
#, scheme-format
msgid "You must pass --~a to set the application web ID.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:722
+#: src/scm/webid-oidc/program.scm:753
#, scheme-format
msgid "You must pass --~a to set the redirection URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:726
+#: src/scm/webid-oidc/program.scm:757
#, scheme-format
msgid "You must pass --~a to set the informative client name.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:730
+#: src/scm/webid-oidc/program.scm:761
#, scheme-format
msgid "You must pass --~a to set the informative client URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:817
+#: src/scm/webid-oidc/program.scm:848
#, scheme-format
msgid "Unknown command ~s\n"
msgstr ""
diff --git a/src/inst/webid-oidc/Makefile.am b/src/inst/webid-oidc/Makefile.am
index 5b7cfc4..d6f3c6f 100644
--- a/src/inst/webid-oidc/Makefile.am
+++ b/src/inst/webid-oidc/Makefile.am
@@ -19,10 +19,11 @@ webidoidcgo_DATA += %reldir%/config.go
%reldir%/config.scm: $(top_builddir)/config.status
$(AM_V_GEN) mkdir -p %reldir% \
- && (echo "(define-module (webid-oidc config))" ; \
+ && (echo "(define-module (webid-oidc config) #:use-module (srfi srfi-19))" ; \
echo "(define-public libdir \"$(libdir)\")" ; \
echo "(define-public localedir \"$(localedir)\")" ; \
echo "(define-public version \"$(VERSION)\")" ; \
+ echo "(define-public release-date (time-utc->date (make-time time-utc 0 $$(date -d '$(RELEASE_DATE)' '+%s'))))" ; \
echo "(define-public package \"$(PACKAGE)\")" ; \
echo "(define-public package-bugreport \"$(PACKAGE_BUGREPORT)\")") \
> $@-t \
diff --git a/src/pre-inst/webid-oidc/Makefile.am b/src/pre-inst/webid-oidc/Makefile.am
index e168509..d2b7fb7 100644
--- a/src/pre-inst/webid-oidc/Makefile.am
+++ b/src/pre-inst/webid-oidc/Makefile.am
@@ -22,10 +22,11 @@ BUILT_SOURCES += %reldir%/config.scm
%reldir%/config.scm: $(top_builddir)/config.status
$(AM_V_GEN) mkdir -p %reldir% \
- && (echo "(define-module (webid-oidc config))" ; \
+ && (echo "(define-module (webid-oidc config) #:use-module (srfi srfi-19))" ; \
echo "(define-public libdir \"$(abs_top_builddir)/src/.libs\")" ; \
echo "(define-public localedir \"$(localedir)\")" ; \
echo "(define-public version \"$(VERSION)\")" ; \
+ echo "(define-public release-date (time-utc->date (make-time time-utc 0 $$(date -d '$(RELEASE_DATE)' '+%s'))))" ; \
echo "(define-public package \"$(PACKAGE)\")" ; \
echo "(define-public package-bugreport \"$(PACKAGE_BUGREPORT)\")") \
> $@-t \
diff --git a/src/scm/webid-oidc/program.scm b/src/scm/webid-oidc/program.scm
index 6b8ad29..4fbc34a 100644
--- a/src/scm/webid-oidc/program.scm
+++ b/src/scm/webid-oidc/program.scm
@@ -215,6 +215,8 @@
(textdomain cfg:package)
(let ((version-sym
(string->symbol (G_ "command-line|version")))
+ (describe-project-sym
+ (string->symbol (G_ "command-line|describe-project")))
(complete-corresponding-source-sym
(string->symbol (G_ "command-line|complete-corresponding-source")))
(help-sym
@@ -250,11 +252,15 @@
(log-file-sym
(string->symbol (G_ "command-line|log-file")))
(error-file-sym
- (string->symbol (G_ "command-line|error-file"))))
+ (string->symbol (G_ "command-line|error-file")))
+ (locale-release-date
+ (strftime (locale-date-format)
+ (localtime (time-second (date->time-utc cfg:release-date))))))
(let ((options
(let ((spec
`((,complete-corresponding-source-sym (single-char #\S) (value #t))
(,version-sym (single-char #\v) (value #f))
+ (,describe-project-sym (value #f))
(,help-sym (single-char #\h) (value #f))
(,log-file-sym (single-char #\l) (value #t))
(,error-file-sym (single-char #\e) (value #t))
@@ -322,9 +328,14 @@ General options:"))
help-sym)
(format #t (G_ "
-v, --~a:
- display the version information (~a) and exit.")
+ display the version information (~a, released ~a) and exit.")
version-sym
- cfg:version)
+ cfg:version
+ locale-release-date)
+ (format #t (G_ "
+ --~a:
+ describe the project in the DOAP vocabulary and exit.")
+ describe-project-sym)
(format #t (G_ "
-l FILE.log, --~a=FILE.log:
redirect the program standard output to FILE.log.")
@@ -565,8 +576,30 @@ If you find a bug, then please send a report to ~a.")
cfg:package-bugreport)
(format #t "\n"))
((option-ref options version-sym #f)
- (format #t (G_ "~a version ~a\n")
- cfg:package cfg:version))
+ (format #t (G_ "~a version ~a
+
+Rreleased ~a\n")
+ cfg:package cfg:version locale-release-date))
+ ((option-ref options describe-project-sym #f)
+ (format #t "@prefix earl: <http://www.w3.org/ns/earl#> .
+@prefix doap: <http://usefulinc.com/ns/doap#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix solid-test: <https://github.com/solid/conformance-test-harness/vocab#> .
+
+<> a earl:Software, earl:TestSubject ;
+ doap:name ~s ;
+ doap:release [ doap:name ~s ; doap:revision ~s ; doap:created ~s^^xsd:date ] ;
+ doap:developer <https://data.planete-kraus.eu/vivien#me> ;
+ doap:homepage <https://webid-oidc.planete-kraus.eu> ;
+ doap:description \"Solid implementation to protect users’ freedom\"@en,
+ \"Implémentation de Solid pour garantir la liberté des utilisateurs\"@fr ;
+ doap:programming-language \"GNU Guile\" ;
+ solid-test:features \"authentication\", \"acl\", \"wac-allow\" .
+"
+ cfg:package
+ (format #f "~a ~a" cfg:package cfg:version)
+ cfg:version
+ (date->string cfg:release-date "~1")))
(else
(let ((rest (option-ref options '() '()))
(complete-corresponding-source
diff --git a/update-channel.scm b/update-channel.scm
index 5e0d9fd..dc5cafd 100644
--- a/update-channel.scm
+++ b/update-channel.scm
@@ -61,9 +61,11 @@
tmp-dirname
(invoke bash "-c" (format #f "guix hash -r source > hash")))
(invoke bash "-c" (format #f "~a describe --tags --always > ~a/version" git tmp-dirname))
+ (invoke bash "-c" (format #f "~a show -s --format=%cI > ~a/release-date" git tmp-dirname))
(invoke bash "-c" (format #f "~a rev-parse master > ~a/commit" git tmp-dirname))
(let ((hash (call-with-input-file (string-append tmp-dirname "/hash") read-line))
(version (call-with-input-file (string-append tmp-dirname "/version") read-line))
+ (release-date (call-with-input-file (string-append tmp-dirname "/release-date") read-line))
(commit (call-with-input-file (string-append tmp-dirname "/commit") read-line))
(interned-modules
(run-with-store
@@ -79,7 +81,7 @@
(chmod "vkraus/packages/webid-oidc.scm" #o644)
(let ((port (open-file "vkraus/packages/webid-oidc.scm" "a")))
(write `(define-public webid-oidc
- (webid-oidc-release ,version ,commit ,hash))
+ (webid-oidc-release ,version ,release-date ,commit ,hash))
port)
(display "\n" port)
(write `(define-public webid-oidc-html