From: Andres Mejia Date: Mon, 14 Jan 2013 04:43:04 +0000 (-0500) Subject: Update libarchive to 3.1.1. X-Git-Tag: v3.1.1^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74cdb52c07a6bbfdfe18bfb24496a07505bfbb7a;p=thirdparty%2Flibarchive.git Update libarchive to 3.1.1. --- diff --git a/NEWS b/NEWS index ea0e30fb0..b1d850166 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +Jan 13, 2013: libarchive 3.1.1 released + Jan 13, 2013: libarchive 3.1.0 released Dec 07, 2012: Implement functions to manually set the format and filters used. diff --git a/build/version b/build/version index bda0a00ba..c437e8aad 100644 --- a/build/version +++ b/build/version @@ -1 +1 @@ -3001000 +3001001 diff --git a/configure.ac b/configure.ac index ef194999f..82b30e5e2 100644 --- a/configure.ac +++ b/configure.ac @@ -4,8 +4,8 @@ dnl First, define all of the version numbers up front. dnl In particular, this allows the version macro to be used in AC_INIT dnl These first two version numbers are updated automatically on each release. -m4_define([LIBARCHIVE_VERSION_S],[3.1.0]) -m4_define([LIBARCHIVE_VERSION_N],[3001000]) +m4_define([LIBARCHIVE_VERSION_S],[3.1.1]) +m4_define([LIBARCHIVE_VERSION_N],[3001001]) dnl bsdtar and bsdcpio versioning tracks libarchive m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S()) diff --git a/libarchive/archive.h b/libarchive/archive.h index 76c7df9cf..6d1da2ae6 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -124,13 +124,13 @@ extern "C" { * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3001000 +#define ARCHIVE_VERSION_NUMBER 3001001 __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_STRING "libarchive 3.1.0" +#define ARCHIVE_VERSION_STRING "libarchive 3.1.1" __LA_DECL const char * archive_version_string(void); /* Declare our basic types. */ diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h index 3d704aa17..9ca121758 100644 --- a/libarchive/archive_entry.h +++ b/libarchive/archive_entry.h @@ -29,7 +29,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3001000 +#define ARCHIVE_VERSION_NUMBER 3001001 /* * Note: archive_entry.h is for use outside of libarchive; the