Imported Upstream version 1.7.3

diff --git a/ChangeLog b/ChangeLog
index 0ab19ac..5dcf176 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-]2011-01-29  Carsten Haitzler (The Rasterman)
+2011-01-29  Carsten Haitzler (The Rasterman)
 
         1.0.0 release
 
@@ -358,3 +358,19 @@
 
         1.7.2 release
 
+2012-11-29  Vincent Torri
+
+        * Do not use -pthread anymore, but instead pass _REENTRANT to the
+       preprocessor and -lpthread to the linker.
+       * On Solaris OS, -mt is passed by default and same flags than
+       linux must be passed.
+
+2012-12-07  Cedric Bail
+
+       * Don't leak fd after exec.
+
+2012-12-07  Luis Felipe Strano Moraes
+
+       * 1.7.3 release
+
+

diff --git a/NEWS b/NEWS
index 2bb693c..df7ab71 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
-Eina 1.7.2
+Eina 1.7.3
+
+Changes since Eina 1.7.2:
+-------------------------
+
+    * Fix Solaris build.
+    * Don't leak fd after exec.
 
 Changes since Eina 1.7.1:
 -------------------------

diff --git a/configure b/configure
index 70f2686..c516b0f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for eina 1.7.2.
+# Generated by GNU Autoconf 2.68 for eina 1.7.3.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='eina'
 PACKAGE_TARNAME='eina'
-PACKAGE_VERSION='1.7.2'
-PACKAGE_STRING='eina 1.7.2'
+PACKAGE_VERSION='1.7.3'
+PACKAGE_STRING='eina 1.7.3'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1459,7 +1459,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 eina 1.7.2 to adapt to many kinds of systems.
+\`configure' configures eina 1.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1529,7 +1529,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of eina 1.7.2:";;
+     short | recursive ) echo "Configuration of eina 1.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1725,7 +1725,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-eina configure 1.7.2
+eina configure 1.7.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2447,7 +2447,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 eina $as_me 1.7.2, which was
+It was created by eina $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3271,7 +3271,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='eina'
- VERSION='1.7.2'
+ VERSION='1.7.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12504,7 +12504,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 2
+#define VMIC 3
 _ACEOF
 
 
@@ -12512,7 +12512,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:2:7"
+version_info="8:3:7"
 release_info=""
 
 
@@ -12540,11 +12540,11 @@ case "$host_os" in
       ;;
    mingw*)
       have_win32="yes"
-      MODULE_ARCH="$host_os-$host_cpu-1.7.2"
+      MODULE_ARCH="$host_os-$host_cpu-1.7.3"
       MODULE_EXT=".dll"
       ;;
    *)
-      MODULE_ARCH="$host_os-$host_cpu-1.7.2"
+      MODULE_ARCH="$host_os-$host_cpu-1.7.3"
       MODULE_EXT=".so"
       ;;
 esac
@@ -13011,15 +13011,10 @@ $as_echo "#define EFL_HAVE_WIN32_THREADS 1" >>confdefs.h
 $as_echo "#define EFL_HAVE_THREADS 1" >>confdefs.h
 
       ;;
-   solaris*)
-      _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-mt"
-      _efl_threads_libs="-mt"
-      ;;
    *)
       _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-pthread"
-      _efl_threads_libs="-pthread"
+      _efl_threads_cflags="-D_REENTRANT"
+      _efl_threads_libs="-lpthread"
       ;;
 esac
 
@@ -22418,7 +22413,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 eina $as_me 1.7.2, which was
+This file was extended by eina $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22484,7 +22479,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="\\
-eina config.status 1.7.2
+eina config.status 1.7.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 199a9a2..55707f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [2])
+m4_define([v_mic], [3])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line

diff --git a/eina.pc b/eina.pc
index 9c4f808..554cf93 100644 (file)
--- a/eina.pc
+++ b/eina.pc
@@ -1,4 +1,4 @@
-prefix=/home/lfelipe/src/efl-stable/local
+prefix=/home/lfelipe/e-release/release/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -6,7 +6,7 @@ includedir=${prefix}/include
 Name: Eina
 Description: A Library that implements fast data types and miscellaneous tools
 Requires.private: 
-Version: 1.7.2
-Libs: -L${libdir} -leina -pthread
-Libs.private: -pthread  -ldl -ldl   -lrt -lm
+Version: 1.7.3
+Libs: -L${libdir} -leina -lpthread
+Libs.private: -lpthread  -ldl -ldl   -lrt -lm
 Cflags: -I${includedir}/eina-1 -I${includedir}/eina-1/eina

diff --git a/eina.spec b/eina.spec
index 1bbc394..6017a93 100644 (file)
--- a/eina.spec
+++ b/eina.spec
@@ -3,7 +3,7 @@
 
 Summary: Data Type Library
 Name: eina
-Version: 1.7.2
+Version: 1.7.3
 Release: %{_rel}
 License: LGPLv2.1
 Group: System Environment/Libraries

diff --git a/m4/common/efl_threads.m4 b/m4/common/efl_threads.m4
index ae29606..b1583ad 100644 (file)
--- a/m4/common/efl_threads.m4
+++ b/m4/common/efl_threads.m4
@@ -27,15 +27,10 @@ case "$host_os" in
       AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported])
       AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
       ;;
-   solaris*)
-      _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-mt"
-      _efl_threads_libs="-mt"
-      ;;
    *)
       _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-pthread"
-      _efl_threads_libs="-pthread"
+      _efl_threads_cflags="-D_REENTRANT"
+      _efl_threads_libs="-lpthread"
       ;;
 esac
 

diff --git a/src/lib/eina_mmap.c b/src/lib/eina_mmap.c
index 90809a2..1a43675 100644 (file)
--- a/src/lib/eina_mmap.c
+++ b/src/lib/eina_mmap.c
@@ -156,9 +156,20 @@ eina_mmap_safety_enabled_set(Eina_Bool enabled)
         /* no zero page device - open it */
         if (_eina_mmap_zero_fd < 0)
           {
+#ifdef HAVE_EXECVP
+             int flags;
+#endif
+
              _eina_mmap_zero_fd = open("/dev/zero", O_RDWR);
              /* if we don;'t have one - fail to set up mmap safety */
              if (_eina_mmap_zero_fd < 0) return EINA_FALSE;
+
+#ifdef HAVE_EXECVP
+             flags = fcntl(_eina_mmap_zero_fd, F_GETFD);
+             flags |= FD_CLOEXEC;
+             fcntl(_eina_mmap_zero_fd, F_SETFD, flags);
+#endif
+            
           }
         /* set up signal handler for SIGBUS */
         sa.sa_sigaction = _eina_mmap_safe_sigbus;