Cleanup of PKGBUILD and patches for pthread

5 files changed, 80 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7d8a1ff73a6..6fd05a082c2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,23 @@
 pkgbase = syncterm
-	pkgdesc = A BBS terminal program, Supports ANSI music and the IBM charset when possible. Will run from a console, under X11 using XLib, or using SDL.
+	pkgdesc = A BBS terminal program, supporting ANSI music and IBM charset.
 	pkgver = 1.1
-	pkgrel = 3
-	epoch = 1
+	pkgrel = 4
 	url = http://syncterm.bbsdev.net
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = unzip
 	depends = ncurses
-	depends = sdl
-	options = !buildflags
-	source = https://phoenixnap.dl.sourceforge.net/project/syncterm/syncterm/syncterm-1.1/syncterm-1.1-src.tgz
+	optdepends = hicolor-icon-theme: for GUI icon support
+	optdepends = sdl2: for SDL GUI support
+	optdepends = libx11: for X11 GUI support
+	source = https://downloads.sourceforge.net/project/syncterm/syncterm/syncterm-1.1/syncterm-1.1-src.tgz
+	source = cl-linux-yield.patch
+	source = cl-makefile.patch
+	source = st_crypt.patch
 	md5sums = f528a1fdbe87a69a52582582d99e4032
+	md5sums = c67ca676bddbbbbefa3fe20cd00ab7e7
+	md5sums = 3471ec7748fc0a9d8be12424be7a8ff5
+	md5sums = 69f59c1a5f71e44beb6e68644d497418
 
 pkgname = syncterm
-
diff --git a/PKGBUILD b/PKGBUILD
index 5b2b57b0e327..2700c7510c46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,40 @@
-# Maintainer chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g'
+# Maintainer: Michael Wawrzyniak <arch ismyusernameat cmstactical nexttothecomma net>
+# Contributor: chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g'
 # Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
 
 pkgname=syncterm
 pkgver=1.1
-pkgrel=3
-epoch=1
-_ver=1.1
-pkgdesc="A BBS terminal program, Supports ANSI music and the IBM charset when possible. Will run from a console, under X11 using XLib, or using SDL."
+pkgrel=4
+pkgdesc="A BBS terminal program, supporting ANSI music and IBM charset."
 url="http://syncterm.bbsdev.net"
 license=('GPL')
-depends=('ncurses' 'sdl')
-options=(!buildflags)
-makedepends=(unzip)
+depends=('ncurses')
+makedepends=('unzip')
+optdepends=('hicolor-icon-theme: for GUI icon support'
+            'sdl2: for SDL GUI support'
+            'libx11: for X11 GUI support')
 arch=('i686' 'x86_64')
-source=("https://phoenixnap.dl.sourceforge.net/project/syncterm/syncterm/syncterm-$_ver/syncterm-$_ver-src.tgz")
-md5sums=('f528a1fdbe87a69a52582582d99e4032')
+source=("https://downloads.sourceforge.net/project/syncterm/syncterm/$pkgname-$pkgver/$pkgname-$pkgver-src.tgz"
+        "cl-linux-yield.patch"
+        "cl-makefile.patch"
+        "st_crypt.patch")
+md5sums=('f528a1fdbe87a69a52582582d99e4032'
+         'c67ca676bddbbbbefa3fe20cd00ab7e7'
+         '3471ec7748fc0a9d8be12424be7a8ff5'
+         '69f59c1a5f71e44beb6e68644d497418')
 
+prepare() {
+	cp "$srcdir/cl-linux-yield.patch" "$pkgname-$pkgver/3rdp/build/cl-linux-yield.patch"
+	patch -Np1 -d "$pkgname-$pkgver" -i "${srcdir}/cl-makefile.patch"
+	patch -Np1 -d "$pkgname-$pkgver" -i "${srcdir}/st_crypt.patch"
+}
 
 build() {
-  cd "$srcdir/syncterm-$_ver"
-  cd "src/syncterm/"
-  make MANPREFIX="$pkgdir/usr/share" SRC_ROOT="$(realpath ..)" PREFIX="/usr" RELEASE=1 || true
+	cd "$pkgname-$pkgver/src/syncterm"
+	make PREFIX="/usr" MANPREFIX="/usr/share" RELEASE=1
 }
 
 package() {
-  cd "$srcdir/syncterm-$_ver"
-  cd "src/syncterm/"
-  make install MANPREFIX="$pkgdir/usr/share" SRC_ROOT="$(realpath ..)" PREFIX="$pkgdir/usr" RELEASE=1
+	cd "$pkgname-$pkgver/src/syncterm"
+	make PREFIX="$pkgdir/usr" MANPREFIX="$pkgdir/usr/share" RELEASE=1 install
 }
-
diff --git a/cl-linux-yield.patch b/cl-linux-yield.patch
new file mode 100644
index 000000000000..5ad87acf65ca
--- /dev/null
+++ b/cl-linux-yield.patch
@@ -0,0 +1,12 @@
+--- kernel/thread.orig	2022-06-01 11:44:29.563747178 -0400
++++ kernel/thread.h	2022-06-01 11:46:19.093752131 -0400
+@@ -3005,7 +3005,8 @@
+   #endif /* Slowaris 5.7 / 7.x or newer */
+ #elif defined( _AIX ) || defined( __Android__ ) || defined( __CYGWIN__ ) || \
+ 	  ( defined( __hpux ) && ( OSVERSION >= 11 ) ) || \
+-	  defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ )
++	  defined( __NetBSD__ ) || defined( __QNX__ ) || \
++	  defined( __UCLIBC__ ) || defined(__linux__)
+   #define THREAD_YIELD()		sched_yield()
+ #elif defined( __XMK__ )
+   /* The XMK underlying scheduling object is the process context, for which
diff --git a/cl-makefile.patch b/cl-makefile.patch
new file mode 100644
index 000000000000..1194f252aaaf
--- /dev/null
+++ b/cl-makefile.patch
@@ -0,0 +1,19 @@
+--- orig/3rdp/build/GNUmakefile	2022-06-01 11:53:12.460437472 -0400
++++ new/3rdp/build/GNUmakefile	2022-06-01 11:54:38.810441375 -0400
+@@ -67,7 +67,7 @@
+ $(CRYPT_IDIR): | $(3RDPODIR)
+ 	$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
+ 
+-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
++$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-linux-yield.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
+ 	@echo Creating $@ ...
+ 	$(QUIET)-rm -rf $(CRYPT_SRC)/*
+ 	$(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
+@@ -112,6 +112,7 @@
+ 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch
+ 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch
+ 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch
++	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-linux-yield.patch
+ ifeq ($(CC),mingw32-gcc)
+ 	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
+ 	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts
diff --git a/st_crypt.patch b/st_crypt.patch
new file mode 100644
index 000000000000..1e366ca9fc4d
--- /dev/null
+++ b/st_crypt.patch
@@ -0,0 +1,11 @@
+--- orig/src/syncterm/st_crypt.h	2022-06-02 13:05:13.210790443 -0400
++++ new/src/syncterm/st_crypt.h	2022-06-02 13:07:18.857457650 -0400
+@@ -4,7 +4,7 @@
+ #define _ST_CRYPT_H_
+ 
+ #ifndef WITHOUT_CRYPTLIB
+-#include <cryptlib.h>
++#include "../../3rdp/src/cl/cryptlib.h"
+ #if CRYPTLIB_VERSION < 3400
+ #if CRYPTLIB_VERSION < 340 || CRYPTLIB_VERSION > 999
+ #define CRYPT_ATTRIBUTE_ERRORMESSAGE	CRYPT_ATTRIBUTE_INT_ERRORMESSAGE