[Pkg-e-commits] [SCM] Enlightenment DR17 file chunk reading/writing library branch, master, updated. debian/1.0.1-1-632-gf1d27f7
Albin Tonnerre
albin.tonnerre at gmail.com
Mon Aug 3 16:48:39 UTC 2009
The following commit has been merged in the master branch:
commit b0d73f23a2922c46aa4439191376ebe242484a24
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Wed Jul 29 16:54:27 2009 +0200
Import upstream release 1.2.2
diff --git a/ChangeLog b/ChangeLog
index 11de2be..4d48ef9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -186,3 +186,18 @@
* Release eet 1.2.1
+2009-07-08 Cedric BAIL
+
+ * Reorder gcry init to be used during gnutls init.
+
+2009-07-11 Hanspeter Portner
+
+ * Improve docs/examples in Eet.h
+
+2009-07-23 Cedric BAIL
+
+ * Fix init on system without SECMEM.
+
+2009-07-29 Carsten Haitzler (The Rasterman)
+
+ * Release eet 1.2.2
diff --git a/README b/README
index 5e2cf59..7235e13 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Eet 1.2.1
+Eet 1.2.2
Requirements:
-------------
@@ -38,7 +38,7 @@ BUILDING PACKAGES:
RPM: To build rpm packages:
- sudo rpm -ta eet-1.2.1.tar.gz
+ sudo rpm -ta eet-1.2.2.tar.gz
You will find rpm packages in your system /usr/src/redhat/* dirs (note you may
not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents
diff --git a/configure b/configure
index 805d1db..0d19d64 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for eet 1.2.1.
+# Generated by GNU Autoconf 2.61 for eet 1.2.2.
#
# Report bugs to <enlightenment-devel at lists.sourceforge.net>.
#
@@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='eet'
PACKAGE_TARNAME='eet'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='eet 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='eet 1.2.2'
PACKAGE_BUGREPORT='enlightenment-devel at lists.sourceforge.net'
ac_unique_file="configure.ac"
@@ -1428,7 +1428,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 eet 1.2.1 to adapt to many kinds of systems.
+\`configure' configures eet 1.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1498,7 +1498,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of eet 1.2.1:";;
+ short | recursive ) echo "Configuration of eet 1.2.2:";;
esac
cat <<\_ACEOF
@@ -1522,9 +1522,9 @@ Optional Features:
--disable-cipher disable cipher support for eet API
--disable-signature disable signature file support for eet
--enable-assert enable assert, [[default=disabled]]
- --enable-tests enable tests [default=no]
- --enable-coverage compile with coverage profiling instrumentation
- [default=no]
+ --enable-tests enable tests [default=disabled]
+ --enable-coverage enable coverage profiling instrumentation
+ [default=disabled]
--disable-doc Disable documentation build [default=enabled]
Optional Packages:
@@ -1624,7 +1624,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-eet configure 1.2.1
+eet configure 1.2.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1638,7 +1638,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 eet $as_me 1.2.1, which was
+It was created by eet $as_me 1.2.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -3480,7 +3480,7 @@ fi
# Define the identity of the package.
PACKAGE='eet'
- VERSION='1.2.1'
+ VERSION='1.2.2'
cat >>confdefs.h <<_ACEOF
@@ -11556,9 +11556,9 @@ if test "${enable_tests+set}" = set; then
else
_efl_enable_tests="no"
-
fi
+
{ echo "$as_me:$LINENO: checking whether tests are built" >&5
echo $ECHO_N "checking whether tests are built... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: ${_efl_enable_tests}" >&5
@@ -11629,10 +11629,8 @@ fi
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
_efl_enable_tests="no"
-
elif test $pkg_failed = untried; then
_efl_enable_tests="no"
-
else
CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
CHECK_LIBS=$pkg_cv_CHECK_LIBS
@@ -11671,9 +11669,9 @@ if test "${enable_coverage+set}" = set; then
else
_efl_enable_coverage="no"
-
fi
+
{ echo "$as_me:$LINENO: checking whether to use profiling instrumentation" >&5
echo $ECHO_N "checking whether to use profiling instrumentation... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $_efl_enable_coverage" >&5
@@ -12476,7 +12474,8 @@ if test "x${efl_enable_doc}" = "xyes" ; then
# Check whether --with-doxygen was given.
if test "${with_doxygen+set}" = set; then
- withval=$with_doxygen; efl_doxygen=${withval}
+ withval=$with_doxygen;
+ efl_doxygen=${withval}
# Extract the first word of "${efl_doxygen}", so it can be a program name with args.
set dummy ${efl_doxygen}; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -14359,7 +14358,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
fi
@@ -15627,7 +15625,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by eet $as_me 1.2.1, which was
+This file was extended by eet $as_me 1.2.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15680,7 +15678,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-eet config.status 1.2.1
+eet config.status 1.2.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 81e8e38..a513148 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT([eet], [1.2.1], [enlightenment-devel at lists.sourceforge.net])
+AC_INIT([eet], [1.2.2], [enlightenment-devel at lists.sourceforge.net])
AC_PREREQ([2.52])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/eet.spec b/eet.spec
index df3298e..fee17ec 100644
--- a/eet.spec
+++ b/eet.spec
@@ -2,7 +2,7 @@
Summary: Library for speedy data storage, retrieval, and compression.
Name: eet
-Version: 1.2.1
+Version: 1.2.2
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: System Environment/Libraries
diff --git a/m4/ac_attribute.m4 b/m4/ac_attribute.m4
index 3926d23..23479a9 100644
--- a/m4/ac_attribute.m4
+++ b/m4/ac_attribute.m4
@@ -31,8 +31,7 @@ int foo(int x __attribute__ ((unused)))
[],
[ac_cv___attribute__="yes"],
[ac_cv___attribute__="no"]
- )]
-)
+ )])
AC_MSG_RESULT($ac_cv___attribute__)
@@ -44,3 +43,5 @@ if test "x${ac_cv___attribute__}" = "xyes" ; then
fi
])
+
+dnl End of ac_attribute.m4
diff --git a/m4/efl_coverage.m4 b/m4/efl_coverage.m4
index 1618f76..baf0002 100644
--- a/m4/efl_coverage.m4
+++ b/m4/efl_coverage.m4
@@ -16,7 +16,7 @@ AC_DEFUN([EFL_CHECK_COVERAGE],
dnl configure option
AC_ARG_ENABLE([coverage],
- [AC_HELP_STRING([--enable-coverage], [compile with coverage profiling instrumentation @<:@default=no@:>@])],
+ [AC_HELP_STRING([--enable-coverage], [enable coverage profiling instrumentation @<:@default=disabled@:>@])],
[
if test "x${enableval}" = "xyes" ; then
_efl_enable_coverage="yes"
@@ -24,8 +24,8 @@ AC_ARG_ENABLE([coverage],
_efl_enable_coverage="no"
fi
],
- [_efl_enable_coverage="no"]
-)
+ [_efl_enable_coverage="no"])
+
AC_MSG_CHECKING([whether to use profiling instrumentation])
AC_MSG_RESULT([$_efl_enable_coverage])
@@ -57,8 +57,10 @@ AC_SUBST(EFL_COVERAGE_LIBS)
AM_CONDITIONAL(EFL_ENABLE_COVERAGE, test "x${_efl_enable_coverage}" = "xyes")
if test "x${_efl_enable_coverage}" = "xyes" ; then
- ifelse([$2], , :, [$2])
+ m4_default([$2], [:])
else
- ifelse([$3], , :, [$3])
+ m4_default([$3], [:])
fi
])
+
+dnl End of efl_coverage.m4
diff --git a/m4/efl_doxygen.m4 b/m4/efl_doxygen.m4
index dd6bc3e..d83ed68 100644
--- a/m4/efl_doxygen.m4
+++ b/m4/efl_doxygen.m4
@@ -32,9 +32,7 @@ AC_MSG_RESULT([${efl_enable_doc}])
if test "x${efl_enable_doc}" = "xyes" ; then
-dnl
dnl Specify the file name, without path
-dnl
efl_doxygen="doxygen"
@@ -42,9 +40,9 @@ dnl
[AC_HELP_STRING(
[--with-doxygen=FILE],
[doxygen program to use @<:@default=doxygen@:>@])],
-dnl
+
dnl Check the given doxygen program.
-dnl
+
[efl_doxygen=${withval}
AC_CHECK_PROG([efl_have_doxygen],
[${efl_doxygen}],
@@ -96,4 +94,4 @@ fi
])
-dnl End of doxygen.m4
+dnl End of efl_doxygen.m4
diff --git a/m4/efl_tests.m4 b/m4/efl_tests.m4
index 8d193b6..98d11bb 100644
--- a/m4/efl_tests.m4
+++ b/m4/efl_tests.m4
@@ -13,7 +13,7 @@ AC_DEFUN([EFL_CHECK_TESTS],
dnl configure option
AC_ARG_ENABLE([tests],
- [AC_HELP_STRING([--enable-tests], [enable tests @<:@default=no@:>@])],
+ [AC_HELP_STRING([--enable-tests], [enable tests @<:@default=disabled@:>@])],
[
if test "x${enableval}" = "xyes" ; then
_efl_enable_tests="yes"
@@ -21,8 +21,8 @@ AC_ARG_ENABLE([tests],
_efl_enable_tests="no"
fi
],
- [_efl_enable_tests="no"]
-)
+ [_efl_enable_tests="no"])
+
AC_MSG_CHECKING([whether tests are built])
AC_MSG_RESULT([${_efl_enable_tests}])
@@ -32,15 +32,16 @@ if test "x${_efl_enable_tests}" = "xyes" ; then
PKG_CHECK_MODULES([CHECK],
[check >= 0.9.5],
[dummy="yes"],
- [_efl_enable_tests="no"]
- )
+ [_efl_enable_tests="no"])
fi
AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes")
if test "x${_efl_enable_tests}" = "xyes" ; then
- ifelse([$1], , :, [$1])
+ m4_default([$1], [:])
else
- ifelse([$2], , :, [$2])
+ m4_default([$2], [:])
fi
])
+
+dnl End of efl_tests.m4
diff --git a/src/lib/Eet.h b/src/lib/Eet.h
index 30d6881..3026578 100644
--- a/src/lib/Eet.h
+++ b/src/lib/Eet.h
@@ -187,6 +187,7 @@ extern "C" {
* @code
* #include <Eet.h>
* #include <stdio.h>
+ * #include <string.h>
*
* int
* main(int argc, char **argv)
@@ -195,6 +196,8 @@ extern "C" {
* char buf[1024], *ret, **list;
* int size, num, i;
*
+ * eet_init();
+ *
* strcpy(buf, "Here is a string of data to save!");
*
* ef = eet_open("/tmp/my_file.eet", EET_FILE_MODE_WRITE);
@@ -220,6 +223,8 @@ extern "C" {
* }
* eet_close(ef);
*
+ * eet_shutdown();
+ *
* return 0;
* }
* @endcode
@@ -874,6 +879,8 @@ extern "C" {
* FILE *f;
* Blah *blah_in;
*
+ * eet_init();
+ *
* edd3 = eet_data_descriptor_new("blah3", sizeof(Blah3),
* eina_list_next,
* eina_list_append,
@@ -960,6 +967,8 @@ extern "C" {
* eet_data_descriptor_free(edd2);
* eet_data_descriptor_free(edd3);
*
+ * eet_shutdown();
+ *
* return 0;
* }
*
@@ -1376,6 +1385,7 @@ eet_dictionary_string_check * example: values), and @p type is the basic data
EAPI Eet_Node *eet_node_var_array_new(const char *name, Eina_List *nodes);
EAPI Eet_Node *eet_node_hash_new(const char *name, const char *key, Eet_Node *node);
EAPI Eet_Node *eet_node_struct_new(const char *name, Eina_List *nodes);
+ EAPI Eet_Node *eet_node_struct_child_new(const char *parent, Eet_Node *child);
EAPI void eet_node_del(Eet_Node *n);
EAPI void *eet_data_node_encode_cipher(Eet_Node *node, const char *key, int *size_ret);
diff --git a/src/lib/eet_cipher.c b/src/lib/eet_cipher.c
index 0532413..6064a16 100644
--- a/src/lib/eet_cipher.c
+++ b/src/lib/eet_cipher.c
@@ -348,22 +348,26 @@ eet_identity_compute_sha1(const void *data_base, unsigned int data_length,
{
void *result;
-#ifdef HAVE_GNUTLS
+#ifdef HAVE_SIGNATURE
+# ifdef HAVE_GNUTLS
result = malloc(gcry_md_get_algo_dlen(GCRY_MD_SHA1));
if (!result) return NULL;
gcry_md_hash_buffer(GCRY_MD_SHA1, result, data_base, data_length);
if (sha1_length) *sha1_length = gcry_md_get_algo_dlen(GCRY_MD_SHA1);
-#else
-# ifdef HAVE_OPENSSL
+# else
+# ifdef HAVE_OPENSSL
result = malloc(SHA_DIGEST_LENGTH);
if (!result) return NULL;
SHA1(data_base, data_length, result);
if (sha1_length) *sha1_length = SHA_DIGEST_LENGTH;
-# else
+# else
+ result = NULL;
+# endif
+# endif
+#else
result = NULL;
-# endif
#endif
return result;
diff --git a/src/lib/eet_lib.c b/src/lib/eet_lib.c
index 0026172..a6b5d99 100644
--- a/src/lib/eet_lib.c
+++ b/src/lib/eet_lib.c
@@ -731,8 +731,6 @@ eet_init(void)
if (eet_initcount > 1) return eet_initcount;
#ifdef HAVE_GNUTLS
- if (gnutls_global_init())
- return --eet_initcount;
/* Before the library can be used, it must initialize itself if needed. */
if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P) == 0)
{
@@ -740,10 +738,7 @@ eet_init(void)
/* Disable warning messages about problems with the secure memory subsystem.
This command should be run right after gcry_check_version. */
if (gcry_control(GCRYCTL_DISABLE_SECMEM_WARN))
- {
- gnutls_global_deinit();
- return --eet_initcount;
- }
+ return --eet_initcount;
/* This command is used to allocate a pool of secure memory and thus
enabling the use of secure memory. It also drops all extra privileges the
process has (i.e. if it is run as setuid (root)). If the argument nbytes
@@ -751,11 +746,10 @@ eet_init(void)
allocated is currently 16384 bytes; you may thus use a value of 1 to
request that default size. */
if (gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0))
- {
- gnutls_global_deinit();
- return --eet_initcount;
- }
+ fprintf(stderr, "BIG FAT WARNING: I AM UNABLE TO REQUEST SECMEM, Cryptographic operation are at risk !");
}
+ if (gnutls_global_init())
+ return --eet_initcount;
#endif
#ifdef HAVE_OPENSSL
ERR_load_crypto_strings();
diff --git a/src/lib/eet_node.c b/src/lib/eet_node.c
index 0514026..1a900b4 100644
--- a/src/lib/eet_node.c
+++ b/src/lib/eet_node.c
@@ -59,18 +59,18 @@ _eet_node_append(Eet_Node *n, Eina_List *nodes)
return n; \
}
-EET_NODE_NEW(EET_T_CHAR, char, c, char);
-EET_NODE_NEW(EET_T_SHORT, short, s, short);
-EET_NODE_NEW(EET_T_INT, int, i, int);
-EET_NODE_NEW(EET_T_LONG_LONG, long_long, l, long long);
-EET_NODE_NEW(EET_T_FLOAT, float, f, float);
-EET_NODE_NEW(EET_T_DOUBLE, double, d, double);
-EET_NODE_NEW(EET_T_UCHAR, unsigned_char, uc, unsigned char);
-EET_NODE_NEW(EET_T_USHORT, unsigned_short, us, unsigned short);
-EET_NODE_NEW(EET_T_UINT, unsigned_int, ui, unsigned int);
-EET_NODE_NEW(EET_T_ULONG_LONG, unsigned_long_long, ul, unsigned long long);
-EET_NODE_STR_NEW(EET_T_STRING, string, str, const char *);
-EET_NODE_STR_NEW(EET_T_INLINED_STRING, inlined_string, str, const char *);
+EET_NODE_NEW(EET_T_CHAR, char, c, char)
+EET_NODE_NEW(EET_T_SHORT, short, s, short)
+EET_NODE_NEW(EET_T_INT, int, i, int)
+EET_NODE_NEW(EET_T_LONG_LONG, long_long, l, long long)
+EET_NODE_NEW(EET_T_FLOAT, float, f, float)
+EET_NODE_NEW(EET_T_DOUBLE, double, d, double)
+EET_NODE_NEW(EET_T_UCHAR, unsigned_char, uc, unsigned char)
+EET_NODE_NEW(EET_T_USHORT, unsigned_short, us, unsigned short)
+EET_NODE_NEW(EET_T_UINT, unsigned_int, ui, unsigned int)
+EET_NODE_NEW(EET_T_ULONG_LONG, unsigned_long_long, ul, unsigned long long)
+EET_NODE_STR_NEW(EET_T_STRING, string, str, const char *)
+EET_NODE_STR_NEW(EET_T_INLINED_STRING, inlined_string, str, const char *)
Eet_Node *
eet_node_null_new(const char *name)
@@ -160,6 +160,22 @@ eet_node_struct_new(const char *name, Eina_List *nodes)
return n;
}
+Eet_Node *
+eet_node_struct_child_new(const char *parent, Eet_Node *child)
+{
+ Eet_Node *n;
+
+ if (child->type != EET_G_UNKNOWN)
+ return child;
+
+ n = _eet_node_new(parent, EET_G_UNKNOWN);
+ if (!n) return NULL;
+
+ _eet_node_append(n, eina_list_prepend(NULL, child));
+
+ return n;
+}
+
void
eet_node_del(Eet_Node *n)
{
--
Enlightenment DR17 file chunk reading/writing library
More information about the Pkg-e-commits
mailing list