diff --git a/SOURCES/cacti-1.2.x-csrf-secret.patch b/SOURCES/cacti-1.2.x-csrf-secret.patch deleted file mode 100644 index a071c6b..0000000 --- a/SOURCES/cacti-1.2.x-csrf-secret.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cacti-1.2.9/include/config.php.orig 2020-02-10 02:25:45.000000000 +0100 -+++ cacti-1.2.9/include/config.php 2020-02-10 10:46:35.436772588 +0100 -@@ -124,7 +124,7 @@ $disable_log_rotation = false; - * the CRSF secret file. - */ - --//$path_csrf_secret = '/usr/share/cacti/resource/csrf-secret.php'; -+$path_csrf_secret = '/var/lib/cacti/csrf/csrf-secret.php'; - - /* - * The following are optional variables for debugging low level system diff --git a/SOURCES/cacti-1.2.x-disable_log_rotation.patch b/SOURCES/cacti-1.2.x-disable_log_rotation.patch deleted file mode 100644 index a072764..0000000 --- a/SOURCES/cacti-1.2.x-disable_log_rotation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cacti-1.2.2/include/config.php.orig 2019-02-24 15:52:08.000000000 +0100 -+++ cacti-1.2.2/include/config.php 2019-02-25 13:31:22.313347085 +0100 -@@ -85,7 +85,7 @@ $cacti_db_session = false; - * Disable log rotation settings for packagers - */ - --$disable_log_rotation = false; -+$disable_log_rotation = true; - - /* - * Optional parameters to define scripts and resource paths. These diff --git a/SOURCES/cacti-httpd.conf b/SOURCES/cacti-httpd.conf deleted file mode 100644 index c687845..0000000 --- a/SOURCES/cacti-httpd.conf +++ /dev/null @@ -1,57 +0,0 @@ -# -# Cacti: An rrd based graphing tool -# - -# For security reasons, the Cacti web interface is accessible only to -# localhost in the default configuration. If you want to allow other clients -# to access your Cacti installation, change the httpd ACLs below. -# For example: -# On httpd 2.4, change "Require host localhost" to "Require all granted". -# On httpd 2.2, change "Allow from localhost" to "Allow from all". - -Alias /cacti /usr/share/cacti - - - - # httpd 2.4 - Require host localhost - - - # httpd 2.2 - Order deny,allow - Deny from all - Allow from localhost - - - - - # mod_security overrides. - # Uncomment these if you use mod_security. - # allow POST of application/x-www-form-urlencoded during install - #SecRuleRemoveById 960010 - # permit the specification of the rrdtool paths during install - #SecRuleRemoveById 900011 - - - -# These sections marked "Require all denied" (or "Deny from all") -# should not be modified. -# These are in place in order to harden Cacti. - - - Require all denied - - - Order deny,allow - Deny from all - - - - - Require all denied - - - Order deny,allow - Deny from all - - diff --git a/SOURCES/cacti.cron b/SOURCES/cacti.cron deleted file mode 100644 index 0aebaee..0000000 --- a/SOURCES/cacti.cron +++ /dev/null @@ -1 +0,0 @@ -#*/5 * * * * apache /usr/bin/php /usr/share/cacti/poller.php > /dev/null 2>&1 diff --git a/SOURCES/cacti.logrotate b/SOURCES/cacti.logrotate deleted file mode 100644 index 754a051..0000000 --- a/SOURCES/cacti.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/cacti/cacti.log { - weekly - rotate 7 - missingok - notifempty - compress - su apache apache -} diff --git a/SOURCES/docsis_dialplan.patch b/SOURCES/docsis_dialplan.patch index 66a9ac4..8ca756e 100644 --- a/SOURCES/docsis_dialplan.patch +++ b/SOURCES/docsis_dialplan.patch @@ -159,13 +159,12 @@ diff --git a/src/docsis_common.h b/src/docsis_common.h index a3aeefe..b94460e 100644 --- a/src/docsis_common.h +++ b/src/docsis_common.h -@@ -32,11 +32,11 @@ +@@ -25,10 +25,10 @@ + #define _DOCSIS_COMMON_H - - #ifndef NUM_IDENTIFIERS --#define NUM_IDENTIFIERS 1427 + /* needed in docsis_symtable.h */ +-#define NUM_IDENTIFIERS 1539 +#define NUM_IDENTIFIERS 9000 - #endif /* NUM_IDENTIFIERS, needed in docsis_symtable.h */ #define MAXINT 2000000000 -#define TLV_VSIZE 1024 @@ -173,6 +172,7 @@ index a3aeefe..b94460e 100644 #define TRUE 1 #define FALSE 0 + diff --git a/src/docsis_decode.c b/src/docsis_decode.c index b0a5b77..f4e6ce5 100644 --- a/src/docsis_decode.c diff --git a/SOURCES/docsis_edge.patch b/SOURCES/docsis_edge.patch new file mode 100644 index 0000000..8fb4030 --- /dev/null +++ b/SOURCES/docsis_edge.patch @@ -0,0 +1,27 @@ +diff --git a/src/docsis_common.h b/src/docsis_common.h +index 424418e..3e626da 100644 +--- a/src/docsis_common.h ++++ b/src/docsis_common.h +@@ -25,7 +25,7 @@ + #define _DOCSIS_COMMON_H + + /* needed in docsis_symtable.h */ +-#define NUM_IDENTIFIERS 1536 ++#define NUM_IDENTIFIERS 1539 + + #define MAXINT 2000000000 + #define TLV_VSIZE 1024 +diff --git a/src/docsis_symtable.h b/src/docsis_symtable.h +index bb2b070..b8a1d76 100644 +--- a/src/docsis_symtable.h ++++ b/src/docsis_symtable.h +@@ -106,6 +106,9 @@ symbol_type symtable[NUM_IDENTIFIERS] = { + { 271, "EnergyManagementCapabilities", 44, 144, (encode_hexstr), (decode_hexstr), 4, 4 }, /* TLV 5.44 MULPIv3.0-I24 Annex C.1.3.1.43 */ + { 272, "CDOCSISCapabilityEncoding", 45, 144, (encode_hexstr), (decode_hexstr), 0, 0 }, /* TLV 5.45 MULPIv3.0-I24 Annex C.1.3.1.44 */ + { 273, "CMSTATUSACK", 46, 144, (encode_uchar), (decode_uchar), 0, 1 }, /* TLV 5.46 MULPIv3.0-I24 Annex C.1.3.1.45 */ ++{ 1536, "DownstreamLowerBandEdgeSupport", 54, 144, (encode_hexstr), (decode_hexstr), 0, 1 }, /* TLV 5.54 MULPIv3.1-I25 Annex C.1.3.1.53 */ ++{ 1537, "DownstreamUpperBandEdgeSupport", 55, 144, (encode_hexstr), (decode_hexstr), 0, 1 }, /* TLV 5.55 MULPIv3.1-I25 Annex C.1.3.1.54 */ ++{ 1538, "DiplexerUpperBandEdgeSupport", 56, 144, (encode_uchar), (decode_uchar), 0, 4 }, /* TLV 5.56 MULPIv3.1-I25 Annex C.1.3.1.55 */ + { 4, "CmMic", 6, 0, (encode_nothing), (decode_md5), 0, 0 }, /* TLV 6 MULPIv3.0-I24 Annex C.1.1.5 */ + { 5, "CmtsMic", 7, 0, (encode_nothing), (decode_md5), 0, 0 }, /* TLV 7 MULPIv3.0-I24 Annex C.1.1.6 */ + { 14, "SwUpgradeFilename", 9, 0, (encode_string), (decode_string), 0, 0 }, /* TLV 9 MULPIv3.0-I24 Annex C.1.2.3 */ diff --git a/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-commands.conf b/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-commands.conf index acbb2cd..77232f3 100644 --- a/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-commands.conf +++ b/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-commands.conf @@ -242,5 +242,5 @@ object CheckCommand "latest_configfiles" { } object CheckCommand "laravel_debug_status" { - command = [ "/usr/bin/sudo", "/opt/remi/php80/root/usr/bin/php", "/var/www/nmsprime/artisan", "nms:debug-status" ] + command = [ "/usr/bin/sudo", "php", "/var/www/nmsprime/artisan", "nms:debug-status" ] } diff --git a/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-services.conf b/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-services.conf index e2e9fcb..e21f0b6 100644 --- a/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-services.conf +++ b/SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-services.conf @@ -140,7 +140,7 @@ apply Service "ip_conntrack" { assign where host.name == NodeName } -apply Service "systemd_service_" for (service in [ "named", "dhcpd", "xinetd", "firewalld", "nmsprimed", "httpd", "crond", "mariadb", "sshd", "php80-php-fpm", "icinga2", "radiusd", "mongod", "genieacs-cwmp", "genieacs-fs", "genieacs-nbi", "kea-dhcp6" ]) { +apply Service "systemd_service_" for (service in [ "named", "dhcpd", "tftp", "time-nmsprime", "firewalld", "nmsprimed", "httpd", "crond", "mariadb", "sshd", "icinga2", "radiusd", "mongod", "genieacs-cwmp", "genieacs-fs", "genieacs-nbi", "kea-dhcp6" ]) { import "generic-service" check_command = "systemd_service" diff --git a/SOURCES/icingaweb2-module-director-common/icinga2-refresh-dhcpd b/SOURCES/icingaweb2-module-director-common/icinga2-refresh-dhcpd index 6570307..e19a9a2 100644 --- a/SOURCES/icingaweb2-module-director-common/icinga2-refresh-dhcpd +++ b/SOURCES/icingaweb2-module-director-common/icinga2-refresh-dhcpd @@ -1 +1 @@ -*/5 * * * * root /usr/bin/bash -c 'test -z "$(icingacli monitoring list services --service=systemd_service_dhcpd --problems)" || /usr/bin/scl enable php80 "php /var/www/nmsprime/artisan nms:dhcp"' > /dev/null 2>&1 +*/5 * * * * root /usr/bin/bash -c 'test -z "$(icingacli monitoring list services --service=systemd_service_dhcpd --problems)" || php /var/www/nmsprime/artisan nms:dhcp' > /dev/null 2>&1 diff --git a/SOURCES/icingaweb2-module-director-common/nmsprime-icinga b/SOURCES/icingaweb2-module-director-common/nmsprime-icinga index 8fbae6f..4fcb111 100644 --- a/SOURCES/icingaweb2-module-director-common/nmsprime-icinga +++ b/SOURCES/icingaweb2-module-director-common/nmsprime-icinga @@ -1,4 +1,4 @@ Defaults:icinga lecture=never,!requiretty icinga ALL=(root) NOPASSWD: /usr/lib64/nagios/plugins/check_dhcpd-pools.sh -icinga ALL=(root) NOPASSWD: /opt/remi/php80/root/usr/bin/php /var/www/nmsprime/artisan nms\:debug-status +icinga ALL=(root) NOPASSWD: /usr/bin/php /var/www/nmsprime/artisan nms\:debug-status icinga ALL=(root) NOPASSWD: /usr/bin/supervisorctl status diff --git a/SPECS/alertmanager.spec b/SPECS/alertmanager.spec index e1fcecc..38e3529 100644 --- a/SPECS/alertmanager.spec +++ b/SPECS/alertmanager.spec @@ -1,5 +1,5 @@ Name: alertmanager -Version: 0.24.0 +Version: 0.28.0 Release: 1 Summary: Prometheus Alertmanager @@ -79,5 +79,11 @@ install -dm755 %{buildroot}%{_sharedstatedir}/%{name} %attr(0755,prometheus,prometheus) %dir %{_sharedstatedir}/%{name} %changelog +* Wed Feb 19 2025 Ole Ernst - 0.28.0-1 +- Update to version v0.28.0 + +* Tue Oct 15 2024 Ole Ernst - 0.27.0-1 +- Update to version v0.27.0 + * Fri Jun 24 2022 Ole Ernst - 0.24.0-1 - Initial RPM release diff --git a/SPECS/cacti-nmsprime.spec b/SPECS/cacti-nmsprime.spec deleted file mode 100644 index e1175b0..0000000 --- a/SPECS/cacti-nmsprime.spec +++ /dev/null @@ -1,572 +0,0 @@ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%define name_org cacti - -Name: cacti-nmsprime -Version: 1.2.18 -Release: 1%{?dist} -Summary: An rrd based graphing tool -License: GPLv2+ -URL: https://www.cacti.net/ -Source0: https://www.cacti.net/downloads/%{name_org}-%{version}.tar.gz -Source1: cacti-httpd.conf -Source2: cacti.logrotate -Source3: %{name_org}.cron -Patch0: cacti-1.2.x-disable_log_rotation.patch -Patch1: cacti-1.2.x-csrf-secret.patch - -BuildArch: noarch - -# Requires PHP 5.4+ -Requires: php(language) >= 5.4 - -# DB access is managed via pdo_mysql -Requires: php-pdo_mysql - -# Core PHP libs/extensions required by Cacti -Requires: php-pdo -Requires: php-reflection -Requires: php-simplexml -Requires: php-ctype -Requires: php-date -Requires: php-dom -Requires: php-gettext -Requires: php-filter -Requires: php-gd -Requires: php-gmp -Requires: php-hash -Requires: php-iconv -Requires: php-intl -Requires: php-json -Requires: php-ldap -Requires: php-mbstring -Requires: php-openssl -Requires: php-pcntl -Requires: php-pcre -Requires: php-posix -Requires: php-session -Requires: php-snmp -Requires: php-sockets -Requires: php-spl -Requires: php-xml -Requires: php-zlib - -# Cacti Requirements -Requires: mysql -Requires: httpd -Requires: rrdtool -Requires: net-snmp -Requires: net-snmp-utils -Requires: crontabs - -# Bundled JS library -Provides: bundled(js-jquery) = 3.4.1 -Provides: bundled(js-storage) = 1.0.4 -Provides: bundled(js-tree) = 3.3.8 - -%description -Cacti is a complete frontend to RRDTool. It stores all of the -necessary information to create graphs and populate them with -data in a MySQL database. The frontend is completely PHP -driven. - -%prep -%autosetup -p1 -n %{name_org}-%{version} - -%build -# Nothing to build - -%install -%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name_org} -%{__install} -d -m 0755 %{buildroot}/%{_pkgdocdir} -%{__install} -d -m 0755 %{buildroot}/%{_datadir}/%{name_org}/ -%{__install} -d -m 0755 cache/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/cache -%{__install} -d -m 0755 cli/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/cli -%{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name_org}/ -%{__install} -d -m 0755 resource/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/resource -%{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/rra/ -%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/scripts/ -%{__install} -d -m 0755 csrf/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/csrf/ -%{__mv} *.php %{buildroot}/%{_datadir}/%{name_org}/ -%{__mv} cache/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/ -%{__mv} cli/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/ -%{__mv} resource/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/ -%{__mv} rra/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/ -%{__mv} scripts/ %{buildroot}/%{_localstatedir}/lib/%{name_org}/ -%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/cron.d/%{name_org} -%{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name_org}.conf -%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti -%{__cp} -ar formats/ images/ include/ install/ lib/ locales/ mibs/ plugins/ %{buildroot}%{_datadir}/%{name_org} -%{__cp} -a docs/ %{buildroot}/%{_pkgdocdir} -%{__mv} %{buildroot}/%{_datadir}/%{name_org}/include/config.php %{buildroot}/%{_sysconfdir}/%{name_org}/db.php -%{__chmod} +x %{buildroot}/%{_datadir}/%{name_org}/cmd.php %{buildroot}/%{_datadir}/%{name_org}/poller.php -ln -s %{_localstatedir}/lib/%{name_org}/cache %{buildroot}/%{_datadir}/%{name_org}/ -ln -s %{_localstatedir}/lib/%{name_org}/cli %{buildroot}/%{_datadir}/%{name_org}/ -ln -s %{_sysconfdir}/%{name_org}/db.php %{buildroot}/%{_datadir}/%{name_org}/include/config.php -ln -s %{_localstatedir}/lib/%{name_org}/resource %{buildroot}/%{_datadir}/%{name_org}/ -ln -s %{_localstatedir}/lib/%{name_org}/rra %{buildroot}/%{_datadir}/%{name_org}/ -ln -s %{_localstatedir}/lib/%{name_org}/scripts %{buildroot}/%{_datadir}/%{name_org}/ -ln -s %{_localstatedir}/log/%{name_org}/ %{buildroot}/%{_datadir}/%{name_org}/log -ln -s %{_datadir}/%{name_org}/lib %{buildroot}/%{_localstatedir}/lib/%{name_org}/ -ln -s %{_datadir}/%{name_org}/include %{buildroot}/%{_localstatedir}/lib/%{name_org}/ -# Create logfiles -touch %{buildroot}/%{_localstatedir}/log/%{name_org}/%{name_org}.log -touch %{buildroot}/%{_localstatedir}/log/%{name_org}/%{name_org}_stderr.log -# Create csrf-secret.php -touch %{buildroot}/%{_localstatedir}/lib/%{name_org}/csrf/csrf-secret.php - -# Migrate /usr/share/cacti/resource to /var/cacti/resource -%pretrans -p -path = "/usr/share/cacti/resource" -st = posix.stat(path) -if st and st.type == "directory" then - status = os.rename(path, path .. ".rpmmoved") - if not status then - suffix = 0 - while not status do - suffix = suffix + 1 - status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) - end - os.rename(path, path .. ".rpmmoved") - end -end - -%post -# Migrate file ownership to apache user -chown -R apache:apache %{_localstatedir}/lib/%{name_org}/cache/ -chown -R apache:apache %{_localstatedir}/lib/%{name_org}/cli/ -chown -R apache:apache %{_localstatedir}/lib/%{name_org}/csrf/ -chown -R apache:apache %{_localstatedir}/lib/%{name_org}/resource/ -chown -R apache:apache %{_localstatedir}/lib/%{name_org}/rra/ -chown -R apache:apache %{_localstatedir}/lib/%{name_org}/scripts/ -chown -R apache:apache %{_localstatedir}/log/%{name_org}/ -chown root:apache %{_sysconfdir}/%{name_org}/db.php - -# SELinux -semanage fcontext -a -t httpd_sys_content_t '%{_sysconfdir}/%{name_org}/db.php' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/cache(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/cli(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/csrf(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/resource(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/scripts(/.*)?' 2>/dev/null || : -restorecon -R %{_localstatedir}/lib/%{name_org} || : -restorecon -R %{_sysconfdir}/%{name_org} || : - -# Migrate cacti polller to apache user - -sed -i -e 's/\tcacti\t/\tapache\t/' %{_sysconfdir}/cron.d/%{name_org} - -%postun -if [ $1 -eq 0 ] ; then -semanage fcontext -d -t httpd_sys_content_t '%{_sysconfdir}/%{name_org}/db.php' 2>/dev/null || : -semanage fcontext -d -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/cache(/.*)?' 2>/dev/null || : -semanage fcontext -d -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/cli(/.*)?' 2>/dev/null || : -semanage fcontext -d -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/csrf(/.*)?' 2>/dev/null || : -semanage fcontext -d -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/resource(/.*)?' 2>/dev/null || : -semanage fcontext -d -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name_org}/scripts(/.*)?' 2>/dev/null || : -fi - -%files -%doc docs/ README.md cacti.sql -%license LICENSE -%dir %{_sysconfdir}/%{name_org} -%dir %{_datadir}/%{name_org} -%dir %{_localstatedir}/lib/%{name_org} -%dir %{_localstatedir}/lib/%{name_org}/cli -%dir %attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/csrf -%dir %attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/scripts -%dir %attr(-,apache,apache) %{_localstatedir}/log/%{name_org}/ -%config(noreplace) %attr(-,apache,apache) %{_localstatedir}/log/%{name_org}/%{name_org}.log -%config(noreplace) %attr(-,apache,apache) %{_localstatedir}/log/%{name_org}/%{name_org}_stderr.log -%config(noreplace) %{_sysconfdir}/cron.d/cacti -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name_org}.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name_org} -%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name_org}/db.php -%{_datadir}/%{name_org}/*.php -%{_datadir}/%{name_org}/cache -%{_datadir}/%{name_org}/cli -%{_datadir}/%{name_org}/formats/ -%{_datadir}/%{name_org}/images/ -%{_datadir}/%{name_org}/include/ -%{_datadir}/%{name_org}/install/ -%{_datadir}/%{name_org}/lib/ -%{_datadir}/%{name_org}/locales/* -%{_datadir}/%{name_org}/log -%{_datadir}/%{name_org}/mibs -%{_datadir}/%{name_org}/plugins/ -%{_datadir}/%{name_org}/resource -%{_datadir}/%{name_org}/rra -%{_datadir}/%{name_org}/scripts -%{_localstatedir}/lib/%{name_org}/scripts/*[^p] -%attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/scripts/*.php -%attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/resource/ -%attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/rra/ -%attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/cache/ -%attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/cli/*php -%attr(-,apache,apache) %{_localstatedir}/lib/%{name_org}/cli/.htaccess -%attr(0770,apache,apache) %{_localstatedir}/lib/%{name_org}/csrf/csrf-secret.php -%attr(-,root,root) %{_localstatedir}/lib/%{name_org}/include -%attr(-,root,root) %{_localstatedir}/lib/%{name_org}/lib -%ghost %{_datadir}/%{name_org}/resource.rpmmoved - -%changelog -* Wed Oct 27 2021 Ole Ernst - 1.2.18-1 -- Update to 1.2.18 - -* Tue Nov 03 2020 Morten Stevens - 1.2.15-1 -- Update to 1.2.15 - -* Thu Aug 06 2020 Morten Stevens - 1.2.14-1 -- Update to 1.2.14 - -* Tue Jul 14 2020 Morten Stevens - 1.2.13-1 -- Update to 1.2.13 -- CVE-2020-11022, CVE-2020-11023, CVE-2020-13625, CVE-2020-14295 - -* Wed May 27 2020 Morten Stevens - 1.2.12-1 -- Update to 1.2.12 - -* Tue Apr 07 2020 Morten Stevens - 1.2.11-1 -- Update to 1.2.11 - -* Mon Mar 02 2020 Morten Stevens - 1.2.10-1 -- Update to 1.2.10 -- CVE-2020-8813 - -* Mon Feb 10 2020 Morten Stevens - 1.2.9-1 -- Update to 1.2.9 -- CVE-2020-7106, CVE-2020-7237 - -* Wed Dec 11 2019 Morten Stevens - 1.2.8-1 -- Update to 1.2.8 -- CVE-2019-17357, CVE-2019-17358, CVE-2019-16723 - -* Sat Nov 30 2019 Morten Stevens - 1.2.7-1 -- Update to 1.2.7 - -* Tue Sep 03 2019 Morten Stevens - 1.2.6-1 -- Update to 1.2.6 -- Don't require php-imap - -* Sat Jul 20 2019 Morten Stevens - 1.2.5-1 -- Update to 1.2.5 - -* Sat Jun 08 2019 Morten Stevens - 1.2.4-1 -- Update to 1.2.4 - -* Sun Mar 31 2019 Morten Stevens - 1.2.3-1 -- Update to 1.2.3 - -* Mon Feb 25 2019 Morten Stevens - 1.2.2-1 -- Update to 1.2.2 -- SELinux improvements -- Packaging improvements - -* Thu Jan 17 2019 Morten Stevens - 1.2.0-1 -- Rebase to 1.2.0 -- Multiple cross-site scripting vulnerabilities fixed in 1.2.0 -- CVE-2018-20723, CVE-2018-20724, CVE-2018-20725, CVE-2018-20726 (#1667024) - -* Mon Dec 03 2018 Morten Stevens - 1.1.38-4 -- Spec file improvements -- Updated logrotation settings -- Removed cacti user -- Changed rra file ownership to apache #1454755 - -* Wed Jul 25 2018 Morten Stevens - 1.1.38-2 -- Fix for https://github.com/Cacti/cacti/issues/1634 - -* Wed May 16 2018 Morten Stevens - 1.1.38-1 -- Update to 1.1.38 - -* Mon Mar 26 2018 Morten Stevens - 1.1.37-1 -- Update to 1.1.37 - -* Mon Feb 26 2018 Morten Stevens - 1.1.36-1 -- Update to 1.1.36 - -* Tue Feb 13 2018 Morten Stevens - 1.1.35-1 -- Update to 1.1.35 - -* Tue Feb 06 2018 Morten Stevens - 1.1.34-1 -- Update to 1.1.34 - -* Wed Jan 24 2018 Morten Stevens - 1.1.33-1 -- Update to 1.1.33 - -* Sun Nov 19 2017 Morten Stevens - 1.1.28-1 -- Update to 1.1.28 -- CVE-2017-16641, CVE-2017-16660, CVE-2017-16661, CVE-2017-16785 - -* Mon Oct 23 2017 Morten Stevens - 1.1.27-1 -- Update to 1.1.27 - -* Tue Oct 17 2017 Morten Stevens - 1.1.26-1 -- Update to 1.1.26 -- CVE-2017-15194 - -* Mon Sep 18 2017 Morten Stevens - 1.1.24-1 -- Update to 1.1.24 - -* Tue Sep 05 2017 Morten Stevens - 1.1.21-1 -- Update to 1.1.21 - -* Mon Aug 21 2017 Morten Stevens - 1.1.19-1 -- Update to 1.1.19 - -* Sun Aug 13 2017 Morten Stevens - 1.1.17-1 -- Update to 1.1.17 - -* Sun Jul 30 2017 Morten Stevens - 1.1.16-1 -- Update to 1.1.16 - -* Tue Jul 25 2017 Morten Stevens - 1.1.15-1 -- Update to 1.1.15 - -* Mon Jul 24 2017 Morten Stevens - 1.1.14-1 -- Update to 1.1.14 - -* Fri Jul 14 2017 Morten Stevens - 1.1.13-1 -- Update to 1.1.13 - -* Thu Jul 06 2017 Morten Stevens - 1.1.12-2 -- Fix Cross-site Scripting (XSS) issue with link.php - -* Wed Jul 05 2017 Morten Stevens - 1.1.12-1 -- Update to 1.1.12 - -* Tue Jul 04 2017 Morten Stevens - 1.1.11-1 -- Update to 1.1.11 - -* Mon Jun 12 2017 Morten Stevens - 1.1.10-1 -- Update to 1.1.10 - -* Mon May 22 2017 Morten Stevens - 1.1.7-1 -- Update to 1.1.7 - -* Sat May 13 2017 Morten Stevens - 1.1.6-2 -- Fix PHP requirements -- Cacti db access not compatible with PHP 7 (#1450578) - -* Mon May 08 2017 Morten Stevens - 1.1.6-1 -- Update to 1.1.6 - -* Wed Apr 26 2017 Morten Stevens - 1.1.5-1 -- Update to 1.1.5 - -* Mon Apr 24 2017 Morten Stevens - 1.1.4-1 -- Update to 1.1.4 - -* Sun Apr 16 2017 Morten Stevens - 1.1.3-1 -- Update to 1.1.3 - -* Wed Apr 12 2017 Morten Stevens - 1.1.2-2 -- Work with several MySQL variants (#1440755) - -* Mon Apr 03 2017 Morten Stevens - 1.1.2-1 -- Update to 1.1.2 - -* Tue Mar 28 2017 Morten Stevens - 1.1.1-1 -- Update to 1.1.1 - -* Mon Mar 20 2017 Morten Stevens - 1.1.0-1 -- Update to 1.1.0 - -* Wed Mar 15 2017 Morten Stevens - 1.0.6-1 -- Update to 1.0.6 - -* Mon Mar 13 2017 Morten Stevens - 1.0.5-1 -- Update to 1.0.5 -- Logfile improvements -- Added php-gd and php-process as dependency (#1430893) - -* Mon Feb 27 2017 Morten Stevens - 1.0.4-1 -- Update to 1.0.4 - -* Sat Feb 18 2017 Morten Stevens - 1.0.3-2 -- Cacti 1.0.x spec file improvements - -* Thu Feb 16 2017 Morten Stevens - 1.0.3-1 -- Update to 1.0.3 - -* Sun Feb 12 2017 Morten Stevens - 1.0.2-1 -- Update to 1.0.2 - -* Fri Feb 10 2017 Fedora Release Engineering - 0.8.8h-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jan 18 2017 Morten Stevens - 0.8.8h-3 -- Fixes for PHP7 backported from Arch Linux (#1390770) - -* Tue Jun 28 2016 Jon Ciesla - 0.8.8h-2 -- php7 Requires fix. - -* Mon May 09 2016 Morten Stevens - 0.8.8h-1 -- Update to 0.8.8h -- CVE-2016-3659 - -* Fri Apr 15 2016 Morten Stevens - 0.8.8g-1 -- Update to 0.8.8g -- Improve spec file (#1302904) - -* Fri Jan 29 2016 Morten Stevens - 0.8.8f-2 -- CVE-2015-8369: SQL Injection vulnerability in graph.php -- CVE-2015-8377: Fix SQL Injection vulnerability in graphs_new.php -- CVE-2015-8604: Fix SQL Injection vulnerability in graphs_new.php - -* Fri Jan 29 2016 Morten Stevens - 0.8.8f-1 -- Update to 0.8.8f - -* Fri Jun 27 2014 Ken Dreyer - 0.8.8b-7 -- Patches for CVE-2014-4002 Cross-site scripting vulnerability - (RHBZ #1113035) - -* Sat Jun 07 2014 Fedora Release Engineering - 0.8.8b-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 07 2014 Ken Dreyer - 0.8.8b-5 -- Patch for CVE-2014-2708 SQL injection issues in graph_xport.php - (RHBZ #1084258) -- Patch for CVE-2014-2709 shell escaping issues in lib/rrd.php - (RHBZ #1084258) -- Patch for CVE-2014-2326 stored XSS attack (RHBZ #1082122) -- Patch for CVE-2014-2328 use of exec-like function calls without safety - checks allow arbitrary command execution (RHBZ #1082122) - -* Fri Feb 07 2014 Ken Dreyer - 0.8.8b-4 -- Move cron to a separate file and require crontabs (RHBZ #947047). Thanks - Jóhann B. Guðmundsson. -- Update for systemd (RHBZ #947047). Thanks Jóhann B. Guðmundsson. -- Fix rpmlint warning about spaces-to-tabs - -* Wed Sep 04 2013 Ken Dreyer - 0.8.8b-3 -- Fix comments in thumbnails (BZ #1004550) - -* Mon Aug 26 2013 Ken Dreyer - 0.8.8b-2 -- Patch for CVE-2013-5588 and CVE-2013-5589 (BZ #1000860) - -* Wed Aug 07 2013 Ken Dreyer - 0.8.8b-1 -- New upstream release (BZ #993042) - -* Mon Jul 29 2013 Ken Dreyer - 0.8.8a-9 -- Use %%{_pkgdocdir}, per - https://fedoraproject.org/wiki/Changes/UnversionedDocdirs - -* Sun Jul 14 2013 Ken Dreyer - 0.8.8a-8 -- Improve security description in cacti's httpd conf (RHBZ #895823) -- Use improved treeview replacement patch (RHBZ #888207) -- rpmlint fixes -- trim RPM changelog - -* Wed Feb 13 2013 Fedora Release Engineering - 0.8.8a-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Jan 08 2013 Ken Dreyer - 0.8.8a-6 -- Add note to README.fedora about the default MySQL password -- Remove reference to "docs/INSTALL" in README.fedora (RHBZ #893122) -- Add dependency on net-snmp-utils (RHBZ #893150) - -* Fri Jan 04 2013 Ken Dreyer - 0.8.8a-5 -- Install our README file as README.fedora - -* Fri Jan 4 2013 Tom Callaway - 0.8.8a-4 -- remove non-free treeview bits (replace with jquery future code from 0.8.9 trunk) - -* Wed Jul 18 2012 Fedora Release Engineering - 0.8.8a-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 28 2012 Ken Dreyer - 0.8.8a-2 -- Add plugins directory (BZ #834355) -- Drop Fedora 15 (EOL) from logrotate syntax adjustment - -* Mon Apr 30 2012 Ken Dreyer - 0.8.8a-1 -- New upstream release (BZ #817506) -- Drop upstreamed $url_path patch - -* Wed Apr 11 2012 Ken Dreyer - 0.8.8-3 -- Patch $url_path to default to "/cacti/" (upstream bug 2217) - -* Fri Apr 06 2012 Ken Dreyer - 0.8.8-2 -- Adjust httpd ACL conditionals to test the presence of mod_authz_core - (as discussed on fedora-devel) - -* Wed Apr 04 2012 Ken Dreyer - 0.8.8-1 -- New upstream release (BZ #809753). - -* Mon Mar 26 2012 Ken Dreyer - 0.8.7i-4 -- Adjust ACLs to support httpd 2.4. - -* Thu Jan 12 2012 Fedora Release Engineering - 0.8.7i-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 13 2011 Ken Dreyer - 0.8.7i-2 -- Only set "su" logrotate parameter for F16 and above. -- Tweak mod_security rules. - -* Mon Dec 12 2011 Ken Dreyer - 0.8.7i-1 -- New upstream release (BZ #766573). - -* Fri Nov 11 2011 Ken Dreyer - 0.8.7h-2 -- block HTTP access to log and rra directories (#609856) -- overrides for mod_security -- set logrotate to su to cacti apache when rotating (#753079) - -* Thu Oct 27 2011 Ken Dreyer - 0.8.7h-1 -- New upstream release. -- Remove upstream'd mysql patch. - -* Mon Aug 08 2011 Jon Ciesla - 0.8.7g-3 -- Patch for MySQL 5.5, BZ 728513. - -* Tue Feb 08 2011 Fedora Release Engineering - 0.8.7g-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jul 12 2010 Mike McGrath 0.8.7g-1 -- Upstream released new version - -* Mon May 24 2010 Mike McGrath - 0.8.7f-1 -- Upstream released new version -- Contains security updates #595289 - -* Fri Apr 23 2010 Mike McGrath - 0.8.7e-4 -- Pulling in patches from upstream -- SQL injection fix -- BZ #541279 - -* Tue Dec 1 2009 Mike McGrath - 0.8.7e-3 -- Pulling in some official patches -- #541279 -- #541962 - -* Sun Aug 16 2009 Mike McGrath - 0.8.7e-1 -- Upstream released new version - -* Fri Jul 24 2009 Fedora Release Engineering - 0.8.7d-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Mar 31 2009 Michael Schwendt - 0.8.7d-3 -- Fix unowned cli directory (#473631) - -* Mon Feb 23 2009 Fedora Release Engineering - 0.8.7d-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Feb 21 2009 Mike McGrath - 0.8.7d-1 -- Upstream released new version - -* Mon Jul 28 2008 Mike McGrath - 0.8.7b-4 -- Added cli directory - -* Fri Jul 18 2008 Tom "spot" Callaway - 0.8.7b-3 -- fix my own mistake in the license tag - -* Tue Jul 15 2008 Tom "spot" Callaway - 0.8.7b-2 -- fix license tag - -* Thu Feb 14 2008 Mike McGrath - 0.8.7b-1 -- Upstream released new version - -* Fri Nov 23 2007 Mike McGrath - 0.8.7a-2 -- db.php is now 640 instead of 660 - #396331 - -* Tue Nov 20 2007 Mike McGrath - 0.8.7a-1 -- Upstream released new version -- Fixes for bug #391691 - CVE-2007-6035 diff --git a/SPECS/dhcpd-pools.spec b/SPECS/dhcpd-pools.spec index f60d916..f15d2ec 100644 --- a/SPECS/dhcpd-pools.spec +++ b/SPECS/dhcpd-pools.spec @@ -1,5 +1,5 @@ Name: dhcpd-pools -Version: 3.1 +Version: 3.2 Release: 1 Summary: ISC dhcpd leases usage analysis @@ -8,7 +8,7 @@ License: BSD URL: https://sourceforge.net/projects/dhcpd-pools Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz -BuildRequires: uthash-devel +BuildRequires: gcc uthash-devel %description This is dhcpd-pools - ISC dhcpd lease status utility. @@ -30,6 +30,9 @@ make %{?_smp_mflags} %{_datarootdir}/* %changelog +* Fri Mar 25 2022 Ole Ernst - 3.2-1 +- upgpkg + * Fri Mar 25 2022 Ole Ernst - 3.1-1 - upgpkg diff --git a/SPECS/docsis.spec b/SPECS/docsis.spec index 4de2c8e..6285983 100644 --- a/SPECS/docsis.spec +++ b/SPECS/docsis.spec @@ -1,13 +1,14 @@ Name: docsis -Version: 0.9.8.r393.gd7c9643 +Version: 0.9.8.r402.g24c9f9f Release: 1 Summary: Human-readable text to binary configuration file converter Group: Applications/Communications License: GPLv2 URL: http://docsis.sourceforge.net -Source: https://github.com/rlaager/%{name}/archive/d7c9643.tar.gz -Patch: docsis_dialplan.patch +Source: https://github.com/rlaager/%{name}/archive/24c9f9f.tar.gz +Patch0: docsis_edge.patch +Patch1: docsis_dialplan.patch BuildRequires: autoconf automake libtool glib2-devel bison flex net-snmp-devel @@ -17,7 +18,8 @@ text configuration file. This tool is fully compliant with the following specs: CM-SP-eRouter-I12, DPoE-SP-DEMARCv1.0-I04, CM-SP-L2VPN-I13, CM-SP-MULPIv3.0-I24 %prep -%autosetup -p1 -n docsis-d7c9643a66bff27278cf9096e7e4a6b7c0427142 +%autosetup -p1 -n docsis-24c9f9f8cbcaa5e55fe0d6ce189d1e56c3cc5c94 +sed -i 's/\[gm4 gnum4 m4\], \[notfound\],\[/\[gm4 gnum4 m4\], \[notfound\],\[\/usr\/bin:/' configure.ac %build ./autogen.sh @@ -36,6 +38,15 @@ cp mibs/*.txt %{buildroot}%{_datarootdir}/snmp/mibs %{_datarootdir}/snmp/mibs/*.txt %changelog +* Mon Jan 27 2025 Ole Ernst - 0.9.8.r402.g24c9f9f-1 +- Bump to latest commit +- Add C.1.3.1.53 Downstream Lower Band Edge Configuration +- Add C.1.3.1.54 Downstream Upper Band Edge Configuration +- Add C.1.3.1.55 Diplexer Upstream Upper Band Edge Configuration + +* Tue Nov 08 2022 Ole Ernst - 0.9.8.r393.gd7c9643-2 +- Fix compiling with Rocky 9 + * Wed May 05 2021 Ole Ernst - 0.9.8.r393.gd7c9643-1 - Add dialplan from user-supplied file and add IETF MTA hash diff --git a/SPECS/fft-nmsprime.spec b/SPECS/fft-nmsprime.spec index 39f82c5..5e1248b 100644 --- a/SPECS/fft-nmsprime.spec +++ b/SPECS/fft-nmsprime.spec @@ -1,6 +1,6 @@ Name: fft-nmsprime Version: 0.0.1 -Release: 1 +Release: 2 Summary: A highly efficient FFT used for PNM data Group: Applications/Communications @@ -26,5 +26,8 @@ install -Dm755 %{name}/%{name} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Mon Nov 14 2022 Ole Ernst - 0.0.1-2 +- Bump for AlmaLinux 9 rebuild + * Mon Aug 19 2020 Ole Ernst - 0.0.1-1 - Initial RPM release diff --git a/SPECS/genieacs.spec b/SPECS/genieacs.spec index dfb4e16..0e3f660 100644 --- a/SPECS/genieacs.spec +++ b/SPECS/genieacs.spec @@ -1,6 +1,6 @@ Name: genieacs -Version: 1.2.9 -Release: 1 +Version: 1.2.13 +Release: 2 Summary: A fast and lightweight TR-069 Auto Configuration Server (ACS) Group: Applications/Communications @@ -55,6 +55,7 @@ cat << EOF >> %{name}.log compress delaycompress dateext + missingok } EOF @@ -88,14 +89,27 @@ install -d %{buildroot}%{_datadir}/%{name}/ext %attr(755, nobody, nobody) %{_localstatedir}/log/%{name} %changelog +* Mon Apr 07 2025 Nino Ryschawy - 1.2.13-2 +- Fix logrote startup error on missing genieacs log file + +* Wed Feb 19 2025 Ole Ernst - 1.2.13-1 +- Update to 1.2.13-1 + +* Fri May 03 2024 Ole Ernst - 1.2.12-1 +- Update to 1.2.12-1 + * Tue Aug 08 2023 Christian Schramm - 1.2.9-1 - Update to 1.2.9-1 - Change Dependency from rh-node12 to nodejs (nodejs 16 LTS) + * Mon Nov 08 2021 Ole Ernst - 1.2.8-1 - Update to 1.2.8-1 + * Sun Dec 13 2020 Ole Ernst - 1.2.3-2 - Use master to workaround factory reset loop + * Tue Dec 08 2020 Ole Ernst - 1.2.3-1 - Update to 1.2.3-1 + * Wed May 29 2019 Ole Ernst - 1.1.3-1 - Initial RPM release diff --git a/SPECS/icinga2.spec b/SPECS/icinga2.spec new file mode 100644 index 0000000..84816e8 --- /dev/null +++ b/SPECS/icinga2.spec @@ -0,0 +1,404 @@ +Summary: Network monitoring application + +License: GPLv2+ + +Group: System/Monitoring +Name: icinga2 +Version: 2.14.2 +Release: 1.el7 +Url: https://www.icinga.com/ +Source: icinga2-2.14.2.tgz + +Requires: icinga2-bin = 2.14.2-1.el7 +Requires: icinga2-common = 2.14.2-1.el7 + +Conflicts: icinga2-common < 2.14.2-1.el7 + +%description +Meta package for Icinga 2 Core, DB IDO and Web. + +%package bin +Summary: Icinga 2 binaries and libraries +Group: System/Monitoring + +Requires: icinga2-bin = 2.14.2-1.el7 + +BuildRequires: libedit-devel +BuildRequires: ncurses-devel + +BuildRequires: binutils +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel + +BuildRequires: openssl-devel +BuildRequires: bison +BuildRequires: cmake +BuildRequires: flex >= 2.5.35 +BuildRequires: make + +BuildRequires: boost-devel >= 1.75 + +BuildRequires: systemd-devel +Requires: systemd + +Obsoletes: icinga2-libs <= 2.10.0 +Conflicts: icinga2-libs <= 2.10.0 + +%description bin +Icinga 2 is a general-purpose network monitoring application. +This subpackage provides the binaries for Icinga 2 Core. + +%package common +Summary: Common Icinga 2 configuration +Group: System/Monitoring + +Requires(pre): shadow-utils +Requires(post): shadow-utils + +BuildRequires: logrotate + +%description common +This subpackage provides common directories, and the UID and GUID definitions +among Icinga 2 related packages. + +%package doc +Summary: Documentation for Icinga 2 +Group: Documentation/Other + +%description doc +This subpackage provides documentation for Icinga 2. + +%package ido-mysql +Summary: IDO MySQL database backend for Icinga 2 +Group: System/Monitoring + +BuildRequires: mysql-devel + +Requires: icinga2-bin = 2.14.2-1.el7 + +%description ido-mysql +Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x +IDOUtils schema >= 1.12 + +%package ido-pgsql +Summary: IDO PostgreSQL database backend for Icinga 2 +Group: System/Monitoring + +BuildRequires: postgresql16-devel + +Requires: icinga2-bin = 2.14.2-1.el7 + +%description ido-pgsql +Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x +IDOUtils schema >= 1.12 + +%package selinux +Summary: SELinux policy module supporting icinga2 +Group: System/Base +BuildRequires: checkpolicy +BuildRequires: hardlink +BuildRequires: selinux-policy-devel +Requires: icinga2-bin = 2.14.2-1.el7 +Requires: icinga-selinux-common + +Requires(post): policycoreutils-python +Requires(postun): policycoreutils-python + +%description selinux +SELinux policy module supporting icinga2. + +%package -n vim-icinga2 +Summary: Vim syntax highlighting for icinga2 +Group: Productivity/Text/Editors + +Requires: vim-filesystem + +%description -n vim-icinga2 +Provides Vim syntax highlighting for icinga2. + +%package -n nano-icinga2 +Summary: Nano syntax highlighting for icinga2 +Group: Productivity/Text/Editors +Requires: nano + +%description -n nano-icinga2 +Provides Nano syntax highlighting for icinga2. + +%prep +%autosetup +sed -i '1 i\set(Boost_INCLUDE_DIR /usr/include)' CMakeLists.txt +sed -i '1 i\set(PostgreSQL_INCLUDE_DIR /usr/pgsql-13/include)' third-party/cmake/FindPostgreSQL.cmake +sed -i '1 i\set(PostgreSQL_LIBRARY /usr/pgsql-13/lib)' third-party/cmake/FindPostgreSQL.cmake + +%build +export CCACHE_BASEDIR="${CCACHE_BASEDIR:-$(pwd)}" + +CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_SYSCONFDIR=/etc \ +-DCMAKE_INSTALL_LOCALSTATEDIR=/var \ +-DCMAKE_BUILD_TYPE=RelWithDebInfo \ +-DCMAKE_VERBOSE_MAKEFILE=ON \ +-DBoost_NO_BOOST_CMAKE=ON \ +-DICINGA2_PLUGINDIR=/usr/lib64/nagios/plugins \ +-DICINGA2_RUNDIR=/run \ +-DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 \ +-DICINGA2_USER=icinga \ +-DICINGA2_GROUP=icinga \ +-DICINGA2_COMMAND_GROUP=icingacmd" + +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=ON" + +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=OFF" + +CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=OFF" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_COMPAT=ON" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_LIVESTATUS=ON" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_NOTIFICATION=ON" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PERFDATA=ON" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_TESTS=ON" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_MYSQL=ON" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=ON" + +CMAKE_OPTS="$CMAKE_OPTS +-DBoost_NO_BOOST_CMAKE=TRUE \ +-DBoost_NO_SYSTEM_PATHS=TRUE \ +-DBOOST_LIBRARYDIR=/usr/lib64 \ +-DBOOST_INCLUDEDIR=/usr/include/boost \ +-DBoost_ADDITIONAL_VERSIONS='1.75;1.75.0'" + +CMAKE_OPTS="$CMAKE_OPTS -DUSE_SYSTEMD=ON" + +cmake3 $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic " -DCMAKE_CXX_FLAGS:STRING="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic " . + +make %_smp_mflags + +cd tools/selinux +for selinuxvariant in mls targeted +do +make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile +mv icinga2.pp icinga2.pp.${selinuxvariant} +make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - + +%install + +make install \ +DESTDIR="%_topdir/BUILDROOT/icinga2-2.14.2-1.el7.x86_64" + +rm -f %_topdir/BUILDROOT/icinga2-2.14.2-1.el7.x86_64//etc/icinga2/features-enabled/*.conf + +cd tools/selinux +for selinuxvariant in mls targeted +do +install -d %_topdir/BUILDROOT/icinga2-2.14.2-1.el7.x86_64/usr/share/selinux/${selinuxvariant} +install -p -m 644 icinga2.pp.${selinuxvariant} \ +%_topdir/BUILDROOT/icinga2-2.14.2-1.el7.x86_64/usr/share/selinux/${selinuxvariant}/icinga2.pp +done +cd - + +install -D -m 0644 tools/syntax/vim/syntax/icinga2.vim %_topdir/BUILDROOT/icinga2-2.14.2-1.el7.x86_64/usr/share/vim/vimfiles/syntax/icinga2.vim +install -D -m 0644 tools/syntax/vim/ftdetect/icinga2.vim %_topdir/BUILDROOT/icinga2-2.14.2-1.el7.x86_64/usr/share/vim/vimfiles/ftdetect/icinga2.vim + +install -D -m 0644 tools/syntax/nano/icinga2.nanorc %_topdir/BUILDROOT/icinga2-2.14.2-1.el7.x86_64/usr/share/nano/icinga2.nanorc + +%check +export CTEST_OUTPUT_ON_FAILURE=1 +make test + +%pre + +%post + +if [ $1 -eq 1 ] ; then +systemctl preset icinga2.service >/dev/null 2>&1 || : +fi + +if [ ${1:-0} -eq 1 ] +then +for feature in checker notification mainlog; do +ln -sf ../features-available/${feature}.conf /etc/icinga2/features-enabled/${feature}.conf +done +fi + +exit 0 + +%preun + +if [ $1 -eq 0 ] ; then +systemctl --no-reload disable icinga2.service > /dev/null 2>&1 || : +systemctl stop icinga2.service > /dev/null 2>&1 || : +fi + +exit 0 + +%postun + +systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then +systemctl try-restart icinga2.service >/dev/null 2>&1 || : +fi + +if [ "$1" = "0" ]; then +rm -rf /etc/icinga2/features-enabled +fi + +exit 0 + +%pre common +getent group icinga >/dev/null || /usr/sbin/groupadd -r icinga +getent group icingacmd >/dev/null || /usr/sbin/groupadd -r icingacmd +getent passwd icinga >/dev/null || /usr/sbin/useradd -c "icinga" -s /sbin/nologin -r -d /var/spool/icinga2 -G icingacmd -g icinga icinga + +%post common + +%post ido-mysql +if [ ${1:-0} -eq 1 ] && [ -e /etc/icinga2/features-enabled/ido-mysql.conf ] +then +ln -sf ../features-available/ido-mysql.conf /etc/icinga2/features-enabled/ido-mysql.conf +fi + +exit 0 + +%postun ido-mysql +if [ "$1" = "0" ]; then +rm -f /etc/icinga2/features-enabled/ido-mysql.conf +fi + +exit 0 + +%post ido-pgsql +if [ ${1:-0} -eq 1 ] && [ -e /etc/icinga2/features-enabled/ido-pgsql.conf ] +then +ln -sf ../features-available/ido-pgsql.conf /etc/icinga2/features-enabled/ido-pgsql.conf +fi + +exit 0 + +%postun ido-pgsql +if [ "$1" = "0" ]; then +rm -f /etc/icinga2/features-enabled/ido-pgsql.conf +fi + +exit 0 + +%post selinux +for selinuxvariant in mls targeted +do +/usr/sbin/semodule -s ${selinuxvariant} -i \ +/usr/share/selinux/${selinuxvariant}/icinga2.pp &> /dev/null || : +done +/sbin/fixfiles -R icinga2 restore &> /dev/null || : +/sbin/fixfiles -R icinga2-bin restore &> /dev/null || : +/sbin/fixfiles -R icinga2-common restore &> /dev/null || : +/sbin/semanage port -a -t icinga2_port_t -p tcp 5665 &> /dev/null || : + +%postun selinux +if [ $1 -eq 0 ] ; then +/sbin/semanage port -d -t icinga2_port_t -p tcp 5665 &> /dev/null || : +for selinuxvariant in mls targeted +do +/usr/sbin/semodule -s ${selinuxvariant} -r icinga2 &> /dev/null || : +done +/sbin/fixfiles -R icinga2 restore &> /dev/null || : +/sbin/fixfiles -R icinga2-bin restore &> /dev/null || : +/sbin/fixfiles -R icinga2-common restore &> /dev/null || : +fi + +%files +%defattr(-,root,root,-) +%doc COPYING + +%config(noreplace) /etc/logrotate.d/icinga2 + +%attr(644,root,root) /usr/lib/systemd/system/icinga2.service +%config(noreplace) /etc/sysconfig/icinga2 + +/usr/sbin/icinga2 + +%dir /usr/lib//icinga2 +/usr/lib//icinga2/prepare-dirs +/usr/lib//icinga2/safe-reload + +%attr(0750,icinga,icinga) %dir /etc/icinga2 +%attr(0750,icinga,icinga) %dir /etc/icinga2/conf.d +%attr(0750,icinga,icinga) %dir /etc/icinga2/features-available +%exclude /etc/icinga2/features-available/ido-*.conf +%attr(0750,icinga,icinga) %dir /etc/icinga2/features-enabled +%attr(0750,icinga,icinga) %dir /etc/icinga2/scripts +%attr(0750,icinga,icinga) %dir /etc/icinga2/zones.d +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/icinga2.conf +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/constants.conf +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/zones.conf +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/conf.d/*.conf +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/features-available/*.conf +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/zones.d/* +%config(noreplace) /etc/icinga2/scripts/* + +%attr(0750,icinga,icingacmd) /var/cache/icinga2 +%attr(0750,icinga,icingacmd) %dir /var/log/icinga2 +%attr(0750,icinga,icinga) %dir /var/log/icinga2/crash +%attr(0750,icinga,icingacmd) %dir /var/log/icinga2/compat +%attr(0750,icinga,icingacmd) %dir /var/log/icinga2/compat/archives +%attr(0750,icinga,icinga) /var/lib/icinga2 +%attr(0750,icinga,icingacmd) %ghost %dir /run/icinga2 +%attr(2750,icinga,icingacmd) %ghost /run/icinga2/cmd +%attr(0750,icinga,icinga) %dir /var/spool/icinga2 +%attr(0770,icinga,icinga) %dir /var/spool/icinga2/perfdata +%attr(0750,icinga,icinga) %dir /var/spool/icinga2/tmp + +%files bin +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md +%dir /usr/lib64/icinga2 +%dir /usr/lib64/icinga2/sbin +/usr/lib64/icinga2/sbin/icinga2 +/usr/lib64/nagios/plugins/check_nscp_api +/usr/share/icinga2 +%exclude /usr/share/icinga2/include +/usr/share/man/man8/icinga2.8.gz + +%files common +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md tools/syntax +/etc/bash_completion.d/icinga2 +%attr(0750,icinga,icinga) %dir /usr/share/icinga2/include +/usr/share/icinga2/include/* + +%files doc +%defattr(-,root,root,-) +/usr/share/doc/icinga2 +%docdir /usr/share/doc/icinga2 + +%files ido-mysql +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/features-available/ido-mysql.conf +/usr/lib64/icinga2/libmysql_shim* +/usr/share/icinga2-ido-mysql + +%files ido-pgsql +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md +%config(noreplace) %attr(0640,icinga,icinga) /etc/icinga2/features-available/ido-pgsql.conf +/usr/lib64/icinga2/libpgsql_shim* +/usr/share/icinga2-ido-pgsql + +%files selinux +%defattr(-,root,root,0755) +%doc tools/selinux/* +/usr/share/selinux/*/icinga2.pp + +%files -n vim-icinga2 +%defattr(-,root,root,-) +/usr/share/vim/vimfiles/syntax/icinga2.vim +/usr/share/vim/vimfiles/ftdetect/icinga2.vim + +%files -n nano-icinga2 +%defattr(-,root,root,-) +/usr/share/nano/icinga2.nanorc + +%changelog +* Thu Jan 18 2024 Icinga GmbH - 2.14.2-1.el7 +- Version 2.14.2-1 + diff --git a/SPECS/icingaweb2-module-director.spec b/SPECS/icingaweb2-module-director.spec index 55f3eb8..7ceef75 100644 --- a/SPECS/icingaweb2-module-director.spec +++ b/SPECS/icingaweb2-module-director.spec @@ -18,8 +18,8 @@ Source8: https://gitlab.com/argaar/nagios-plugins/raw/master/check%20symmetra%20 Source9: https://raw.githubusercontent.com/melmorabity/nagios-plugin-systemd-service/master/check_systemd_service.sh Requires: bc dhcpd-pools icinga2 icinga2-ido-pgsql icingacli icingaweb2 icingaweb2-module-incubator nagios-plugins-all -Requires: nmsprime-hfcreq nmsprime-provmon perl-Nagios-Plugin perl-Net-SNMP -Requires: perl-Readonly perl-Switch php80-php-ldap php80-php-intl rh-php73-php-process pgloader +Requires: nmsprime-hfcreq nmsprime-provmon nagios-plugins-perl perl-Net-SNMP +Requires: perl-Readonly perl-Switch php-ldap php-intl php-process pgloader %description Icinga Director has been designed to make Icinga 2 configuration handling easy. @@ -322,8 +322,6 @@ sed -i "s/vars.pgsql_password = \"\"/vars.pgsql_password = \" systemctl enable icinga2 systemctl start icinga2 -systemctl enable php80-php-fpm -systemctl start php80-php-fpm systemctl enable icinga-director systemctl start icinga-director icinga2 feature enable ido-pgsql @@ -363,7 +361,6 @@ sed -i -e "s/^endpoint = \"\"$/endpoint = \"$(hostname)\"/" \ -e "s/^password = \"\"$/password = \"$director_api_psw\"/" /etc/icingaweb2/modules/director/kickstart.ini sed -i "s/^password = \"\"$/password = \"$cmdtransport_api_psw\"/" /etc/icingaweb2/modules/monitoring/commandtransports.ini systemctl restart httpd -systemctl restart php80-php-fpm icingacli module enable director icingacli director migration run echo "127.0.0.1 $(hostname)" >> /etc/hosts diff --git a/SPECS/modemparser-nmsprime.spec b/SPECS/modemparser-nmsprime.spec index 2fa8823..290c335 100644 --- a/SPECS/modemparser-nmsprime.spec +++ b/SPECS/modemparser-nmsprime.spec @@ -1,5 +1,5 @@ Name: modemparser-nmsprime -Version: 0.0.2 +Version: 0.0.5 Release: 1 Summary: A highly efficient modem parser written in Rust @@ -14,9 +14,12 @@ A highly efficient modem parser for DOCSIS / SNMP and CWMP / TR069 devices writt %prep git clone git@github.com:nmsprime/modemparser.git +cd modemparser +sed -i "s/vVERSION/v$(git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g')/" src/main.rs %build cd modemparser +git switch --detach "%{version}" cargo rustc --release %install @@ -27,6 +30,12 @@ install -Dm755 target/release/modemparser %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Mon Feb 17 2025 Ole Ernst - 0.0.5-1 +- Bugfix / Make script more robust + +* Thu Jun 27 2024 Ole Ernst - 0.0.4-1 +- Rocky9 release + * Wed Mar 23 2022 Ole Ernst - 0.0.2-1 - Use PostgreSQL DB now diff --git a/SPECS/modempoller-nmsprime.spec b/SPECS/modempoller-nmsprime.spec index 56fa258..c70ec2f 100644 --- a/SPECS/modempoller-nmsprime.spec +++ b/SPECS/modempoller-nmsprime.spec @@ -8,8 +8,8 @@ License: GPLv3 URL: https://github.com/nmsprime/async-snmp-poller Source: https://raw.githubusercontent.com/nmsprime/async-snmp-poller/master/src/%{name}.c -Requires: net-snmp-libs libpq5 -BuildRequires: gcc net-snmp-devel libpq5-devel +Requires: net-snmp-libs postgresql16-libs +BuildRequires: gcc net-snmp-devel postgresql16-devel %description This asynchronous snmp poller solves the issue with Cacti when monitoring several @@ -18,7 +18,7 @@ its monitoring data by using hundreds of concurrent php workers which handle eac small batch of devices sequentially. This blocks the CPU and scales pretty poorly. %build -gcc -s -L $(pg_config --libdir) -l netsnmp -l pq -o %{name} %{_sourcedir}/%{name}.c +gcc -s -I $(/usr/pgsql-16/bin/pg_config --includedir) -L $(/usr/pgsql-16/bin/pg_config --libdir) -l netsnmp -l pq -o %{name} %{_sourcedir}/%{name}.c %install install -Dm755 %{name} %{buildroot}%{_bindir}/%{name} diff --git a/SPECS/nmsprime-repos.spec b/SPECS/nmsprime-repos.spec index e26cc67..eae48f4 100644 --- a/SPECS/nmsprime-repos.spec +++ b/SPECS/nmsprime-repos.spec @@ -1,51 +1,51 @@ Name: nmsprime-repos -Version: 3.2.0 -Release: 1 +Version: 4.0.0 +Release: 3 Summary: NMS Prime and dependency RPM repos Group: Applications/Communications License: GPLv3 BuildArch: noarch URL: https://www.nmsprime.com -Source1: https://packages.icinga.com/epel/icinga-rpm-release-7-latest.noarch.rpm -Source2: https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm +Source1: https://rpms.remirepo.net/enterprise/remi-release-9.rpm +Source2: https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm %description This package contains the nmsprime and dependency RPM repos. %prep -rpm2cpio %{_sourcedir}/icinga-rpm-release-7-latest.noarch.rpm | cpio -ivdm +rpm2cpio %{_sourcedir}/remi-release-9.rpm | cpio -ivdm rpm2cpio %{_sourcedir}/pgdg-redhat-repo-latest.noarch.rpm | cpio -ivdm %build -cat << EOF >> nmsprime-os.repo +cat << EOF > nmsprime-os.repo [nmsprime-os] -name=NMS Prime -baseurl=https://repo.nmsprime.com/rpm/nmsprimeNG/os +name=NMS Prime OS +baseurl=https://repo9.nmsprime.com/rpm/nmsprime-rocky/os enabled=1 gpgcheck=0 sslverify=1 EOF -cat << EOF >> nmsprime-prime.repo +cat << EOF > nmsprime-prime.repo [nmsprime-prime] name=NMS Prime -baseurl=https://repo.nmsprime.com/rpm/nmsprimeNG/prime +baseurl=https://repo9.nmsprime.com/rpm/nmsprime-rocky/prime enabled=0 gpgcheck=0 sslverify=1 EOF -cat << "EOF" >> mongodb-org-4.4.repo -[mongodb-org-4.4] +cat << "EOF" > mongodb-org-7.0.repo +[mongodb-org-7.0] name=MongoDB Repository -baseurl=https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.4/x86_64/ +baseurl=https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/7.0/x86_64/ gpgcheck=1 enabled=1 -gpgkey=https://www.mongodb.org/static/pgp/server-4.4.asc +gpgkey=https://www.mongodb.org/static/pgp/server-7.0.asc EOF -cat << "EOF" >> timescale_timescaledb.repo +cat << "EOF" > timescale_timescaledb.repo [timescale_timescaledb] name=timescale_timescaledb baseurl=https://packagecloud.io/timescale/timescaledb/el/$releasever/$basearch @@ -55,7 +55,6 @@ enabled=1 gpgkey=https://packagecloud.io/timescale/timescaledb/gpgkey sslverify=1 sslcacert=/etc/pki/tls/certs/ca-bundle.crt -metadata_expire=300 EOF cat << EOF > grafana.repo @@ -68,54 +67,49 @@ gpgcheck=1 gpgkey=https://rpm.grafana.com/gpg.key sslverify=1 sslcacert=/etc/pki/tls/certs/ca-bundle.crt +exclude=*beta* EOF -cat << EOF > remi-safe.repo -[remi-safe] -name=Safe Remis RPM repository for Enterprise Linux 7 - $basearch -mirrorlist=http://cdn.remirepo.net/enterprise/7/safe/mirror -enabled=1 -gpgcheck=1 -gpgkey=https://rpms.remirepo.net/RPM-GPG-KEY-remi -EOF - -cat << EOF > influxdb.repo +cat << "EOF" > influxdb.repo [influxdb] -name = InfluxData Repository - Stable -baseurl = https://repos.influxdata.com/stable/\$basearch/main +name = InfluxDB Repository - RHEL +baseurl = https://repos.influxdata.com/rhel/$releasever/$basearch/stable/ enabled = 1 gpgcheck = 1 -gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key +gpgkey = https://repos.influxdata.com/influxdb.key EOF %install install -Dm 644 nmsprime-os.repo %{buildroot}%{_sysconfdir}/yum.repos.d/nmsprime-os.repo install -Dm 644 nmsprime-prime.repo %{buildroot}%{_sysconfdir}/yum.repos.d/nmsprime-prime.repo -install -Dm 644 mongodb-org-4.4.repo %{buildroot}%{_sysconfdir}/yum.repos.d/mongodb-org-4.4.repo +install -Dm 644 mongodb-org-7.0.repo %{buildroot}%{_sysconfdir}/yum.repos.d/mongodb-org-7.0.repo install -Dm 644 timescale_timescaledb.repo %{buildroot}%{_sysconfdir}/yum.repos.d/timescale_timescaledb.repo install -Dm 644 grafana.repo %{buildroot}%{_sysconfdir}/yum.repos.d/grafana.repo -install -Dm 644 remi-safe.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-safe.repo install -Dm 644 influxdb.repo %{buildroot}%{_sysconfdir}/yum.repos.d/influxdb.repo -install -Dm 644 ./etc/yum.repos.d/pgdg-redhat-all.repo %{buildroot}%{_sysconfdir}/yum.repos.d/pgdg-redhat-all.repo -install -Dm 644 ./etc/yum.repos.d/ICINGA-release.repo %{buildroot}%{_sysconfdir}/yum.repos.d/ICINGA-release.repo -install -Dm 644 ./etc/pki/rpm-gpg/RPM-GPG-KEY-ICINGA %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ICINGA -install -Dm 644 ./etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-PGDG - -rm nmsprime-os.repo -rm nmsprime-prime.repo -rm mongodb-org-4.4.repo -rm timescale_timescaledb.repo -rm grafana.repo -rm remi-safe.repo -rm influxdb.repo -rm -rf ./etc -rm -rf ./usr +install -dm755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg +mv etc/pki/rpm-gpg/* %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ +install -dm755 %{buildroot}%{_sysconfdir}/yum.repos.d +mv etc/yum.repos.d/* %{buildroot}%{_sysconfdir}/yum.repos.d/ %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/* %changelog +* Wed Aug 07 2024 Ole Ernst - 4.0.0-3 +- adjust baseurl for rocky9 release + +* Thu Mar 07 2024 Ole Ernst - 4.0.0-2 +- Reintroduce remi repo for php-8.2 support +- Update PostgreSQL repository +- Update MongoDB repository +- Remove alma-devel repo, since we can get freeradius-postgresql from CRB + +* Fri Nov 10 2023 Ole Ernst - 4.0.0-1 +- Add alma-devel repo used for freeradius-postgresql +- Add influxdb repo used for telegraf +- Remove unneeded remi repo, since native php is used from now on + * Mon Apr 24 2023 Christian Schramm - 3.2.0-1 - Add Telegraf repositories - Update Grafana repo urls diff --git a/SPECS/nodejs-axios-nmsprime.spec b/SPECS/nodejs-axios-nmsprime.spec new file mode 100644 index 0000000..08e9912 --- /dev/null +++ b/SPECS/nodejs-axios-nmsprime.spec @@ -0,0 +1,26 @@ +Name: nodejs-axios-nmsprime +Version: 1.6.8 +Release: 1 +Summary: Promise based HTTP client for the browser and node.js +Group: Applications/Communications +License: MIT +BuildArch: noarch +URL: https://github.com/axios/axios + +BuildRequires: npm +Requires: nodejs + +%description +Promise based HTTP client for the browser and node.js + +%install +CACHE_DIR=$(mktemp -d) +npm install axios --cache "$CACHE_DIR" --loglevel warn --global true --prefix %{buildroot} +rm -rf "$CACHE_DIR" + +%files +/lib/node_modules/axios/* + +%changelog +* Wed Apr 24 2024 Ole Ernst - 1.6.8-1 +- Initial RPM release diff --git a/SPECS/php-sourceguardian-loader.spec b/SPECS/php-sourceguardian-loader.spec index 8665a9a..20702a2 100644 --- a/SPECS/php-sourceguardian-loader.spec +++ b/SPECS/php-sourceguardian-loader.spec @@ -1,9 +1,9 @@ +%global debug_package %{nil} + Name: php-sourceguardian-loader -Version: 12.1.1 -Release: 2 +Version: 15.0.0 +Release: 1 Summary: The SourceGuardian Loader -Conflicts: php-ioncube-loader -Obsoletes: php-ioncube-loader <= 10.4.5 Group: Applications/Communications License: proprietary @@ -21,20 +21,26 @@ SourceGuardian loader to be installed on the server and made available to PHP. mv "SourceGuardian Loader License.pdf" LICENSE.pdf cat << EOF > 01-sourceguardian_loader.ini ; Enable sourceguardian_loader extension module -zend_extension = ixed.8.0.lin +zend_extension = ixed.8.3.lin EOF %install -install -Dm644 01-sourceguardian_loader.ini %{buildroot}%{_sysconfdir}/opt/remi/php80/php.d/01-sourceguardian_loader.ini -install -Dm755 ixed.8.0.lin %{buildroot}/opt/remi/php80/root/usr/lib64/php/modules/ixed.8.0.lin +install -Dm644 01-sourceguardian_loader.ini %{buildroot}%{_sysconfdir}/php.d/01-sourceguardian_loader.ini +install -Dm755 ixed.8.3.lin %{buildroot}/usr/lib64/php/modules/ixed.8.3.lin %files %doc README %license LICENSE.pdf -%config(noreplace) %{_sysconfdir}/opt/remi/php80/php.d/01-sourceguardian_loader.ini -/opt/remi/php80/root/usr/lib64/php/modules/ixed.8.0.lin +%config(noreplace) %{_sysconfdir}/php.d/01-sourceguardian_loader.ini +/usr/lib64/php/modules/ixed.8.3.lin %changelog +* Wed May 08 2024 Ole Ernst - 15.0.0-1 +- Upgrade php-sourceguardian-loader for PHP8.3 + +* Fri Nov 11 2022 Ole Ernst - 12.1.1-3 +- Use native php version for Almalinux 9 + * Thu Jan 06 2022 Nino Ryschawy - 12.1.1-2 - Fix: Restart PHP8 after changing ini diff --git a/SPECS/prometheus.spec b/SPECS/prometheus.spec index 82f852d..e8894fd 100644 --- a/SPECS/prometheus.spec +++ b/SPECS/prometheus.spec @@ -1,5 +1,5 @@ Name: prometheus -Version: 2.36.2 +Version: 2.54.1 Release: 1 Summary: A monitoring system and time series database @@ -7,7 +7,6 @@ Group: Applications/Communications License: ASL 2.0 URL: https://prometheus.io Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.linux-amd64.tar.gz -Requires: promscale promscale-extension-postgresql-13 %description Prometheus, a Cloud Native Computing Foundation project, is a systems and @@ -43,31 +42,12 @@ scrape_configs: tls_config: insecure_skip_verify: true -remote_write: - - url: "http://localhost:9201/write" -remote_read: - - url: "http://localhost:9201/read" - read_recent: true - -rule_files: - - 'prometheus_rules.yml' - alerting: alertmanagers: - static_configs: - targets: ['localhost:9093'] EOF -cat << EOF > %{name}_rules.yml -groups: -- name: CM - rules: - - alert: HighUsSNR - expr: snmp_us_pwr > 370 - labels: - severity: critical -EOF - cat << EOF > %{name}.service [Unit] Description=Prometheus Time Series Collection and Processing Server @@ -90,7 +70,6 @@ EOF %install install -Dm644 %{name}.yml %{buildroot}%{_sysconfdir}/%{name}/%{name}.yml -install -Dm644 %{name}_rules.yml %{buildroot}%{_sysconfdir}/%{name}/%{name}_rules.yml install -Dm644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service cd %{name}-%{version}.linux-amd64 install -Dm755 %{name} %{buildroot}%{_bindir}/%{name} @@ -106,10 +85,13 @@ useradd -c "Prometheus dedicated user" -u 210 -g %{name} -s /bin/false -r %{name %{_bindir}/%{name} %{_bindir}/promtool %config(noreplace) %{_sysconfdir}/%{name}/%{name}.yml -%config(noreplace)%{_sysconfdir}/%{name}/%{name}_rules.yml %{_unitdir}/%{name}.service %attr(0755,prometheus,prometheus) %dir %{_sharedstatedir}/%{name} %changelog +* Tue Oct 15 2024 Ole Ernst - 2.54.1-1 +- Update to v2.54.1 +- Remove remote_{read,write} since promscale is deprecated + * Fri Jun 24 2022 Ole Ernst - 2.36.2-1 - Initial RPM release diff --git a/SPECS/time-nmsprime.spec b/SPECS/time-nmsprime.spec new file mode 100644 index 0000000..ff24ac8 --- /dev/null +++ b/SPECS/time-nmsprime.spec @@ -0,0 +1,47 @@ +Name: time-nmsprime +Version: 0.0.1 +Release: 1 +Summary: Time Protocol written in Rust + +Group: Applications/Communications +License: Custom +URL: https://github.com/nmsprime/%{name} + +BuildRequires: cargo git rust + +%description +%{summary} + +%prep +git clone git@github.com:nmsprime/%{name}.git + +%build +cd %{name} +cargo rustc --release + +cat << EOF > %{name}.service +[Unit] +Description=%{summary} +After=network.target + +[Service] +ExecStart=/usr/bin/%{name} +Restart=always + +[Install] +WantedBy=default.target +EOF + + +%install +cd %{name} +install -Dm755 target/release/%{name} %{buildroot}%{_bindir}/%{name} +install -Dm644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service + +%files +%{_bindir}/%{name} +%{_unitdir}/%{name}.service + +%changelog +* Fri Nov 04 2022 Ole Ernst - 0.0.1-1 +- Initial RPM release diff --git a/SPECS/uthash-devel.spec b/SPECS/uthash-devel.spec new file mode 100644 index 0000000..116933b --- /dev/null +++ b/SPECS/uthash-devel.spec @@ -0,0 +1,27 @@ +Name: uthash-devel +Version: 2.3.0 +Release: 1 +Summary: C preprocessor implementations of a hash table and a linked list + +Group: Applications/Communications +License: BSD +BuildArch: noarch +URL: https://troydhanson.github.io/uthash +Source: https://github.com/troydhanson/uthash/archive/v%{version}.tar.gz + +%description +C preprocessor implementations of a hash table and a linked list + +%prep +%autosetup -n uthash-%{version} + +%install +install -dm755 %{buildroot}%{_includedir} +cp src/*.h %{buildroot}%{_includedir} + +%files +%{_includedir}/*.h + +%changelog +* Mon Nov 14 2022 Ole Ernst - 2.3.0-1 +- Initial RPM release diff --git a/SPECS/voipmonitor.spec b/SPECS/voipmonitor.spec index e1d3fa1..3e5502a 100644 --- a/SPECS/voipmonitor.spec +++ b/SPECS/voipmonitor.spec @@ -1,19 +1,15 @@ Name: voipmonitor -Version: 2024.01 +Version: 2024.08.1 Release: 1 Summary: A live network packet sniffer which analyze SIP and RTP protocol Group: Applications/Communications License: GPLv2 -URL: https://www.voipmonitor.org -Source: https://github.com/%{name}/sniffer/archive/a6df0dd.tar.gz +URL: https://www.%{name}.org +Source0: https://sourceforge.net/projects/%{name}/files/2024.08/%{name}-amd64-%{version}-static.tar.gz +Source1: https://raw.githubusercontent.com/%{name}/sniffer/c899707257d547351b068bcdede55af343af9c0e/config/systemd/%{name}.service -BuildRequires: curl-devel, json-c-devel, fftw-devel, gnutls-devel, libogg-devel -BuildRequires: libpcap-devel, libgcrypt-devel, libpng-devel, libssh-devel -BuildRequires: libxml2-devel, libvorbis-devel, lzo-devel, mariadb-devel -BuildRequires: rrdtool-devel, snappy-devel, unixODBC-devel, zlib-devel -BuildRequires: libicu-devel, libzstd-devel, lz4-devel -Requires: curl, json-c, mariadb-server, rrdtool, snappy, unixODBC, libzstd +Requires: curl, json-c, mariadb-server, rrdtool, snappy, unixODBC %description VoIPmonitor is open source live network packet sniffer which analyze SIP @@ -28,18 +24,12 @@ BYE or OK was not seen. To accuratly transform latency to loss packets, voipmonitor simulates fixed and adaptive jitterbuffer. %prep -%autosetup -n sniffer-a6df0dd4ae19cde999dfcfbe5ec18fdce12f1826 -sed -i 's/-ge 34/-ge 27/' configure.in - -%build -autoreconf -vfi -%configure -make %{?_smp_mflags} +%autosetup -n %{name}-amd64-%{version}-static %install -install -Dm755 %{name} %{buildroot}%{_bindir}/%{name} -install -Dm644 config/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf -install -Dm644 config/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service +install -Dm755 usr/local/sbin/%{name} %{buildroot}%{_bindir}/%{name} +install -Dm644 etc/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf +install -Dm644 %{_sourcedir}/%{name}.service %{buildroot}%{_unitdir}/%{name}.service install -d %{buildroot}%{_localstatedir}/spool/%{name} %files @@ -49,7 +39,11 @@ install -d %{buildroot}%{_localstatedir}/spool/%{name} %dir %{_localstatedir}/spool/%{name} %changelog +* Wed Aug 07 2024 Ole Ernst - 2024.08.1-1 +- Update 2024.08.01 + * Thu Jan 04 2024 Ole Ernst - 2024.01-1 - Update 2024.01 + * Mon Jun 13 2016 Ole Ernst - 16.0.2-1 - Initial RPM release