summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD56
-rw-r--r--nostromo.logrotate2
-rw-r--r--nostromo.patch48
4 files changed, 62 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 69a39ba0cf7..9caabf69261 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nostromo
pkgdesc = A simple, fast, and secure HTTP server
- pkgver = 1.9.6
- pkgrel = 2
+ pkgver = 1.9.7
+ pkgrel = 1
url = http://www.nazgul.ch/dev_nostromo.html
install = nostromo.install
arch = i686
@@ -12,18 +12,18 @@ 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.6.tar.gz
+ source = http://www.nazgul.ch/dev/nostromo-1.9.7.tar.gz
source = nostromo.service
source = nostromo.logrotate
source = nostromo.patch
source = nostromo.install
source = LICENSE
- sha1sums = 6f3d8ebc15486398f819ac55a9d2a9ac14c3b35e
- sha1sums = d47c953e2926d3b2ae8b8b98f522bdd6d2b75f95
- sha1sums = a0069cb13614bee9b3bef76188597de3948be71d
- sha1sums = 82a1be1c2d481b107a9944fcb0f2e3ed7371a875
- sha1sums = 24c57e0fb9ceea3452475898dbe2b0c59c49368e
- sha1sums = e5abcccacf9d1c9136e55de2cc0dceaabdb02ec1
+ sha256sums = 33c635f317fb441e10d5297bb4218ae0ea62c48f2fc3029c08f5d2167c6cdfca
+ sha256sums = b630392d6501f963a4405b3737d65facb7b60fce28b46edf3dc0e23efce8ab0d
+ sha256sums = 56d3a07205a8d2c6c06851694ffebf2a5a6a64089eb78c13b0e00f9071a1efbc
+ sha256sums = b1b52ac532b46217245dbf79403fcb64e1b62fb0151349e364eb6fb8f67f3731
+ sha256sums = 79501227e4129c6ee54fe9a5572ca79f0122eab812ed868d08ec16284909b53b
+ sha256sums = cd16e1ab175c9ecbaca1a1f0d555930005b120769a1ebad242f4daf17b0b9a47
pkgname = nostromo
diff --git a/PKGBUILD b/PKGBUILD
index 0bb6ad42d9d..c939b2f3df4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,52 @@
# Maintainer: Andrew O'Neill <andrew at meanjollies dot com>
pkgname=nostromo
-pkgver=1.9.6
-pkgrel=2
+pkgver=1.9.7
+pkgrel=1
pkgdesc='A simple, fast, and secure HTTP server'
arch=('i686' 'x86_64')
url='http://www.nazgul.ch/dev_nostromo.html'
license=('custom:ISC')
depends=('openssl')
makedepends=('openssl')
-backup=("etc/$pkgname/conf/nhttpd.conf"
- "etc/$pkgname/conf/mimes"
- "etc/logrotate.d/$pkgname")
-install=$pkgname.install
-source=(http://www.nazgul.ch/dev/$pkgname-$pkgver.tar.gz
- $pkgname.service
- $pkgname.logrotate
- $pkgname.patch
- $pkgname.install
- LICENSE)
-sha1sums=('6f3d8ebc15486398f819ac55a9d2a9ac14c3b35e'
- 'd47c953e2926d3b2ae8b8b98f522bdd6d2b75f95'
- 'a0069cb13614bee9b3bef76188597de3948be71d'
- '82a1be1c2d481b107a9944fcb0f2e3ed7371a875'
- '24c57e0fb9ceea3452475898dbe2b0c59c49368e'
- 'e5abcccacf9d1c9136e55de2cc0dceaabdb02ec1')
+backup=("etc/${pkgname}/conf/nhttpd.conf"
+ "etc/${pkgname}/conf/mimes"
+ "etc/logrotate.d/${pkgname}")
+install=${pkgname}.install
+source=("http://www.nazgul.ch/dev/${pkgname}-${pkgver}.tar.gz"
+ "${pkgname}.service"
+ "${pkgname}.logrotate"
+ "${pkgname}.patch"
+ "${pkgname}.install"
+ "LICENSE")
+sha256sums=('33c635f317fb441e10d5297bb4218ae0ea62c48f2fc3029c08f5d2167c6cdfca'
+ 'b630392d6501f963a4405b3737d65facb7b60fce28b46edf3dc0e23efce8ab0d'
+ '56d3a07205a8d2c6c06851694ffebf2a5a6a64089eb78c13b0e00f9071a1efbc'
+ 'b1b52ac532b46217245dbf79403fcb64e1b62fb0151349e364eb6fb8f67f3731'
+ '79501227e4129c6ee54fe9a5572ca79f0122eab812ed868d08ec16284909b53b'
+ 'cd16e1ab175c9ecbaca1a1f0d555930005b120769a1ebad242f4daf17b0b9a47')
prepare() {
- cd $pkgname-$pkgver
+ cd "${pkgname}-${pkgver}"
- patch -p1 -i ../$pkgname.patch
+ patch -p1 -i ../${pkgname}.patch
}
build() {
- cd $pkgname-$pkgver
+ cd "${pkgname}-${pkgver}"
make
}
package() {
- cd $pkgname-$pkgver
+ cd "${pkgname}-${pkgver}"
- install -d $pkgdir/usr/bin
- install -d $pkgdir/usr/share/man/man8
+ install -d "${pkgdir}/usr/bin"
+ install -d "${pkgdir}/usr/share/man/man8"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="${pkgdir}" install
- install -Dm644 $srcdir/$pkgname.logrotate $pkgdir/etc/logrotate.d/$pkgname
- install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
- install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
+ install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+ install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/nostromo.logrotate b/nostromo.logrotate
index 6187457041f..92d2d28d41a 100644
--- a/nostromo.logrotate
+++ b/nostromo.logrotate
@@ -4,6 +4,6 @@
notifempty
sharedscripts
postrotate
- systemctl reload lighttpd.service || true
+ systemctl reload nostromo.service || true
endscript
}
diff --git a/nostromo.patch b/nostromo.patch
index 521898305f4..0fdc45b5962 100644
--- a/nostromo.patch
+++ b/nostromo.patch
@@ -1,6 +1,6 @@
-diff -rupN nostromo-1.9.6/conf/nhttpd.conf-dist nostromo-1.9.6b/conf/nhttpd.conf-dist
---- nostromo-1.9.6/conf/nhttpd.conf-dist 2016-04-12 14:54:16.000000000 -0400
-+++ nostromo-1.9.6b/conf/nhttpd.conf-dist 2017-04-09 11:06:02.815520612 -0400
+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
@@ -2,29 +2,31 @@
# MAIN [MANDATORY]
@@ -56,9 +56,9 @@ diff -rupN nostromo-1.9.6/conf/nhttpd.conf-dist nostromo-1.9.6b/conf/nhttpd.conf
# HOMEDIRS [OPTIONAL]
-diff -rupN nostromo-1.9.6/GNUmakefile nostromo-1.9.6b/GNUmakefile
---- nostromo-1.9.6/GNUmakefile 2016-04-12 14:52:41.000000000 -0400
-+++ nostromo-1.9.6b/GNUmakefile 2017-04-09 01:05:33.377686037 -0400
+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
@@ -5,30 +5,30 @@ all:
install:
@@ -105,9 +105,9 @@ diff -rupN nostromo-1.9.6/GNUmakefile nostromo-1.9.6b/GNUmakefile
clean:
cd src; ${MAKE} clean
-diff -rupN nostromo-1.9.6/Makefile nostromo-1.9.6b/Makefile
---- nostromo-1.9.6/Makefile 2016-04-12 14:52:41.000000000 -0400
-+++ nostromo-1.9.6b/Makefile 2017-04-09 01:07:58.754173489 -0400
+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
@@ -3,24 +3,24 @@
SUBDIR+= src
@@ -145,9 +145,9 @@ diff -rupN nostromo-1.9.6/Makefile nostromo-1.9.6b/Makefile
+ $(DESTDIR)/usr/share/nostromo/icons/file.gif
.include <bsd.subdir.mk>
-diff -rupN nostromo-1.9.6/src/nhttpd/main.c nostromo-1.9.6b/src/nhttpd/main.c
---- nostromo-1.9.6/src/nhttpd/main.c 2016-04-12 15:02:06.000000000 -0400
-+++ nostromo-1.9.6b/src/nhttpd/main.c 2017-04-09 00:15:35.431740659 -0400
+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
@@ -61,7 +61,7 @@
* global vars local
*/
@@ -157,9 +157,9 @@ diff -rupN nostromo-1.9.6/src/nhttpd/main.c nostromo-1.9.6b/src/nhttpd/main.c
/*
* global vars extern
-diff -rupN nostromo-1.9.6/src/nhttpd/Makefile nostromo-1.9.6b/src/nhttpd/Makefile
---- nostromo-1.9.6/src/nhttpd/Makefile 2016-04-12 15:02:06.000000000 -0400
-+++ nostromo-1.9.6b/src/nhttpd/Makefile 2017-04-09 00:15:35.431740659 -0400
+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
@@ -12,7 +12,7 @@ MAN= nhttpd.8
BINOWN= root
@@ -169,9 +169,9 @@ diff -rupN nostromo-1.9.6/src/nhttpd/Makefile nostromo-1.9.6b/src/nhttpd/Makefil
OS!= uname -s
-diff -rupN nostromo-1.9.6/src/nhttpd/nhttpd.8 nostromo-1.9.6b/src/nhttpd/nhttpd.8
---- nostromo-1.9.6/src/nhttpd/nhttpd.8 2016-04-12 16:32:43.000000000 -0400
-+++ nostromo-1.9.6b/src/nhttpd/nhttpd.8 2017-04-09 00:15:35.431740659 -0400
+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
@@ -85,7 +85,7 @@ Enable IPv6 only.
Uses
.Ar configfile
@@ -227,9 +227,9 @@ diff -rupN nostromo-1.9.6/src/nhttpd/nhttpd.8 nostromo-1.9.6b/src/nhttpd/nhttpd.
http daemon
.El
.Sh HISTORY
-diff -rupN nostromo-1.9.6/src/tools/crypt.c nostromo-1.9.6b/src/tools/crypt.c
---- nostromo-1.9.6/src/tools/crypt.c 2016-04-12 15:02:58.000000000 -0400
-+++ nostromo-1.9.6b/src/tools/crypt.c 2017-04-09 00:15:35.435073967 -0400
+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
@@ -32,7 +32,7 @@
#include "../libbsd/strlcat.h"
#endif
@@ -239,9 +239,9 @@ diff -rupN nostromo-1.9.6/src/tools/crypt.c nostromo-1.9.6b/src/tools/crypt.c
/*
* Prototypes
-diff -rupN nostromo-1.9.6/src/tools/Makefile nostromo-1.9.6b/src/tools/Makefile
---- nostromo-1.9.6/src/tools/Makefile 2016-04-12 15:02:58.000000000 -0400
-+++ nostromo-1.9.6b/src/tools/Makefile 2017-04-09 00:15:35.435073967 -0400
+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
@@ -11,7 +11,7 @@ MAN=
BINOWN= root