Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2025-03-12 15:20:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.19136 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Wed Mar 12 15:20:21 2025 rev:136 rq:1252160 version:4.16.0+git45.646a41d1
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2025-01-29 16:09:42.929815588 +0100
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.19136/resource-agents.changes
2025-03-12 15:20:35.973540550 +0100
@@ -1,0 +2,14 @@
+Tue Mar 11 15:24:39 UTC 2025 - Peter Varkoly <[email protected]>
+
+- Adapt drop-deprecated-agents.patch according (jsc#PED-8737)
+
+-------------------------------------------------------------------
+Mon Mar 03 16:05:42 UTC 2025 - [email protected]
+
+- Update to version 4.16.0+git45.646a41d1:
+ * portblock: use ocf_log() for logging
+ * simplify iptables version string regex
+ * Update portblock: improve version detection of iptables
+ * ocf-shellfuncs: add missing variable in crm_mon_no_validation()
+
+-------------------------------------------------------------------
Old:
----
resource-agents-4.16.0+git38.da9ef4e2.tar.xz
New:
----
resource-agents-4.16.0+git45.646a41d1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.1UahnI/_old 2025-03-12 15:20:38.325639048 +0100
+++ /var/tmp/diff_new_pack.1UahnI/_new 2025-03-12 15:20:38.349640053 +0100
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 4.16.0+git38.da9ef4e2
+Version: 4.16.0+git45.646a41d1
Release: 0
Summary: HA Reusable Cluster Resource Scripts
License: GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later
@@ -124,6 +124,7 @@
autoreconf -fvi
# because quilt push changed the permissions of sg_persist.
# chmod 775 heartbeat/sg_persist
+export BUILD_AZURE_EVENTS=0
%configure \
--docdir=%{_defaultdocdir}/%{name} \
--with-ras-set=linux-ha \
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.1UahnI/_old 2025-03-12 15:20:38.953665347 +0100
+++ /var/tmp/diff_new_pack.1UahnI/_new 2025-03-12 15:20:39.001667358 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">de51a1705ce761f1fb5f1b2294cfc1153af70c1c</param>
+<param name="changesrevision">8a3328c07d8e8f1cfe34dd37afaa5707dcafce9b</param>
</service>
</servicedata>
(No newline at EOF)
++++++ drop-deprecated-agents.patch ++++++
--- /var/tmp/diff_new_pack.1UahnI/_old 2025-03-12 15:20:39.189675231 +0100
+++ /var/tmp/diff_new_pack.1UahnI/_new 2025-03-12 15:20:39.245677576 +0100
@@ -1,14 +1,14 @@
---- resource-agents/heartbeat/Makefile.am-orig 2024-07-31 09:49:35.561174274
+0200
-+++ resource-agents/heartbeat/Makefile.am 2024-07-31 10:04:17.124253572
+0200
-@@ -50,94 +50,59 @@
+--- resource-agents-4.16.0+git45.646a41d1/heartbeat/Makefile.am
2025-02-25 12:34:45.000000000 +0100
++++ resource-agents/heartbeat/Makefile.am 2025-03-11 16:23:01.351179440
+0100
+@@ -50,94 +50,61 @@
send_ua_SOURCES = send_ua.c IPv6addr_utils.c
send_ua_LDADD = $(LIBNETLIBS)
-ocf_SCRIPTS = AoEtarget \
- AudibleAlarm \
- ClusterMon \
-+ocf_SCRIPTS = ClusterMon \
- CTDB \
+- CTDB \
++ocf_SCRIPTS = CTDB \
Delay \
Dummy \
- EvmsSCC \
@@ -18,7 +18,7 @@
- IPaddr \
IPaddr2 \
IPsrcaddr \
-- LVM \
+ LVM \
- LinuxSCSI \
lvmlockd \
LVM-activate \
@@ -61,6 +61,7 @@
db2 \
dhcpd \
- dnsupdate \
++ dnsupdate \
dummypy \
docker \
docker-compose \
@@ -90,13 +91,14 @@
mariadb \
mdraid \
- minio \
++ mpathpersist \
mysql \
mysql-proxy \
- nagios \
named \
nfsnotify \
nfsserver \
-@@ -145,11 +110,6 @@
+@@ -145,11 +112,6 @@
nvmet-subsystem \
nvmet-namespace \
nvmet-port \
@@ -108,7 +110,7 @@
oraasm \
oracle \
oralsnr \
-@@ -157,34 +117,20 @@
+@@ -157,38 +119,21 @@
ovsmonitor \
pgagent \
pgsql \
@@ -127,12 +129,12 @@
- scsi2reservation \
sfex \
sg_persist \
- mpathpersist \
- slapd \
+- mpathpersist \
+- slapd \
- smb-share \
storage-mon \
- sybaseASE \
- symlink \
+- symlink \
- syslog-ng \
- tomcat \
- varnish \
@@ -140,8 +142,15 @@
- vmware \
- vsftpd \
- zabbixserver
-+ tomcat
++ symlink
- if BUILD_AZURE_EVENTS
- ocf_SCRIPTS += azure-events
+-if BUILD_AZURE_EVENTS
+-ocf_SCRIPTS += azure-events
+-endif
++#if BUILD_AZURE_EVENTS
++#ocf_SCRIPTS += azure-events
++#endif
+
+ if BUILD_AZURE_EVENTS_AZ
+ ocf_SCRIPTS += azure-events-az
++++++ resource-agents-4.16.0+git38.da9ef4e2.tar.xz ->
resource-agents-4.16.0+git45.646a41d1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.16.0+git38.da9ef4e2/heartbeat/ocf-shellfuncs.in
new/resource-agents-4.16.0+git45.646a41d1/heartbeat/ocf-shellfuncs.in
--- old/resource-agents-4.16.0+git38.da9ef4e2/heartbeat/ocf-shellfuncs.in
2025-01-28 09:10:22.000000000 +0100
+++ new/resource-agents-4.16.0+git45.646a41d1/heartbeat/ocf-shellfuncs.in
2025-02-25 12:34:45.000000000 +0100
@@ -741,6 +741,7 @@
{
# The subshell prevents parsing error with incompatible shells
ocf_version_cmp "$OCF_RESKEY_crm_feature_set" "3.19.7"
+ res=$?
if [ $res -eq 2 ] || [ $res -eq 1 ]; then
"$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q) \
${HA_SBIN_DIR}/crm_mon \$*" -- $*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.16.0+git38.da9ef4e2/heartbeat/portblock
new/resource-agents-4.16.0+git45.646a41d1/heartbeat/portblock
--- old/resource-agents-4.16.0+git38.da9ef4e2/heartbeat/portblock
2025-01-28 09:10:22.000000000 +0100
+++ new/resource-agents-4.16.0+git45.646a41d1/heartbeat/portblock
2025-02-25 12:34:45.000000000 +0100
@@ -359,17 +359,17 @@
SayActive()
{
- echo "$CMD DROP rule [$*] is running (OK)"
+ ocf_log debug "$CMD DROP rule [$*] is running (OK)"
}
SayConsideredActive()
{
- echo "$CMD DROP rule [$*] considered to be running (OK)"
+ ocf_log debug "$CMD DROP rule [$*] considered to be running (OK)"
}
SayInactive()
{
- echo "$CMD DROP rule [$*] is inactive"
+ ocf_log debug "$CMD DROP rule [$*] is inactive"
}
#IptablesStatus {udp|tcp} portno,portno ip {in|out|both} {block|unblock}
@@ -430,7 +430,7 @@
op=$1 proto=$2 ports=$3 ip=$4 chain=$5
active=0; chain_isactive "$proto" "$ports" "$ip" "$chain" && active=1
want_active=0; [ "$op" = "-I" ] && want_active=1
- echo "active: $active want_active: $want_active"
+ ocf_log debug "active: $active want_active: $want_active"
if [ $active -eq $want_active ] ; then
: Chain already in desired state
else
@@ -618,7 +618,7 @@
fi
# iptables v1.4.20+ is required to use -w (wait)
-version=$(iptables -V | awk -F ' v' '{print $NF}')
+version=$(iptables -V | grep -oE '[0-9]+[\.0-9]+')
ocf_version_cmp "$version" "1.4.19.1"
if [ "$?" -eq "2" ]; then
wait="-w"
