forked from pool/monitoring-plugins
c26a8b5fed
- enable check_curl by BuildRequiring its dependencies - restore patches not yet applied upstream (and rename to 2.3.5): + monitoring-plugins-2.3.3-check_log_-_quoting.patch + monitoring-plugins-2.3.3-check_http-proxy.patch - drop upstreamed patches: + monitoring-plugins-2.3.3-check_by_ssh.patch (GitHub #1774) + monitoring-plugins-2.3.3-check_disk_on_btrfs.patch (GH #1388) - GitHub issues for patches upstreamed on 2023-12-05: + monitoring-plugins-2.3.3-check_snmp.arrayaddress.patch (GH #1870) + monitoring-plugins-2.3.3-mariadb_102_build_fix.patch (GH #1522) + monitoring-plugins-2.3.3-check_dhcp_-_detect_rogue_dhcp_servers.patch (GH #1906) + monitoring-plugins-2.3.3-check_icmp.patch (GH #1807) + systemd-not-utmp.patch (GH #1888) - Repair the "no chown" patch to actually avoid calling chown; avoid automake build deps by patching Makefile.in rather than Makefile.am. + After upstream updated the gl subdir, it complains that the automake in SLE 12 SP5 is too old. - Fix build on SLE 12 SP5 (link failure due to mixing OpenSSL 1.0 & 1.1) by using only OpenSSL 1.1, and excluding curl subpackage (needs uriparser). - Rename patch files to match version number. - sync check_mssql package description with plugin's help output + Note that not all distros contain perl-DBD-Sybase and/or freetds - remove obsolete configure options + --with-ntp{q,dc,date}-command dropped upstream in 1.4.4 (e667553) + --with-proc-loadavg dropped in 1.4.6 (fe856aa) - remove unnecessary chmod commands during build - disable gettextize as upstream has (temporarily?) removed translations (GH #1947) OBS-URL: https://build.opensuse.org/request/show/1144413 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=119
21 lines
914 B
Diff
21 lines
914 B
Diff
--- monitoring-plugins-2.3.5/plugins-root/Makefile.in.orig 2023-11-28 17:23:06.400019507 -0600
|
|
+++ monitoring-plugins-2.3.5/plugins-root/Makefile.in 2023-11-28 17:49:03.832492223 -0600
|
|
@@ -1960,8 +1960,6 @@
|
|
p=$$f; \
|
|
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
|
|
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
|
|
- echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
|
|
- chown root $(DESTDIR)$(libexecdir)/$$p; \
|
|
echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
|
|
chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
|
|
done
|
|
@@ -2484,7 +2482,7 @@
|
|
@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
|
|
rm -f $$TMPFILE; \
|
|
echo > $$TMPFILE; \
|
|
- can_create_suid_root_executable=no; \
|
|
+ can_create_suid_root_executable=yes; \
|
|
chown root $$TMPFILE > /dev/null 2>&1 \
|
|
&& chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
|
|
&& can_create_suid_root_executable=yes; \
|