Bug#1107228: attached debdiff
I've attached the debdiff
--
My Main Blog http://etbe.coker.com.au/
My Documents Blog http://doc.coker.com.au/
diff -Nru etbemon-1.4.1/debian/changelog etbemon-1.4.1/debian/changelog
--- etbemon-1.4.1/debian/changelog 2024-09-03 22:00:45.000000000 +1000
+++ etbemon-1.4.1/debian/changelog 2025-05-25 15:57:51.000000000 +1000
@@ -1,3 +1,17 @@
+etbemon (1.4.1-2) unstable; urgency=medium
+
+ * Fixed a font error in mon.8
+ * Removed the /etc/default/mon ENABLED setting
+ * Removed obsolete url in copyright
+ * Removed national encoding (high ASCII) in README.Debian and
+ README.syslog.monitor
+ * Pre-depend on adduser Closes: #1104576
+ * Made local-syslog.monitor fail when it can't open log file Closes: #787766
+ * Made http_tppnp.monitor use /var/lib/mon instead of /tmp Closes: #824979
+ * Removed old FSF postal address from copyright
+
+ -- Russell Coker <russell@coker.com.au> Sun, 25 May 2025 15:57:51 +1000
+
etbemon (1.4.1-1) unstable; urgency=medium
* Added extra capabilities in systemd to match what SE Linux allows for local
diff -Nru etbemon-1.4.1/debian/control etbemon-1.4.1/debian/control
--- etbemon-1.4.1/debian/control 2023-03-25 13:33:21.000000000 +1100
+++ etbemon-1.4.1/debian/control 2025-05-25 15:57:51.000000000 +1000
@@ -12,7 +12,8 @@
Package: mon
Architecture: any
-Depends: mon-client (>= 1.2.0), libtime-period-perl, adduser, ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: adduser
+Depends: mon-client (>= 1.2.0), libtime-period-perl, ${shlibs:Depends}, ${misc:Depends}
Recommends: fping, libauthen-pam-perl, libfilesys-df-perl, libnet-perl, libnet-dns-perl, libnet-ldap-perl, libnet-telnet-perl, libsnmp-perl, libstatistics-descriptive-perl, libtime-parsedate-perl, libcrypt-ssleay-perl, libmail-imapclient-perl, libtimedate-perl, swaks, libcgi-pm-perl, bc, libproc-processtable-perl, libsys-filesystem-perl
Suggests: mon-contrib, libdbd-mysql-perl, go-sendxmpp, xmpp-dns
Conflicts: mon-contrib (<= 1.0+dfsg-3+nmu1)
diff -Nru etbemon-1.4.1/debian/copyright etbemon-1.4.1/debian/copyright
--- etbemon-1.4.1/debian/copyright 2014-10-27 02:23:38.000000000 +1100
+++ etbemon-1.4.1/debian/copyright 2025-05-25 15:57:51.000000000 +1000
@@ -1,4 +1,3 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&revision=207
Upstream-Name: mon
Upstream-Contact: Jim Trocki <trockij@transmeta.com>
Source: http://sourceforge.net/projects/mon/files/mon/
@@ -20,11 +19,6 @@
PURPOSE. See the GNU General Public License for more
details.
.
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
- .
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
diff -Nru etbemon-1.4.1/debian/mon.default etbemon-1.4.1/debian/mon.default
--- etbemon-1.4.1/debian/mon.default 2017-08-30 12:15:45.000000000 +1000
+++ etbemon-1.4.1/debian/mon.default 2025-05-25 15:57:51.000000000 +1000
@@ -1,11 +1,6 @@
# Defaults for mon initscript
# Created by Dario Minnucci <midget@debian.org>
-# Master system-wide mon switch.
-# The initscript will not run if ENABLED is set
-# to values other than: "yes", "true" or "1".
-ENABLED="yes"
-
# Daemon options
DAEMON_OPTS="-f "
diff -Nru etbemon-1.4.1/debian/patches/series etbemon-1.4.1/debian/patches/series
--- etbemon-1.4.1/debian/patches/series 1970-01-01 10:00:00.000000000 +1000
+++ etbemon-1.4.1/debian/patches/series 2025-05-25 15:57:51.000000000 +1000
@@ -0,0 +1 @@
+trixie
diff -Nru etbemon-1.4.1/debian/patches/trixie etbemon-1.4.1/debian/patches/trixie
--- etbemon-1.4.1/debian/patches/trixie 1970-01-01 10:00:00.000000000 +1000
+++ etbemon-1.4.1/debian/patches/trixie 2025-05-25 15:57:51.000000000 +1000
@@ -0,0 +1,111 @@
+Index: etbemon-1.4.1/doc/mon.8
+===================================================================
+--- etbemon-1.4.1.orig/doc/mon.8
++++ etbemon-1.4.1/doc/mon.8
+@@ -255,14 +255,12 @@ host group. For example, if the watch gr
+ the hostnames "smtp", "nntp", and "ns", and the monitor line reads
+ as follows,
+ .br
+-\fC
+ monitor fping.monitor \-t 4000 \-r 2
+ \fR
+ .br
+ then the exectuable "fping.monitor" will be executed with these
+ parameters:
+ .br
+-\fC
+ MONITOR_DIR/fping.monitor \-t 4000 \-r 2 smtp nntp ns
+ \fR
+ .br
+Index: etbemon-1.4.1/etc/init.d/mon
+===================================================================
+--- etbemon-1.4.1.orig/etc/init.d/mon
++++ etbemon-1.4.1/etc/init.d/mon
+@@ -168,25 +168,9 @@ force_stop() {
+ }
+
+
+-check_directive() {
+-#
+-# Check directive status in /etc/default/mon
+-#
+-if [ $1 != "yes" ] &&
+- [ $1 != "true" ] &&
+- [ $1 != "1" ]
+-then
+- log_failure_msg "mon is disabled, set ENABLED to \"yes\", \"true\" or \"1\" in /etc/default/mon to enable it."
+- exit 0
+-fi
+-}
+-
+-
+ case "$1" in
+ start)
+
+- check_directive $ENABLED
+-
+ log_daemon_msg "Starting $DESC " "$NAME"
+ # Check if it's running first
+ if running ; then
+@@ -238,8 +222,6 @@ case "$1" in
+ ;;
+ restart|force-reload)
+
+- check_directive $ENABLED
+-
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ errcode=0
+ stop_server || errcode=$?
+Index: etbemon-1.4.1/mon.d/local-syslog.monitor
+===================================================================
+--- etbemon-1.4.1.orig/mon.d/local-syslog.monitor
++++ etbemon-1.4.1/mon.d/local-syslog.monitor
+@@ -222,7 +222,11 @@ foreach $File (@Files) {
+
+ $FailureDetail{$File} = '';
+
+- open(F, $FullPath);
++ if(not open(F, $FullPath))
++ {
++ print "Can't open file \"$FullPath\"\n";
++ exit(1);
++ }
+
+ if ($size > $last_size) { # Position to read new lines only
+ seek(F, $last_size, 0);
+Index: etbemon-1.4.1/mon.d/http_tppnp.monitor
+===================================================================
+--- etbemon-1.4.1.orig/mon.d/http_tppnp.monitor
++++ etbemon-1.4.1/mon.d/http_tppnp.monitor
+@@ -187,7 +187,7 @@ The full path to the SmartAlarm configur
+ =item B<--pipe /path/to/pipe>
+
+ The full path, including file name, of the named pipe used for
+-inter-process communication. The default is /tmp/http_tppnp, the PID
++inter-process communication. The default is /var/lib/mon/http_tppnp, the PID
+ of the server process is added to this name to ensure uniqueness and
+ allow multiple sets of server/clients to run simultaneously.
+
+@@ -338,7 +338,7 @@ $ServerTimeout = 45 unless $ServerTimeou
+ $ClientTimeout = 30 unless $ClientTimeout;
+ $ResponseAlarmTime = 10000 unless $ResponseAlarmTime;
+ $RandSkew = 10 unless defined $RandSkew; # Can be zero
+-$NamedPipe = '/tmp/http_tppnp' unless $NamedPipe;
++$NamedPipe = '/var/lib/mon/http_tppnp' unless $NamedPipe;
+ $MKFIFO = '/usr/bin/mkfifo'; # Program to make the named pipe, or FIFO
+
+ my $ResponseCount = 0; # Count the responses as they are delivered
+Index: etbemon-1.4.1/doc/README.syslog.monitor
+===================================================================
+--- etbemon-1.4.1.orig/doc/README.syslog.monitor
++++ etbemon-1.4.1/doc/README.syslog.monitor
+@@ -70,8 +70,7 @@ If this should lead to global warming, c
+ accept absolutely no responsibility. However, I will gladly receive and
+ incoporate bugfixes and sensible bug reports.
+
+-Lars Marowsky-Br�<lars@marowsky-bree.de>
+-
++Lars Marowsky-Brée <lars@marowsky-bree.de>
+ URL
+
+ It appears we have made our way to
diff -Nru etbemon-1.4.1/debian/README.Debian etbemon-1.4.1/debian/README.Debian
--- etbemon-1.4.1/debian/README.Debian 2019-04-15 18:04:35.000000000 +1000
+++ etbemon-1.4.1/debian/README.Debian 2025-05-25 15:57:51.000000000 +1000
@@ -4,28 +4,28 @@
* New and deprecated alerts and monitors in mon-1.2.0:
------------------------------------------------------
- Added alerts:
- � irc.alert
+ . irc.alert
- Added monitors:
- � dns-query.monitor
- � local-syslog.monitor
- � lpd.monitor
- � ntpdate.monitor
- � radius.monitor
- � snmpdiskspace.monitor
- � snmpvar.monitor
- � trace.monitor
+ . dns-query.monitor
+ . local-syslog.monitor
+ . lpd.monitor
+ . ntpdate.monitor
+ . radius.monitor
+ . snmpdiskspace.monitor
+ . snmpvar.monitor
+ . trace.monitor
- Removed alerts:
- � remote.alert
+ . remote.alert
- Removed monitors:
- � http_t.monitor
- � http_tp.monitor
- � http_tpp.monitor
+ . http_t.monitor
+ . http_tp.monitor
+ . http_tpp.monitor
- Rename monitors:
- � dialin.monitor to dialin.monitor.wrap
+ . dialin.monitor to dialin.monitor.wrap
@@ -44,12 +44,6 @@
These 2 options allows you to control the daemon behaviour:
-- ENABLED:
- If you don't want to run 'mon' at boot time, please ensure the variable
- ENABLED in /etc/default/mon is set to something different to : "yes", "true" or "1"
-
- Default is: ENABLED="yes"
-
- DAEMON_OPTS:
Additional options can be passed to the daemon by adding them to DAEMON_OPTS.
Reply to: