diff --git a/.gitignore b/.gitignore index 17b9f5d..4e88d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ in.gophernicus # Release files # *.gz +ChangeLog # # Debian packaging leftovers diff --git a/Makefile b/Makefile index 1be4f95..9926a54 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ NAME = gophernicus PACKAGE = $(NAME) BINARY = in.$(NAME) -VERSION = 2.4 +VERSION = 2.5-beta CODENAME = Millennium Edition SOURCES = $(NAME).c file.c menu.c string.c platform.c session.c options.c @@ -68,14 +68,13 @@ withwrap: # # Special targets # -deb: ChangeLog +deb: dpkg-buildpackage -rfakeroot -uc -us ChangeLog: if [ -d .git ]; then \ - (./git2changelog > .ChangeLog; \ - sed -ne '/2012-12-02/,$$p' ChangeLog >> .ChangeLog; \ - mv -f .ChangeLog ChangeLog); \ + (./git2changelog > ChangeLog; \ + cat changelog.old >> ChangeLog); \ else true; fi .PHONY: ChangeLog @@ -124,7 +123,7 @@ files.h: bin2c clean: clean-build clean-deb clean-build: - rm -f $(BINARY) $(OBJECTS) $(PACKAGE)-*.tar.gz $(HEADERS) README.options bin2c .ChangeLog + rm -f $(BINARY) $(OBJECTS) $(PACKAGE)-*.tar.gz $(HEADERS) README.options bin2c clean-deb: if [ -d debian/$(PACKAGE) ]; then fakeroot debian/rules clean; fi @@ -312,7 +311,7 @@ release: dist # # List all C defines # -defines: +defines: functions.h files.h $(CC) -dM -E $(NAME).c diff --git a/ChangeLog b/changelog.old similarity index 64% rename from ChangeLog rename to changelog.old index f9063f1..a867a05 100644 --- a/ChangeLog +++ b/changelog.old @@ -1,167 +1,3 @@ -[ Automatically generated from git log ] - -2017-02-06 Kim Holviala - - * New -np option to disable HAproxy proxy protocol - -2017-02-04 Kim Holviala - - * Released version 2.4 "Millennium Edition" - * Fixed logging of TLS connections (using gophers:// protocol) - * Add TLS support for CGI apps and caps.txt via -T option - * Fixed line wrapping in README - -2017-02-03 Kim Holviala - - * Released version 2.3 - * Document the use of Stunnel4 for gopher over TLS - * Don't get TCP port number from user session data - -2017-02-02 Kim Holviala - - * Initial support for HAproxy/Stunnel proxy protocol v1 - * Skip goto labels when generating functions.h - -2017-02-01 Kim Holviala - - * Fixed make clean to remove all old gophernicus-VERSION.tar.gz files - * Enabled large file support on 32-bit Linux and AIX - * Remove sendfile() support from Linux - -2016-12-30 Kim Holviala - - * Changed copyright years to include 2017 - Happy New Year - -2016-12-11 Kim Holviala - - * Released version 2.2 - * Small fix for git2changelog so that it keeps \ and / in comments - * Fixed systemd-based installation for openSUSE and RedHat - -2016-11-14 Kim Holviala - - * Re-released version 2.1 \m/ - * Ignore exit errors in systemd configuration - -2016-11-13 Kim Holviala - - * Updated TODO - * Released version 2.1 - * Added systemd support for Debian package - * Removed dependency for update-inetd in Debian package - * Fix Debian package building for inetd systems - * Added systemd entries to Debian logcheck ignore file - -2016-10-18 Kim Holviala - - * Fixed a potentially uninitialized char in strcut() - * Autogenerated CAPS now shows release codename - -2016-09-08 Kim Holviala - - * Released version 2.0 - * Updated deb package control files (still borken) - -2016-01-01 Kim Holviala - - * Released version 2.0-alpha "for Workgroups" - * Added option -v to display version number and build date - * Updated TODO (removed tasks that were done) - * Added detection for non-DMI Linux hypervisors (Xen) - * Added support for release codenames - * Fixed make install for non-systemd systems - * Added optional support for TCP wrappers - -2015-12-31 Kim Holviala - - * Installing now explicitly clears the SHM block Gophernicus uses - -2015-12-30 Kim Holviala - - * Updated TODO (removed tasks that are now done) - * Installation now shows the current configuration file - * Move configuration from systemd unit file to separate enviroment file - * Increased default page width from 70 to 76 chars - * Added detection for Gentoo Linux version - * Fixed installation for CentOS 7 - -2015-12-29 Kim Holviala - - * Added install/uninstall support for Linux systemd - * Get hardware vendor and type from DMI data on Linux - * Tiny fix for 'make ChangeLog' to force overwrite of old file - * Added filetype definition for webm and ogv movies - * Fixed installation for Mac OSX 10.11 El Capitan - * Removed last remaining 'for inetd' form docs - * Removed 'for inetd' from docs because it's not a requirement - * Code needed more cows - * Changed copyright years to 2009-2016 - -2015-10-16 Kim Holviala - - * Released version 1.8.1 (1.8 had broken gophermap support) - * Fix for executing shell commands inside gophermaps (previous commit broke this) - -2015-09-23 Kim Holviala - - * Released version 1.8 - * Fix for executable gophermaps in directories with spaces (bugreport from Black Rider) - * Fixed whitespace formatting - -2015-03-02 Kim Holviala - - * Changed copyright years include 2015 - * Released version 1.7 - -2015-01-04 Kim Holviala - - * Added ServerDefaultEncoding to automatic caps.txt - -2015-01-01 Kim Holviala - - * Added ServerSupportsStdinScripts to automatic caps.txt - -2014-12-19 Kim Holviala - - * Fixed a comment & formatting - * Added detection for CRUX Linux - * Added $SESSION_ID environment variable for CGI scripts - -2014-11-10 Kim Holviala - - * Added MacOSX 10.10 to the list of supported systems in INSTALL - * Released version 1.6 - * Fix compiling for MacOS X Yosemite - -2014-05-15 Kim Holviala - - * Updated TODO for systemd/upstart - * Fix platform detection for Slackware (and possibly others) - -2014-02-01 Kim Holviala - - * Add license header to bin2c.c - * Up version number to 1.6-whatever - -2014-01-25 Kim Holviala - - * Remove 'only tested with GCC' from INSTALL - * Automatically copy ChangeLog to distribution dir on release - * Automatically copy INSTALL & README to distribution dir on release - * Add deb packaging leftovers to .gitignore - * Up version number to 1.5 + include forgotten file git2changelog - * Don't update ChangeLog unless the source tree is a git repo - * Make ChangeLog update itself automatically from git log - * Up Debian package version to 1.5 - * Added .gitignore - * Clean up supported platforms list - * Up version number to 1.5-rc1 (I mean really, this time) - * Up version number to 1.5-rc1 & update copyright years to 2014 - * Search strings were being urldecoded against the specs (bugreport from Kacper Gutowski) - * Fixed a (non-security) bug in strcut() - * Initial git commit with version 1.4 - - 2012-12-02 Kim Holviala * Released version 1.4 diff --git a/debian/rules b/debian/rules index 76f4dc6..cc265ff 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,7 @@ build-stamp: dh_testdir $(MAKE) + $(MAKE) ChangeLog touch $@