Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ovpn-dco for openSUSE:Factory
checked in at 2025-06-02 21:59:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ovpn-dco (Old)
and /work/SRC/openSUSE:Factory/.ovpn-dco.new.16005 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovpn-dco"
Mon Jun 2 21:59:25 2025 rev:5 rq:1281070 version:0.2.20241216~git0.a08b2fd
Changes:
--------
--- /work/SRC/openSUSE:Factory/ovpn-dco/ovpn-dco.changes 2025-03-21
20:21:38.288802668 +0100
+++ /work/SRC/openSUSE:Factory/.ovpn-dco.new.16005/ovpn-dco.changes
2025-06-02 21:59:44.247172924 +0200
@@ -1,0 +2,7 @@
+Wed May 28 16:20:41 UTC 2025 - Jiri Slaby <jsl...@suse.cz>
+
+- add patches for 6.15
+ * use-new-timer-api.patch
+ * 6.15-newlink-proto.patch
+
+-------------------------------------------------------------------
New:
----
6.15-newlink-proto.patch
use-new-timer-api.patch
BETA DEBUG BEGIN:
New: * use-new-timer-api.patch
* 6.15-newlink-proto.patch
New:- add patches for 6.15
* use-new-timer-api.patch
* 6.15-newlink-proto.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ovpn-dco.spec ++++++
--- /var/tmp/diff_new_pack.h5CvsZ/_old 2025-06-02 21:59:44.943201790 +0200
+++ /var/tmp/diff_new_pack.h5CvsZ/_new 2025-06-02 21:59:44.947201956 +0200
@@ -25,6 +25,8 @@
Source: ovpn-dco-%{version}.tar.gz
Source1: ovpn-dco-preamble
Patch0: do-not-redefine-symbols-when-they-are-upstream.patch
+Patch1: use-new-timer-api.patch
+Patch2: 6.15-newlink-proto.patch
BuildRequires: %kernel_module_package_buildreqs
# Releases prior to 15.2 don't have a new enough kernel
++++++ 6.15-newlink-proto.patch ++++++
---
drivers/net/ovpn-dco/main.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/drivers/net/ovpn-dco/main.c
+++ b/drivers/net/ovpn-dco/main.c
@@ -163,10 +163,20 @@ static const struct nla_policy ovpn_poli
__OVPN_MODE_AFTER_LAST - 1),
};
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
+static int ovpn_newlink(struct net_device *dev,
+ struct rtnl_newlink_params *params,
+ struct netlink_ext_ack *extack)
+#else
static int ovpn_newlink(struct net *src_net, struct net_device *dev, struct
nlattr *tb[],
struct nlattr *data[], struct netlink_ext_ack *extack)
+#endif
{
struct ovpn_struct *ovpn = netdev_priv(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
+ struct nlattr **data = params->data;
+#endif
int ret;
ret = security_tun_dev_create();
++++++ use-new-timer-api.patch ++++++
---
drivers/net/ovpn-dco/peer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/net/ovpn-dco/peer.c
+++ b/drivers/net/ovpn-dco/peer.c
@@ -191,8 +191,8 @@ unlock:
static void ovpn_peer_timer_delete_all(struct ovpn_peer *peer)
{
- del_timer_sync(&peer->keepalive_xmit);
- del_timer_sync(&peer->keepalive_recv);
+ timer_delete_sync(&peer->keepalive_xmit);
+ timer_delete_sync(&peer->keepalive_recv);
}
static void ovpn_peer_free(struct ovpn_peer *peer)
@@ -303,7 +303,7 @@ void ovpn_peer_keepalive_set(struct ovpn
delta = msecs_to_jiffies(interval * MSEC_PER_SEC);
mod_timer(&peer->keepalive_xmit, jiffies + delta);
} else {
- del_timer(&peer->keepalive_xmit);
+ timer_delete(&peer->keepalive_xmit);
}
peer->keepalive_timeout = timeout;
@@ -311,7 +311,7 @@ void ovpn_peer_keepalive_set(struct ovpn
delta = msecs_to_jiffies(timeout * MSEC_PER_SEC);
mod_timer(&peer->keepalive_recv, jiffies + delta);
} else {
- del_timer(&peer->keepalive_recv);
+ timer_delete(&peer->keepalive_recv);
}
}
