From 9865912f770fbc4662e9bc3425241f3218fe9241 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 19 Jan 2020 13:18:48 +0100 Subject: mention maintainers --- template/contact.html.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/template/contact.html.j2 b/template/contact.html.j2 index adf5691d..32040e06 100644 --- a/template/contact.html.j2 +++ b/template/contact.html.j2 @@ -42,6 +42,9 @@ either PSEUDONYM@gnunet.org or LASTNAME@gnunet.org. Most of us support receiving GnuPG encrypted Emails. + Urgent and sensitive security issues may be + addressed to the GNU maintainers + schanzen and grothoff. {% endtrans %}

-- cgit v1.2.3 From 89079144e0609efe4e380ac916bab97697f4e676 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 19 Jan 2020 13:22:37 +0100 Subject: add well-known --- .well-known/security.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .well-known/security.txt diff --git a/.well-known/security.txt b/.well-known/security.txt new file mode 100644 index 00000000..c5a8b281 --- /dev/null +++ b/.well-known/security.txt @@ -0,0 +1,14 @@ +# Our security address(es). Two just to be safe. +Contact: grothoff@gnunet.org +Contact: schanzen@gnunet.org + +# Our PGP keys: +Encryption: https://grothoff.org/christian/grothoff.asc +Encryption: https://schanzen.eu/schanzen.asc + +# Our disclosure policy: +Disclosure: Full + +# Happy to acknowledge once there is something to acknowledge, +# for now 404 as we had no incidents. +Acknowledgement: https://taler.net/en/security.html -- cgit v1.2.3 From f95ff6920f1dc7daccacab81c5095aaaa66e96af Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 20 Jan 2020 11:58:05 +0000 Subject: actually install security.txt in the target. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index e47f3faa..b032c34c 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,7 @@ all: locale template for lang in en de es fr it; do \ $(cp) $$lang/rss.xml $$lang/news/rss.xml; \ done) + ($(mkdir) -p rendered/.well-known ; $(cp) .well-known/security.txt rendered/.well-known/) # Extract translateable strings from jinja2 templates. # Because of the local i18nfix extractor module we need -- cgit v1.2.3 From 6b4d0f240b6da3ad6f598dffd75b5d42dea53b03 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 20 Jan 2020 12:07:52 +0000 Subject: bump remote submodules. build-system one includes a wrong understanding of updates, --remote shouldn't be used _unless_ you update the pinned commit of the submodules. --- build-system/taler-build-scripts | 2 +- inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts index d725a0cd..d81bbfab 160000 --- a/build-system/taler-build-scripts +++ b/build-system/taler-build-scripts @@ -1 +1 @@ -Subproject commit d725a0cd1b4aa3ff54452a702b8c19db3f3c3393 +Subproject commit d81bbfabc2538932f631d3946bd6a9b95182b4f2 diff --git a/inc b/inc index bdef602f..6a51c97b 160000 --- a/inc +++ b/inc @@ -1 +1 @@ -Subproject commit bdef602fcbd13d59aef971307b3730247a8b9c56 +Subproject commit 6a51c97bddcffef78e0c3b39a0eddd69876b6907 -- cgit v1.2.3 From a576211678732ffbe6b85fbe91717323aaee204b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 20 Jan 2020 15:28:51 +0100 Subject: fix link --- .well-known/security.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.well-known/security.txt b/.well-known/security.txt index c5a8b281..554b0268 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -11,4 +11,4 @@ Disclosure: Full # Happy to acknowledge once there is something to acknowledge, # for now 404 as we had no incidents. -Acknowledgement: https://taler.net/en/security.html +Acknowledgement: https://gnunet.org/en/security.html -- cgit v1.2.3 From 1869271ec2c960b1f1ac0645baf509bd1df40ae1 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 25 Jan 2020 10:28:24 +0000 Subject: change to track git factory default (master) --- .gitmodules | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1cb35121..e15461d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,4 @@ [submodule "inc"] path = inc url = https://git.gnunet.org/www_shared.git - branch = default ignore = dirty -- cgit v1.2.3 From 4e8ff3dbb98e55c33c976a5ec5e872e49d91db3e Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Sun, 9 Feb 2020 13:32:48 +0100 Subject: add fosdem video --- www.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/www.yml b/www.yml index cd544fae..bdc1354a 100644 --- a/www.yml +++ b/www.yml @@ -173,6 +173,20 @@ newsposts: # # videoslist: + - year: 2020 + authors: + - "Martin Schanzenbach" + location: "FOSDEM20" + description: "GNUnet presented at the Decentralized Internet and Privacy devroom at FOSDEM20 in 2020." + name: "GNUnet at FOSDEM20" + sources: + - "https://git.gnunet.org/gnunet-videos-2020.git/plain/FOSDEM20/dip_gnunet.webm" + mirror_sources: + - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.webm" + - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.mp4" + slides: + - "https://git.gnunet.org/presentations.git/plain/FOSDEM20/20200202_fosdem20_gnunet.pdf" + comment: - year: 2019 authors: - "Martin Schanzenbach" -- cgit v1.2.3 From c04ac57d05a6305952d9a343c43da044b4d53241 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Sun, 9 Feb 2020 13:41:44 +0100 Subject: fix link to slides --- www.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www.yml b/www.yml index bdc1354a..960a4eb2 100644 --- a/www.yml +++ b/www.yml @@ -185,7 +185,7 @@ videoslist: - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.webm" - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.mp4" slides: - - "https://git.gnunet.org/presentations.git/plain/FOSDEM20/20200202_fosdem20_gnunet.pdf" + - "https://git.gnunet.org/presentations.git/plain/fosdem20/20200202_fosdem20_gnunet.pdf" comment: - year: 2019 authors: -- cgit v1.2.3