[packages/pump] Rel 4

[arekm]

commit af4ab97bc21e2308ed57d81b31bbd3aabbb338dd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Mar 9 18:33:31 2026 +0100

    Rel 4

 pump-c99-true-keyword.patch | 38 ++++++++++++++++++++++++++++++++++++++
 pump-fix-off-by-one.patch   | 11 +++++++++++
 pump.spec                   |  8 +++++++-
 3 files changed, 56 insertions(+), 1 deletion(-)
---
diff --git a/pump.spec b/pump.spec
index 3bbef96..d4ba48b 100644
--- a/pump.spec
+++ b/pump.spec
@@ -6,13 +6,17 @@ Summary(ru.UTF-8):	Клиент bootp и dhcp для автоматическо
 Summary(uk.UTF-8):	Клієнт bootp та dhcp для автоматичного налагодження IP
 Name:		pump
 Version:	0.8.24
-Release:	3
+Release:	4
 License:	MIT
 Group:		Networking/Utilities
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	866fc9f62b8161eb1514a6a06597edc9
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-pl.patch
+# fix 'int true' variable name conflicting with C99/C23 keyword
+Patch2:		%{name}-c99-true-keyword.patch
+# fix off-by-one buffer overflow in hostname null termination
+Patch3:		%{name}-fix-off-by-one.patch
 BuildRequires:	gettext-tools
 BuildRequires:	popt-devel
 Requires:	rc-scripts
@@ -108,6 +112,8 @@ Statyczna biblioteka pump.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
 
 mv -f po/{eu_ES,eu}.po
 mv -f po/{no,nb}.po
diff --git a/pump-c99-true-keyword.patch b/pump-c99-true-keyword.patch
new file mode 100644
index 0000000..757a87b
--- /dev/null
+++ b/pump-c99-true-keyword.patch
@@ -0,0 +1,38 @@
+--- a/dhcp.c
++++ b/dhcp.c
+@@ -1010,7 +1010,7 @@
+ static int createSocket(const char * device) {
+     struct sockaddr_in clientAddr;
+     int s;
+-    int true = 1;
++    int broadcast = 1;
+
+     s = socket(AF_INET, SOCK_DGRAM, 0);
+     if (s < 0)
+@@ -1016,7 +1016,7 @@
+     if (s < 0)
+ 	return -1;
+
+-    if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &true, sizeof(true))) {
++    if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &broadcast, sizeof(broadcast))) {
+ 	close(s);
+ 	return -1;
+     }
+@@ -1259,7 +1259,7 @@
+     struct bootpRequest breq, bresp;
+     char * chptr;
+     time_t startTime = pumpUptime();
+-    int true = 1;
++    int broadcast = 1;
+     int ttl = 16;
+     char * saveDeviceName;
+     unsigned char messageType;
+@@ -1280,7 +1280,7 @@
+ 	return perrorstr("socket");
+     }
+
+-    if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &true, sizeof(true))) {
++    if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &broadcast, sizeof(broadcast))) {
+ 	close(s);
+ 	return perrorstr("setsockopt");
+     }
diff --git a/pump-fix-off-by-one.patch b/pump-fix-off-by-one.patch
new file mode 100644
index 0000000..1c54bf9
--- /dev/null
+++ b/pump-fix-off-by-one.patch
@@ -0,0 +1,11 @@
+--- a/pump.c	2026-03-09 18:29:11.360762220 +0100
++++ b/pump.c	2026-03-09 18:29:11.362552492 +0100
+@@ -598,7 +598,7 @@
+ 		    if (intf[i].set & PUMP_NETINFO_HAS_HOSTNAME)
+ 			strncpy(cmd.u.status.hostname,
+ 			    intf->hostname, sizeof(cmd.u.status.hostname));
+-		    cmd.u.status.hostname[sizeof(cmd.u.status.hostname)] = '\0';
++		    cmd.u.status.hostname[sizeof(cmd.u.status.hostname) - 1] = '\0';
+ 
+ 		    if (intf[i].set & PUMP_NETINFO_HAS_DOMAIN)
+ 			strncpy(cmd.u.status.domain,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pump.git/commitdiff/af4ab97bc21e2308ed57d81b31bbd3aabbb338dd