From be867aca1891094e05d5c4474635141690430e8f Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 8 Aug 2011 07:30:33 +0000 Subject: [PATCH] Requiring libisofs-1.1.4 (because of ACL extraction problem in 1.1.2) --- README | 2 +- configure.ac | 2 +- libisoburn/libisoburn.h | 2 +- xorriso/README_gnu_xorriso | 2 +- xorriso/configure_ac.txt | 2 +- xorriso/xorriso_eng.html | 3 ++- xorriso/xorriso_timestamp.h | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README b/README index b8d2d25e..31682f2a 100644 --- a/README +++ b/README @@ -36,7 +36,7 @@ By using this software you agree to the disclaimer at the end of this text: Dynamic library and compile time header requirements for libisoburn-1.1.4 : - libburn.so.4 , version libburn-1.1.4 or higher -- libisofs.so.6 , version libisofs-1.1.2 or higher +- libisofs.so.6 , version libisofs-1.1.4 or higher libisoburn and xorriso will not start with libraries which are older than their include headers seen at compile time. diff --git a/configure.ac b/configure.ac index ddb515a2..e1efb14c 100644 --- a/configure.ac +++ b/configure.ac @@ -304,7 +304,7 @@ AC_CHECK_HEADER(libisofs/libisofs.h) dnl Check for proper library versions LIBBURN_REQUIRED=1.1.4 -LIBISOFS_REQUIRED=1.1.2 +LIBISOFS_REQUIRED=1.1.4 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED) PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED) diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h index 0608ef81..1cc781fe 100644 --- a/libisoburn/libisoburn.h +++ b/libisoburn/libisoburn.h @@ -242,7 +242,7 @@ void isoburn_version(int *major, int *minor, int *micro); */ #define isoburn_libisofs_req_major 1 #define isoburn_libisofs_req_minor 1 -#define isoburn_libisofs_req_micro 2 +#define isoburn_libisofs_req_micro 4 /** The minimum version of libburn to be used with this version of libisoburn at compile time. diff --git a/xorriso/README_gnu_xorriso b/xorriso/README_gnu_xorriso index 7a0d3ef7..4325ddf2 100644 --- a/xorriso/README_gnu_xorriso +++ b/xorriso/README_gnu_xorriso @@ -291,7 +291,7 @@ suitable revision. Dynamic library and compile time header requirements for libisoburn-1.1.4 : - libburn.so.4 , version libburn-1.1.4 or higher -- libisofs.so.6 , version libisofs-1.1.2 or higher +- libisofs.so.6 , version libisofs-1.1.4 or higher libisoburn and xorriso will not start with libraries which are older than their headers seen at compile time. So compile in the oldest possible installation setup unless you have reason to enforce a newer bug fix level. diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt index 969b21ec..698b4d1a 100644 --- a/xorriso/configure_ac.txt +++ b/xorriso/configure_ac.txt @@ -30,7 +30,7 @@ AC_SUBST(BURN_MICRO_VERSION) LIBISOFS_MAJOR_VERSION=1 LIBISOFS_MINOR_VERSION=1 -LIBISOFS_MICRO_VERSION=3 +LIBISOFS_MICRO_VERSION=4 AC_SUBST(LIBISOFS_MAJOR_VERSION) AC_SUBST(LIBISOFS_MINOR_VERSION) AC_SUBST(LIBISOFS_MICRO_VERSION) diff --git a/xorriso/xorriso_eng.html b/xorriso/xorriso_eng.html index 8d5fee1e..938a4373 100644 --- a/xorriso/xorriso_eng.html +++ b/xorriso/xorriso_eng.html @@ -499,6 +499,7 @@ Bug fixes towards xorriso-1.1.2: