Version bump

3 files changed, 32 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3d8140e439a..d4719a94115d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = nostromo
 	pkgdesc = A simple, fast, and secure HTTP server
-	pkgver = 1.9.8
+	pkgver = 1.9.9
 	pkgrel = 1
 	url = http://www.nazgul.ch/dev_nostromo.html
 	install = nostromo.install
-	arch = i686
 	arch = x86_64
 	license = custom:ISC
 	makedepends = openssl
@@ -12,14 +11,14 @@ 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.8.tar.gz
+	source = http://www.nazgul.ch/dev/nostromo-1.9.9.tar.gz
 	source = nostromo.patch
 	source = nostromo.service
 	source = nostromo.logrotate
 	source = nostromo.install
 	source = LICENSE
-	sha256sums = 51e4838344e2151d5e346b15fca4df31d5ca2a7ae8264e3c9668fa4d6d0e8b98
-	sha256sums = 045ca929471a5b8499499e67113160f407ad7fbd09e2e79b99aeaa621193b21f
+	sha256sums = 1fad0a28d934835b582cedc98857e12e5adb991b14b87b52b39e6a501f4a9486
+	sha256sums = bdcc6a46ce8f675481db911e0ffbda0ba15ac4fbcee1244d6746b632850b2c2a
 	sha256sums = b630392d6501f963a4405b3737d65facb7b60fce28b46edf3dc0e23efce8ab0d
 	sha256sums = 56d3a07205a8d2c6c06851694ffebf2a5a6a64089eb78c13b0e00f9071a1efbc
 	sha256sums = 79501227e4129c6ee54fe9a5572ca79f0122eab812ed868d08ec16284909b53b
diff --git a/PKGBUILD b/PKGBUILD
index 609c710ef0e8..4b2c69c58309 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Andrew O'Neill <andrew at meanjollies dot com>
 
 pkgname=nostromo
-pkgver=1.9.8
+pkgver=1.9.9
 pkgrel=1
 pkgdesc='A simple, fast, and secure HTTP server'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='http://www.nazgul.ch/dev_nostromo.html'
 license=('custom:ISC')
 depends=('openssl')
@@ -19,8 +19,8 @@ source=("http://www.nazgul.ch/dev/${pkgname}-${pkgver}.tar.gz"
         "${pkgname}.logrotate"
         "${pkgname}.install"
         "LICENSE")
-sha256sums=('51e4838344e2151d5e346b15fca4df31d5ca2a7ae8264e3c9668fa4d6d0e8b98'
-            '045ca929471a5b8499499e67113160f407ad7fbd09e2e79b99aeaa621193b21f'
+sha256sums=('1fad0a28d934835b582cedc98857e12e5adb991b14b87b52b39e6a501f4a9486'
+            'bdcc6a46ce8f675481db911e0ffbda0ba15ac4fbcee1244d6746b632850b2c2a'
             'b630392d6501f963a4405b3737d65facb7b60fce28b46edf3dc0e23efce8ab0d'
             '56d3a07205a8d2c6c06851694ffebf2a5a6a64089eb78c13b0e00f9071a1efbc'
             '79501227e4129c6ee54fe9a5572ca79f0122eab812ed868d08ec16284909b53b'
diff --git a/nostromo.patch b/nostromo.patch
index b13b2f59f0f1..b3dae3df8948 100644
--- a/nostromo.patch
+++ b/nostromo.patch
@@ -1,6 +1,6 @@
-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
+diff -rupN nostromo-1.9.9/conf/nhttpd.conf-dist nostromo-1.9.9b/conf/nhttpd.conf-dist
+--- nostromo-1.9.9/conf/nhttpd.conf-dist	2016-04-12 14:54:16.000000000 -0400
++++ nostromo-1.9.9b/conf/nhttpd.conf-dist	2020-07-12 19:18:50.152212262 -0400
 @@ -2,29 +2,31 @@
  
  # MAIN [MANDATORY]
@@ -55,9 +55,9 @@ diff -rupN nostromo-1.9.8/conf/nhttpd.conf-dist nostromo-1.9.8b/conf/nhttpd.conf
  
  # HOMEDIRS [OPTIONAL]
  
-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
+diff -rupN nostromo-1.9.9/GNUmakefile nostromo-1.9.9b/GNUmakefile
+--- nostromo-1.9.9/GNUmakefile	2016-04-12 14:52:41.000000000 -0400
++++ nostromo-1.9.9b/GNUmakefile	2020-07-12 19:18:50.155545591 -0400
 @@ -5,30 +5,30 @@ all:
  
  install:
@@ -104,28 +104,9 @@ diff -rupN nostromo-1.9.8/GNUmakefile nostromo-1.9.8b/GNUmakefile
  
  clean:
  	cd src; ${MAKE} clean
-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
+diff -rupN nostromo-1.9.9/Makefile nostromo-1.9.9b/Makefile
+--- nostromo-1.9.9/Makefile	2016-04-12 14:52:41.000000000 -0400
++++ nostromo-1.9.9b/Makefile	2020-07-12 19:18:50.155545591 -0400
 @@ -3,24 +3,24 @@
  SUBDIR+= src
  
@@ -163,9 +144,9 @@ diff -rupN nostromo-1.9.8/Makefile nostromo-1.9.8b/Makefile
 +		$(DESTDIR)/usr/share/nostromo/icons/file.gif
  
  .include <bsd.subdir.mk>
-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
+diff -rupN nostromo-1.9.9/src/nhttpd/main.c nostromo-1.9.9b/src/nhttpd/main.c
+--- nostromo-1.9.9/src/nhttpd/main.c	2020-07-06 16:42:17.000000000 -0400
++++ nostromo-1.9.9b/src/nhttpd/main.c	2020-07-12 19:18:50.155545591 -0400
 @@ -61,7 +61,7 @@
   * global vars local
   */
@@ -175,9 +156,9 @@ diff -rupN nostromo-1.9.8/src/nhttpd/main.c nostromo-1.9.8b/src/nhttpd/main.c
  
  /*
   * global vars extern
-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
+diff -rupN nostromo-1.9.9/src/nhttpd/Makefile nostromo-1.9.9b/src/nhttpd/Makefile
+--- nostromo-1.9.9/src/nhttpd/Makefile	2016-04-12 15:02:06.000000000 -0400
++++ nostromo-1.9.9b/src/nhttpd/Makefile	2020-07-12 19:18:50.155545591 -0400
 @@ -12,7 +12,7 @@ MAN= nhttpd.8
  
  BINOWN=	root
@@ -187,9 +168,9 @@ diff -rupN nostromo-1.9.8/src/nhttpd/Makefile nostromo-1.9.8b/src/nhttpd/Makefil
  
  OS!= uname -s
  
-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
+diff -rupN nostromo-1.9.9/src/nhttpd/nhttpd.8 nostromo-1.9.9b/src/nhttpd/nhttpd.8
+--- nostromo-1.9.9/src/nhttpd/nhttpd.8	2016-04-12 16:32:43.000000000 -0400
++++ nostromo-1.9.9b/src/nhttpd/nhttpd.8	2020-07-12 19:18:50.155545591 -0400
 @@ -85,7 +85,7 @@ Enable IPv6 only.
  Uses
  .Ar configfile
@@ -245,9 +226,9 @@ diff -rupN nostromo-1.9.8/src/nhttpd/nhttpd.8 nostromo-1.9.8b/src/nhttpd/nhttpd.
  http daemon
  .El
  .Sh HISTORY
-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
+diff -rupN nostromo-1.9.9/src/tools/crypt.c nostromo-1.9.9b/src/tools/crypt.c
+--- nostromo-1.9.9/src/tools/crypt.c	2016-04-12 15:02:58.000000000 -0400
++++ nostromo-1.9.9b/src/tools/crypt.c	2020-07-12 19:18:50.158878920 -0400
 @@ -32,7 +32,7 @@
  #include "../libbsd/strlcat.h"
  #endif
@@ -257,9 +238,9 @@ diff -rupN nostromo-1.9.8/src/tools/crypt.c nostromo-1.9.8b/src/tools/crypt.c
  
  /*
   * Prototypes
-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
+diff -rupN nostromo-1.9.9/src/tools/Makefile nostromo-1.9.9b/src/tools/Makefile
+--- nostromo-1.9.9/src/tools/Makefile	2016-04-12 15:02:58.000000000 -0400
++++ nostromo-1.9.9b/src/tools/Makefile	2020-07-12 19:18:50.158878920 -0400
 @@ -11,7 +11,7 @@ MAN=
  
  BINOWN=	root