Projects
Essentials
libaacs
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 7
View file
libaacs.changes
Changed
@@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Mar 15 13:12:59 UTC 2015 - joerg.lorenzen@ki.tng.de + +- update to 0.8.1 + * Accept NULL mount / device path when application handles file system access. + * Fix FreeBSD build. + * Do not require pthread with gcrypt >= 1.6.0. + +------------------------------------------------------------------- Tue Jan 27 12:39:43 UTC 2015 - joerg.lorenzen@ki.tng.de - update to 0.8.0
View file
libaacs.spec
Changed
@@ -19,7 +19,7 @@ Name: libaacs -Version: 0.8.0 +Version: 0.8.1 Release: 1.1 License: LGPL-2.1+ Summary: Open implentation of AACS specification @@ -27,6 +27,7 @@ Group: System/Libraries Source: ftp://ftp.videolan.org/pub/videolan/libaacs/%{version}/libaacs-%{version}.tar.bz2 Patch0: libaacs-0.6.0-bison-2.3-compatibility.patch +Patch1: libaacs-pthread.patch BuildRequires: bison BuildRequires: flex BuildRequires: libgcrypt-devel @@ -60,6 +61,7 @@ %if 0%{?suse_version} < 1140 %patch0 -p1 %endif +%patch1 -p0 %build ./bootstrap
View file
libaacs-pthread.patch
Added
@@ -0,0 +1,10 @@ +--- src/libaacs/crypto.c.orig 2015-03-16 12:59:58.682853468 +0100 ++++ src/libaacs/crypto.c 2015-03-16 12:59:58.707852962 +0100 +@@ -38,6 +38,7 @@ + #ifdef HAVE_PTHREAD_H + #if GCRYPT_VERSION_NUMBER < 0x010600 + #include <pthread.h> ++#include <errno.h> + #endif + #endif +
View file
libaacs-0.8.0.tar.bz2/ChangeLog -> libaacs-0.8.1.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,8 @@ +2015-03-13: Version 0.8.1 + - Accept NULL mount / device path when application handles file system access. + - Fix FreeBSD build. + - Do not require pthread with gcrypt >= 1.6.0. + 2015-01-23: Version 0.8.0 - Add improved file system interface - Support opening raw devices
View file
libaacs-0.8.0.tar.bz2/Makefile.in -> libaacs-0.8.1.tar.bz2/Makefile.in
Changed
@@ -116,6 +116,7 @@ $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libgcrypt.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac @@ -350,6 +351,8 @@ GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ +GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ +GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@
View file
libaacs-0.8.0.tar.bz2/aclocal.m4 -> libaacs-0.8.1.tar.bz2/aclocal.m4
Changed
@@ -1203,6 +1203,8 @@ ) # _AM_PROG_TAR m4_include(m4/attributes.m4) +m4_include(m4/gpg-error.m4) +m4_include(m4/libgcrypt.m4) m4_include(m4/libtool.m4) m4_include(m4/ltoptions.m4) m4_include(m4/ltsugar.m4)
View file
libaacs-0.8.0.tar.bz2/configure -> libaacs-0.8.1.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libaacs 0.8.0. +# Generated by GNU Autoconf 2.69 for libaacs 0.8.1. # # Report bugs to <http://www.videolan.org/developers/libaacs.html>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libaacs' PACKAGE_TARNAME='libaacs' -PACKAGE_VERSION='0.8.0' -PACKAGE_STRING='libaacs 0.8.0' +PACKAGE_VERSION='0.8.1' +PACKAGE_STRING='libaacs 0.8.1' PACKAGE_BUGREPORT='http://www.videolan.org/developers/libaacs.html' PACKAGE_URL='' @@ -640,6 +640,8 @@ AACS_VERSION_MICRO AACS_VERSION_MINOR AACS_VERSION_MAJOR +GPG_ERROR_MT_LIBS +GPG_ERROR_MT_CFLAGS GPG_ERROR_LIBS GPG_ERROR_CFLAGS GPG_ERROR_CONFIG @@ -793,6 +795,7 @@ enable_libtool_lock enable_largefile with_libgcrypt_prefix +with_libgpg_error_prefix with_gpg_error_prefix ' ac_precious_vars='build_alias @@ -1346,7 +1349,7 @@ # 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 libaacs 0.8.0 to adapt to many kinds of systems. +\`configure' configures libaacs 0.8.1 to adapt to many kinds of systems. Usage: $0 OPTION... VAR=VALUE... @@ -1417,7 +1420,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libaacs 0.8.0:";; + short | recursive ) echo "Configuration of libaacs 0.8.1:";; esac cat <<\_ACEOF @@ -1455,9 +1458,10 @@ --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). --with-libgcrypt-prefix=PFX - prefix where libgcrypt is installed (optional) - --with-gpg-error-prefix=PFX - prefix where gpg-error is installed (optional) + prefix where LIBGCRYPT is installed (optional) + --with-libgpg-error-prefix=PFX + prefix where GPG Error is installed (optional) + Some influential environment variables: CC C compiler command @@ -1541,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libaacs configure 0.8.0 +libaacs configure 0.8.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2013,7 +2017,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libaacs $as_me 0.8.0, which was +It was created by libaacs $as_me 0.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2988,7 +2992,7 @@ # Define the identity of the package. PACKAGE='libaacs' - VERSION='0.8.0' + VERSION='0.8.1' cat >>confdefs.h <<_ACEOF @@ -12896,9 +12900,439 @@ -if test "${SYS}" != "mingw32"; then : - for ac_header in pthread.h + +# Check whether --with-libgcrypt-prefix was given. +if test "${with_libgcrypt_prefix+set}" = set; then : + withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval" +else + libgcrypt_config_prefix="" +fi + + if test x$libgcrypt_config_prefix != x ; then + if test x${LIBGCRYPT_CONFIG+set} != xset ; then + LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config + fi + fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}libgcrypt-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}libgcrypt-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LIBGCRYPT_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LIBGCRYPT_CONFIG in + \\/* | ?:\\/*) + ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG +if test -n "$LIBGCRYPT_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5 +$as_echo "$LIBGCRYPT_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_LIBGCRYPT_CONFIG"; then + ac_pt_LIBGCRYPT_CONFIG=$LIBGCRYPT_CONFIG + # Extract the first word of "libgcrypt-config", so it can be a program name with args. +set dummy libgcrypt-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_LIBGCRYPT_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_LIBGCRYPT_CONFIG in + \\/* | ?:\\/*) + ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$ac_pt_LIBGCRYPT_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_LIBGCRYPT_CONFIG=$ac_cv_path_ac_pt_LIBGCRYPT_CONFIG +if test -n "$ac_pt_LIBGCRYPT_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LIBGCRYPT_CONFIG" >&5 +$as_echo "$ac_pt_LIBGCRYPT_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_LIBGCRYPT_CONFIG" = x; then
View file
libaacs-0.8.0.tar.bz2/configure.ac -> libaacs-0.8.1.tar.bz2/configure.ac
Changed
@@ -1,7 +1,7 @@ dnl library version number m4_define(aacs_major, 0) m4_define(aacs_minor, 8) -m4_define(aacs_micro, 0) +m4_define(aacs_micro, 1) m4_define(aacs_version,aacs_major.aacs_minor.aacs_micro) dnl shared library version (.so version) @@ -16,7 +16,7 @@ m4_define(lt_current, 5) m4_define(lt_age, 5) -m4_define(lt_revision, 0) +m4_define(lt_revision, 1) dnl initilization AC_INIT(libaacs, aacs_version, http://www.videolan.org/developers/libaacs.html) @@ -109,59 +109,25 @@ dnl required libraries -dnl pthread check (not on win32) -AS_IF(test "${SYS}" != "mingw32", - AC_CHECK_HEADERS(pthread.h, , - AC_MSG_ERROR(pthread required)) - AC_SEARCH_LIBS(pthread_create, pthread, , - AC_MSG_ERROR(pthread required)) -) - dnl gcrypt check - -AC_ARG_WITH(libgcrypt-prefix, - AC_HELP_STRING(--with-libgcrypt-prefix=PFX, - prefix where libgcrypt is installed (optional)), - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") -if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config - fi -fi - -AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) -if test x"$LIBGCRYPT_CONFIG" = xno; then - AC_MSG_ERROR(libgcrypt not found on system) -else - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - AC_SUBST(LIBGCRYPT_CFLAGS) - AC_SUBST(LIBGCRYPT_LIBS) -fi -AC_FUNC_STRERROR_R +AM_PATH_LIBGCRYPT(1.6.0, have_gcrypt=yes) +AS_IF(test "x$have_gcrypt" != xyes, + dnl older gcrypt requires pthread + AM_PATH_LIBGCRYPT(1.1.94,, + AC_MSG_ERROR(libgcrypt not found on system)) + dnl pthread check (not on win32) + AS_IF(test "${SYS}" != "mingw32", + AC_CHECK_HEADERS(pthread.h, , + AC_MSG_ERROR(pthread required)) + AC_SEARCH_LIBS(pthread_create, pthread, , + AC_MSG_ERROR(pthread required)) + ) + ) dnl use re-entrant version of gcrypt_error() from gpg-error - -AC_ARG_WITH(gpg-error-prefix, - AC_HELP_STRING(--with-gpg-error-prefix=PFX, - prefix where gpg-error is installed (optional)), - gpg_error_config_prefix="$withval", gpg_error_config_prefix="") -if test x$gpg_error_config_prefix != x ; then - if test x${GPG_ERROR_CONFIG+set} != xset ; then - GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config - fi -fi - -AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -if test x"$GPG_ERROR_CONFIG" = xno; then - AC_MSG_ERROR(gpg-error not found on system) -else - GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` - GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` - AC_SUBST(GPG_ERROR_CFLAGS) - AC_SUBST(GPG_ERROR_LIBS) - AC_DEFINE(HAVE_LIBGPG_ERROR, 1, Define to 1 if you have the gpg-error library) -fi +AC_FUNC_STRERROR_R +AM_PATH_GPG_ERROR(0.5, + AC_DEFINE(HAVE_LIBGPG_ERROR, 1, Define to 1 if you have the gpg-error library)) CC_CHECK_CFLAGS_APPEND(-Wall -Wdisabled-optimization -Wpointer-arith dnl -Wredundant-decls -Wcast-qual -Wwrite-strings -Wtype-limits -Wundef dnl
View file
libaacs-0.8.1.tar.bz2/m4/gpg-error.m4
Added
@@ -0,0 +1,102 @@ +# gpg-error.m4 - autoconf macro to detect libgpg-error. +# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Last-changed: 2014-01-24 + + +dnl AM_PATH_GPG_ERROR(MINIMUM-VERSION, +dnl ACTION-IF-FOUND , ACTION-IF-NOT-FOUND ) +dnl +dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +dnl used for programs requireding real multi thread support. +dnl +AC_DEFUN(AM_PATH_GPG_ERROR, + AC_REQUIRE(AC_CANONICAL_HOST) + gpg_error_config_prefix="" + dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, + dnl since that is consistent with how our three siblings use the directory/ + dnl package name in --with-$dir_name-prefix=PFX. + AC_ARG_WITH(libgpg-error-prefix, + AC_HELP_STRING(--with-libgpg-error-prefix=PFX, + prefix where GPG Error is installed (optional)), + gpg_error_config_prefix="$withval") + + dnl Accept --with-gpg-error-prefix and make it work the same as + dnl --with-libgpg-error-prefix above, for backwards compatibility, + dnl but do not document this old, inconsistently-named option. + AC_ARG_WITH(gpg-error-prefix,, + gpg_error_config_prefix="$withval") + + if test x$gpg_error_config_prefix != x ; then + if test x${GPG_ERROR_CONFIG+set} != xset ; then + GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config + fi + fi + + AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no) + min_gpg_error_version=ifelse($1, ,0.0,$1) + AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) + ok=no + if test "$GPG_ERROR_CONFIG" != "no" \ + && test -f "$GPG_ERROR_CONFIG" ; then + req_major=`echo $min_gpg_error_version | \ + sed 's/\(0-9*\)\.\(0-9*\)/\1/'` + req_minor=`echo $min_gpg_error_version | \ + sed 's/\(0-9*\)\.\(0-9*\)/\2/'` + gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` + major=`echo $gpg_error_config_version | \ + sed 's/\(0-9*\)\.\(0-9*\).*/\1/'` + minor=`echo $gpg_error_config_version | \ + sed 's/\(0-9*\)\.\(0-9*\).*/\2/'` + if test "$major" -gt "$req_major"; then + ok=yes + else + if test "$major" -eq "$req_major"; then + if test "$minor" -ge "$req_minor"; then + ok=yes + fi + fi + fi + fi + if test $ok = yes; then + GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` + GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` + GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` + GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` + AC_MSG_RESULT(yes ($gpg_error_config_version)) + ifelse($2, , :, $2) + gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` + if test x"$gpg_error_config_host" != xnone ; then + if test x"$gpg_error_config_host" != x"$host" ; then + AC_MSG_WARN( +*** +*** The config script $GPG_ERROR_CONFIG was +*** built for $gpg_error_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-gpg-error-prefix +*** to specify a matching config script. +***) + fi + fi + else + GPG_ERROR_CFLAGS="" + GPG_ERROR_LIBS="" + GPG_ERROR_MT_CFLAGS="" + GPG_ERROR_MT_LIBS="" + AC_MSG_RESULT(no) + ifelse($3, , :, $3) + fi + AC_SUBST(GPG_ERROR_CFLAGS) + AC_SUBST(GPG_ERROR_LIBS) + AC_SUBST(GPG_ERROR_MT_CFLAGS) + AC_SUBST(GPG_ERROR_MT_LIBS) +)
View file
libaacs-0.8.1.tar.bz2/m4/libgcrypt.m4
Added
@@ -0,0 +1,122 @@ +dnl Autoconf macros for libgcrypt +dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. +dnl +dnl This file is free software; as a special exception the author gives +dnl unlimited permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl +dnl This file is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + +dnl AM_PATH_LIBGCRYPT(MINIMUM-VERSION, +dnl ACTION-IF-FOUND , ACTION-IF-NOT-FOUND ) +dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. +dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed +dnl with the API version to also check the API compatibility. Example: +dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed +dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using +dnl this features allows to prevent build against newer versions of libgcrypt +dnl with a changed API. +dnl +AC_DEFUN(AM_PATH_LIBGCRYPT, + AC_REQUIRE(AC_CANONICAL_HOST) + AC_ARG_WITH(libgcrypt-prefix, + AC_HELP_STRING(--with-libgcrypt-prefix=PFX, + prefix where LIBGCRYPT is installed (optional)), + libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") + if test x$libgcrypt_config_prefix != x ; then + if test x${LIBGCRYPT_CONFIG+set} != xset ; then + LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config + fi + fi + + AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + tmp=ifelse($1, ,1:1.2.0,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_libgcrypt_api=0 + min_libgcrypt_version="$tmp" + fi + + AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) + ok=no + if test "$LIBGCRYPT_CONFIG" != "no" ; then + req_major=`echo $min_libgcrypt_version | \ + sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\)/\1/'` + req_minor=`echo $min_libgcrypt_version | \ + sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\)/\2/'` + req_micro=`echo $min_libgcrypt_version | \ + sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\)/\3/'` + libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` + major=`echo $libgcrypt_config_version | \ + sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\).*/\1/'` + minor=`echo $libgcrypt_config_version | \ + sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\).*/\2/'` + micro=`echo $libgcrypt_config_version | \ + sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\).*/\3/'` + if test "$major" -gt "$req_major"; then + ok=yes + else + if test "$major" -eq "$req_major"; then + if test "$minor" -gt "$req_minor"; then + ok=yes + else + if test "$minor" -eq "$req_minor"; then + if test "$micro" -ge "$req_micro"; then + ok=yes + fi + fi + fi + fi + fi + fi + if test $ok = yes; then + AC_MSG_RESULT(yes ($libgcrypt_config_version)) + else + AC_MSG_RESULT(no) + fi + if test $ok = yes; then + # If we have a recent libgcrypt, we should also check that the + # API is compatible + if test "$req_libgcrypt_api" -gt 0 ; then + tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING(LIBGCRYPT API version) + if test "$req_libgcrypt_api" -eq "$tmp" ; then + AC_MSG_RESULT(okay) + else + ok=no + AC_MSG_RESULT(does not match. want=$req_libgcrypt_api got=$tmp) + fi + fi + fi + fi + if test $ok = yes; then + LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` + LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` + ifelse($2, , :, $2) + libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` + if test x"$libgcrypt_config_host" != xnone ; then + if test x"$libgcrypt_config_host" != x"$host" ; then + AC_MSG_WARN( +*** +*** The config script $LIBGCRYPT_CONFIG was +*** built for $libgcrypt_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-libgcrypt-prefix +*** to specify a matching config script. +***) + fi + fi + else + LIBGCRYPT_CFLAGS="" + LIBGCRYPT_LIBS="" + ifelse($3, , :, $3) + fi + AC_SUBST(LIBGCRYPT_CFLAGS) + AC_SUBST(LIBGCRYPT_LIBS) +)
View file
libaacs-0.8.0.tar.bz2/src/file/mmc_device_linux.c -> libaacs-0.8.1.tar.bz2/src/file/mmc_device_linux.c
Changed
@@ -32,6 +32,7 @@ #include "util/strutl.h" #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <unistd.h> #include <fcntl.h> @@ -115,7 +116,6 @@ struct stat st; int fd = -1; MMCDEV *dev = NULL; - FILE *proc_mounts; /* resolve path */ if (!aacs_resolve_path(path, resolved_path)) { @@ -153,6 +153,7 @@ #if defined(HAVE_MNTENT_H) if (fd < 0) { /* resolve mount point to block device */ + FILE *proc_mounts; if ((proc_mounts = setmntent("/proc/mounts", "r"))) { struct mntent* mount_entry; @@ -180,8 +181,8 @@ } else { BD_DEBUG(DBG_MMC | DBG_CRIT, "Error opening /proc/mounts\n"); } -#endif } +#endif if (fd >= 0) { dev = calloc(1, sizeof(MMCDEV));
View file
libaacs-0.8.0.tar.bz2/src/libaacs/aacs.c -> libaacs-0.8.1.tar.bz2/src/libaacs/aacs.c
Changed
@@ -382,6 +382,9 @@ if (aacs->fopen) { return aacs->fopen(aacs->fopen_handle, file); } + if (!aacs->path) { + return NULL; + } f_name = str_printf("%s" DIR_SEP "%s", aacs->path, file); fp = file_open(f_name, "rb"); @@ -1005,7 +1008,7 @@ config_file *cf; int error_code; - aacs->path = str_printf("%s", path); + aacs->path = path ? str_printf("%s", path) : NULL; error_code = _calc_title_hash(aacs); if (error_code != AACS_SUCCESS) {
View file
libaacs-0.8.0.tar.bz2/src/libaacs/crypto.c -> libaacs-0.8.1.tar.bz2/src/libaacs/crypto.c
Changed
@@ -32,11 +32,14 @@ #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif + #include <gcrypt.h> + #ifdef HAVE_PTHREAD_H +#if GCRYPT_VERSION_NUMBER < 0x010600 #include <pthread.h> #endif -#include <errno.h> +#endif /* elliptic curve from AACS specs */ #define AACS_EC_p "9DC9D81355ECCEB560BDB09EF9EAE7C479A7D7DF" @@ -53,7 +56,9 @@ /* Use pthread in libgcrypt */ #ifdef HAVE_PTHREAD_H +# if GCRYPT_VERSION_NUMBER < 0x010600 GCRY_THREAD_OPTION_PTHREAD_IMPL; +# endif #endif /* include some elliptic curve utils from libgcrypt */ @@ -122,7 +127,9 @@ if (!crypto_init_check) { crypto_init_check = 1; #ifdef HAVE_PTHREAD_H +# if GCRYPT_VERSION_NUMBER < 0x010600 gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); +# endif #endif if (!gcry_check_version(GCRYPT_VERSION)) { crypto_init_check = 0;
View file
libaacs-0.8.0.tar.bz2/src/libaacs/ec.c -> libaacs-0.8.1.tar.bz2/src/libaacs/ec.c
Changed
@@ -22,7 +22,9 @@ #define mpi_alloc_like(m) gcry_mpi_new(0) #define mpi_alloc_set_ui(u) gcry_mpi_set_ui(gcry_mpi_new(0), u) #define mpi_free(m) gcry_mpi_release(m) +#ifndef mpi_is_neg #define mpi_is_neg(m) (mpi_cmp_ui(m, 0) < 0) +#endif #define DIM(t) (sizeof(t)/sizeof(t0)) /************************************ mpi.h ***********************************/
View file
libaacs-0.8.0.tar.bz2/src/libaacs/mmc.c -> libaacs-0.8.1.tar.bz2/src/libaacs/mmc.c
Changed
@@ -340,7 +340,13 @@ MMC *mmc_open(const char *path) { - MMC *mmc = calloc(1, sizeof(MMC)); + MMC *mmc; + + if (!path) { + return NULL; + } + + mmc = calloc(1, sizeof(MMC)); crypto_create_nonce(mmc->host_nonce, sizeof(mmc->host_nonce));
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.