]> git.uio.no Git - uio-zabbix.git/commitdiff
Add patch files to define python shebang when running a RPM build [GID-1248]
authorRafael Martinez <r.m.guerrero@usit.uio.no>
Thu, 8 Sep 2022 07:35:27 +0000 (09:35 +0200)
committerRafael Martinez <r.m.guerrero@usit.uio.no>
Thu, 8 Sep 2022 07:35:27 +0000 (09:35 +0200)
uio-zabbix-rhel78.patch [new file with mode: 0644]
uio-zabbix-rhel9.patch [new file with mode: 0644]

diff --git a/uio-zabbix-rhel78.patch b/uio-zabbix-rhel78.patch
new file mode 100644 (file)
index 0000000..2ee3992
--- /dev/null
@@ -0,0 +1,163 @@
+Binary files uio-zabbix-orig/.git/index and uio-zabbix-rhel78/.git/index differ
+diff -uNr uio-zabbix-orig/get_default_gateway uio-zabbix-rhel78/get_default_gateway
+--- uio-zabbix-orig/get_default_gateway        2022-09-05 14:30:44.297654455 +0200
++++ uio-zabbix-rhel78/get_default_gateway      2022-09-08 09:19:22.007821891 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ import socket, struct
+diff -uNr uio-zabbix-orig/zabbix_ca_bundle_info.py uio-zabbix-rhel78/zabbix_ca_bundle_info.py
+--- uio-zabbix-orig/zabbix_ca_bundle_info.py   2022-09-05 14:34:12.829629016 +0200
++++ uio-zabbix-rhel78/zabbix_ca_bundle_info.py 2022-09-08 09:25:55.227326719 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # Mustafa Ocak
+diff -uNr uio-zabbix-orig/zabbix_elasticsearch_cluster_health.py uio-zabbix-rhel78/zabbix_elasticsearch_cluster_health.py
+--- uio-zabbix-orig/zabbix_elasticsearch_cluster_health.py     2022-09-07 10:10:06.461820379 +0200
++++ uio-zabbix-rhel78/zabbix_elasticsearch_cluster_health.py   2022-09-08 09:25:55.231326715 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_elasticsearch_node_stats.py uio-zabbix-rhel78/zabbix_elasticsearch_node_stats.py
+--- uio-zabbix-orig/zabbix_elasticsearch_node_stats.py 2022-09-07 10:49:48.619099346 +0200
++++ uio-zabbix-rhel78/zabbix_elasticsearch_node_stats.py       2022-09-08 09:25:55.235326709 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_elk_container.py uio-zabbix-rhel78/zabbix_elk_container.py
+--- uio-zabbix-orig/zabbix_elk_container.py    2022-09-07 11:04:57.190847236 +0200
++++ uio-zabbix-rhel78/zabbix_elk_container.py  2022-09-08 09:25:55.235326709 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # Mustafa Ocak
+diff -uNr uio-zabbix-orig/zabbix_filesystem_limits.py uio-zabbix-rhel78/zabbix_filesystem_limits.py
+--- uio-zabbix-orig/zabbix_filesystem_limits.py        2022-09-07 11:14:31.534782081 +0200
++++ uio-zabbix-rhel78/zabbix_filesystem_limits.py      2022-09-08 09:25:55.239326705 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_filesystem_not_monitored.py uio-zabbix-rhel78/zabbix_filesystem_not_monitored.py
+--- uio-zabbix-orig/zabbix_filesystem_not_monitored.py 2022-09-07 11:18:56.046764938 +0200
++++ uio-zabbix-rhel78/zabbix_filesystem_not_monitored.py       2022-09-08 09:25:55.243326700 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_get_haproxy_stats.py uio-zabbix-rhel78/zabbix_get_haproxy_stats.py
+--- uio-zabbix-orig/zabbix_get_haproxy_stats.py        2022-09-07 11:30:24.238873429 +0200
++++ uio-zabbix-rhel78/zabbix_get_haproxy_stats.py      2022-09-08 09:25:55.247326694 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ #
+ # Authors:
+diff -uNr uio-zabbix-orig/zabbix_get_logstash_stats.py uio-zabbix-rhel78/zabbix_get_logstash_stats.py
+--- uio-zabbix-orig/zabbix_get_logstash_stats.py       2022-09-07 11:30:13.614863949 +0200
++++ uio-zabbix-rhel78/zabbix_get_logstash_stats.py     2022-09-08 09:25:55.251326690 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_rabbitmq_stats.py uio-zabbix-rhel78/zabbix_get_rabbitmq_stats.py
+--- uio-zabbix-orig/zabbix_get_rabbitmq_stats.py       2022-09-07 11:30:00.818852395 +0200
++++ uio-zabbix-rhel78/zabbix_get_rabbitmq_stats.py     2022-09-08 09:25:55.255326685 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_webapps_info.py uio-zabbix-rhel78/zabbix_get_webapps_info.py
+--- uio-zabbix-orig/zabbix_get_webapps_info.py 2022-09-07 13:20:24.896629766 +0200
++++ uio-zabbix-rhel78/zabbix_get_webapps_info.py       2022-09-08 09:25:55.259326679 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@e-mc2.net / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_webapps_status.py uio-zabbix-rhel78/zabbix_get_webapps_status.py
+--- uio-zabbix-orig/zabbix_get_webapps_status.py       2022-09-07 13:27:46.747776807 +0200
++++ uio-zabbix-rhel78/zabbix_get_webapps_status.py     2022-09-08 09:25:55.259326679 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@e-mc2.net / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_webapps_status_v2.py uio-zabbix-rhel78/zabbix_get_webapps_status_v2.py
+--- uio-zabbix-orig/zabbix_get_webapps_status_v2.py    2022-09-07 13:29:45.295595446 +0200
++++ uio-zabbix-rhel78/zabbix_get_webapps_status_v2.py  2022-09-08 09:25:55.263326675 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_haproxy_autodiscovery.py uio-zabbix-rhel78/zabbix_haproxy_autodiscovery.py
+--- uio-zabbix-orig/zabbix_haproxy_autodiscovery.py    2022-09-07 13:31:41.399433351 +0200
++++ uio-zabbix-rhel78/zabbix_haproxy_autodiscovery.py  2022-09-08 09:25:55.267326669 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_logstash_autodiscovery.py uio-zabbix-rhel78/zabbix_logstash_autodiscovery.py
+--- uio-zabbix-orig/zabbix_logstash_autodiscovery.py   2022-09-07 13:33:19.343307328 +0200
++++ uio-zabbix-rhel78/zabbix_logstash_autodiscovery.py 2022-09-08 09:25:55.271326664 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_memcached_info.py uio-zabbix-rhel78/zabbix_memcached_info.py
+--- uio-zabbix-orig/zabbix_memcached_info.py   2022-09-07 13:35:20.451163663 +0200
++++ uio-zabbix-rhel78/zabbix_memcached_info.py 2022-09-08 09:25:55.275326660 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ import memcache
+ import argparse
+diff -uNr uio-zabbix-orig/zabbix_networkteam_info.py uio-zabbix-rhel78/zabbix_networkteam_info.py
+--- uio-zabbix-orig/zabbix_networkteam_info.py 2022-09-07 13:39:23.890909942 +0200
++++ uio-zabbix-rhel78/zabbix_networkteam_info.py       2022-09-08 09:25:55.275326660 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # Mustafa Ocak
+diff -uNr uio-zabbix-orig/zabbix_rabbitmq_autodiscovery.py uio-zabbix-rhel78/zabbix_rabbitmq_autodiscovery.py
+--- uio-zabbix-orig/zabbix_rabbitmq_autodiscovery.py   2022-09-07 13:42:05.694763143 +0200
++++ uio-zabbix-rhel78/zabbix_rabbitmq_autodiscovery.py 2022-09-08 09:25:55.279326654 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
diff --git a/uio-zabbix-rhel9.patch b/uio-zabbix-rhel9.patch
new file mode 100644 (file)
index 0000000..6070cc4
--- /dev/null
@@ -0,0 +1,153 @@
+diff -uNr uio-zabbix-orig/zabbix_ca_bundle_info.py uio-zabbix-rhel9/zabbix_ca_bundle_info.py
+--- uio-zabbix-orig/zabbix_ca_bundle_info.py   2022-09-05 14:34:12.829629016 +0200
++++ uio-zabbix-rhel9/zabbix_ca_bundle_info.py  2022-09-08 09:29:19.031070863 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # Mustafa Ocak
+diff -uNr uio-zabbix-orig/zabbix_elasticsearch_cluster_health.py uio-zabbix-rhel9/zabbix_elasticsearch_cluster_health.py
+--- uio-zabbix-orig/zabbix_elasticsearch_cluster_health.py     2022-09-07 10:10:06.461820379 +0200
++++ uio-zabbix-rhel9/zabbix_elasticsearch_cluster_health.py    2022-09-08 09:29:19.035070857 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_elasticsearch_node_stats.py uio-zabbix-rhel9/zabbix_elasticsearch_node_stats.py
+--- uio-zabbix-orig/zabbix_elasticsearch_node_stats.py 2022-09-07 10:49:48.619099346 +0200
++++ uio-zabbix-rhel9/zabbix_elasticsearch_node_stats.py        2022-09-08 09:29:19.039070853 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_elk_container.py uio-zabbix-rhel9/zabbix_elk_container.py
+--- uio-zabbix-orig/zabbix_elk_container.py    2022-09-07 11:04:57.190847236 +0200
++++ uio-zabbix-rhel9/zabbix_elk_container.py   2022-09-08 09:29:19.043070847 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # Mustafa Ocak
+diff -uNr uio-zabbix-orig/zabbix_filesystem_limits.py uio-zabbix-rhel9/zabbix_filesystem_limits.py
+--- uio-zabbix-orig/zabbix_filesystem_limits.py        2022-09-07 11:14:31.534782081 +0200
++++ uio-zabbix-rhel9/zabbix_filesystem_limits.py       2022-09-08 09:29:19.047070842 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_filesystem_not_monitored.py uio-zabbix-rhel9/zabbix_filesystem_not_monitored.py
+--- uio-zabbix-orig/zabbix_filesystem_not_monitored.py 2022-09-07 11:18:56.046764938 +0200
++++ uio-zabbix-rhel9/zabbix_filesystem_not_monitored.py        2022-09-08 09:29:19.047070842 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_get_haproxy_stats.py uio-zabbix-rhel9/zabbix_get_haproxy_stats.py
+--- uio-zabbix-orig/zabbix_get_haproxy_stats.py        2022-09-07 11:30:24.238873429 +0200
++++ uio-zabbix-rhel9/zabbix_get_haproxy_stats.py       2022-09-08 09:29:19.051070838 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ #
+ # Authors:
+diff -uNr uio-zabbix-orig/zabbix_get_logstash_stats.py uio-zabbix-rhel9/zabbix_get_logstash_stats.py
+--- uio-zabbix-orig/zabbix_get_logstash_stats.py       2022-09-07 11:30:13.614863949 +0200
++++ uio-zabbix-rhel9/zabbix_get_logstash_stats.py      2022-09-08 09:29:19.055070832 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_rabbitmq_stats.py uio-zabbix-rhel9/zabbix_get_rabbitmq_stats.py
+--- uio-zabbix-orig/zabbix_get_rabbitmq_stats.py       2022-09-07 11:30:00.818852395 +0200
++++ uio-zabbix-rhel9/zabbix_get_rabbitmq_stats.py      2022-09-08 09:29:19.059070827 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_webapps_info.py uio-zabbix-rhel9/zabbix_get_webapps_info.py
+--- uio-zabbix-orig/zabbix_get_webapps_info.py 2022-09-07 13:20:24.896629766 +0200
++++ uio-zabbix-rhel9/zabbix_get_webapps_info.py        2022-09-08 09:29:19.063070822 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@e-mc2.net / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_webapps_status.py uio-zabbix-rhel9/zabbix_get_webapps_status.py
+--- uio-zabbix-orig/zabbix_get_webapps_status.py       2022-09-07 13:27:46.747776807 +0200
++++ uio-zabbix-rhel9/zabbix_get_webapps_status.py      2022-09-08 09:29:19.063070822 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@e-mc2.net / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_get_webapps_status_v2.py uio-zabbix-rhel9/zabbix_get_webapps_status_v2.py
+--- uio-zabbix-orig/zabbix_get_webapps_status_v2.py    2022-09-07 13:29:45.295595446 +0200
++++ uio-zabbix-rhel9/zabbix_get_webapps_status_v2.py   2022-09-08 09:29:19.067070817 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@postgresql.org.es / http://www.postgresql.org.es/
+diff -uNr uio-zabbix-orig/zabbix_haproxy_autodiscovery.py uio-zabbix-rhel9/zabbix_haproxy_autodiscovery.py
+--- uio-zabbix-orig/zabbix_haproxy_autodiscovery.py    2022-09-07 13:31:41.399433351 +0200
++++ uio-zabbix-rhel9/zabbix_haproxy_autodiscovery.py   2022-09-08 09:29:19.071070813 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_logstash_autodiscovery.py uio-zabbix-rhel9/zabbix_logstash_autodiscovery.py
+--- uio-zabbix-orig/zabbix_logstash_autodiscovery.py   2022-09-07 13:33:19.343307328 +0200
++++ uio-zabbix-rhel9/zabbix_logstash_autodiscovery.py  2022-09-08 09:29:19.075070807 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/
+diff -uNr uio-zabbix-orig/zabbix_memcached_info.py uio-zabbix-rhel9/zabbix_memcached_info.py
+--- uio-zabbix-orig/zabbix_memcached_info.py   2022-09-07 13:35:20.451163663 +0200
++++ uio-zabbix-rhel9/zabbix_memcached_info.py  2022-09-08 09:29:19.075070807 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ import memcache
+ import argparse
+diff -uNr uio-zabbix-orig/zabbix_networkteam_info.py uio-zabbix-rhel9/zabbix_networkteam_info.py
+--- uio-zabbix-orig/zabbix_networkteam_info.py 2022-09-07 13:39:23.890909942 +0200
++++ uio-zabbix-rhel9/zabbix_networkteam_info.py        2022-09-08 09:29:19.079070802 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # Mustafa Ocak
+diff -uNr uio-zabbix-orig/zabbix_rabbitmq_autodiscovery.py uio-zabbix-rhel9/zabbix_rabbitmq_autodiscovery.py
+--- uio-zabbix-orig/zabbix_rabbitmq_autodiscovery.py   2022-09-07 13:42:05.694763143 +0200
++++ uio-zabbix-rhel9/zabbix_rabbitmq_autodiscovery.py  2022-09-08 09:29:19.079070802 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Authors:
+ # rafael@E-MC2.NET / https://e-mc2.net/