Version bump

3 files changed, 53 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9caabf692614..c3d8140e439a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nostromo
 	pkgdesc = A simple, fast, and secure HTTP server
-	pkgver = 1.9.7
+	pkgver = 1.9.8
 	pkgrel = 1
 	url = http://www.nazgul.ch/dev_nostromo.html
 	install = nostromo.install
@@ -12,16 +12,16 @@ pkgbase = nostromo
 	backup = etc/nostromo/conf/nhttpd.conf
 	backup = etc/nostromo/conf/mimes
 	backup = etc/logrotate.d/nostromo
-	source = http://www.nazgul.ch/dev/nostromo-1.9.7.tar.gz
+	source = http://www.nazgul.ch/dev/nostromo-1.9.8.tar.gz
+	source = nostromo.patch
 	source = nostromo.service
 	source = nostromo.logrotate
-	source = nostromo.patch
 	source = nostromo.install
 	source = LICENSE
-	sha256sums = 33c635f317fb441e10d5297bb4218ae0ea62c48f2fc3029c08f5d2167c6cdfca
+	sha256sums = 51e4838344e2151d5e346b15fca4df31d5ca2a7ae8264e3c9668fa4d6d0e8b98
+	sha256sums = 045ca929471a5b8499499e67113160f407ad7fbd09e2e79b99aeaa621193b21f
 	sha256sums = b630392d6501f963a4405b3737d65facb7b60fce28b46edf3dc0e23efce8ab0d
 	sha256sums = 56d3a07205a8d2c6c06851694ffebf2a5a6a64089eb78c13b0e00f9071a1efbc
-	sha256sums = b1b52ac532b46217245dbf79403fcb64e1b62fb0151349e364eb6fb8f67f3731
 	sha256sums = 79501227e4129c6ee54fe9a5572ca79f0122eab812ed868d08ec16284909b53b
 	sha256sums = cd16e1ab175c9ecbaca1a1f0d555930005b120769a1ebad242f4daf17b0b9a47
 
diff --git a/PKGBUILD b/PKGBUILD
index c939b2f3df4c..609c710ef0e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Andrew O'Neill <andrew at meanjollies dot com>
 
 pkgname=nostromo
-pkgver=1.9.7
+pkgver=1.9.8
 pkgrel=1
 pkgdesc='A simple, fast, and secure HTTP server'
 arch=('i686' 'x86_64')
@@ -14,15 +14,15 @@ backup=("etc/${pkgname}/conf/nhttpd.conf"
         "etc/logrotate.d/${pkgname}")
 install=${pkgname}.install
 source=("http://www.nazgul.ch/dev/${pkgname}-${pkgver}.tar.gz"
+        "${pkgname}.patch"
         "${pkgname}.service"
         "${pkgname}.logrotate"
-        "${pkgname}.patch"
         "${pkgname}.install"
         "LICENSE")
-sha256sums=('33c635f317fb441e10d5297bb4218ae0ea62c48f2fc3029c08f5d2167c6cdfca'
+sha256sums=('51e4838344e2151d5e346b15fca4df31d5ca2a7ae8264e3c9668fa4d6d0e8b98'
+            '045ca929471a5b8499499e67113160f407ad7fbd09e2e79b99aeaa621193b21f'
             'b630392d6501f963a4405b3737d65facb7b60fce28b46edf3dc0e23efce8ab0d'
             '56d3a07205a8d2c6c06851694ffebf2a5a6a64089eb78c13b0e00f9071a1efbc'
-            'b1b52ac532b46217245dbf79403fcb64e1b62fb0151349e364eb6fb8f67f3731'
             '79501227e4129c6ee54fe9a5572ca79f0122eab812ed868d08ec16284909b53b'
             'cd16e1ab175c9ecbaca1a1f0d555930005b120769a1ebad242f4daf17b0b9a47')
 
diff --git a/nostromo.patch b/nostromo.patch
index 0fdc45b5962d..b13b2f59f0f1 100644
--- a/nostromo.patch
+++ b/nostromo.patch
@@ -1,14 +1,13 @@
-diff -rupN nostromo-1.9.7/conf/nhttpd.conf-dist nostromo-1.9.7b/conf/nhttpd.conf-dist
---- nostromo-1.9.7/conf/nhttpd.conf-dist	2016-04-12 14:54:16.000000000 -0400
-+++ nostromo-1.9.7b/conf/nhttpd.conf-dist	2019-11-04 12:35:14.872534157 -0500
+diff -rupN nostromo-1.9.8/conf/nhttpd.conf-dist nostromo-1.9.8b/conf/nhttpd.conf-dist
+--- nostromo-1.9.8/conf/nhttpd.conf-dist	2016-04-12 14:54:16.000000000 -0400
++++ nostromo-1.9.8b/conf/nhttpd.conf-dist	2020-07-04 14:29:42.412190995 -0400
 @@ -2,29 +2,31 @@
  
  # MAIN [MANDATORY]
  
 -servername		www.nazgul.ch
--#servername		www.nazgul.ch:8080
 +servername		localhost
-+#servername		localhost:8080
+ #servername		www.nazgul.ch:8080
  serverlisten		*
  #serverlisten		81.221.21.250 127.0.0.1 ::1
  serveradmin		webmaster@nazgul.ch
@@ -56,9 +55,9 @@ diff -rupN nostromo-1.9.7/conf/nhttpd.conf-dist nostromo-1.9.7b/conf/nhttpd.conf
  
  # HOMEDIRS [OPTIONAL]
  
-diff -rupN nostromo-1.9.7/GNUmakefile nostromo-1.9.7b/GNUmakefile
---- nostromo-1.9.7/GNUmakefile	2016-04-12 14:52:41.000000000 -0400
-+++ nostromo-1.9.7b/GNUmakefile	2019-11-04 12:35:14.875867502 -0500
+diff -rupN nostromo-1.9.8/GNUmakefile nostromo-1.9.8b/GNUmakefile
+--- nostromo-1.9.8/GNUmakefile	2016-04-12 14:52:41.000000000 -0400
++++ nostromo-1.9.8b/GNUmakefile	2020-07-04 14:29:42.415524317 -0400
 @@ -5,30 +5,30 @@ all:
  
  install:
@@ -105,9 +104,28 @@ diff -rupN nostromo-1.9.7/GNUmakefile nostromo-1.9.7b/GNUmakefile
  
  clean:
  	cd src; ${MAKE} clean
-diff -rupN nostromo-1.9.7/Makefile nostromo-1.9.7b/Makefile
---- nostromo-1.9.7/Makefile	2016-04-12 14:52:41.000000000 -0400
-+++ nostromo-1.9.7b/Makefile	2019-11-04 12:35:14.875867502 -0500
+diff -rupN nostromo-1.9.8/htdocs/index.html nostromo-1.9.8b/htdocs/index.html
+--- nostromo-1.9.8/htdocs/index.html	2019-10-22 14:59:34.000000000 -0400
++++ nostromo-1.9.8b/htdocs/index.html	2020-07-04 14:30:17.595411784 -0400
+@@ -3,13 +3,13 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <html>
+ <head>
+-  <title>nostromo 1.9.7</title>
++  <title>nostromo 1.9.8</title>
+   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+ </head>
+ <body>
+ 
+ <center>
+-  <h2>nostromo 1.9.7</h2>
++  <h2>nostromo 1.9.8</h2>
+   <p>
+   <u>INTERFACE 2037 READY FOR INQUIRY</u>
+   <p>
+diff -rupN nostromo-1.9.8/Makefile nostromo-1.9.8b/Makefile
+--- nostromo-1.9.8/Makefile	2016-04-12 14:52:41.000000000 -0400
++++ nostromo-1.9.8b/Makefile	2020-07-04 14:29:42.415524317 -0400
 @@ -3,24 +3,24 @@
  SUBDIR+= src
  
@@ -145,9 +163,9 @@ diff -rupN nostromo-1.9.7/Makefile nostromo-1.9.7b/Makefile
 +		$(DESTDIR)/usr/share/nostromo/icons/file.gif
  
  .include <bsd.subdir.mk>
-diff -rupN nostromo-1.9.7/src/nhttpd/main.c nostromo-1.9.7b/src/nhttpd/main.c
---- nostromo-1.9.7/src/nhttpd/main.c	2019-10-22 14:59:34.000000000 -0400
-+++ nostromo-1.9.7b/src/nhttpd/main.c	2019-11-04 12:28:26.981236630 -0500
+diff -rupN nostromo-1.9.8/src/nhttpd/main.c nostromo-1.9.8b/src/nhttpd/main.c
+--- nostromo-1.9.8/src/nhttpd/main.c	2019-10-22 14:59:34.000000000 -0400
++++ nostromo-1.9.8b/src/nhttpd/main.c	2020-07-04 14:29:42.415524317 -0400
 @@ -61,7 +61,7 @@
   * global vars local
   */
@@ -157,9 +175,9 @@ diff -rupN nostromo-1.9.7/src/nhttpd/main.c nostromo-1.9.7b/src/nhttpd/main.c
  
  /*
   * global vars extern
-diff -rupN nostromo-1.9.7/src/nhttpd/Makefile nostromo-1.9.7b/src/nhttpd/Makefile
---- nostromo-1.9.7/src/nhttpd/Makefile	2016-04-12 15:02:06.000000000 -0400
-+++ nostromo-1.9.7b/src/nhttpd/Makefile	2019-11-04 12:35:14.875867502 -0500
+diff -rupN nostromo-1.9.8/src/nhttpd/Makefile nostromo-1.9.8b/src/nhttpd/Makefile
+--- nostromo-1.9.8/src/nhttpd/Makefile	2016-04-12 15:02:06.000000000 -0400
++++ nostromo-1.9.8b/src/nhttpd/Makefile	2020-07-04 14:29:42.415524317 -0400
 @@ -12,7 +12,7 @@ MAN= nhttpd.8
  
  BINOWN=	root
@@ -169,9 +187,9 @@ diff -rupN nostromo-1.9.7/src/nhttpd/Makefile nostromo-1.9.7b/src/nhttpd/Makefil
  
  OS!= uname -s
  
-diff -rupN nostromo-1.9.7/src/nhttpd/nhttpd.8 nostromo-1.9.7b/src/nhttpd/nhttpd.8
---- nostromo-1.9.7/src/nhttpd/nhttpd.8	2016-04-12 16:32:43.000000000 -0400
-+++ nostromo-1.9.7b/src/nhttpd/nhttpd.8	2019-11-04 12:35:14.875867502 -0500
+diff -rupN nostromo-1.9.8/src/nhttpd/nhttpd.8 nostromo-1.9.8b/src/nhttpd/nhttpd.8
+--- nostromo-1.9.8/src/nhttpd/nhttpd.8	2016-04-12 16:32:43.000000000 -0400
++++ nostromo-1.9.8b/src/nhttpd/nhttpd.8	2020-07-04 14:29:42.418857640 -0400
 @@ -85,7 +85,7 @@ Enable IPv6 only.
  Uses
  .Ar configfile
@@ -227,9 +245,9 @@ diff -rupN nostromo-1.9.7/src/nhttpd/nhttpd.8 nostromo-1.9.7b/src/nhttpd/nhttpd.
  http daemon
  .El
  .Sh HISTORY
-diff -rupN nostromo-1.9.7/src/tools/crypt.c nostromo-1.9.7b/src/tools/crypt.c
---- nostromo-1.9.7/src/tools/crypt.c	2016-04-12 15:02:58.000000000 -0400
-+++ nostromo-1.9.7b/src/tools/crypt.c	2019-11-04 12:35:14.875867502 -0500
+diff -rupN nostromo-1.9.8/src/tools/crypt.c nostromo-1.9.8b/src/tools/crypt.c
+--- nostromo-1.9.8/src/tools/crypt.c	2016-04-12 15:02:58.000000000 -0400
++++ nostromo-1.9.8b/src/tools/crypt.c	2020-07-04 14:29:42.418857640 -0400
 @@ -32,7 +32,7 @@
  #include "../libbsd/strlcat.h"
  #endif
@@ -239,9 +257,9 @@ diff -rupN nostromo-1.9.7/src/tools/crypt.c nostromo-1.9.7b/src/tools/crypt.c
  
  /*
   * Prototypes
-diff -rupN nostromo-1.9.7/src/tools/Makefile nostromo-1.9.7b/src/tools/Makefile
---- nostromo-1.9.7/src/tools/Makefile	2016-04-12 15:02:58.000000000 -0400
-+++ nostromo-1.9.7b/src/tools/Makefile	2019-11-04 12:35:14.875867502 -0500
+diff -rupN nostromo-1.9.8/src/tools/Makefile nostromo-1.9.8b/src/tools/Makefile
+--- nostromo-1.9.8/src/tools/Makefile	2016-04-12 15:02:58.000000000 -0400
++++ nostromo-1.9.8b/src/tools/Makefile	2020-07-04 14:29:42.418857640 -0400
 @@ -11,7 +11,7 @@ MAN=
  
  BINOWN=	root