Skip to content

Commit

Permalink
Prepare for 1.5.3 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
jfigus committed Nov 25, 2015
1 parent be06686 commit 0b8031e
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 20 deletions.
12 changes: 12 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
Changelog

1.5.3

Fix for CVE-2015-6360.

Pull request 103 - Makefile.in: Don't hard-code ar.

Pull request 99 - Various fixes for compiling with Visual Studio.

Pull request 98 - Do not duplicate shared library when installing.

Please see commit log for a full list of other minor fixes.

1.5.2

Autoconf checks for libz and libdl for buildroot support.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.2-dev
1.5.3
44 changes: 35 additions & 9 deletions config_in.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/* config_in.h. Generated from configure.in by autoheader. */

/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD

/* Define if building for a CISC machine (e.g. Intel). */
#undef CPU_CISC

Expand Down Expand Up @@ -42,9 +45,18 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H

/* Define to 1 if you have the `crypto' library (-lcrypto). */
#undef HAVE_LIBCRYPTO

/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL

/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET

/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ

/* Define to 1 if you have the <machine/types.h> header file. */
#undef HAVE_MACHINE_TYPES_H

Expand All @@ -54,6 +66,9 @@
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H

/* Define to 1 if you have the `pcap' library (-lpcap) */
#undef HAVE_PCAP

/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION

Expand Down Expand Up @@ -117,6 +132,9 @@
/* Define to use X86 inlined assembly code */
#undef HAVE_X86

/* Define this to use OpenSSL crypto. */
#undef OPENSSL

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

Expand All @@ -129,21 +147,21 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the home page for this package. */
#undef PACKAGE_URL

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* The size of a `unsigned long', as computed by sizeof. */
/* The size of `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG

/* The size of a `unsigned long long', as computed by sizeof. */
/* The size of `unsigned long long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG_LONG

/* Define to use GDOI. */
#undef SRTP_GDOI

/* Define to use OpenSSL crypto. */
#undef OPENSSL

/* Define to compile for kernel contexts. */
#undef SRTP_KERNEL

Expand All @@ -159,9 +177,17 @@
/* Define to use syslog logging. */
#undef USE_SYSLOG

/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
# undef WORDS_BIGENDIAN
# endif
#endif

/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Expand All @@ -172,5 +198,5 @@
#undef inline
#endif

/* Define to `unsigned' if <sys/types.h> does not define. */
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libsrtp 1.5.2-dev.
# Generated by GNU Autoconf 2.69 for libsrtp 1.5.3.
#
# Report bugs to <https://github.com/cisco/libsrtp/issues>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libsrtp'
PACKAGE_TARNAME='libsrtp'
PACKAGE_VERSION='1.5.2-dev'
PACKAGE_STRING='libsrtp 1.5.2-dev'
PACKAGE_VERSION='1.5.3'
PACKAGE_STRING='libsrtp 1.5.3'
PACKAGE_BUGREPORT='https://github.com/cisco/libsrtp/issues'
PACKAGE_URL=''

Expand Down Expand Up @@ -1256,7 +1256,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libsrtp 1.5.2-dev to adapt to many kinds of systems.
\`configure' configures libsrtp 1.5.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1321,7 +1321,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libsrtp 1.5.2-dev:";;
short | recursive ) echo "Configuration of libsrtp 1.5.3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1414,7 +1414,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libsrtp configure 1.5.2-dev
libsrtp configure 1.5.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2020,7 +2020,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libsrtp $as_me 1.5.2-dev, which was
It was created by libsrtp $as_me 1.5.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -6516,7 +6516,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libsrtp $as_me 1.5.2-dev, which was
This file was extended by libsrtp $as_me 1.5.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -6578,7 +6578,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libsrtp config.status 1.5.2-dev
libsrtp config.status 1.5.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([libsrtp], [1.5.2-dev], [https://github.com/cisco/libsrtp/issues])
AC_INIT([libsrtp], [1.5.3], [https://github.com/cisco/libsrtp/issues])

dnl Must come before AC_PROG_CC
if test -z "$CFLAGS"; then
Expand Down

0 comments on commit 0b8031e

Please sign in to comment.