From 011ee324faf2adf9a5eed4e6d6fb83aeb4c4c93e Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Tue, 16 Oct 2018 20:56:26 -0700 Subject: [PATCH 1/5] prepare 0.22 release --- NEWS | 7 +++++++ configure.ac | 2 +- libtelnet.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 33896a7..f479420 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Version 0.22 +============ + +* EOL handling fixes +* allocation fixes to Q option states +* portability fixes + Version 0.21 ============ diff --git a/configure.ac b/configure.ac index 021b48f..bbb7563 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.58]) -AC_INIT([libtelnet], [0.21], [http://github.com/elanthis/libtelnet/tree/master]) +AC_INIT([libtelnet], [0.22], [http://github.com/elanthis/libtelnet/tree/master]) #AC_CONFIG_AUX_DIR([auxfiles]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/libtelnet.h b/libtelnet.h index eaeda68..19ebd52 100644 --- a/libtelnet.h +++ b/libtelnet.h @@ -34,7 +34,7 @@ * * \file libtelnet.h * - * \version 0.21 + * \version 0.22 * * \author Sean Middleditch */ From 7dc662f6ecace5415a543e357d0b1dbaf9f6b7a2 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Wed, 17 Oct 2018 17:28:44 +0200 Subject: [PATCH 2/5] Add Visual Studio files to distribution tarball (fixes #7) Signed-off-by: Michael Heimpold --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c13c9c0..1a4ef5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to generate Makefile.in ACLOCAL_AMFLAGS = -I m4 --install AM_CFLAGS = $(zlib_CFLAGS) -EXTRA_DIST = Doxyfile libtelnet.pc.in libtelnet-uninstalled.pc.in +EXTRA_DIST = Doxyfile libtelnet.pc.in libtelnet-uninstalled.pc.in msvc2008 msvc2010 SUBDIRS = . doc util test include_HEADERS = libtelnet.h From de191ccc3cc28d96d85902f69a930b58fcc21a5f Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Wed, 17 Oct 2018 17:33:52 +0200 Subject: [PATCH 3/5] Add ar-lib and test-driver to .gitignore Signed-off-by: Michael Heimpold --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index cc51efd..8aef04b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ m4/*.m4 missing stamp-h1 compile +ar-lib +test-driver telnet-client telnet-proxy From d466915d36fea2841822ff60166f7fb5ce965e6f Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Wed, 17 Oct 2018 17:31:09 +0200 Subject: [PATCH 4/5] Add autogen helper shell scripts During development these two files can be used for convenience. Signed-off-by: Michael Heimpold --- Makefile.am | 2 +- autogen-clean.sh | 11 +++++++++++ autogen.sh | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100755 autogen-clean.sh create mode 100755 autogen.sh diff --git a/Makefile.am b/Makefile.am index 1a4ef5e..004e5d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to generate Makefile.in ACLOCAL_AMFLAGS = -I m4 --install AM_CFLAGS = $(zlib_CFLAGS) -EXTRA_DIST = Doxyfile libtelnet.pc.in libtelnet-uninstalled.pc.in msvc2008 msvc2010 +EXTRA_DIST = Doxyfile libtelnet.pc.in libtelnet-uninstalled.pc.in msvc2008 msvc2010 autogen.sh autogen-clean.sh SUBDIRS = . doc util test include_HEADERS = libtelnet.h diff --git a/autogen-clean.sh b/autogen-clean.sh new file mode 100755 index 0000000..5d1c054 --- /dev/null +++ b/autogen-clean.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ -f Makefile ]; then + echo "Making make distclean..." + make distclean +fi + +echo "Removing autogenned files..." +rm -f aclocal.m4 depcomp config.guess config.sub configure install-sh missing mkinstalldirs Makefile.in ltmain.sh stamp-h.in */Makefile.in ltconfig stamp-h config.h.in +rm -rf autom4te.cache +echo "Done." diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..d57e325 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,2 @@ +#!/bin/sh +autoreconf -v --install --symlink --force || exit 1 From 485b29ff1dfba51ad5e39d815238c1c8ec5053c0 Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Wed, 17 Oct 2018 22:50:07 -0700 Subject: [PATCH 5/5] Prepare 0.23 --- NEWS | 5 +++++ configure.ac | 2 +- libtelnet.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f479420..70a02e3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Version 0.23 +============ + +* Fixed release errors + Version 0.22 ============ diff --git a/configure.ac b/configure.ac index bbb7563..b2bf6a1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.58]) -AC_INIT([libtelnet], [0.22], [http://github.com/elanthis/libtelnet/tree/master]) +AC_INIT([libtelnet], [0.23], [http://github.com/elanthis/libtelnet/tree/master]) #AC_CONFIG_AUX_DIR([auxfiles]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/libtelnet.h b/libtelnet.h index 19ebd52..40030c1 100644 --- a/libtelnet.h +++ b/libtelnet.h @@ -34,7 +34,7 @@ * * \file libtelnet.h * - * \version 0.22 + * \version 0.23 * * \author Sean Middleditch */