From dcaea1aba9f6c8e657e02311900f017ec29e5198 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Mon, 18 Mar 2024 17:24:00 -0400
Subject: [PATCH] * Mon Mar 18 2024 Jean-Philippe Pialasse <jpp@koozali.org>
 0.88-6.sme - patch to build on el8/SME11

---
 ucspi-tcp-0.88-el8.patch | 69 ++++++++++++++++++++++++++++++++++++++++
 ucspi-tcp.spec           | 12 +++++--
 2 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 ucspi-tcp-0.88-el8.patch

diff --git a/ucspi-tcp-0.88-el8.patch b/ucspi-tcp-0.88-el8.patch
new file mode 100644
index 0000000..ae4438a
--- /dev/null
+++ b/ucspi-tcp-0.88-el8.patch
@@ -0,0 +1,69 @@
+diff -Nur --no-dereference ucspi-tcp-0.88/chkshsgr.c ucspi-tcp-0.88.new/chkshsgr.c
+--- ucspi-tcp-0.88/chkshsgr.c	2000-03-18 10:18:42.000000000 -0500
++++ ucspi-tcp-0.88.new/chkshsgr.c	2024-03-18 16:48:03.509000000 -0400
+@@ -1,8 +1,12 @@
+ #include "exit.h"
++#include <sys/types.h>
++#include <stdlib.h>
++#include <grp.h>
++#include <unistd.h>
+ 
+-main()
++main(int argc, char *argv[])
+ {
+-  short x[4];
++  gid_t x[4];
+ 
+   x[0] = x[1] = 0;
+   if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
+diff -Nur --no-dereference ucspi-tcp-0.88/conf-cc ucspi-tcp-0.88.new/conf-cc
+--- ucspi-tcp-0.88/conf-cc	2000-03-18 10:18:42.000000000 -0500
++++ ucspi-tcp-0.88.new/conf-cc	2024-03-18 16:45:17.896000000 -0400
+@@ -1,3 +1,3 @@
+-gcc -O2
++${CC} ${CFLAGS}
+ 
+ This will be used to compile .c files.
+diff -Nur --no-dereference ucspi-tcp-0.88/conf-ld ucspi-tcp-0.88.new/conf-ld
+--- ucspi-tcp-0.88/conf-ld	2000-03-18 10:18:42.000000000 -0500
++++ ucspi-tcp-0.88.new/conf-ld	2024-03-18 16:45:42.251000000 -0400
+@@ -1,3 +1,3 @@
+-gcc -s
++${CC} ${LDFLAGS}
+ 
+ This will be used to link .o files into an executable.
+diff -Nur --no-dereference ucspi-tcp-0.88/install.c ucspi-tcp-0.88.new/install.c
+--- ucspi-tcp-0.88/install.c	2000-03-18 10:18:42.000000000 -0500
++++ ucspi-tcp-0.88.new/install.c	2024-03-18 17:10:46.118000000 -0400
+@@ -4,6 +4,7 @@
+ #include "open.h"
+ #include "readwrite.h"
+ #include "exit.h"
++#include <sys/stat.h>
+ 
+ extern void hier();
+ 
+diff -Nur --no-dereference ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile
+--- ucspi-tcp-0.88/Makefile	2000-03-18 10:18:42.000000000 -0500
++++ ucspi-tcp-0.88.new/Makefile	2024-03-18 16:43:21.840000000 -0400
+@@ -328,7 +328,7 @@
+ hasshsgr.h: \
+ choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 chkshsgr \
+ warn-shsgr
+-	./chkshsgr || ( cat warn-shsgr; exit 1 )
++	echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )"
+ 	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
+ 
+ haswaitp.h: \
+diff -Nur --no-dereference ucspi-tcp-0.88/x86cpuid.c ucspi-tcp-0.88.new/x86cpuid.c
+--- ucspi-tcp-0.88/x86cpuid.c	2000-03-18 10:18:42.000000000 -0500
++++ ucspi-tcp-0.88.new/x86cpuid.c	2024-03-18 16:51:38.537000000 -0400
+@@ -5,7 +5,7 @@
+   exit(1);
+ }
+ 
+-main()
++int main(int argc, char *argv[])
+ {
+   unsigned long x[4];
+   unsigned long y[4];
diff --git a/ucspi-tcp.spec b/ucspi-tcp.spec
index 148a72a..656f4cf 100644
--- a/ucspi-tcp.spec
+++ b/ucspi-tcp.spec
@@ -5,11 +5,12 @@
 #
 # $Id: ucspi-tcp.spec,v 1.1 2016/02/04 18:12:41 vip-ire Exp $
 #
+%global debug_package %{nil}
 Summary: Command-line tools for building TCP client-server applications.
 %define name ucspi-tcp
 Name: %{name}
 %define version 0.88
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: Daniel J. Bernstein
@@ -17,6 +18,7 @@ Group: Networking/Daemons
 Source: http://cr.yp.to/%{name}/%{name}-%{version}.tar.gz
 URL: http://cr.yp.to/ucspi-tcp.html
 Patch0: %{name}-%{version}.patch.2001020500
+Patch1: %{name}-%{version}-el8.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Provides: ucspi-tcp
 AutoReqProv: no
@@ -52,6 +54,9 @@ Interface, using the TCP protocol. UCSPI tools are available for several
 different networks.
 
 %changelog
+* Mon Mar 18 2024 Jean-Philippe Pialasse <jpp@koozali.org> 0.88-6.sme
+- patch to build on el8/SME11
+
 * Fri Jul 14 2023 BogusDateBot
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
   by assuming the date is correct and changing the weekday.
@@ -85,14 +90,15 @@ different networks.
 # final installed locations.
 
 %patch0 -p1
+%patch1 -p1
 
 # Create the relative installation directory.
 
 mkdir -p ./root/usr
 
 %build
-echo gcc -O2 --include /usr/include/errno.h > conf-cc
-make
+#echo gcc -O2 --include /usr/include/errno.h > conf-cc
+make CC="gcc"  CFLAGS="$RPM_OPT_FLAGS --include /usr/include/errno.h"  LDFLAGS="-s"
 
 %install
 make setup