debian/changelog

@@ -13,6 +13,13 @@ libapache2-mod-tile (0.4+git20170108-e25bfdb-1) UNRELEASED; urgency=medium
   * Fix install files.
   * Add dependency on lsb-base required by init script.
   * Add patch to use libjs-openlayers package.
+  * Add patch to fix spelling errors.
+  * Add lintian override for testsuite-autopkgtest-missing.
+  * Enable all hardening buildflags.
+  * Add status option to init script.
+  * Add patch to fix manpage section for renderd.
+  * Update libapache2-mod-tile packaging for 2.4.
+  * Add override for web-application-depends-on-apache2-data-package.
 
  -- Bas Couwenberg <sebastic@debian.org>  Sun, 14 Jul 2019 13:26:28 +0200
 

debian/control

@@ -20,8 +20,7 @@ Homepage: https://wiki.openstreetmap.org/wiki/Mod_tile
 Package: libapache2-mod-tile
 Architecture: any
 Section: httpd
-Depends: apache2,
-         libjs-openlayers,
+Depends: libjs-openlayers,
          renderd | tirex-master,
          ${shlibs:Depends},
          ${misc:Depends},

debian/libapache2-mod-tile.apache2

 mod src/.libs/mod_tile.so
 mod debian/tile.load
-conf debian/tile.conf
+conf debian/libapache2-mod-tile.conf

debian/tile.conf → debian/libapache2-mod-tile.conf

@@ -4,13 +4,7 @@ Alias /mod_tile /usr/share/libapache2-mod-tile
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
 
-    <IfVersion >= 2.3>
     Require all granted
-    </IfVersion>
-    <IfVersion < 2.3>
-        Order allow,deny
-        Allow from all
-    </IfVersion>
 
     # You can manually configure each tile set with AddTileConfig or AddTileMimeConfig.
     # The first argument is the URL path relative to this virtual host

debian/libapache2-mod-tile.config

-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_input high libapache2-mod-tile/enablesite || true
-db_go || true
-
-cat <<EOF > /etc/default/libapache2-mod-tile
-# Default settings for openstreetmap-mapnik-data
-INIT_DB="$INIT_DB"
-GRANT_USER="$GRANT_USER"
-EOF
-

debian/libapache2-mod-tile.dirs

-/usr/share/libapache2-mod-tile
+usr/share/libapache2-mod-tile
+var/lib/mod_tile

debian/libapache2-mod-tile.lintian-overrides

+# It's an apache module, not a web application.
+web-application-depends-on-apache2-data-package apache2-bin
+

debian/libapache2-mod-tile.postinst

 #!/bin/sh
+
 set -e
 
 if [ "$1" = configure ] ; then
-
-    . /usr/share/debconf/confmodule
-
-    mkdir -p /var/lib/mod_tile
+    if [ -e /var/lib/mod_tile ]; then
         chown www-data:www-data /var/lib/mod_tile
+    fi
 
     # only enable on new installs, not on upgrades
     if [ -z "$2" ] ; then
-        a2enmod tile
-        db_get libapache2-mod-tile/enablesite || true
-        ENABLE_SITE=$RET
-        db_stop
-        if [ "x$ENABLE_SITE" = "xtrue" ] ; then
-            a2ensite tileserver_site
-            a2dissite 000-default
+        if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+            . /usr/share/apache2/apache2-maintscript-helper
+            apache2_invoke enmod tile
         fi
     fi
     
-    # only restart if mod_something is enabled
-    if [ -e /etc/apache2/mods-enabled/tile.load ] ; then
-        invoke-rc.d apache2 restart
-    fi
-    
     # automatically install munin plugins if munin is present.
     if [ -d /etc/munin/plugins ] ; then
         cd /etc/munin/plugins
@@ -36,12 +26,6 @@ if [ "$1" = configure ] ; then
             fi
         done
     fi
-    true
 fi
 
-#script will hang without this!
-db_stop
-
 #DEBHELPER#
-
-exit 0

debian/libapache2-mod-tile.prerm

 #!/bin/sh
+
 set -e
 
 if [ "$1" = remove ]; then
-    a2dissite tileserver_site || true
-    a2ensite 000-default || true
-    a2dismod -q -f tile || true
-    invoke-rc.d apache2 restart || true
+    if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
+        . /usr/share/apache2/apache2-maintscript-helper
+        apache2_invoke dismod tile
+    fi
 fi
 
 # automatically remove munin plugins
-if [ -d /etc/munin/plugins ]
-then
+if [ -d /etc/munin/plugins ]; then
     rm -f /etc/munin/plugins/mod_tile* 
 fi
 

debian/libapache2-mod-tile.templates

-Template: libapache2-mod-tile/enablesite
-Type: boolean
-Default: true
-Description: Do you want to enable mod_tile in the apache config?
- This will enable the apache config for mod_tile
- WARNING: This will disable the currently active default site config

debian/patches/manpage-section-mismatch.patch

+Description: Fix manpage section for renderd.
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- /dev/null
++++ b/docs/renderd.1
+@@ -0,0 +1,46 @@
++.TH RENDERD 1 "Jan 25, 2012"
++.\" Please adjust this date whenever revising the manpage.
++.SH NAME
++renderd \- Rendering daemon for rendering OpenStreetMap tiles.
++.SH SYNOPSIS
++.B renderd
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B renderd
++command.
++.PP
++.B renderd
++is a rendering daemon for map tiles with the mapnik library. It receives render requests
++on a socket. Renderd queues requests in a number of different queues to manage load while 
++rendering the requests with the mapnik library. By default renderd will start as a daemon.
++It will log information in the syslog.
++.PP
++.SH OPTIONS
++This programs follow the usual GNU command line syntax, with long
++options starting with two dashes (`-').
++A summary of options is included below.
++.TP
++\fB\-f\fR|\-\-foreground
++Run renderd in the foreground for debugging purposes.
++.TP
++\fB\-c\fR|\-\-config
++Set the location of the config file used to configure the various parameters of renderd,
++like the mapnik style sheet. The default is /etc/renderd.conf
++.TP
++\fB\-s\fR|\-\-slave
++Renderd can be used in a distributed fashion across multiple rendering servers. The master renderd handles queuing and
++passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance
++of renderd. The default is to use the master section
++.TP
++\fB\-h\fR|\-\-help
++Print out a help text for renderd
++.PP
++.SH SEE ALSO
++.BR renderd.conf (1),
++.br
++.SH AUTHOR
++renderd was written by Jon Burgess, and other OpenStreetMap project members.
++.PP
++This manual page was written by OpenStreetMap authors.
+--- a/docs/renderd.8
++++ /dev/null
+@@ -1,46 +0,0 @@
+-.TH RENDERD 1 "Jan 25, 2012"
+-.\" Please adjust this date whenever revising the manpage.
+-.SH NAME
+-renderd \- Rendering daemon for rendering OpenStreetMap tiles.
+-.SH SYNOPSIS
+-.B renderd
+-.RI [ options ]
+-.br
+-.SH DESCRIPTION
+-This manual page documents briefly the
+-.B renderd
+-command.
+-.PP
+-.B renderd
+-is a rendering daemon for map tiles with the mapnik library. It receives render requests
+-on a socket. Renderd queues requests in a number of different queues to manage load while 
+-rendering the requests with the mapnik library. By default renderd will start as a daemon.
+-It will log information in the syslog.
+-.PP
+-.SH OPTIONS
+-This programs follow the usual GNU command line syntax, with long
+-options starting with two dashes (`-').
+-A summary of options is included below.
+-.TP
+-\fB\-f\fR|\-\-foreground
+-Run renderd in the foreground for debugging purposes.
+-.TP
+-\fB\-c\fR|\-\-config
+-Set the location of the config file used to configure the various parameters of renderd,
+-like the mapnik style sheet. The default is /etc/renderd.conf
+-.TP
+-\fB\-s\fR|\-\-slave
+-Renderd can be used in a distributed fashion across multiple rendering servers. The master renderd handles queuing and
+-passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance
+-of renderd. The default is to use the master section
+-.TP
+-\fB\-h\fR|\-\-help
+-Print out a help text for renderd
+-.PP
+-.SH SEE ALSO
+-.BR renderd.conf (1),
+-.br
+-.SH AUTHOR
+-renderd was written by Jon Burgess, and other OpenStreetMap project members.
+-.PP
+-This manual page was written by OpenStreetMap authors.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,7 +13,7 @@ STORE_CPPFLAGS =
+ 
+ bin_PROGRAMS = renderd render_expired render_list render_speedtest render_old
+ noinst_PROGRAMS = gen_tile_test
+-man_MANS = docs/renderd.8 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
++man_MANS = docs/renderd.1 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
+ 
+ renderddir = $(sysconfdir)
+ renderd_SOURCES = src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/request_queue.c src/cache_expire.c src/metatile.cpp src/parameterize_style.cpp src/protocol_helper.c $(STORE_SOURCES)

debian/patches/series

 iniparser.patch
 openlayers.patch
+spelling-errors.patch
+manpage-section-mismatch.patch

debian/patches/spelling-errors.patch

+Description: Fix spelling errors.
+ * recieve   -> receive
+ * accross   -> across
+ * determins -> determines
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/src/protocol_helper.c
++++ b/src/protocol_helper.c
+@@ -42,7 +42,7 @@ int recv_cmd(struct protocol * cmd, int
+         return 0;
+     }
+     if ((cmd->ver > 3) || (cmd->ver < 1)) {
+-        syslog(LOG_WARNING, "WARNING: Failed to recieve render cmd with unknown protocol version %i\n", cmd->ver);
++        syslog(LOG_WARNING, "WARNING: Failed to receive render cmd with unknown protocol version %i\n", cmd->ver);
+         return -1;
+     }
+     syslog(LOG_DEBUG, "DEBUG: Got incoming request with protocol version %i\n", cmd->ver); 
+--- a/docs/renderd.8
++++ b/docs/renderd.8
+@@ -30,7 +30,7 @@ Set the location of the config file used
+ like the mapnik style sheet. The default is /etc/renderd.conf
+ .TP
+ \fB\-s\fR|\-\-slave
+-Renderd can be used in a distributed fashion accross multiple rendering servers. The master renderd handles queuing and
++Renderd can be used in a distributed fashion across multiple rendering servers. The master renderd handles queuing and
+ passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance
+ of renderd. The default is to use the master section
+ .TP
+--- a/src/mod_tile.c
++++ b/src/mod_tile.c
+@@ -2412,7 +2412,7 @@ static const command_rec tile_cmds[] =
+         mod_tile_cache_lastmod_factor_config,   /* config action routine */
+         NULL,                                   /* argument to include in call */
+         OR_OPTIONS,                             /* where available */
+-        "Set the factor by which the last modified determins cache expiry" /* directive description */
++        "Set the factor by which the last modified determines cache expiry" /* directive description */
+     ),
+     AP_INIT_TAKE2(
+         "ModTileCacheDurationLowZoom",       /* directive name */

debian/renderd.init

@@ -143,6 +143,9 @@ case "$1" in
 		;;
 	esac
 	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
   *)
 	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2

debian/rules

@@ -2,6 +2,9 @@
 
 # DH_VERBOSE := 1
 
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
 	dh $@ --with autoreconf,apache2 --parallel
 

debian/source/lintian-overrides

+# Not worth the effort
+testsuite-autopkgtest-missing
+