commit ethumb for openSUSE:Factory
Hello community, here is the log from the commit of package ethumb for openSUSE:Factory checked in at 2013-04-17 23:04:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ethumb (Old) and /work/SRC/openSUSE:Factory/.ethumb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ethumb", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ethumb/ethumb.changes 2013-01-10 15:27:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ethumb.new/ethumb.changes 2013-04-17 23:04:24.000000000 +0200 @@ -1,0 +2,35 @@ +Tue Apr 16 22:55:32 UTC 2013 - sleep_walker@suse.cz + +- removing man page documentation completely + +------------------------------------------------------------------- +Tue Apr 9 14:15:02 UTC 2013 - sleep_walker@suse.cz + +- build manpages for every project again, but try to filter + unimportant files + +------------------------------------------------------------------- +Mon Apr 8 12:24:30 UTC 2013 - sleep_walker@suse.cz + +- disable man page generation for now as it collides with man pages + of boost package + you can still enable that easily in spec and rebuilt it locally + or take it from X11:Enlightenment:Factory + +------------------------------------------------------------------- +Sat Apr 6 00:10:16 UTC 2013 - simon@simotek.net + +- update to 1.7.6 + Changelog: +Rafael Antognolli (2): + Bump stable efl to 1.7.6. + Update changelog for 1.7.6 release. + +Stefan Schmidt (2): + ethumb: Backport mem leak fixes rev 83818 and 83817 + ethumb-1.7: Changelof and NEWS entry for backports + +Tom Hacohen (1): + Fix revision fetching when not using git. + +------------------------------------------------------------------- Old: ---- ethumb-1.7.5.tar.bz2 New: ---- ethumb-1.7.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ethumb.spec ++++++ --- /var/tmp/diff_new_pack.hX18oU/_old 2013-04-17 23:04:25.000000000 +0200 +++ /var/tmp/diff_new_pack.hX18oU/_new 2013-04-17 23:04:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ethumb # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: ethumb -Version: 1.7.5 -Release: 1 -License: LGPL-2.1 +Version: 1.7.6 +Release: 0 Summary: Thumbnail generation library for EFL -Url: http://enlightenment.org/ +License: LGPL-2.1 Group: Development/Libraries/C and C++ +Url: http://enlightenment.org/ Source: %{name}-%{version}.tar.bz2 BuildRequires: doxygen %if 0%{?suse_version} @@ -80,13 +80,6 @@ %description doc-html Documentation of Ethumb library in form of HTML pages. -%package doc-man -Summary: Man documentation of Ethumb -Group: Documentation/Man - -%description doc-man -Documentation of Ethumb library in form of man pages. - %prep %setup -q @@ -108,12 +101,10 @@ echo "Copying HTML documentation" mkdir -p %{buildroot}%{_docdir}/%{name}/html /bin/cp -vr doc/html/* %{buildroot}%{_docdir}/%{name}/html/ -echo "Copying MAN pages" -/bin/cp -vr doc/man/ %{buildroot}%{_mandir}/ + # remove duplicates %if 0%{?suse_version} %fdupes -s %{buildroot}%{_docdir} -%fdupes -s %{buildroot}%{_mandir} %endif cp COPYING README %{buildroot}%{_docdir}/%{name}/ @@ -158,8 +149,4 @@ %defattr(-, root, root) %doc %{_docdir}/%{name}/html/ -%files doc-man -%defattr(-, root, root) -%{_mandir}/*/* - %changelog ++++++ ethumb-1.7.5.tar.bz2 -> ethumb-1.7.6.tar.bz2 ++++++ ++++ 2575 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/ChangeLog new/ethumb-1.7.6/ChangeLog --- old/ethumb-1.7.5/ChangeLog 2013-01-04 14:59:45.000000000 +0100 +++ new/ethumb-1.7.6/ChangeLog 2013-04-04 22:49:46.000000000 +0200 @@ -44,3 +44,11 @@ * 1.7.5 release +2013-02-11 Stefan Schmidt + + * Fix memory leak in error case in ethumbd_child.c + + +2013-04-04 Rafael Antognolli + + * 1.7.6 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/NEWS new/ethumb-1.7.6/NEWS --- old/ethumb-1.7.5/NEWS 2013-01-04 14:59:48.000000000 +0100 +++ new/ethumb-1.7.6/NEWS 2013-04-04 21:42:04.000000000 +0200 @@ -1,5 +1,11 @@ Ethumb 1.7.5 +Changes since Ethumb 1.7.5: +------------------------- + +Fixes: + * Fixed memory leak on error case in ethumbd_child. + Changes since Ethumb 1.7.4: ------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/compile new/ethumb-1.7.6/compile --- old/ethumb-1.7.5/compile 2012-12-19 16:03:01.000000000 +0100 +++ new/ethumb-1.7.6/compile 2013-04-04 23:18:59.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-03-05.13; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free # Software Foundation, Inc. @@ -79,6 +79,48 @@ esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +151,34 @@ ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/configure.ac new/ethumb-1.7.6/configure.ac --- old/ethumb-1.7.5/configure.ac 2013-01-04 15:07:28.000000000 +0100 +++ new/ethumb-1.7.6/configure.ac 2013-04-04 21:59:40.000000000 +0200 @@ -2,9 +2,8 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [5]) -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']))]) +m4_define([v_mic], [6]) +m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line @@ -99,23 +98,23 @@ case "$host_os" in mingw*) - PKG_CHECK_MODULES([EVIL], [evil >= 1.7.5]) + PKG_CHECK_MODULES([EVIL], [evil >= 1.7.6]) AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) - requirement_ethumb="${requirement_ethumb} evil >= 1.7.5" + requirement_ethumb="${requirement_ethumb} evil >= 1.7.6" ;; esac -PKG_CHECK_MODULES(EINA, [eina >= 1.7.5]) -PKG_CHECK_MODULES(EVAS, [evas >= 1.7.5]) -PKG_CHECK_MODULES(ECORE, [ecore >= 1.7.5]) -PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas >= 1.7.5]) -PKG_CHECK_MODULES(ECORE_FILE, [ecore-file >= 1.7.5 ]) -PKG_CHECK_MODULES(EDJE, [edje >= 1.7.5]) -PKG_CHECK_MODULES(EET, [eet >= 1.7.5]) +PKG_CHECK_MODULES(EINA, [eina >= 1.7.6]) +PKG_CHECK_MODULES(EVAS, [evas >= 1.7.6]) +PKG_CHECK_MODULES(ECORE, [ecore >= 1.7.6]) +PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas >= 1.7.6]) +PKG_CHECK_MODULES(ECORE_FILE, [ecore-file >= 1.7.6 ]) +PKG_CHECK_MODULES(EDJE, [edje >= 1.7.6]) +PKG_CHECK_MODULES(EET, [eet >= 1.7.6]) EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) -requirement_ethumb=" ${requirement_ethumb} eina >= 1.7.5 evas >= 1.7.5 ecore >= 1.7.5 ecore-evas >= 1.7.5 ecore-file >= 1.7.5 edje >= 1.7.5" -requirement_ethumb_client="eina >= 1.7.5 ecore >= 1.7.5 edbus >= 1.7.5 ethumb >= 1.7.5" +requirement_ethumb=" ${requirement_ethumb} eina >= 1.7.6 evas >= 1.7.6 ecore >= 1.7.6 ecore-evas >= 1.7.6 ecore-file >= 1.7.6 edje >= 1.7.6" +requirement_ethumb_client="eina >= 1.7.6 ecore >= 1.7.6 edbus >= 1.7.6 ethumb >= 1.7.6" AM_CONDITIONAL(HAVE_EMOTION, false) define([CHECK_MODULE_EMOTION], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/doc/Doxyfile new/ethumb-1.7.6/doc/Doxyfile --- old/ethumb-1.7.5/doc/Doxyfile 2013-01-04 15:27:47.000000000 +0100 +++ new/ethumb-1.7.6/doc/Doxyfile 2013-04-05 00:42:17.000000000 +0200 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.7.5 +PROJECT_NUMBER = 1.7.6 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/ethumb.spec new/ethumb-1.7.6/ethumb.spec --- old/ethumb-1.7.5/ethumb.spec 2013-01-04 15:27:47.000000000 +0100 +++ new/ethumb-1.7.6/ethumb.spec 2013-04-05 00:42:17.000000000 +0200 @@ -3,7 +3,7 @@ Summary: Thumbnail Generation Library Name: ethumb -Version: 1.7.5 +Version: 1.7.6 Release: %{_rel} License: LGPLv2.1 Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/m4/libtool.m4 new/ethumb-1.7.6/m4/libtool.m4 --- old/ethumb-1.7.5/m4/libtool.m4 2012-12-19 16:03:00.000000000 +0100 +++ new/ethumb-1.7.6/m4/libtool.m4 2013-04-04 23:18:58.000000000 +0200 @@ -2669,10 +2669,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2684,18 +2688,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3301,7 +3293,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4113,7 +4105,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4590,9 +4582,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4655,9 +4644,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4879,7 +4865,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5056,7 +5042,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5361,7 +5346,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ethumb-1.7.5/src/bin/ethumbd_child.c new/ethumb-1.7.6/src/bin/ethumbd_child.c --- old/ethumb-1.7.5/src/bin/ethumbd_child.c 2012-12-19 15:43:49.000000000 +0100 +++ new/ethumb-1.7.6/src/bin/ethumbd_child.c 2013-04-04 21:42:04.000000000 +0200 @@ -262,13 +262,25 @@ return 0; r = _ec_pipe_str_read(ec, &key); if (!r) - return 0; + { + free(path); + return 0; + } r = _ec_pipe_str_read(ec, &thumb_path); if (!r) - return 0; + { + free(path); + free(key); + return 0; + } r = _ec_pipe_str_read(ec, &thumb_key); if (!r) - return 0; + { + free(path); + free(key); + free(thumb_path); + return 0; + } ethumb_file_set(ec->ethumbt[idx], path, key); ethumb_thumb_path_set(ec->ethumbt[idx], thumb_path, thumb_key); @@ -436,16 +448,30 @@ return 0; r = _ec_read_safe(STDIN_FILENO, &type, sizeof(type)); if (!r) - return 0; + { + free(theme_file); + return 0; + } r = _ec_pipe_str_read(ec, &group); if (!r) - return 0; + { + free(theme_file); + return 0; + } r = _ec_read_safe(STDIN_FILENO, &type, sizeof(type)); if (!r) - return 0; + { + free(theme_file); + free(group); + return 0; + } r = _ec_pipe_str_read(ec, &swallow); if (!r) - return 0; + { + free(theme_file); + free(group); + return 0; + } DBG("frame = %s:%s:%s", theme_file, group, swallow); ethumb_frame_set(e, theme_file, group, swallow); free(theme_file); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de