summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-07-25 15:36:17 +0300
committerSergey Poznyakoff <gray@gnu.org>2019-07-25 15:36:17 +0300
commitf1afd377c55f948f685ddfa2f668491fb4f9b021 (patch)
tree36a743e4c1ab3c9cc78db0893e6c11ce931412d5
parentc59f619e101464874ba1535c7a2bed42306b5866 (diff)
downloadfileserv-f1afd377c55f948f685ddfa2f668491fb4f9b021.tar.gz
fileserv-f1afd377c55f948f685ddfa2f668491fb4f9b021.tar.bz2
Add NEWS and automatically generated ChangeLog file.
* GNUmakefile: New file. * NEWS: New file. * git2clog.pl: New file. * Makefile.am: Distribute the ChangeLog file * README: Update. * configure.ac: Raise version number.
-rw-r--r--.gitignore1
-rw-r--r--GNUmakefile17
-rw-r--r--Makefile.am3
-rw-r--r--NEWS56
-rw-r--r--README5
-rw-r--r--configure.ac6
-rw-r--r--git2clog.pl77
7 files changed, 160 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index a0f510d..67695fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,13 @@
.#*
.deps/
*.[oa]
*.l[oa]
.emacs*
.gdbinit
+ChangeLog
Makefile
Makefile.in
aclocal.m4
autom4te.cache/
compile
config.log
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..c36f6cd
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,17 @@
+ifneq (,$(wildcard Makefile))
+ include Makefile
+
+.PHONY: ChangeLog
+ChangeLog:
+ @perl ./git2clog.pl
+
+else
+$(if $(MAKECMDGOALS),$(MAKECMDGOALS),all): Makefile
+ $(MAKE) $(MAKECMDGOALS)
+
+Makefile: Makefile.am configure
+ ./configure
+
+configure: configure.ac
+ autoreconf -f -i -s
+endif
diff --git a/Makefile.am b/Makefile.am
index 2bd6172..b7478fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
-EXTRA_DIST=README wordsplit/wordsplit.c wordsplit/wordsplit.h
+EXTRA_DIST=README ChangeLog wordsplit/wordsplit.c wordsplit/wordsplit.h
SUBDIRS = mimetypes src
distuninstallcheck_listfiles = find . -type f -not -name 'fileserv.conf' -print
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..a2efa25
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,56 @@
+fileserv -- history of user-visible changes. 2019-07-25
+See the end of file for copying conditions.
+
+Please send fileserv bug reports to <gray+fileserv@gnu.org.ua>
+
+Version 0.3.90 (git)
+
+Version 0.3, 2018-04-21
+
+* Global configuration file
+
+* Per-directory configuration files.
+
+* MIME type autodetection
+
+* Auto-generated directory indexes
+
+Index pages are generated from user-supplied templates. In the absense
+of these, the built-in template is used.
+
+* Listen on all available IP addresses if none is set explicitly
+
+* Configurable HTTP status handling
+
+* Handle IPv4 mapped addresses
+
+Version 0.2, 2017-10-26
+
+Initial release.
+
+
+=========================================================================
+Copyright information:
+
+Copyright (C) 2017-2019 Sergey Poznyakoff
+
+ Permission is granted to anyone to make or distribute verbatim copies
+ of this document as received, in any medium, provided that the
+ copyright notice and this permission notice are preserved,
+ thus giving the recipient permission to redistribute in turn.
+
+ Permission is granted to distribute modified versions
+ of this document, or of portions of it,
+ under the above conditions, provided also that they
+ carry prominent notices stating who last changed them.
+
+Local variables:
+mode: outline
+paragraph-separate: "[ ]*$"
+eval: (add-hook 'write-file-hooks 'time-stamp)
+time-stamp-start: "changes. "
+time-stamp-format: "%:y-%02m-%02d"
+time-stamp-end: "\n"
+end:
+
+
diff --git a/README b/README
index 3311986..bc2ac0d 100644
--- a/README
+++ b/README
@@ -1,6 +1,9 @@
+fileserv README.
+See the end of file for copying conditions.
+
* Overview
This is a simple HTTP server for serving static files. It is suitable
as a lightweight replacement for full-fledged HTTP servers on sites
where only sporadic serving of static data is needed.
@@ -93,13 +96,13 @@ Send bug reports to <gray+fileserv@gnu.org.ua>.
[2] Haproxy - http://www.haproxy.org
[3] GNU Libmicrohttpd - https://www.gnu.org/software/libmicrohttpd
* Copyright information:
-Copyright (C) 2017-2018 Sergey Poznyakoff
+Copyright (C) 2017-2019 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
copyright notice and this permission notice are preserved,
thus giving the recipient permission to redistribute in turn.
diff --git a/configure.ac b/configure.ac
index a3cfc01..c549892 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
# -*- Autoconf -*-
# This file is part of fileserv.
-# Copyright (C) 2017, 2018 Sergey Poznyakoff
+# Copyright (C) 2017-2019 Sergey Poznyakoff
#
# Fileserv is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
@@ -12,15 +12,15 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with fileserv. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([fileserv], 0.3, [gray+fileserv@gnu.org.ua])
+AC_INIT([fileserv], 0.3.90, [gray+fileserv@gnu.org.ua])
AC_CONFIG_SRCDIR([src/fileserv.c])
-AM_INIT_AUTOMAKE([1.11 foreign tar-ustar dist-xz silent-rules])
+AM_INIT_AUTOMAKE([1.15 foreign tar-ustar dist-xz silent-rules])
# Enable silent rules by default:
AM_SILENT_RULES([yes])
# Checks for programs.
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_YACC
diff --git a/git2clog.pl b/git2clog.pl
new file mode 100644
index 0000000..de93e3d
--- /dev/null
+++ b/git2clog.pl
@@ -0,0 +1,77 @@
+# Pretty simple ChangeLog generator -*-perl-*-
+# Copyright (C) 2019 Sergey Poznyakoff
+# Distributed under the terms of the GNU General Public License, either
+# version 3, or (at your option) any later version. See file COPYING
+# for the text of the license.
+use strict;
+use warnings;
+
+my $name = shift @ARGV || 'ChangeLog';
+my $outfile = "$name.$$";
+
+END {
+ if (-f $outfile) {
+ unlink $outfile
+ }
+}
+
+my $header;
+
+die "must be run in a cloned source tree\n" unless -d '.git';
+
+if (-f $name) {
+ open(FH, '<', $name)
+ or die "can't open $name for reading: $!\n";
+ chomp($header = <FH>);
+ close FH
+}
+
+open(STDIN, '-|',
+ q{git log --pretty='format:<%ci>%an <%ae>%n%n%s%n%n%b%n'})
+ or die "can't run git: $!\n";
+
+open(STDOUT, '>', $outfile)
+ or die "can't open temporary file\n";
+
+my $nl = 0;
+while (<>) {
+ chomp;
+ if (/^\s*$/) {
+ $nl++;
+ } else {
+ if ($nl) {
+ print "\n";
+ $nl = 0;
+ }
+ if (s/^<([\d-]+) .*?>(.*)/$1 $2/) {
+ if (defined($header)) {
+ if ($_ eq $header) {
+ exit(0)
+ }
+ $header = undef
+ }
+ } else {
+ print "\t";
+ }
+ print "$_\n";
+ }
+}
+
+print "\f\nLocal Variables:\n";
+print <<'EOT';
+mode: change-log
+version-control: never
+buffer-read-only: t
+End:
+EOT
+;
+
+close STDOUT;
+if (-f $name) {
+ unlink $name or die "can't unlink $name: $!\n";
+}
+rename $outfile, $name or die "can't rename $outfile to $name: $!\n";
+
+
+
+

Return to:

Send suggestions and report system problems to the System administrator.