* Update geomyidae to latest changes

* Fix service file

	modified:   geomyidae-git/.SRCINFO
	modified:   geomyidae-git/PKGBUILD
	new file:   geomyidae-git/geomyidae-libressl.patch
	modified:   geomyidae-git/service

4 files changed, 37 insertions, 13 deletions

diff --git a/geomyidae-git/.SRCINFO b/geomyidae-git/.SRCINFO
index e5a3a13..4fa1606 100644
--- a/geomyidae-git/.SRCINFO
+++ b/geomyidae-git/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = geomyidae-git
 	pkgdesc = A gopher server daemon
-	pkgver = 0.238.6fcf2a6
+	pkgver = 0.293.1c649c8
 	pkgrel = 1
 	url = http://r-36.net/scm/geomyidae
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
+	depends = libressl
 	provides = geomyidae
 	conflicts = geomyidae
 	backup = etc/conf.d/geomyidae
@@ -16,12 +17,14 @@ pkgbase = geomyidae-git
 	source = sysusers
 	source = geomyidae-chroot.patch
 	source = geomyidae-journald.patch
+	source = geomyidae-libressl.patch
 	sha256sums = SKIP
-	sha256sums = 2e26b4fce0590d68b27c0d70b7d5302ac4c14f9888d52020efc372bc327d6f6b
+	sha256sums = 484c45b6fd6534e959d7d1786ebada94f96e772060702cb3002dc7664fc33f91
 	sha256sums = d8a791643036d8cfccd7ffd64df7a99f2da5a3b3306d32b59a625c0285c1b9a1
 	sha256sums = 816de9b6211254663c0e2bbce039f869b1efc4b8fdce8bd4fdb676e8a722cce4
 	sha256sums = 813ca5000327453e91259119805474e78d0d31e81404a823cf47171cca1cb76f
 	sha256sums = caa4378e7b64790d0eeb77682749e81684124065bac826f4b0905c7905bcded5
+	sha256sums = 19605684acf29fd058663850b15ae81da82a950e238448cb99cf0a1ac0c11d30
 
 pkgname = geomyidae-git
 
diff --git a/geomyidae-git/PKGBUILD b/geomyidae-git/PKGBUILD
index 3064e37..6e043b9 100644
--- a/geomyidae-git/PKGBUILD
+++ b/geomyidae-git/PKGBUILD
@@ -4,28 +4,31 @@
 
 _pkgname=geomyidae
 pkgname=${_pkgname}-git
-pkgver=0.242.4f4128c
+pkgver=0.293.1c649c8
 pkgrel=1
 pkgdesc="A gopher server daemon"
 arch=('i686' 'x86_64')
 url="http://r-36.net/scm/geomyidae"
 license=('MIT')
+depends=('libressl')
 makedepends=('git')
 conflicts=('geomyidae')
 provides=('geomyidae')
 backup=("etc/conf.d/${_pkgname}")
 source=("git://r-36.net/${_pkgname}"
         'service'
-	'confd'
+        'confd'
         'sysusers'
         'geomyidae-chroot.patch'
-	'geomyidae-journald.patch')
+        'geomyidae-journald.patch'
+        'geomyidae-libressl.patch')
 sha256sums=('SKIP'
-            '2e26b4fce0590d68b27c0d70b7d5302ac4c14f9888d52020efc372bc327d6f6b'
+            '484c45b6fd6534e959d7d1786ebada94f96e772060702cb3002dc7664fc33f91'
             'd8a791643036d8cfccd7ffd64df7a99f2da5a3b3306d32b59a625c0285c1b9a1'
             '816de9b6211254663c0e2bbce039f869b1efc4b8fdce8bd4fdb676e8a722cce4'
             '813ca5000327453e91259119805474e78d0d31e81404a823cf47171cca1cb76f'
-            'caa4378e7b64790d0eeb77682749e81684124065bac826f4b0905c7905bcded5')
+            'caa4378e7b64790d0eeb77682749e81684124065bac826f4b0905c7905bcded5'
+            '19605684acf29fd058663850b15ae81da82a950e238448cb99cf0a1ac0c11d30')
 
 pkgver() {
   cd "${_pkgname}"
@@ -35,6 +38,9 @@ pkgver() {
 prepare() {
   cd "${_pkgname}"
 
+  # Fix libressl paths
+  patch -p1 -i ../geomyidae-libressl.patch
+
   # Fix chroot
   patch -p1 -i ../geomyidae-chroot.patch
 
@@ -46,14 +52,14 @@ prepare() {
 
   # Install to /usr
   sed -i 's|/usr/local|/usr|g' Makefile
-  
-  # Use Arch Linux standard CFLAGS
-  sed -i 's|CFLAGS = -O2 -Wall|CFLAGS = $(FLAGS)|g' Makefile
+ 
+  # No /usr/sbin on Arch
+  sed -i 's|BINDIR = ${PREFIX}/sbin|BINDIR = ${PREFIX}/bin|g' Makefile
 }
 
 build() {
   cd "${_pkgname}"
-  make FLAGS="${CFLAGS}"
+  make CFLAGS="${CFLAGS}"
 }
 
 package() {
@@ -74,7 +80,7 @@ package() {
   
   install -dm755 "${pkgdir}/usr/share/doc/${_pkgname}"
 
-  install -m644 README CGI LINKS index.gph \
+  install -m644 README CGI.md LINKS index.gph \
     "${pkgdir}/usr/share/doc/${_pkgname}/"
 
   install -dm755 "${pkgdir}"/usr/share/vim/vimfiles/{ftdetect,syntax}
diff --git a/geomyidae-git/geomyidae-libressl.patch b/geomyidae-git/geomyidae-libressl.patch
new file mode 100644
index 0000000..e40543a
--- /dev/null
+++ b/geomyidae-git/geomyidae-libressl.patch
@@ -0,0 +1,15 @@
+diff -u -r -N geomyidae-orig/Makefile geomyidae-arch-libressl/Makefile
+--- geomyidae-orig/Makefile	2021-03-13 07:54:15.387185713 +0100
++++ geomyidae-arch-libressl/Makefile	2021-03-13 07:55:31.239586207 +0100
+@@ -10,9 +10,9 @@
+ MANDIR = ${PREFIX}/share/man/man8
+ 
+ # Comment to disable TLS support
+-TLS_CFLAGS = -DENABLE_TLS
++TLS_CFLAGS = -DENABLE_TLS -I/usr/include/libressl
+ # libtls is provided using for example LibreSSL.
+-TLS_LDFLAGS = -ltls 
++TLS_LDFLAGS = -L/usr/lib/libressl -Wl,-rpath=/usr/lib/libressl -ltls 
+ 
+ GEOM_CFLAGS = -D_DEFAULT_SOURCE -I. -I/usr/include ${TLS_CFLAGS} ${CFLAGS}
+ GEOM_LDFLAGS = -L/usr/lib -L. ${TLS_LDFLAGS} ${LDFLAGS}
diff --git a/geomyidae-git/service b/geomyidae-git/service
index 41da8eb..66f7a29 100644
--- a/geomyidae-git/service
+++ b/geomyidae-git/service
@@ -11,7 +11,7 @@ ProtectHome=true
 MemoryDenyWriteExecute=true
 SystemCallArchitectures=native
 NoNewPrivileges=true
-StandardOutput=syslog
+StandardOutput=journal
 SyslogIdentifier=geomyidae
 EnvironmentFile=-/etc/conf.d/geomyidae
 ExecStart=/usr/bin/geomyidae -c -l stdout -u geomyidae -g geomyidae $GEOMYIDAE_ARGS