summaryrefslogtreecommitdiffstats
path: root/source/n
diff options
context:
space:
mode:
Diffstat (limited to 'source/n')
-rw-r--r--source/n/NetworkManager/patches/dhcpcd.graceful.exit.patch (renamed from source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch)28
-rwxr-xr-xsource/n/netatalk/netatalk.SlackBuild2
-rwxr-xr-xsource/n/samba/samba.SlackBuild2
3 files changed, 16 insertions, 16 deletions
diff --git a/source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch b/source/n/NetworkManager/patches/dhcpcd.graceful.exit.patch
index ebc4e8424..6abc3e468 100644
--- a/source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch
+++ b/source/n/NetworkManager/patches/dhcpcd.graceful.exit.patch
@@ -1,6 +1,6 @@
---- ./src/core/dhcp/nm-dhcp-client.h.orig 2022-03-06 07:02:58.000000000 -0600
-+++ ./src/core/dhcp/nm-dhcp-client.h 2022-03-09 15:07:05.974017045 -0600
-@@ -260,7 +260,7 @@
+--- ./src/core/dhcp/nm-dhcp-client.h.orig 2024-02-22 00:44:13.335158315 -0600
++++ ./src/core/dhcp/nm-dhcp-client.h 2024-02-22 19:41:56.134066083 -0600
+@@ -249,7 +249,7 @@
/* Backend helpers for subclasses */
void nm_dhcp_client_stop_existing(const char *pid_file, const char *binary_name);
@@ -9,8 +9,8 @@
void nm_dhcp_client_start_timeout(NMDhcpClient *self);
---- ./src/core/dhcp/nm-dhcp-dhcpcd.c.orig 2022-02-23 09:40:42.000000000 -0600
-+++ ./src/core/dhcp/nm-dhcp-dhcpcd.c 2022-03-09 15:07:05.974017045 -0600
+--- ./src/core/dhcp/nm-dhcp-dhcpcd.c.orig 2024-02-22 19:41:56.134066083 -0600
++++ ./src/core/dhcp/nm-dhcp-dhcpcd.c 2024-02-22 19:47:18.556073296 -0600
@@ -158,31 +158,17 @@
{
NMDhcpDhcpcd *self = NM_DHCP_DHCPCD(client);
@@ -32,7 +32,7 @@
- */
- if (kill(pid, sig) == -1) {
- errsv = errno;
-- _LOGE("failed to kill dhcpcd %d:%s", errsv, strerror(errsv));
+- _LOGE("failed to kill dhcpcd %d:%s", errsv, nm_strerror_native(errsv));
- }
-
- /* When this function exits NM expects the PID to be -1.
@@ -47,20 +47,20 @@
}
}
---- ./src/core/dhcp/nm-dhcp-dhclient.c.orig 2022-02-23 09:40:42.000000000 -0600
-+++ ./src/core/dhcp/nm-dhcp-dhclient.c 2022-03-09 15:07:05.974017045 -0600
-@@ -617,7 +617,7 @@
+--- ./src/core/dhcp/nm-dhcp-dhclient.c.orig 2024-02-22 00:44:13.335158315 -0600
++++ ./src/core/dhcp/nm-dhcp-dhclient.c 2024-02-22 19:41:56.134066083 -0600
+@@ -622,7 +622,7 @@
- if (dhclient_start(client, NULL, TRUE, &rpid, NULL)) {
+ if (dhclient_start(client, FALSE, TRUE, FALSE, &rpid, NULL)) {
/* Wait a few seconds for the release to happen */
- nm_dhcp_client_stop_pid(rpid, nm_dhcp_client_get_iface(client));
+ nm_dhcp_client_stop_pid(rpid, nm_dhcp_client_get_iface(client), SIGTERM);
}
}
}
---- ./src/core/dhcp/nm-dhcp-client.c.orig 2022-03-06 07:02:58.000000000 -0600
-+++ ./src/core/dhcp/nm-dhcp-client.c 2022-03-09 15:08:51.964019416 -0600
-@@ -204,14 +204,14 @@
+--- ./src/core/dhcp/nm-dhcp-client.c.orig 2024-02-22 00:44:13.334158313 -0600
++++ ./src/core/dhcp/nm-dhcp-client.c 2024-02-22 19:41:56.134066083 -0600
+@@ -367,14 +367,14 @@
}
void
@@ -77,7 +77,7 @@
LOGD_DHCP,
name ?: "dhcp-client",
NULL,
-@@ -232,7 +232,7 @@
+@@ -395,7 +395,7 @@
if (priv->pid > 0) {
/* Clean up the watch handler since we're explicitly killing the daemon */
watch_cleanup(self);
diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild
index 701482288..acb26fe93 100755
--- a/source/n/netatalk/netatalk.SlackBuild
+++ b/source/n/netatalk/netatalk.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=netatalk
VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index 7eed0b774..099c1079f 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=samba
VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# This option may be set to "heimdal" or "mit".
# Upstream considers the use of MIT Kerberos for provisioning an AD DC