cdecl99-1.3 bash-5 hotfix

Turns out that prior to release the package was not tested on any
systems where /bin/sh is bash-5, and the configure script hits a
parser bug in this shell regarding for loops in case statements.

A workaround is to set CONFIG_SHELL environment variable to some
other shell without this bug.  But if that's not possible, this
patch can be applied to avoid the bug.

diff --git a/content/archive/cdecl99/cdecl99-1.3-bash5-fix.patch b/content/archive/cdecl99/cdecl99-1.3-bash5-fix.patch
new file mode 100644 (file)
index 0000000..0ffc323
--- /dev/null
+++ b/content/archive/cdecl99/cdecl99-1.3-bash5-fix.patch
@@ -0,0 +1,49 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+NotDashEscaped: You need gpg to verify this message
+
+The configure script included with the cdecl99-1.3 release fails on
+bash-5 due to a parser bug in this shell.  On affected systems, a
+message similar to the following may be seen when running configure:
+
+  ./configure: line 6631: syntax error near unexpected token `do'
+  ./configure: line 6631: `do'
+
+You can work around the problem by setting the CONFIG_SHELL environment
+variable to some other shell before running configure; otherwise you can
+apply this patch file with a command such as:
+
+  % cd cdecl99-1.3
+  % patch -p1 <cdecl99-1.3-bash5-fix.patch
+
+*** cdecl99-1.3.orig/configure
+--- cdecl99-1.3/configure
+***************
+*** 6626,6633 ****
+    $as_echo_n "(cached) " >&6
+  else
+    dx_cv_have_alignas=no
+! for _dx_alignas
+! in '_Alignas(X)' '__attribute__((__aligned__(X)))' '__declspec(align(X))'
+  do
+  if ac_fn_c_compute_int "$LINENO" "sizeof (struct { char a; char ALIGNAS_TEST(4) b; }) >= 8" "_dx_tmp"        "#include <stddef.h>
+  #define ALIGNAS_TEST(X) $_dx_alignas
+--- 6626,6632 ----
+    $as_echo_n "(cached) " >&6
+  else
+    dx_cv_have_alignas=no
+! for _dx_alignas in '_Alignas(X)' '__attribute__((__aligned__(X)))' '__declspec(align(X))'
+  do
+  if ac_fn_c_compute_int "$LINENO" "sizeof (struct { char a; char ALIGNAS_TEST(4) b; }) >= 8" "_dx_tmp"        "#include <stddef.h>
+  #define ALIGNAS_TEST(X) $_dx_alignas
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAEBCAAdFiEEJagcgrvBtB9dtMuDW0XT0YW44fYFAmYfNBUACgkQW0XT0YW4
+4famBQf9GhDZJGOvrkDB5dGWwieXqFCWXJBbATVbY8JmY5wJupke5MqvDEQJ3tBr
+A2YIcQZ67+KjA2LwWTTQhQgKkveQs1HWFdTDrHnhTm4dF4jZdlxwVK3K3kHCcref
+uW+vl/6C9YkKcVcbf8OeHT4JVgYv2h7XRKW69XIB6lchdMc6rGNeStuCHyuGKYWG
+7n3WH9bA5OBPmPAd6yUPmU4urWBHjZwxyTaFBYBO7T+9R3Q4KvvyzCfxt1JxTUPS
+SmiQC1B0gg16/N2XJzCmnBsaVXSHdsvt8UrZeIZyWipejqtb2UR1MVnVToz/83NO
+gh5tyhxXnYiQgRqd2/uRg9z+GzziDw==
+=/RXF
+-----END PGP SIGNATURE-----

diff --git a/content/archive/cdecl99/cdecl99-1.3.tar.gz b/content/archive/cdecl99/cdecl99-1.3.tar.gz
new file mode 120000 (symlink)
index 0000000..b948234
--- /dev/null
+++ b/content/archive/cdecl99/cdecl99-1.3.tar.gz
@@ -0,0 +1 @@
+../../../.git/annex/objects/v9/65/SHA512-s897087--54ab0ce2db34beaee220cbed936b009added5a51b901c2251c7767df6e63a84a8ce6f59b59ec6b00925c2845674a8d5ef02e620bd5eb8074b52cd07441c005cd/SHA512-s897087--54ab0ce2db34beaee220cbed936b009added5a51b901c2251c7767df6e63a84a8ce6f59b59ec6b00925c2845674a8d5ef02e620bd5eb8074b52cd07441c005cd
\ No newline at end of file

diff --git a/content/archive/cdecl99/cdecl99-1.3.tar.gz.sig b/content/archive/cdecl99/cdecl99-1.3.tar.gz.sig
new file mode 120000 (symlink)
index 0000000..57d10b0
--- /dev/null
+++ b/content/archive/cdecl99/cdecl99-1.3.tar.gz.sig
@@ -0,0 +1 @@
+../../../.git/annex/objects/4v/p3/SHA512-s310--b4b196e4df43c18634ba5dcc8823cf677931ceb0bd2965713db0a078d29e979c601f190e854caed60af7d7249a60f2b39cbd86c1bcdb9b43827945aa5acd5669/SHA512-s310--b4b196e4df43c18634ba5dcc8823cf677931ceb0bd2965713db0a078d29e979c601f190e854caed60af7d7249a60f2b39cbd86c1bcdb9b43827945aa5acd5669
\ No newline at end of file

diff --git a/content/archive/cdecl99/cdecl99-1.3.tar.lz b/content/archive/cdecl99/cdecl99-1.3.tar.lz
new file mode 120000 (symlink)
index 0000000..8382932
--- /dev/null
+++ b/content/archive/cdecl99/cdecl99-1.3.tar.lz
@@ -0,0 +1 @@
+../../../.git/annex/objects/3j/wf/SHA512-s591522--11f04eeda91ef127f6e3d5ef5e2cbb135e6a1f46a138640decbe80ed687c9fd2110a94b2fd883d8d0125704b36760c89cf41aeb5005f7965721b85fb55826b6c/SHA512-s591522--11f04eeda91ef127f6e3d5ef5e2cbb135e6a1f46a138640decbe80ed687c9fd2110a94b2fd883d8d0125704b36760c89cf41aeb5005f7965721b85fb55826b6c
\ No newline at end of file

diff --git a/content/archive/cdecl99/cdecl99-1.3.tar.lz.sig b/content/archive/cdecl99/cdecl99-1.3.tar.lz.sig
new file mode 120000 (symlink)
index 0000000..fbb9bb9
--- /dev/null
+++ b/content/archive/cdecl99/cdecl99-1.3.tar.lz.sig
@@ -0,0 +1 @@
+../../../.git/annex/objects/3k/Mp/SHA512-s310--5c1d52ff133aeaaa7be59f5ec394ecf95d29341eb491909a12412f246b1d88251e6449aab9385797d0d3bf23eb6ff8fd8eedf80dbc446c4d61f5dbf43dc45ed4/SHA512-s310--5c1d52ff133aeaaa7be59f5ec394ecf95d29341eb491909a12412f246b1d88251e6449aab9385797d0d3bf23eb6ff8fd8eedf80dbc446c4d61f5dbf43dc45ed4
\ No newline at end of file

diff --git a/content/archive/rarpd-dx/rarpd-dx-1.tar.gz b/content/archive/rarpd-dx/rarpd-dx-1.tar.gz
new file mode 120000 (symlink)
index 0000000..5ed165b
--- /dev/null
+++ b/content/archive/rarpd-dx/rarpd-dx-1.tar.gz
@@ -0,0 +1 @@
+../../../.git/annex/objects/fv/p8/SHA512-s105283--742eeeccb8eba6daea7294ab696cd9e2ad92e84c1b81d5512c8654c5d1df258d5584c360569fe41b73b84757f0cfea93d5da1b67de59b4b920610009068b85de/SHA512-s105283--742eeeccb8eba6daea7294ab696cd9e2ad92e84c1b81d5512c8654c5d1df258d5584c360569fe41b73b84757f0cfea93d5da1b67de59b4b920610009068b85de
\ No newline at end of file

diff --git a/content/archive/rarpd-dx/rarpd-dx-1.tar.gz.sig b/content/archive/rarpd-dx/rarpd-dx-1.tar.gz.sig
new file mode 120000 (symlink)
index 0000000..6c7a819
--- /dev/null
+++ b/content/archive/rarpd-dx/rarpd-dx-1.tar.gz.sig
@@ -0,0 +1 @@
+../../../.git/annex/objects/g6/j8/SHA512-s310--b40653638706881f135868329359e00c0c55134fadebebb4572f93de79c3d2ff39f6c0af7ad5dcc16f1ed9dd3b2afdca8b9af8dbd071a6b19afabc104658feb6/SHA512-s310--b40653638706881f135868329359e00c0c55134fadebebb4572f93de79c3d2ff39f6c0af7ad5dcc16f1ed9dd3b2afdca8b9af8dbd071a6b19afabc104658feb6
\ No newline at end of file

diff --git a/content/archive/rarpd-dx/rarpd-dx-1.tar.lz b/content/archive/rarpd-dx/rarpd-dx-1.tar.lz
new file mode 120000 (symlink)
index 0000000..cbf3770
--- /dev/null
+++ b/content/archive/rarpd-dx/rarpd-dx-1.tar.lz
@@ -0,0 +1 @@
+../../../.git/annex/objects/65/5W/SHA512-s82601--3642314e7390074a50f080c1d3039b1db6d57895efd40a8285a2cc95f5777962282b11edfee3a17caa10fe9c4dc129729fe4b3c6c02ddb411d1b6d57186e1278/SHA512-s82601--3642314e7390074a50f080c1d3039b1db6d57895efd40a8285a2cc95f5777962282b11edfee3a17caa10fe9c4dc129729fe4b3c6c02ddb411d1b6d57186e1278
\ No newline at end of file

diff --git a/content/archive/rarpd-dx/rarpd-dx-1.tar.lz.sig b/content/archive/rarpd-dx/rarpd-dx-1.tar.lz.sig
new file mode 120000 (symlink)
index 0000000..c219a09
--- /dev/null
+++ b/content/archive/rarpd-dx/rarpd-dx-1.tar.lz.sig
@@ -0,0 +1 @@
+../../../.git/annex/objects/k5/6V/SHA512-s310--530702e16b139db74862244dde8ddbb8d8618c462b935e3e9bc02fdf7e0fa58ff4d952aa444acfb524e4e4c0f2317a7c20a6cc65ec64ff2f9442b9a5753cfafe/SHA512-s310--530702e16b139db74862244dde8ddbb8d8618c462b935e3e9bc02fdf7e0fa58ff4d952aa444acfb524e4e4c0f2317a7c20a6cc65ec64ff2f9442b9a5753cfafe
\ No newline at end of file

diff --git a/content/images/eclipse-20240408-143755.jpg b/content/images/eclipse-20240408-143755.jpg
new file mode 120000 (symlink)
index 0000000..36f5d3c
--- /dev/null
+++ b/content/images/eclipse-20240408-143755.jpg
@@ -0,0 +1 @@
+../../.git/annex/objects/zX/Px/SHA512-s389810--6d85094e85dbfcc4e73a7861d7992ab8d89d31f369ecc6d977ed89f646a96344dc9361374f8f08ba91f426acf9fdf53bfaad89f3f66563822cfc852b93f4cdef/SHA512-s389810--6d85094e85dbfcc4e73a7861d7992ab8d89d31f369ecc6d977ed89f646a96344dc9361374f8f08ba91f426acf9fdf53bfaad89f3f66563822cfc852b93f4cdef
\ No newline at end of file

diff --git a/content/images/eclipse-20240408-143755.yaml b/content/images/eclipse-20240408-143755.yaml
new file mode 100644 (file)
index 0000000..7eb4d34
--- /dev/null
+++ b/content/images/eclipse-20240408-143755.yaml
@@ -0,0 +1,4 @@
+---
+title: 2024-04-08 Solar Eclipse near Cornwall, ON
+copyright: 2024 Nick Bowler
+license: cc-by-sa-4.0

diff --git a/content/images/eclipse-20240408-151623.jpg b/content/images/eclipse-20240408-151623.jpg
new file mode 120000 (symlink)
index 0000000..5b3949f
--- /dev/null
+++ b/content/images/eclipse-20240408-151623.jpg
@@ -0,0 +1 @@
+../../.git/annex/objects/7V/zg/SHA512-s302673--ee3080ea9d00aed29a5af1d407e7dfad733a63131a907cb2d52c7b4342a552bf1b2ad9fa4bd062b96d3355162e09220c14134180091db3d3c9fca5b2f2da464a/SHA512-s302673--ee3080ea9d00aed29a5af1d407e7dfad733a63131a907cb2d52c7b4342a552bf1b2ad9fa4bd062b96d3355162e09220c14134180091db3d3c9fca5b2f2da464a
\ No newline at end of file

diff --git a/content/images/eclipse-20240408-151623.yaml b/content/images/eclipse-20240408-151623.yaml
new file mode 100644 (file)
index 0000000..7eb4d34
--- /dev/null
+++ b/content/images/eclipse-20240408-151623.yaml
@@ -0,0 +1,4 @@
+---
+title: 2024-04-08 Solar Eclipse near Cornwall, ON
+copyright: 2024 Nick Bowler
+license: cc-by-sa-4.0

diff --git a/content/images/eclipse-20240408-152435.jpg b/content/images/eclipse-20240408-152435.jpg
new file mode 120000 (symlink)
index 0000000..5abb405
--- /dev/null
+++ b/content/images/eclipse-20240408-152435.jpg
@@ -0,0 +1 @@
+../../.git/annex/objects/v5/gQ/SHA512-s273018--1a0d88d6b0756be9b23771154e7062da73c442e3f9f8222a6097b8c079382effe64fd7db6f0f763968d983aa9dada88be56932ebee68cbb59e01523ef483662f/SHA512-s273018--1a0d88d6b0756be9b23771154e7062da73c442e3f9f8222a6097b8c079382effe64fd7db6f0f763968d983aa9dada88be56932ebee68cbb59e01523ef483662f
\ No newline at end of file

diff --git a/content/images/eclipse-20240408-152435.yaml b/content/images/eclipse-20240408-152435.yaml
new file mode 100644 (file)
index 0000000..7eb4d34
--- /dev/null
+++ b/content/images/eclipse-20240408-152435.yaml
@@ -0,0 +1,4 @@
+---
+title: 2024-04-08 Solar Eclipse near Cornwall, ON
+copyright: 2024 Nick Bowler
+license: cc-by-sa-4.0

diff --git a/content/images/eclipse-20240408-152639.jpg b/content/images/eclipse-20240408-152639.jpg
new file mode 120000 (symlink)
index 0000000..21e8d49
--- /dev/null
+++ b/content/images/eclipse-20240408-152639.jpg
@@ -0,0 +1 @@
+../../.git/annex/objects/wf/58/SHA512-s348783--191e38f10a9f3d6c3e2334795e342b6ea92ba37e28502e102bf3034aae65e0c8bd9fdd8af9847e33e54059f4bcb6f6597394e1e76ff27403b4d606375735e62f/SHA512-s348783--191e38f10a9f3d6c3e2334795e342b6ea92ba37e28502e102bf3034aae65e0c8bd9fdd8af9847e33e54059f4bcb6f6597394e1e76ff27403b4d606375735e62f
\ No newline at end of file

diff --git a/content/images/eclipse-20240408-152639.yaml b/content/images/eclipse-20240408-152639.yaml
new file mode 100644 (file)
index 0000000..d162875
--- /dev/null
+++ b/content/images/eclipse-20240408-152639.yaml
@@ -0,0 +1,7 @@
+---
+title: 2024-04-08 Total Solar Eclipse near Cornwall, ON
+copyright: 2024 Nick Bowler
+license: cc-by-sa-4.0
+description: |
+  The Sun's corona is visible during totality.  The red spots on the fringes
+  are likely solar prominences.

diff --git a/content/images/eclipse-20240408-152802.jpg b/content/images/eclipse-20240408-152802.jpg
new file mode 120000 (symlink)
index 0000000..1eafa28
--- /dev/null
+++ b/content/images/eclipse-20240408-152802.jpg
@@ -0,0 +1 @@
+../../.git/annex/objects/34/ZV/SHA512-s520397--1fb51e2946228e45bffa5b8552ad9243a52e8ba6fb8715a3885c602d0046a84724795717b4674753bf202dceefa2bee263a853909222217405889b5258db14d8/SHA512-s520397--1fb51e2946228e45bffa5b8552ad9243a52e8ba6fb8715a3885c602d0046a84724795717b4674753bf202dceefa2bee263a853909222217405889b5258db14d8
\ No newline at end of file

diff --git a/content/images/eclipse-20240408-152802.yaml b/content/images/eclipse-20240408-152802.yaml
new file mode 100644 (file)
index 0000000..bc26d22
--- /dev/null
+++ b/content/images/eclipse-20240408-152802.yaml
@@ -0,0 +1,7 @@
+---
+title: 2024-04-08 Diamond Ring near Cornwall, ON
+copyright: 2024 Nick Bowler
+license: cc-by-sa-4.0
+description: |
+  The sun's disc peeks out again at third contact producing the diamond ring
+  effect.

diff --git a/content/images/eclipse-20240408-152846.jpg b/content/images/eclipse-20240408-152846.jpg
new file mode 120000 (symlink)
index 0000000..f49afd2
--- /dev/null
+++ b/content/images/eclipse-20240408-152846.jpg
@@ -0,0 +1 @@
+../../.git/annex/objects/W3/KV/SHA512-s295663--d941929c012be29bbb82e9c22b69280a64b7e9e21321cc7faf2e65088eb251deed5aa2a16b6820473fba40a1057dc72d6b3444e3b916691e8d68322b8d9e1201/SHA512-s295663--d941929c012be29bbb82e9c22b69280a64b7e9e21321cc7faf2e65088eb251deed5aa2a16b6820473fba40a1057dc72d6b3444e3b916691e8d68322b8d9e1201
\ No newline at end of file

diff --git a/content/images/eclipse-20240408-152846.yaml b/content/images/eclipse-20240408-152846.yaml
new file mode 100644 (file)
index 0000000..7eb4d34
--- /dev/null
+++ b/content/images/eclipse-20240408-152846.yaml
@@ -0,0 +1,4 @@
+---
+title: 2024-04-08 Solar Eclipse near Cornwall, ON
+copyright: 2024 Nick Bowler
+license: cc-by-sa-4.0

diff --git a/content/projects/cdecl99.md b/content/projects/cdecl99.md
index c083ba576368d37d7694d39eb6ede9c0993e5c3d..c2fb9f498c9221d27bc4546ce3fce57f55765fed 100644 (file)
--- a/content/projects/cdecl99.md
+++ b/content/projects/cdecl99.md
@@ -1,9 +1,9 @@
 ---
 title: Cdecl99
-copyright: 2021-2022 Nick Bowler
+copyright: 2021-2024 Nick Bowler
 license: gpl-3 or (at your option) any later version
 module: cdecl99
-release: v1.2
+release: v1.3
 ---
 
 <%= project_readme %>

diff --git a/content/projects/rarpd-dx.md b/content/projects/rarpd-dx.md
index ffaf19f31204cba820682dd7ea6b05b88c3df44f..9eaf368faea02b4cb03681e7277d6dbbcba7e9ea 100644 (file)
--- a/content/projects/rarpd-dx.md
+++ b/content/projects/rarpd-dx.md
@@ -3,6 +3,7 @@ title: RARP Daemon
 copyright: 2023 Nick Bowler
 license: gpl-2 or (at your option) any later version
 module: rarpd-dx
+release: v1
 ---
 
 *[RARP]: Reverse Address Resolution Protocol

diff --git a/content/weblog/eclipse-20240408.md b/content/weblog/eclipse-20240408.md
new file mode 100644 (file)
index 0000000..0cf01bf
--- /dev/null
+++ b/content/weblog/eclipse-20240408.md
@@ -0,0 +1,14 @@
+---
+title: Solar Eclipse near Cornwall on 2024-04-08
+copyright: 2024 Nick Bowler
+license: cc-by-sa-4.0
+published: 2024-04-09T00:44:23-0400
+updated: 2024-04-09T21:04:19-0400
+---
+
+More to come...
+
+<% images = @items.find_all("/images/eclipse-20240408*.jpg")
+images.sort_by(&:identifier).each do |item| %>
+<%= gallery_img(item, caption: "") %>
+<% end %>

diff --git a/gitmodules/cdecl99 b/gitmodules/cdecl99
index ae2e55ea361bf632ba771264e07ec674123b0446..db974c0a690f2044dcbc06446333837c3c3e1cec 160000 (submodule)
--- a/gitmodules/cdecl99
+++ b/gitmodules/cdecl99
@@ -1 +1 @@
-Subproject commit ae2e55ea361bf632ba771264e07ec674123b0446
+Subproject commit db974c0a690f2044dcbc06446333837c3c3e1cec

diff --git a/gitmodules/rarpd-dx b/gitmodules/rarpd-dx
index 97a182920cd28f822aa3fcdd74ace01cf7b0a495..e5609838c7733c84200f368bfd89bf2fe07b3d9e 160000 (submodule)
--- a/gitmodules/rarpd-dx
+++ b/gitmodules/rarpd-dx
@@ -1 +1 @@
-Subproject commit 97a182920cd28f822aa3fcdd74ace01cf7b0a495
+Subproject commit e5609838c7733c84200f368bfd89bf2fe07b3d9e

diff --git a/layouts/default.xml b/layouts/default.xml
index 11aeec1e955d0a273d856a37d8d45b67b03eb48f..2f78b3d8481e3805fddaead2dd771b1da5ff39e1 100644 (file)
--- a/layouts/default.xml
+++ b/layouts/default.xml
@@ -64,6 +64,8 @@ end %>
 %>  <article>
 <%= attribute_to_time(@item[:published]).strftime \
 "    <published>%Y-%m-%d</published>\n" if @item[:published]
+%><%= attribute_to_time(@item[:updated]).strftime \
+"    <updated>%Y-%m-%d</updated>\n" if @item[:updated]
 %>  </article>
 <% end
 %>  <html xmlns="<%= Xmlns['xhtml'] %>" id="<%=

diff --git a/layouts/default.xsl b/layouts/default.xsl
index 6bf809440ac0c07b8dd411158ac0551d994ede51..aa22e8f23460062220cba346f2b7468de96bf1ef 100644 (file)
--- a/layouts/default.xsl
+++ b/layouts/default.xsl
@@ -369,8 +369,10 @@
     <xsl:text>Posted </xsl:text>
     <xsl:value-of select='/document/article/published' />
     <xsl:if test='/document/article/updated'>
-      <xsl:text>, last updated </xsl:text>
-      <xsl:value-of select='/document/article/updated' />
+      <xsl:if test='/document/article/updated != /document/article/published'>
+        <xsl:text>, last updated </xsl:text>
+        <xsl:value-of select='/document/article/updated' />
+      </xsl:if>
     </xsl:if>
   </p>
 </xsl:template>

diff --git a/tools/weblog-update.rb b/tools/weblog-update.rb
index f955f245d9ff3a4f861ea292f2922df40fd33ae7..677f3678166223e1921a0655cf72ba8429dc9b09 100755 (executable)
--- a/tools/weblog-update.rb
+++ b/tools/weblog-update.rb
@@ -29,7 +29,7 @@ if content =~ /\A---(--)?\s*$/
 end
 
 if metadata
-    meta = YAML.load(metadata)
+    meta = YAML.load(metadata, permitted_classes: [Time])
     timefmt = "%FT%T%z"
     updatestr = updatetime.round.strftime(timefmt)
     autoset = nil
@@ -49,7 +49,7 @@ if metadata
 
     if autoset
         # Revalidate YAML
-        meta = YAML.load(metadata)
+        meta = YAML.load(metadata, permitted_classes: [Time])
         unless meta[autoset] == updatetime.round
             raise "failed to auto-insert " + autoset
         end