From 3686eab348b7927bfeeee3a014bb244c6a5dee6c Mon Sep 17 00:00:00 2001 From: Michael Rash Date: Wed, 8 Jun 2016 17:12:37 -0700 Subject: [PATCH] bump version numbers in preparation for 2.6.9 release --- ChangeLog | 2 +- VERSION | 2 +- configure.ac | 2 +- fwknop.spec | 8 +++++++- lib/Makefile.am | 8 ++++---- win32/config.h | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16084c78..9091eb5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -fwknop-2.6.9 (04//2016): +fwknop-2.6.9 (06/08/2016): - (Jonathan Bennett) Added support for the SHA3 "Keccak" algorithm (specifically SHA3_256 and SHA3_512) for SPA HMAC and digest checking. Enabling SHA3 from the fwknop client command line is done with the '-m' diff --git a/VERSION b/VERSION index 743af5e1..d48d3702 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.8 +2.6.9 diff --git a/configure.ac b/configure.ac index 664be006..ffdc1e82 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_PREREQ(2.62) dnl Define our name, version and email. m4_define(my_package, [fwknop]) -m4_define(my_version, [2.6.8]) +m4_define(my_version, [2.6.9]) m4_define(my_bug_email, [dstuart@dstuart.org]) AC_INIT(my_package, my_version, my_bug_email) diff --git a/fwknop.spec b/fwknop.spec index 944244f0..3cb9a9bf 100644 --- a/fwknop.spec +++ b/fwknop.spec @@ -13,7 +13,7 @@ %define _mandir /usr/share/man Name: fwknop -Version: 2.6.8 +Version: 2.6.9 Epoch: 1 Release: 1%{?dist} Summary: Firewall Knock Operator client. An implementation of Single Packet Authorization. @@ -142,6 +142,12 @@ fi %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/fwknop/access.conf %changelog +* Wed Jun 08 2016 - 2.6.9 +- fwknop-2.6.9 release. +- Bumped libfko version to 3.0.0 to account for SHA3 hash support. This + conforms to libtool convensions, e.g. + http://www.delorie.com/gnu/docs/libtool/libtool_35.html + * Wed Dec 23 2015 - 2.6.8 - fwknop-2.6.8 release. - Bumped libfko version to 2.0.4 to account for fko_set_username() crash diff --git a/lib/Makefile.am b/lib/Makefile.am index 91716a0e..8428d942 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -16,18 +16,18 @@ fko_utests_SOURCES = fko_utests.c $(libfko_source_files) fko_utests_CPPFLAGS = -I $(top_builddir)/lib -I $(top_builddir)/common $(GPGME_CFLAGS) fko_utests_LDADD = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS) -libfko_la_LDFLAGS = -version-info 2:4:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' \ +libfko_la_LDFLAGS = -version-info 3:0:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' \ -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive else if APPLE_PLATFORM -libfko_la_LDFLAGS = -version-info 2:4:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' +libfko_la_LDFLAGS = -version-info 3:0:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' else if USE_MINGW -libfko_la_LDFLAGS = -version-info 2:4:0 $(GPGME_LIBS) \ +libfko_la_LDFLAGS = -version-info 3:0:0 $(GPGME_LIBS) \ -export-symbols-regex '^fko_' -no-undefined \ -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive,-lwsock32,-lws2_32 else -libfko_la_LDFLAGS = -version-info 2:4:0 $(GPGME_LIBS) \ +libfko_la_LDFLAGS = -version-info 3:0:0 $(GPGME_LIBS) \ -export-symbols-regex '^fko_' \ -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive endif diff --git a/win32/config.h b/win32/config.h index d63e00a7..cf12cd1a 100644 --- a/win32/config.h +++ b/win32/config.h @@ -178,7 +178,7 @@ #undef TIME_WITH_SYS_TIME /* Version number of package */ -#define VERSION "2.6.8" +#define VERSION "2.6.9" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */