Add READYCC patch from https://stackoverflow.com/a/62457597delegate

3 files changed, 49 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5057b64..0b8e149 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,22 @@
 pkgbase = delegate
         pkgdesc = Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface
         pkgver = 9.9.13
-        pkgrel = 3
+        pkgrel = 4
         url = http://www.delegate.org/
         install = delegate.install
         arch = x86_64
         license = GPL
+        depends = libnsl
         depends = pam
-        options = !strip
+        optdepends = openssl-1.0: TLS support
+        optdepends = zlib: Zlib support
+        options = strip
         source = ftp://ftp:ps790809%40inbox%2Eru@ftp.delegate.org/pub/DeleGate/delegate9.9.13.tar.gz
         source = ssl3.patch
-        md5sums = b617959aa785b751a6292dad7487c722
-        md5sums = de7ebae5f5ba97509dc26a19e8e0aaf1
+        source = readycc.patch
+        sha384sums = 3118c948643431c9cd232091a23ad6eca05fbe32c42537d3e8178cebce4a4916e51544874c19b509a4f5158d00198932
+        sha384sums = 589f1c9c086340d4e5b3d111b176925951a656007495aed0100d7cd7c5051cfb8800f4283a01cfbb2de6e78baea6472a
+        sha384sums = 6f549bedaa8bb840759ab043aa9e71befd40841b440d3d5ba78a1a3efe3449038064883def995af82508da2c2cbab62c
 
 pkgname = delegate
 
diff --git a/PKGBUILD b/PKGBUILD
index ffc6f85..95f8bd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,30 @@
 # $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Kristóf Marussy <kristof@marussy.com>
 
 pkgname=delegate
 pkgver=9.9.13
-pkgrel=3
+pkgrel=4
 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface"
 arch=('x86_64')
 url="http://www.delegate.org/"
 license=('GPL')
-depends=('pam')
-options=(!strip)
+depends=('libnsl' 'pam')
+optdepends=('openssl-1.0: TLS support' 'zlib: Zlib support')
+options=(strip)
 install=delegate.install
 source=(ftp://ftp:ps790809%40inbox%2Eru@ftp.delegate.org/pub/DeleGate/delegate$pkgver.tar.gz
-        ssl3.patch)
-md5sums=('b617959aa785b751a6292dad7487c722'
-         'de7ebae5f5ba97509dc26a19e8e0aaf1')
+        ssl3.patch
+        readycc.patch)
+sha384sums=('3118c948643431c9cd232091a23ad6eca05fbe32c42537d3e8178cebce4a4916e51544874c19b509a4f5158d00198932'
+            '589f1c9c086340d4e5b3d111b176925951a656007495aed0100d7cd7c5051cfb8800f4283a01cfbb2de6e78baea6472a'
+            '6f549bedaa8bb840759ab043aa9e71befd40841b440d3d5ba78a1a3efe3449038064883def995af82508da2c2cbab62c')
 
 prepare() {
   cd "$srcdir"/$pkgname$pkgver
   patch -p1 <"$srcdir"/ssl3.patch
+  patch -p1 <"$srcdir"/readycc.patch
 }
 
 build() {
diff --git a/readycc.patch b/readycc.patch
new file mode 100644
index 0000000..399c9c0
--- /dev/null
+++ b/readycc.patch
@@ -0,0 +1,29 @@
+diff -r -c1 orig/delegate9.9.13/include/fpoll.h delegate9.9.13/include/fpoll.h
+*** orig/delegate9.9.13/include/fpoll.h Sun May 18 05:11:20 2014
+--- delegate9.9.13/include/fpoll.h      Fri Jun 19 12:16:16 2020
+***************
+*** 7,8 ****
+--- 7,9 ----
+   */
++ #define _LIBIO_H // @2020-0619, @SatoxITS @ITS-more
+  #ifdef __linux__
+diff -r -c1 orig/delegate9.9.13/include/ystring.h delegate9.9.13/include/ystring.h
+*** orig/delegate9.9.13/include/ystring.h       Sun Aug 10 17:29:50 2014
+--- delegate9.9.13/include/ystring.h    Fri Jun 19 12:15:15 2020
+***************
+*** 1502,1503 ****
+--- 1502,1514 ----
+
++ // the shortest patch for comilation of delegate9.9.13 on recent Linuxes
++ // @2020-0619, @SatoxITS, @ITS-more
++ #pragma GCC diagnostic ignored "-Wparentheses"
++ #pragma GCC diagnostic ignored "-Wcomment"
++ #pragma GCC diagnostic ignored "-Wunused-result"
++ #pragma GCC diagnostic ignored "-Wunused-value"
++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++ #pragma GCC diagnostic ignored "-Wformat-extra-args"
++ #pragma GCC diagnostic ignored "-Wnarrowing"
++ #pragma GCC diagnostic ignored "-Wstringop-overflow=" // for Pi
++ 
+  #endif /* _YSTRING_H */
+