New upstream version 1.0.18upstream

10 files changed, 430 insertions, 133 deletions

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR 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 program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/config.c b/config.c
index c249445..238a802 100644
--- a/config.c
+++ b/config.c
@@ -18,6 +18,7 @@ License: GPLv2
 #include <unistd.h>
 
 #include <dirent.h>
+#include <linux/limits.h>
 #include <fnmatch.h>
 
 #include "config.h"
@@ -181,7 +182,7 @@ void init_config(void)
 static int find_all_configs(char* fn, int mustexist, CONFIG **first, CONFIG **last, GROUPS **firstg, GROUPS **lastg)
 {
 	struct dirent **namelist;
-	char dir[BUFSIZ], pattern[128], *p, s[BUFSIZ];
+	char dir[PATH_MAX - NAME_MAX - 1], pattern[128], *p, s[PATH_MAX];
 	int n, i, found;
 
 	/* Split fn to dir/pattern */
@@ -208,7 +209,7 @@ static int find_all_configs(char* fn, int mustexist, CONFIG **first, CONFIG **la
 	for (i = 0; i < n; i++) {
 		if (fnmatch(pattern, namelist[i]->d_name, 0) == 0 &&
 		    fnmatch("*~", namelist[i]->d_name, 0) != 0) {
-			snprintf(s, BUFSIZ, "%s/%s", dir, namelist[i]->d_name);
+			snprintf(s, PATH_MAX, "%s/%s", dir, namelist[i]->d_name);
 			read_one_config(s, first, last, firstg, lastg);
 			found++;
 		}
diff --git a/default_script b/default_script
index b736053..37daffe 100644
--- a/default_script
+++ b/default_script
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Copyright (C) 2009-2015 Mika Ilmaranta <ilmis@nullnet.fi>
-# Copyright (C) 2015 Tuomo Soini <tis@foobar.fi>
+# Copyright (C) 2015-2021 Tuomo Soini <tis@foobar.fi>
 #
 # License: GPLv2
 #
@@ -31,13 +31,15 @@ if [ -z "${WARN_EMAIL}" ] ; then
     exit 0
 fi
 
-DATE=$(date --date=@${TIMESTAMP})
+DATE=$(date +'%Y-%m-%d %H:%M:%S %Z' --date=@${TIMESTAMP})
+HOSTNAME=$(hostname)
 
 cat <<EOM | mail -s "Foolsm: ${NAME} ${STATE}, IP ${CHECKIP}" ${WARN_EMAIL}
 
 Hi,
 
-Your connection ${NAME} has changed its state to ${STATE} at ${DATE}.
+Your connection ${NAME} has changed its state to ${STATE}
+on ${HOSTNAME} at ${DATE}.
 
 Following parameters were passed:
 prevstate    = ${PREVSTATE}
@@ -46,6 +48,7 @@ name         = ${NAME}
 checkip      = ${CHECKIP}
 device       = ${DEVICE}
 sourceip     = ${SRCIP}
+host         = ${HOSTNAME}
 warn_email   = ${WARN_EMAIL}
 
 Packet statuses:
@@ -64,4 +67,3 @@ Your Foolsm installation
 EOM
 
 exit 0
-#
diff --git a/foolsm.spec b/foolsm.spec
index 2836998..70a2f89 100644
--- a/foolsm.spec
+++ b/foolsm.spec
@@ -1,40 +1,19 @@
 #define devel 1
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-%bcond_without systemd	# enabled
-%else
-%bcond_with systemd	# disabled
-%endif
 
 Summary: The Foobar Link Status Monitor
 Name: foolsm
-Version: 1.0.14
+Version: 1.0.18
 Release: 1%{?dist}
 License: GPLv2
-URL: http://lsm.foobar.fi/
-Source0: %{name}-%{version}.tar.gz
-%if %{with systemd}
-Requires(post):   systemd-units
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
-BuildRequires:    systemd
-%else
-Requires(post): chkconfig
-Requires(postun): /sbin/service
-Requires(preun): /sbin/service
-Requires(preun): chkconfig
-%endif
-Requires: mailx
+URL: https://lsm.foobar.fi/
+Source0: https://lsm.foobar.fi/download/%{name}-%{version}.tar.gz
 %if 0%{?devel}
 BuildRequires: ElectricFence
 %endif
-%if 0%{?rhel} && 0%{?rhel} <= 5
-Group: System Environment/Daemons
-%global _sharedstatedir /var/lib
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%endif
-Obsoletes: lsm < 1.0.7-1
-Conflicts: lsm < 1.0.7-1
-Provides: lsm = %{version}-%{release}
+BuildRequires:    systemd
+%{?systemd_requires}
+Requires: mailx
+Requires: hostname
 
 %description
 Foolsm is the Foobar Link Status Monitor.
@@ -56,119 +35,35 @@ EFENCE="-lefence"
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=${EFENCE} %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}%{_sysconfdir}/foolsm
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_libexecdir}/foolsm
 mkdir -p %{buildroot}%{_sharedstatedir}/foolsm
+mkdir -p %{buildroot}%{_datadir}/munin/plugins/
 
 install -m0755 foolsm %{buildroot}%{_sbindir}
 install -m0644 foolsm.conf %{buildroot}%{_sysconfdir}/foolsm
 install -m0755 default_script group_script shorewall_script shorewall6_script \
     %{buildroot}%{_libexecdir}/foolsm/
+install -m0755 foolsm_ %{buildroot}%{_datadir}/munin/plugins/
 
-%if %{with systemd}
 mkdir -p %{buildroot}%{_unitdir}
 install -m0644 foolsm.service %{buildroot}%{_unitdir}/
-%else
-mkdir -p %{buildroot}%{_initrddir}
-install -m0755 foolsm.init %{buildroot}%{_initrddir}/foolsm
-%endif
-
-%clean
-rm -rf %{buildroot}
-
-%triggerun -- lsm < 1.0.7-1
-%if %{with systemd}
-systemctl --quiet is-enabled lsm.service && \
-    touch %{_localstatedir}/lock/subsys/lsm.enabled || :
-systemctl --quiet is-active lsm.service && \
-    touch %{_localstatedir}/lock/subsys/lsm.started || :
-%else
-/sbin/chkconfig lsm >/dev/null 2>&1 && \
-    touch %{_localstatedir}/lock/subsys/lsm.enabled || :
-/sbin/service lsm status >/dev/null 2>&1 && \
-    touch %{_localstatedir}/lock/subsys/lsm.started || :
-%endif
-for config in %{_sysconfdir}/lsm/lsm.conf \
-    %{_sysconfdir}/lsm/local*.conf \
-    %{_sysconfdir}/lsm/*_script
-do
-    [ -f ${config} ] && \
-	cp -p ${config} %{_sysconfdir}/foolsm/
-done
-if [ -f %{_sysconfdir}/foolsm/lsm.conf ]; then
-    mv -f %{_sysconfdir}/foolsm/foolsm.conf \
-	%{_sysconfdir}/foolsm/foolsm.conf.rpmnew
-    echo "warning: %{_sysconfdir}/foolsm/foolsm.conf created as %{_sysconfdir}/foolsm/foolsm.conf.rpmnew"
-    mv -f %{_sysconfdir}/foolsm/lsm.conf %{_sysconfdir}/foolsm/foolsm.conf
-fi
-for config in %{_sysconfdir}/foolsm/*.conf; do
-    sed --in-place=.rpmsave \
-	-e 's@/etc/lsm/@/etc/foolsm/@g' \
-	-e 's@%{_datadir}/lsm/@%{_libexecdir}/foolsm/@g' \
-	-e 's@%{_libexecdir}/lsm/@%{_libexecdir}/foolsm/@g' \
-	${config} >/dev/null 2>&1 || :
-done
-
-%triggerpostun -- lsm < 1.0.7-1
-%if %{with systemd}
-if [ -f %{_localstatedir}/lock/subsys/lsm.enabled ]; then
-    systemctl enable foolsm.service >/dev/null 2>&1 || :
-    rm -f %{_localstatedir}/lock/subsys/lsm.enabled
-fi
-if [ -f %{_localstatedir}/lock/subsys/lsm.started ]; then
-    systemctl start foolsm.service >/dev/null 2>&1 || :
-    rm -f %{_localstatedir}/lock/subsys/lsm.started
-fi
-%else
-/sbin/chkconfig --add foolsm
-if [ -f %{_localstatedir}/lock/subsys/lsm.enabled ]; then
-    /sbin/chkconfig foolsm on
-    rm -f %{_localstatedir}/lock/subsys/lsm.enabled
-fi
-if [ -f %{_localstatedir}/lock/subsys/lsm.started ]; then
-    /sbin/service foolsm restart >/dev/null 2>&1
-    rm -f %{_localstatedir}/lock/subsys/lsm.started
-fi
-%endif
 
 %post
-%if %{with systemd}
 %systemd_post foolsm.service
-%else
-/sbin/chkconfig --add foolsm
-%endif
 
 %preun
-%if %{with systemd}
 %systemd_preun foolsm.service
-%else
-if [ $1 -eq 0 ]; then
-    /sbin/service foolsm stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del foolsm
-fi
-%endif
 
 %postun
-%if %{with systemd}
 %systemd_postun_with_restart foolsm.service
-%else
-if [ $1 -ge 1 ]; then
-    /sbin/service foolsm condrestart >/dev/null 2>&1 || :
-fi
-%endif
 
 
 %files
-%defattr(-,root,root,-)
 %doc README foolsm.conf.sample default_script.sample rsyslog-foolsm.conf.sample
-%if %{with systemd}
+%license LICENSE
 %{_unitdir}/foolsm.service
-%else
-%{_initrddir}/foolsm
-%endif
 %dir %{_libexecdir}/foolsm
 %{_libexecdir}/foolsm/default_script
 %{_libexecdir}/foolsm/group_script
@@ -178,8 +73,27 @@ fi
 %config(noreplace) %{_sysconfdir}/foolsm/foolsm.conf
 %{_sbindir}/foolsm
 %dir %{_sharedstatedir}/foolsm
+%dir %{_datadir}/munin
+%dir %{_datadir}/munin/plugins
+%{_datadir}/munin/plugins/foolsm_
 
 %changelog
+* Mon Jul 19 2021 Mika Ilmaranta <ilmis@nullnet.fi> - 1.0.18-1
+- fixed compile time warnings with el8 compiler
+
+* Mon Jul 19 2021 Tuomo Soini <tis@foobar.fi> - 1.0.17-1
+- Drop legacy stuff from spec
+
+* Mon Jul 19 2021 Tuomo Soini <tis@foobar.fi> - 1.0.16-1
+- Add hostname to default_script and group_script
+- Change date format in emails to be more readable
+- Add Requirement for hostname package
+- Cleanup spec file
+- Add LICENSE file
+
+* Wed Mar 31 2021 Mika Ilmaranta <ilmis@nullnet.fi> - 1.0.15-1
+- foolsm_ munin plugin added
+
 * Mon May  4 2020 Mika Ilmaranta <ilmis@nullnet.fi> - 1.0.14-1
 - log recvfrom errors only on debug level >= 9
 - foolsm.conf: debug level 100 doesn't control detaching from controlling
diff --git a/foolsm_ b/foolsm_
new file mode 100755
index 0000000..2edc017
--- /dev/null
+++ b/foolsm_
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Wildcard-script to monitor foolsm.
+#
+# Parameters:
+#
+# 	config
+# 	autoconf
+# 	suggest
+#
+#%# family=auto
+#%# capabilities=autoconf suggest
+
+if [ "$1" = "autoconf" ]; then
+    if [ ! -d /var/lib/foolsm ] ; then
+	echo "no (foolsm not found)"
+	exit 0
+    fi
+    echo "yes"
+    exit 0
+fi
+
+if [ "$1" = "suggest" ]; then
+    for file in /var/lib/foolsm/config.*; do
+	echo ${file#/var/lib/foolsm/config.}
+    done
+    exit 0
+fi
+
+GRAPH=$(basename $0 | sed 's/^foolsm_//')
+
+if [ "$1" = "config" ]; then
+    cat /var/lib/foolsm/config.${GRAPH}
+    exit 0
+fi
+
+cat /var/lib/foolsm/status.${GRAPH}
diff --git a/group_script b/group_script
index d15228b..b72d151 100644
--- a/group_script
+++ b/group_script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2016 Tuomo Soini <tis@foobar.fi>
+# Copyright (C) 2012-2021 Tuomo Soini <tis@foobar.fi>
 #
 # License: GPLv2
 #
@@ -30,18 +30,21 @@ if [ -z "${WARN_EMAIL}" ] ; then
     exit 0
 fi
 
-DATE=$(date --date=@${TIMESTAMP})
+DATE=$(date +'%Y-%m-%d %H:%M:%S %Z' --date=@${TIMESTAMP})
+HOSTNAME=$(hostname)
 
 cat <<EOM | mail -s "Foolsm: ${NAME} ${STATE}" ${WARN_EMAIL}
 
 Hi,
 
-Your group ${NAME} has changed its state to ${STATE} at ${DATE}.
+Your connection ${NAME} has changed its state to ${STATE}
+on ${HOSTNAME} at ${DATE}.
 
 Following parameters were passed:
 prevstate    = ${PREVSTATE}
 newstate     = ${STATE}
 name         = ${NAME}
+host         = ${HOSTNAME}
 warn_email   = ${WARN_EMAIL}
 device       = ${DEVICE}
 
@@ -53,4 +56,3 @@ Your Foolsm installation
 EOM
 
 exit 0
-#
diff --git a/icmp6_t.c b/icmp6_t.c
index e0928f8..bc308b5 100644
--- a/icmp6_t.c
+++ b/icmp6_t.c
@@ -100,11 +100,14 @@ struct icmp6msg icmp6msgs[] = {
 	{ 256, 256, "impossible combination", "impossible combination" }
 };
 
+struct icmp6msg icmp6error =
+	{ 256, 256, "unknown", "unknown" };
+
 struct icmp6msg *stricmp6(int type, int code)
 {
 	int i;
 
-	if(type > 255) return(&((struct icmp6msg) { 256, 256, "unknown", "unknown" }));
+	if(type > 255) return &icmp6error;
 
 	for(i = 0; icmp6msgs[i].type <= type; i++)
 		if(icmp6msgs[i].type == type && icmp6msgs[i].code == code) return(&(icmp6msgs[i]));
@@ -112,7 +115,7 @@ struct icmp6msg *stricmp6(int type, int code)
 	for(i = 0; icmp6msgs[i].type <= type; i++)
 		if(icmp6msgs[i].type == type) return(&(icmp6msgs[i]));
 
-	return(&((struct icmp6msg) { 256, 256, "unknown", "unknown" }));
+	return &icmp6error;
 }
 
 /* EOF */
diff --git a/icmp_t.c b/icmp_t.c
index 3620920..5262efa 100644
--- a/icmp_t.c
+++ b/icmp_t.c
@@ -322,11 +322,14 @@ static struct icmpmsg icmpmsgs[] = {
 	{ 256, 256, "impossible combination", "impossible combination" }
 };
 
+static struct icmpmsg icmperror =
+	{ 256, 256, "unknown", "unknown" };
+
 struct icmpmsg *stricmp(int type, int code)
 {
 	int i;
 
-	if(type > 255) return(&((struct icmpmsg) { 256, 256, "unknown", "unknown" }));
+	if(type > 255) return &icmperror;
 
 	for(i = 0; icmpmsgs[i].type <= type; i++)
 		if(icmpmsgs[i].type == type && icmpmsgs[i].code == code) return(&(icmpmsgs[i]));
@@ -334,7 +337,7 @@ struct icmpmsg *stricmp(int type, int code)
 	for(i = 0; icmpmsgs[i].type <= type; i++)
 		if(icmpmsgs[i].type == type) return(&(icmpmsgs[i]));
 
-	return(&((struct icmpmsg) { 256, 256, "unknown", "unknown" }));
+	return &icmperror;
 }
 
 /* EOF */
diff --git a/shorewall6_script b/shorewall6_script
index fad9afb..bce2ffc 100644
--- a/shorewall6_script
+++ b/shorewall6_script
@@ -27,8 +27,6 @@ SRCIP=${14}
 PREVSTATE=${15}
 TIMESTAMP=${16}
 
-DATE=$(date --date=@${TIMESTAMP})
-
 if [ ${STATE} = up ]; then
     state=0
     action=enable
diff --git a/shorewall_script b/shorewall_script
index 3144480..cfd7f5b 100644
--- a/shorewall_script
+++ b/shorewall_script
@@ -28,8 +28,6 @@ SRCIP=${14}
 PREVSTATE=${15}
 TIMESTAMP=${16}
 
-DATE=$(date --date=@${TIMESTAMP})
-
 if [ ${STATE} = up ]; then
     state=0
     action=enable