From 66ff61babe6a9148e80a1522f7aef916c0b07aa3 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 25 May 2026 19:27:59 +0200
Subject: [PATCH 1/2] Update m4, doc/common, fix local.ent not found

---
 doc/Makefile.am | 4 ++--
 doc/common      | 2 +-
 m4              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a0dcd14c..59172434 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 # This file is part of Pazpar2.
 SUBDIRS = common
 
-SUFFIXES=.1 .5 .7 .8 .pdf .esp .xml 
+SUFFIXES=.1 .5 .7 .8 .pdf .esp .xml
 
 XMLFILES = book.xml ajaxdev.xml manref.xml gpl-2.0.xml local.ent
 
@@ -51,7 +51,7 @@ jade-check: $(XMLFILES)
 manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl local.ent
 	rm -f manref.xml
 	for i in $(XMLMAN); do \
-		xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
+		$(XSLTPROC_COMPILE) $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
 	done
 
 clean-data-hook:
diff --git a/doc/common b/doc/common
index 9fb378eb..34b6301d 160000
--- a/doc/common
+++ b/doc/common
@@ -1 +1 @@
-Subproject commit 9fb378eb77b7bb5004580afcb2830671d68dbf8a
+Subproject commit 34b6301de5e648bf5444d0f27bbaeaa254bded71
diff --git a/m4 b/m4
index 24a1e038..7d0de47b 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 24a1e038c0d0915c246f2c6e9f45777548f3a9bf
+Subproject commit 7d0de47b22739b4c13272604c60d3152b9cb55a2

From ef63798dc3e1f6eecddd484d20c4c785ad5c3cb8 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 25 May 2026 19:33:03 +0200
Subject: [PATCH 2/2] Update a couple of links

---
 doc/book.xml         | 10 +++++-----
 doc/pazpar2.xml      | 28 ++++++++++++++--------------
 doc/pazpar2_conf.xml |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/book.xml b/doc/book.xml
index 2f5ed021..3057a0e3 100644
--- a/doc/book.xml
+++ b/doc/book.xml
@@ -427,7 +427,7 @@
    <para>
     Apache 2 has a
     <ulink
-	url="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">
+	url="https://httpd.apache.org/docs/2.2/mod/mod_proxy.html">
      proxy module
     </ulink>
     which allows Pazpar2 to become a backend to an Apache 2
@@ -448,7 +448,7 @@
     <literal>/search.pz2</literal>.
     The
     <ulink
-	url="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass">
+	url="https://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass">
     ProxyPass
     </ulink>
     directive of Apache must be used to map a URL path
@@ -681,7 +681,7 @@
     search. You start a new search using the 'search' command. Once the
     search has been started, you can follow its progress using the
     'stat', 'bytarget', 'termlist', or 'show' commands. Detailed records
-    can be fetched using the 'record' command. 
+    can be fetched using the 'record' command.
    </para>
   </section>
 
@@ -723,7 +723,7 @@
      requests to Pazpar2, this set up can be easily extended to include
      load balancing capabilites.
      To do so, you need to enable the
-     <ulink url="http://httpd.apache.org/docs/2.2/mod/mod_proxy_balancer.html">
+     <ulink url="https://httpd.apache.org/docs/2.2/mod/mod_proxy_balancer.html">
       mod_proxy_balance
      </ulink>
      module in your Apache2 installation.
@@ -866,7 +866,7 @@
        ]]></screen>
    <para>
     For controlling the ranking parameters, refer to the
-    <link linkend="service-rank">rank</link> element of the 
+    <link linkend="service-rank">rank</link> element of the
     service definition.
     Refer to the <link linkend="metadata-rank">rank</link> attribute
     of the metadata element for how to control ranking for individual
diff --git a/doc/pazpar2.xml b/doc/pazpar2.xml
index 33c4c925..0274c1ad 100644
--- a/doc/pazpar2.xml
+++ b/doc/pazpar2.xml
@@ -20,12 +20,12 @@
   <manvolnum>8</manvolnum>
   <refmiscinfo class="manual">System management commands</refmiscinfo>
  </refmeta>
- 
+
  <refnamediv>
   <refname>pazpar2</refname>
   <refpurpose>Metasearch daemon.</refpurpose>
  </refnamediv>
- 
+
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pazpar2</command>
@@ -47,7 +47,7 @@
    <arg choice="opt"><option>-remove</option></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
- 
+
  <refsect1>
   <title>DESCRIPTION</title>
   <para>
@@ -61,10 +61,10 @@
    <option>-f</option>.
   </para>
  </refsect1>
- 
+
  <refsect1>
   <title>OPTIONS</title>
-  
+
   <variablelist>
    <varlistentry>
     <term><option>-d</option></term>
@@ -124,7 +124,7 @@
      Sets the format of time-stamps for logging.
      Refer to the
        <ulink
-	   url="http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html">
+	   url="https://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html">
        strftime(3)</ulink>
        man page for the format.
     </para></listitem>
@@ -252,16 +252,16 @@
    </varlistentry>
 
   </variablelist>
-  
+
  </refsect1>
- 
+
  <refsect1>
   <title>EXAMPLES</title>
   <para>The Debian package of pazpar2 starts the server with:
    <screen>
     pazpar2 -D -f /etc/pazpar2/pazpar2.cfg -l /var/log/pazpar2.log -p /var/run/pazpar2.pid -u nobody
    </screen>
-   (one line). 
+   (one line).
   </para>
   <para>
    This will put pazpar2 in the background (-D), read config from from
@@ -284,17 +284,17 @@
     (gdb) run -X -f ../etc/pazpar2.cfg
    </screen>
   </para>
- </refsect1> 
- 
+ </refsect1>
+
  <refsect1>
   <title>FILES</title>
   <para><filename>/usr/sbin/pazpar2</filename>: pazpar2 daemon</para>
-  
+
   <para><filename>/usr/share/pazpar2</filename>: pazpar2 shared files</para>
-  
+
   <para><filename>/etc/pazpar2</filename>: pazpar2 config area</para>
  </refsect1>
- 
+
  <refsect1>
   <title>SEE ALSO</title>
   <para>
diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 3fdf027b..510da9e1 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -648,7 +648,7 @@
 	  'name' and 'value' respectively. Refer to possible list of names
 	  in the
 	  <ulink
-	      url="http://www.indexdata.com/yaz/doc/tools.html#ccl.directives.table">
+	      url="https://www.indexdata.com/yaz/doc/tools.html#ccl.directives.table">
 	   YAZ manual
 	   </ulink>.
 	 </para>