Skip to content

Commit

Permalink
bump version numbers in preparation for 2.6.9 release
Browse files Browse the repository at this point in the history
  • Loading branch information
mrash committed Jun 9, 2016
1 parent 6db4249 commit 3686eab
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.8
2.6.9
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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, [[email protected]])

AC_INIT(my_package, my_version, my_bug_email)
Expand Down
8 changes: 7 additions & 1 deletion fwknop.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -142,6 +142,12 @@ fi
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/fwknop/access.conf

%changelog
* Wed Jun 08 2016 <[email protected]> - 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 <[email protected]> - 2.6.8
- fwknop-2.6.8 release.
- Bumped libfko version to 2.0.4 to account for fko_set_username() crash
Expand Down
8 changes: 4 additions & 4 deletions lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion win32/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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). */
Expand Down

0 comments on commit 3686eab

Please sign in to comment.