May 2016 - openSUSE Commits - openSUSE Mailing Lists

commit llvm for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package llvm for openSUSE:Factory checked in at 2016-05-05 13:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/llvm (Old) and /work/SRC/openSUSE:Factory/.llvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "llvm" Changes: -------- --- /work/SRC/openSUSE:Factory/llvm/llvm.changes 2016-04-22 16:16:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.llvm.new/llvm.changes 2016-05-05 13:19:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 25 07:25:22 UTC 2016 - idonmez(a)suse.com + +- Update rpmlintrc to whitelist libLTO.so + +------------------------------------------------------------------- @@ -4,0 +10,6 @@ + +------------------------------------------------------------------- +Sun Apr 10 19:18:41 UTC 2016 - dmueller(a)suse.com + +- fix arm_suse_support.diff for armv6hl +- adjust compile flags for llvm on armv6hl (fixes Mesa build) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ llvm.spec ++++++ --- /var/tmp/diff_new_pack.pbVWBx/_old 2016-05-05 13:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pbVWBx/_new 2016-05-05 13:19:11.000000000 +0200 @@ -259,8 +259,8 @@ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ %ifarch armv6hl - -DCMAKE_C_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ - -DCMAKE_CXX_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ + -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ + -DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \ %endif %ifarch armv7hl -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \ ++++++ arm_suse_support.diff ++++++ --- /var/tmp/diff_new_pack.pbVWBx/_old 2016-05-05 13:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pbVWBx/_new 2016-05-05 13:19:11.000000000 +0200 @@ -1,8 +1,8 @@ Index: cfe-3.8.0.src/lib/Driver/ToolChains.cpp =================================================================== ---- cfe-3.8.0.src/lib/Driver/ToolChains.cpp +--- cfe-3.8.0.src/lib/Driver/ToolChains.cpp.orig +++ cfe-3.8.0.src/lib/Driver/ToolChains.cpp -@@ -1266,16 +1266,18 @@ bool Generic_GCC::GCCInstallationDetecto +@@ -1418,7 +1418,7 @@ bool Generic_GCC::GCCInstallationDetecto static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; static const char *const AArch64Triples[] = { "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-linux-android", @@ -11,15 +11,13 @@ static const char *const AArch64beLibDirs[] = {"/lib"}; static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", "aarch64_be-linux-gnu"}; - - static const char *const ARMLibDirs[] = {"/lib"}; +@@ -1427,7 +1427,9 @@ bool Generic_GCC::GCCInstallationDetecto static const char *const ARMTriples[] = {"arm-linux-gnueabi", -- "arm-linux-androideabi"}; -+ "arm-linux-androideabi", -+ "armv6hl-suse-linux-gnueabi"}; + "arm-linux-androideabi"}; static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", - "armv7hl-redhat-linux-gnueabi"}; + "armv7hl-redhat-linux-gnueabi", ++ "armv6hl-suse-linux-gnueabi", + "armv7hl-suse-linux-gnueabi"}; static const char *const ARMebLibDirs[] = {"/lib"}; static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", ++++++ assume-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.pbVWBx/_old 2016-05-05 13:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pbVWBx/_new 2016-05-05 13:19:11.000000000 +0200 @@ -1,8 +1,8 @@ Index: cfe-3.8.0.src/lib/Driver/ToolChains.cpp =================================================================== ---- cfe-3.8.0.src/lib/Driver/ToolChains.cpp +--- cfe-3.8.0.src/lib/Driver/ToolChains.cpp.orig +++ cfe-3.8.0.src/lib/Driver/ToolChains.cpp -@@ -3080,6 +3080,7 @@ static bool IsUbuntu(enum Distro Distro) +@@ -3422,6 +3422,7 @@ static bool IsUbuntu(enum Distro Distro) } static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) { @@ -10,7 +10,7 @@ llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File = llvm::MemoryBuffer::getFile("/etc/lsb-release"); if (File) { -@@ -3155,6 +3156,8 @@ static Distro DetectDistro(const Driver +@@ -3498,6 +3499,8 @@ static Distro DetectDistro(const Driver return ArchLinux; return UnknownDistro; ++++++ default-to-i586.patch ++++++ --- /var/tmp/diff_new_pack.pbVWBx/_old 2016-05-05 13:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pbVWBx/_new 2016-05-05 13:19:11.000000000 +0200 @@ -1,8 +1,8 @@ Index: cfe-3.8.0.src/lib/Driver/Tools.cpp =================================================================== ---- cfe-3.8.0.src/lib/Driver/Tools.cpp +--- cfe-3.8.0.src/lib/Driver/Tools.cpp.orig +++ cfe-3.8.0.src/lib/Driver/Tools.cpp -@@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const +@@ -1680,8 +1680,8 @@ static const char *getX86TargetCPU(const case llvm::Triple::Bitrig: return "i686"; default: ++++++ llvm-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.pbVWBx/_old 2016-05-05 13:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pbVWBx/_new 2016-05-05 13:19:11.000000000 +0200 @@ -6,5 +6,5 @@ addFilter("devel-file-in-non-devel-package .*/usr/include/.*") addFilter("devel-file-in-non-devel-package .*/lib.*/*.a") -addFilter ("libclang.*shlib-policy-name-error") -addFilter ("libLLVM.*shlib-policy-name-error") +addFilter("devel-file-in-non-devel-package .*/lib.*/*.so") +addFilter("llvm-clang.*shlib-policy-name-error") ++++++ set-revision.patch ++++++ --- /var/tmp/diff_new_pack.pbVWBx/_old 2016-05-05 13:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pbVWBx/_new 2016-05-05 13:19:11.000000000 +0200 @@ -1,8 +1,8 @@ Index: cfe-3.8.0.src/lib/Basic/Version.cpp =================================================================== ---- cfe-3.8.0.src/lib/Basic/Version.cpp +--- cfe-3.8.0.src/lib/Basic/Version.cpp.orig +++ cfe-3.8.0.src/lib/Basic/Version.cpp -@@ -66,19 +66,11 @@ std::string getLLVMRepositoryPath() { +@@ -72,19 +72,11 @@ std::string getLLVMRepositoryPath() { } std::string getClangRevision() {

1 0

commit imlib2 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package imlib2 for openSUSE:Factory checked in at 2016-05-05 13:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imlib2 (Old) and /work/SRC/openSUSE:Factory/.imlib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "imlib2" Changes: -------- --- /work/SRC/openSUSE:Factory/imlib2/imlib2.changes 2016-03-20 11:47:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.imlib2.new/imlib2.changes 2016-05-05 13:19:04.000000000 +0200 @@ -1,0 +2,25 @@ +Sun May 1 17:27:34 UTC 2016 - mpluskal(a)suse.com + +- Update to 1.4.9 + * Fix cross-endianness for masks (1-bit depth images) + * gif: fix oob reads w/bad colormaps + * Fix "assuming signed overflow does not occur" warning. + * Fix some "variable set but not used" warnings. + * Fix some "variable might be clobbered" warnings. + * Fix off-by-one OOB read in __imlib_MergeUpdate(). + * Revert "gif: fix oob reads w/bad colormaps" + * GIF loader: Fix out-of-bound reads from colormap. + * GIF loader: Remove check made redundant by previous commit. + * GIF loader: Reduce progress checks from per-pixel to per-row. + * GIF loader: Indent. + * Fix potential divide-by-zero in imlib_image_draw_ellipse(). + * Make a number of functions static. + * Eliminate pImlibExternalFilter type. + * Trivial file function cleanups. + * Move __imlib_ItemInList() to file.c. + * Fix various potential OOM crashes. + * Fix integer overflow resulting in insufficient heap allocation + * loader_xpm: remove nonsense/impossible/broken condition + * Harden API and internals against overly large images + +------------------------------------------------------------------- Old: ---- imlib2-1.4.8.tar.bz2 New: ---- imlib2-1.4.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imlib2.spec ++++++ --- /var/tmp/diff_new_pack.4kIH3t/_old 2016-05-05 13:19:05.000000000 +0200 +++ /var/tmp/diff_new_pack.4kIH3t/_new 2016-05-05 13:19:05.000000000 +0200 @@ -18,7 +18,7 @@ %define lname libImlib2-1 Name: imlib2 -Version: 1.4.8 +Version: 1.4.9 Release: 0 Summary: Image handling and conversion library License: BSD-3-Clause @@ -26,6 +26,8 @@ Url: http://sourceforge.net/projects/enlightenment/ Source: http://downloads.sourceforge.net/project/enlightenment/imlib2-src/%{version… Patch1: imlib2-bswap.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: freetype2-devel BuildRequires: giflib-devel BuildRequires: libid3tag-devel @@ -33,6 +35,7 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: zlib-devel @@ -99,7 +102,7 @@ %patch1 %build -autoreconf --force --install +autoreconf -fiv %configure \ %ifarch %ix86 --enable-mmx \ ++++++ imlib2-1.4.8.tar.bz2 -> imlib2-1.4.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/ChangeLog new/imlib2-1.4.9/ChangeLog --- old/imlib2-1.4.8/ChangeLog 2016-03-12 08:50:05.000000000 +0100 +++ new/imlib2-1.4.9/ChangeLog 2016-04-29 19:52:10.000000000 +0200 @@ -1,5 +1,39 @@ *** +*** Version 1.4.9 *** +*** + +Alexander Smirnov (1): + Fix cross-endianness for masks (1-bit depth images) + +Bernhard Übelacker (1): + gif: fix oob reads w/bad colormaps + +Kim Woelders (16): + Fix "assuming signed overflow does not occur" warning. + Fix some "variable set but not used" warnings. + Fix some "variable might be clobbered" warnings. + Fix off-by-one OOB read in __imlib_MergeUpdate(). + Revert "gif: fix oob reads w/bad colormaps" + GIF loader: Fix out-of-bound reads from colormap. + GIF loader: Remove check made redundant by previous commit. + GIF loader: Reduce progress checks from per-pixel to per-row. + GIF loader: Indent. + Fix potential divide-by-zero in imlib_image_draw_ellipse(). + Make a number of functions static. + Eliminate pImlibExternalFilter type. + Trivial file function cleanups. + Move __imlib_ItemInList() to file.c. + Fix various potential OOM crashes. + 1.4.9. + +Yuriy M. Kaminskiy (3): + Fix integer overflow resulting in insufficient heap allocation + loader_xpm: remove nonsense/impossible/broken condition + Harden API and internals against overly large images + + +*** *** Version 1.4.8 *** *** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/README new/imlib2-1.4.9/README --- old/imlib2-1.4.8/README 2016-03-12 08:53:23.000000000 +0100 +++ new/imlib2-1.4.9/README 2016-04-29 19:52:49.000000000 +0200 @@ -1,4 +1,4 @@ -Imlib2 1.4.8 +Imlib2 1.4.9 This is the Imlib 2 library - a library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support, etc. @@ -36,7 +36,7 @@ RPM: To build rpm packages: - sudo rpm -ta imlib2-1.4.8.tar.gz + sudo rpm -ta imlib2-1.4.9.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 @@ -44,11 +44,11 @@ DEB: To build deb packages: - tar zvf imlib2-1.4.8.tar.gz - cd imlib2-1.4.8 + tar zvf imlib2-1.4.9.tar.gz + cd imlib2-1.4.9 dpkg-buildpackage -us -uc -rfakeroot cd .. - rm -rf imlib2-1.4.8 + rm -rf imlib2-1.4.9 You will find all the debian source, binary etc. packages put in the directory where you first untarred the source tarball. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/configure new/imlib2-1.4.9/configure --- old/imlib2-1.4.8/configure 2016-03-12 08:52:43.000000000 +0100 +++ new/imlib2-1.4.9/configure 2016-04-29 19:52:27.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for imlib2 1.4.8. +# Generated by GNU Autoconf 2.69 for imlib2 1.4.9. # # Report bugs to <enlightenment-devel(a)lists.sourceforge.net>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='imlib2' PACKAGE_TARNAME='imlib2' -PACKAGE_VERSION='1.4.8' -PACKAGE_STRING='imlib2 1.4.8' +PACKAGE_VERSION='1.4.9' +PACKAGE_STRING='imlib2 1.4.9' PACKAGE_BUGREPORT='enlightenment-devel(a)lists.sourceforge.net' PACKAGE_URL='' @@ -1383,7 +1383,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 imlib2 1.4.8 to adapt to many kinds of systems. +\`configure' configures imlib2 1.4.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of imlib2 1.4.8:";; + short | recursive ) echo "Configuration of imlib2 1.4.9:";; esac cat <<\_ACEOF @@ -1596,7 +1596,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -imlib2 configure 1.4.8 +imlib2 configure 1.4.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1965,7 +1965,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by imlib2 $as_me 1.4.8, which was +It was created by imlib2 $as_me 1.4.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2902,7 +2902,7 @@ # Define the identity of the package. PACKAGE='imlib2' - VERSION='1.4.8' + VERSION='1.4.9' cat >>confdefs.h <<_ACEOF @@ -13355,7 +13355,7 @@ VERSION_CUR=5 -VERSION_REV=8 +VERSION_REV=9 VERSION_AGE=4 lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE} @@ -16370,7 +16370,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by imlib2 $as_me 1.4.8, which was +This file was extended by imlib2 $as_me 1.4.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16436,7 +16436,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -imlib2 config.status 1.4.8 +imlib2 config.status 1.4.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/configure.ac new/imlib2-1.4.9/configure.ac --- old/imlib2-1.4.8/configure.ac 2016-03-12 08:48:30.000000000 +0100 +++ new/imlib2-1.4.9/configure.ac 2016-04-29 17:45:02.000000000 +0200 @@ -1,7 +1,7 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT([imlib2], [1.4.8], [enlightenment-devel(a)lists.sourceforge.net] +AC_INIT([imlib2], [1.4.9], [enlightenment-devel(a)lists.sourceforge.net] AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD @@ -23,7 +23,7 @@ LT_INIT VERSION_CUR=5 -VERSION_REV=8 +VERSION_REV=9 VERSION_AGE=4 lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE} AC_SUBST(lt_version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/imlib2.spec new/imlib2-1.4.9/imlib2.spec --- old/imlib2-1.4.8/imlib2.spec 2016-03-12 08:53:23.000000000 +0100 +++ new/imlib2-1.4.9/imlib2.spec 2016-04-29 19:52:49.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Powerful image loading and rendering library Name: imlib2 -Version: 1.4.8 +Version: 1.4.9 Release: 0.%(date '+%Y%m%d') License: BSD Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/bin/imlib2_bumpmap.c new/imlib2-1.4.9/src/bin/imlib2_bumpmap.c --- old/imlib2-1.4.8/src/bin/imlib2_bumpmap.c 2016-02-07 08:10:42.000000000 +0100 +++ new/imlib2-1.4.9/src/bin/imlib2_bumpmap.c 2016-03-21 09:16:35.000000000 +0100 @@ -32,7 +32,7 @@ main(int argc, char **argv) { int w, h, x, y; - Imlib_Image im = NULL, im_bg = NULL; + Imlib_Image im_bg; XEvent ev; const char *display_name = getenv("DISPLAY"); @@ -74,8 +74,6 @@ imlib_context_set_color_modifier(NULL); im_bg = imlib_load_image(PACKAGE_DATA_DIR "/data/images/imlib2.png"); - im = imlib_load_image(PACKAGE_DATA_DIR "/data/images/imlib2.png"); - imlib_context_set_image(im_bg); w = imlib_image_get_width(); h = imlib_image_get_height(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/bin/imlib2_show.c new/imlib2-1.4.9/src/bin/imlib2_show.c --- old/imlib2-1.4.8/src/bin/imlib2_show.c 2016-02-07 08:10:42.000000000 +0100 +++ new/imlib2-1.4.9/src/bin/imlib2_show.c 2016-03-21 09:16:35.000000000 +0100 @@ -80,7 +80,10 @@ int scaleup = 0; int scaleboth = 0; int origone = 0; + +#if 0 int bump_map_to_point = 0; +#endif Imlib_Color_Modifier colormod = 0; ImlibPolygon poly, poly2, poly3; int textdir = IMLIB_TEXT_TO_RIGHT; @@ -158,8 +161,10 @@ scaleup = 1; else if (!strcmp(argv[i], "-both")) scaleboth = 1; +#if 0 else if (!strcmp(argv[i], "-bmp2pt")) bump_map_to_point = 1; +#endif else if (!strcmp(argv[i], "-orig")) origone = 1; else if (!strcmp(argv[i], "-blend")) @@ -786,8 +791,8 @@ } else if (interactive) { - int wo, ho, px, py, first = 1; - Imlib_Image im_bg, im_sh1, im_sh2, im_sh3, im_ic[13], im_tmp; + int px, py, first = 1; + Imlib_Image im_bg, im_sh1, im_sh2, im_sh3, im_ic[13]; /* Imlib_Border border; */ Imlib_Updates up = NULL; @@ -935,11 +940,8 @@ else im_bg = imlib_load_image(PACKAGE_DATA_DIR "/data/images/bg.png"); imlib_context_set_image(im_bg); - im_tmp = imlib_clone_image(); w = imlib_image_get_width(); h = imlib_image_get_height(); - wo = w; - ho = h; w *= 1; h *= 1; XResizeWindow(disp, win, w, h); @@ -1047,12 +1049,17 @@ imlib_image_get_height()); } -/* - if( bump_map_to_point ) - imlib_apply_filter("bump_map_point(x=[],y=[],map=test_images/bulb.png);", &x, &y ); - else - imlib_apply_filter("bump_map(x=[],y=[],map=test_images/bulb.png);", &x, &y ); -*/ + +#if 0 + if (bump_map_to_point) + imlib_apply_filter + ("bump_map_point(x=[],y=[],map=test_images/bulb.png);", + &x, &y); + else + imlib_apply_filter + ("bump_map(x=[],y=[],map=test_images/bulb.png);", &x, &y); +#endif + up = imlib_update_append_rect(up, 0, 0, imlib_image_get_width(), imlib_image_get_height()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/Makefile.am new/imlib2-1.4.9/src/lib/Makefile.am --- old/imlib2-1.4.8/src/lib/Makefile.am 2016-02-09 17:53:27.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/Makefile.am 2016-04-17 08:27:05.000000000 +0200 @@ -47,6 +47,7 @@ image.h \ line.c \ loaderpath.h \ +modules.c \ polygon.c \ rectangle.c \ rend.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/Makefile.in new/imlib2-1.4.9/src/lib/Makefile.in --- old/imlib2-1.4.8/src/lib/Makefile.in 2016-03-12 08:52:46.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/Makefile.in 2016-04-29 19:52:31.000000000 +0200 @@ -145,9 +145,9 @@ am_libImlib2_la_OBJECTS = api.lo blend.lo color.lo color_helpers.lo \ colormod.lo context.lo draw.lo dynamic_filters.lo ellipse.lo \ file.lo filter.lo font_draw.lo font_load.lo font_main.lo \ - font_query.lo grab.lo grad.lo image.lo line.lo polygon.lo \ - rectangle.lo rend.lo rgba.lo rgbadraw.lo rotate.lo scale.lo \ - script.lo span.lo updates.lo ximage.lo + font_query.lo grab.lo grad.lo image.lo line.lo modules.lo \ + polygon.lo rectangle.lo rend.lo rgba.lo rgbadraw.lo rotate.lo \ + scale.lo script.lo span.lo updates.lo ximage.lo am__EXTRA_libImlib2_la_SOURCES_DIST = amd64_blend.S amd64_blend_cmod.S \ asm_blend.S asm_blend_cmod.S asm_rgba.S asm_rotate.S \ asm_scale.S @@ -423,6 +423,7 @@ image.h \ line.c \ loaderpath.h \ +modules.c \ polygon.c \ rectangle.c \ rend.c \ @@ -572,6 +573,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grad.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modules.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polygon.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rend.Plo@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/api.c new/imlib2-1.4.9/src/lib/api.c --- old/imlib2-1.4.8/src/lib/api.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/api.c 2016-04-17 08:27:05.000000000 +0200 @@ -1976,7 +1976,7 @@ DATA32 *data; CHECK_CONTEXT(ctx); - if ((width <= 0) || (height <= 0)) + if (!IMAGE_DIMENSIONS_OK(width, height)) return NULL; data = malloc(width * height * sizeof(DATA32)); if (data) @@ -2010,7 +2010,7 @@ CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_image_using_data", "data", data, NULL); - if ((width <= 0) || (height <= 0)) + if (!IMAGE_DIMENSIONS_OK(width, height)) return NULL; im = __imlib_CreateImage(width, height, data); if (im) @@ -2039,7 +2039,7 @@ CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_image_using_copied_data", "data", data, NULL); - if ((width <= 0) || (height <= 0)) + if (!IMAGE_DIMENSIONS_OK(width, height)) return NULL; im = __imlib_CreateImage(width, height, NULL); if (!im) @@ -2085,6 +2085,8 @@ char domask = 0; CHECK_CONTEXT(ctx); + if (!IMAGE_DIMENSIONS_OK(width, height)) + return NULL; if (mask) { domask = 1; @@ -2131,6 +2133,8 @@ ImlibImage *im; CHECK_CONTEXT(ctx); + if (!IMAGE_DIMENSIONS_OK(width, height)) + return NULL; im = __imlib_CreateImage(width, height, NULL); im->data = malloc(width * height * sizeof(DATA32)); __imlib_GrabXImageToRGBA(im->data, 0, 0, width, height, @@ -2181,6 +2185,10 @@ Pixmap p, m; CHECK_CONTEXT(ctx); + if (!IMAGE_DIMENSIONS_OK(source_width, source_height)) + return NULL; + if (!IMAGE_DIMENSIONS_OK(destination_width, destination_height)) + return NULL; if ((mask) || (get_mask_from_shape)) domask = 1; p = XCreatePixmap(ctx->display, ctx->drawable, destination_width, @@ -2375,6 +2383,10 @@ im_old->loader->load(im_old, NULL, 0, 1); if (!(im_old->data)) return NULL; + /* Note: below check should've ensured by original image allocation, + * but better safe than sorry. */ + if (!IMAGE_DIMENSIONS_OK(im_old->w, im_old->h)) + return NULL; im = __imlib_CreateImage(im_old->w, im_old->h, NULL); if (!(im)) return NULL; @@ -2423,6 +2435,8 @@ CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_cropped_image", "image", ctx->image, NULL); + if (!IMAGE_DIMENSIONS_OK(abs(width), abs(height))) + return NULL; CAST_IMAGE(im_old, ctx->image); if ((!(im_old->data)) && (im_old->loader) && (im_old->loader->load)) im_old->loader->load(im_old, NULL, 0, 1); @@ -2479,6 +2493,8 @@ CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_cropped_scaled_image", "image", ctx->image, NULL); + if (!IMAGE_DIMENSIONS_OK(abs(destination_width), abs(destination_height))) + return NULL; CAST_IMAGE(im_old, ctx->image); if ((!(im_old->data)) && (im_old->loader) && (im_old->loader->load)) im_old->loader->load(im_old, NULL, 0, 1); @@ -4681,6 +4697,9 @@ dx = (int)(cos(angle) * _ROTATE_PREC_MAX); dy = -(int)(sin(angle) * _ROTATE_PREC_MAX); + if (!IMAGE_DIMENSIONS_OK(sz, sz)) + return NULL; + im = __imlib_CreateImage(sz, sz, NULL); im->data = calloc(sz * sz, sizeof(DATA32)); if (!(im->data)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/dynamic_filters.c new/imlib2-1.4.9/src/lib/dynamic_filters.c --- old/imlib2-1.4.8/src/lib/dynamic_filters.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/dynamic_filters.c 2016-04-17 08:27:05.000000000 +0200 @@ -15,10 +15,9 @@ #include "dynamic_filters.h" #include "file.h" #include "image.h" -#include "loaderpath.h" #include "script.h" -static pImlibExternalFilter filters = NULL; +static ImlibExternalFilter *filters = NULL; static int dyn_initialised = 0; #define MALLOCSHOW @@ -27,7 +26,7 @@ #define FDEBUG */ -pImlibExternalFilter +static ImlibExternalFilter * __imlib_LoadFilter(char *file) { ImlibExternalFilter *ptr; @@ -99,7 +98,7 @@ #ifdef FDEBUG printf("DEBUG: Loading Filters\n"); #endif - list = __imlib_ListFilters(&num_filters); + list = __imlib_ListModules("filters", &num_filters); for (i = num_filters - 1; i >= 0; i--) { tptr = NULL; @@ -125,10 +124,10 @@ { } -pImlibExternalFilter +ImlibExternalFilter * __imlib_get_dynamic_filter(char *name) { - pImlibExternalFilter f_ptr; + ImlibExternalFilter *f_ptr; int i = 0; /* scan the filters */ @@ -148,40 +147,3 @@ } return NULL; } - -/* loader dir */ -char ** -__imlib_ListFilters(int *num_ret) -{ - char **list = NULL, **l, *s; - int num, i, pi = 0; - - *num_ret = 0; - /* same for system loader path */ - s = (char *)malloc(sizeof(SYS_LOADERS_PATH) + 8 + 1); - sprintf(s, SYS_LOADERS_PATH "/filters"); - l = __imlib_FileDir(s, &num); - if (num > 0) - { - *num_ret += num; - list = realloc(list, sizeof(char *) * *num_ret); - for (i = 0; i < num; i++) - { - s = (char *)realloc(s, - sizeof(SYS_LOADERS_PATH) + 9 + strlen(l[i]) + - 1); - sprintf(s, SYS_LOADERS_PATH "/filters/%s", l[i]); - list[pi + i] = strdup(s); - } - __imlib_FileFreeDirList(l, num); - } - free(s); - - /* List currently contains *everything in there* we need to weed out - * the .so, .la, .a versions of the same loader or whatever else. - * dlopen can take an extension-less name and do the Right Thing - * with it, so that's what we'll give it. */ - list = __imlib_TrimLoaderList(list, num_ret); - - return list; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/dynamic_filters.h new/imlib2-1.4.9/src/lib/dynamic_filters.h --- old/imlib2-1.4.8/src/lib/dynamic_filters.h 2016-02-09 17:53:27.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/dynamic_filters.h 2016-04-17 08:27:05.000000000 +0200 @@ -1,7 +1,6 @@ #ifndef _DYNAMIC_FILTERS_H_ #define _DYNAMIC_FILTERS_H_ -#include "common.h" #include "script.h" struct imlib_filter_info { @@ -13,7 +12,6 @@ }; typedef struct _imlib_external_filter ImlibExternalFilter; -typedef struct _imlib_external_filter *pImlibExternalFilter; struct _imlib_external_filter { char *name; @@ -27,13 +25,11 @@ void (*deinit_filter) (void); void *(*exec_filter) (char *filter, void *im, pIFunctionParam params); - pImlibExternalFilter next; + ImlibExternalFilter *next; }; void __imlib_dynamic_filters_init(void); void __imlib_dynamic_filters_deinit(void); -pImlibExternalFilter __imlib_get_dynamic_filter(char *name); -char **__imlib_ListFilters(int *num_ret); -pImlibExternalFilter __imlib_LoadFilter(char *file); +ImlibExternalFilter *__imlib_get_dynamic_filter(char *name); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/ellipse.c new/imlib2-1.4.9/src/lib/ellipse.c --- old/imlib2-1.4.8/src/lib/ellipse.c 2016-02-07 08:10:42.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/ellipse.c 2016-04-13 22:18:20.000000000 +0200 @@ -71,6 +71,9 @@ if (IN_RANGE(rx, by, clw, clh)) pfunc(color, bp + len); + if (dx < 1) + dx = 1; + dy += b2; yy -= ((dy << 16) / dx); lx--; @@ -123,6 +126,9 @@ if (IN_RANGE(rx, by, clw, clh)) pfunc(color, bp + len); + if (dy < 1) + dy = 1; + dx -= a2; xx += ((dx << 16) / dy); ty++; @@ -222,6 +228,9 @@ if (IN_RANGE(rx, by, clw, clh)) pfunc(col1, bp + len); + if (dx < 1) + dx = 1; + dy += b2; yy -= ((dy << 16) / dx); lx--; @@ -295,6 +304,9 @@ if (IN_RANGE(rx, by, clw, clh)) pfunc(col1, bp + len); + if (dy < 1) + dy = 1; + dx -= a2; xx += ((dx << 16) / dy); ty++; @@ -395,6 +407,9 @@ if (IN_RANGE(rx, by, clw, clh)) pfunc(color, bp + len); + if (dx < 1) + dx = 1; + dy += b2; yy -= ((dy << 16) / dx); lx--; @@ -453,6 +468,9 @@ if (((unsigned)by < (unsigned)clh) && (len > 0)) sfunc(color, bpp, len); + if (dy < 1) + dy = 1; + dx -= a2; xx += ((dx << 16) / dy); ty++; @@ -556,6 +574,9 @@ if (IN_RANGE(rx, by, clw, clh)) pfunc(col1, bp + len); + if (dx < 1) + dx = 1; + dy += b2; yy -= ((dy << 16) / dx); lx--; @@ -629,6 +650,9 @@ if (IN_RANGE(rx, by, clw, clh)) pfunc(col1, bp + len); + if (dy < 1) + dy = 1; + dx -= a2; xx += ((dx << 16) / dy); ty++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/file.c new/imlib2-1.4.9/src/lib/file.c --- old/imlib2-1.4.8/src/lib/file.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/file.c 2016-04-17 08:27:05.000000000 +0200 @@ -240,7 +240,7 @@ } char ** -__imlib_FileDir(char *dir, int *num) +__imlib_FileDir(const char *dir, int *num) { int i, dirlen; int done = 0; @@ -249,12 +249,12 @@ struct dirent *dp; if ((!dir) || (!*dir)) - return (0); + return 0; dirp = opendir(dir); if (!dirp) { *num = 0; - return (NULL); + return NULL; } /* count # of entries in dir (worst case) */ for (dirlen = 0; (dp = readdir(dirp)); dirlen++); @@ -262,12 +262,12 @@ { closedir(dirp); *num = dirlen; - return (NULL); + return NULL; } names = (char **)malloc(dirlen * sizeof(char *)); if (!names) - return (NULL); + return NULL; rewinddir(dirp); for (i = 0; i < dirlen;) @@ -303,7 +303,7 @@ } } } - return (names); + return names; } void @@ -315,16 +315,14 @@ if (l[num]) free(l[num]); free(l); - return; } void -__imlib_FileDel(char *s) +__imlib_FileDel(const char *s) { if ((!s) || (!*s)) return; unlink(s); - return; } int @@ -332,7 +330,7 @@ { struct stat st; - return ((stat(s, &st) != -1) && (S_ISREG(st.st_mode))); + return (stat(s, &st) != -1) && (S_ISREG(st.st_mode)); } time_t @@ -380,7 +378,7 @@ if ((uid == usr_uid) && (usr_s)) { - return (strdup(usr_s)); + return strdup(usr_s); } pwd = getpwuid(uid); @@ -389,8 +387,26 @@ s = strdup(pwd->pw_dir); if (uid == usr_uid) usr_s = strdup(s); - return (s); + return s; } return NULL; } + +int +__imlib_ItemInList(char **list, int size, char *item) +{ + int i; + + if (!list) + return 0; + if (!item) + return 0; + + for (i = 0; i < size; i++) + { + if (!strcmp(list[i], item)) + return 1; + } + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/file.h new/imlib2-1.4.9/src/lib/file.h --- old/imlib2-1.4.8/src/lib/file.h 2014-12-20 17:08:07.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/file.h 2016-04-16 21:06:19.000000000 +0200 @@ -1,5 +1,5 @@ -#ifndef __FILE -#define __FILE 1 +#ifndef __FILE_H +#define __FILE_H 1 #include "common.h" @@ -9,13 +9,17 @@ int __imlib_FileExists(const char *s); int __imlib_FileIsFile(const char *s); int __imlib_FileIsDir(const char *s); -char **__imlib_FileDir(char *dir, int *num); +char **__imlib_FileDir(const char *dir, int *num); void __imlib_FileFreeDirList(char **l, int num); -void __imlib_FileDel(char *s); +void __imlib_FileDel(const char *s); time_t __imlib_FileModDate(const char *s); char *__imlib_FileHomeDir(int uid); int __imlib_FilePermissions(const char *s); int __imlib_FileCanRead(const char *s); int __imlib_IsRealFile(const char *s); +int __imlib_ItemInList(char **list, int size, char *item); + +char **__imlib_ListModules(const char *what, int *num_ret); + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/font_draw.c new/imlib2-1.4.9/src/lib/font_draw.c --- old/imlib2-1.4.8/src/lib/font_draw.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/font_draw.c 2016-04-17 08:27:05.000000000 +0200 @@ -81,10 +81,11 @@ __imlib_font_query_advance(fn, text, &w, NULL); h = __imlib_font_max_ascent_get(fn) - __imlib_font_max_descent_get(fn); - data = malloc(w * h * sizeof(DATA32)); + if (!IMAGE_DIMENSIONS_OK(w, h)) + return; + data = calloc(w * h, sizeof(DATA32)); if (!data) return; - memset(data, 0, w * h * sizeof(DATA32)); /* TODO check if this is the right way of rendering. Esp for huge sizes */ im2 = __imlib_CreateImage(w, h, data); if (!im2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/image.c new/imlib2-1.4.9/src/lib/image.c --- old/imlib2-1.4.8/src/lib/image.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/image.c 2016-04-16 21:15:51.000000000 +0200 @@ -17,6 +17,8 @@ #include "image.h" #include "loaderpath.h" +static void __imlib_LoadAllLoaders(void); + static ImlibImage *images = NULL; #ifdef BUILD_X11 @@ -560,7 +562,7 @@ /* try dlopen()ing the file if we succeed finish filling out the malloced */ /* loader struct and return it */ -ImlibLoader * +static ImlibLoader * __imlib_ProduceLoader(char *file) { ImlibLoader *l; @@ -592,110 +594,8 @@ return l; } -/* list all the filenames of loaders in the system loaders dir and the user */ -/* loader dir */ -char ** -__imlib_ListLoaders(int *num_ret) -{ - char **list = NULL, **l, *s; - int num, i, pi = 0; - - *num_ret = 0; - /* same for system loader path */ - s = (char *)malloc(sizeof(SYS_LOADERS_PATH) + 8 + 1); - sprintf(s, SYS_LOADERS_PATH "/loaders"); - l = __imlib_FileDir(s, &num); - if (num > 0) - { - *num_ret += num; - list = realloc(list, sizeof(char *) * *num_ret); - - for (i = 0; i < num; i++) - { - s = (char *)realloc(s, - sizeof(SYS_LOADERS_PATH) + 9 + strlen(l[i]) + - 1); - sprintf(s, SYS_LOADERS_PATH "/loaders/%s", l[i]); - list[pi + i] = strdup(s); - } - __imlib_FileFreeDirList(l, num); - } - free(s); - - /* List currently contains *everything in there* we need to weed out - * the .so, .la, .a versions of the same loader or whatever else. - * dlopen can take an extension-less name and do the Right Thing - * with it, so that's what we'll give it. */ - list = __imlib_TrimLoaderList(list, num_ret); - - return list; -} - -char ** -__imlib_TrimLoaderList(char **list, int *num) -{ - int i, n, size = 0; - - char **ret = NULL; - - if (!list) - return NULL; - if (*num == 0) - return list; - - n = *num; - - for (i = 0; i < n; i++) - { - char *ext; - - if (!list[i]) - continue; - ext = strrchr(list[i], '.'); - if ((ext) && ( -#ifdef __CYGWIN__ - (!strcasecmp(ext, ".dll")) || -#endif - (!strcasecmp(ext, ".so")))) - { - /* Don't add the same loader multiple times... */ - if (!__imlib_ItemInList(ret, size, list[i])) - { - ret = realloc(ret, sizeof(char *) * (size + 1)); - - ret[size++] = strdup(list[i]); - } - } - if (list[i]) - free(list[i]); - } - free(list); - *num = size; - return ret; -} - -int -__imlib_ItemInList(char **list, int size, char *item) -{ - int i; - - if (!size) - return 0; - if (!list) - return 0; - if (!item) - return 0; - - for (i = 0; i < size; i++) - { - if (!strcmp(list[i], item)) - return 1; - } - return 0; -} - /* fre the struct for a loader and close its dlopen'd handle */ -void +static void __imlib_ConsumeLoader(ImlibLoader * l) { if (l->file) @@ -713,7 +613,7 @@ free(l); } -void +static void __imlib_RescanLoaders(void) { static time_t last_scan_time = 0; @@ -764,14 +664,14 @@ /* find all the loaders we can find and load them up to see what they can */ /* load / save */ -void +static void __imlib_LoadAllLoaders(void) { int i, num; char **list; /* list all the loaders imlib can find */ - list = __imlib_ListLoaders(&num); + list = __imlib_ListModules("loaders", &num); /* no loaders? well don't load anything */ if (!list) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/image.h new/imlib2-1.4.9/src/lib/image.h --- old/imlib2-1.4.8/src/lib/image.h 2014-12-20 17:09:17.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/image.h 2016-04-16 21:06:19.000000000 +0200 @@ -135,14 +135,7 @@ void __imlib_RemoveImagePixmapFromCache(ImlibImagePixmap * ip); void __imlib_CleanupImagePixmapCache(void); #endif -ImlibLoader *__imlib_ProduceLoader(char *file); -char **__imlib_ListLoaders(int *num_ret); -char **__imlib_TrimLoaderList(char **list, int *num); -int __imlib_ItemInList(char **list, int size, char *item); -void __imlib_ConsumeLoader(ImlibLoader * l); -void __imlib_RescanLoaders(void); void __imlib_RemoveAllLoaders(void); -void __imlib_LoadAllLoaders(void); ImlibLoader *__imlib_FindBestLoaderForFile(const char *file, int for_save); ImlibLoader *__imlib_FindBestLoaderForFileFormat(const char *file, @@ -188,7 +181,8 @@ /* The maximum pixmap dimension is 65535. */ /* However, for now, use 46340 (46340^2 < 2^31) to avoid buffer overflow issues. */ -#define X_MAX_DIM 46340 +/* Reduced further to 32767, so that (w * h * sizeof(DATA32)) won't exceed ULONG_MAX */ +#define X_MAX_DIM 32767 #define IMAGE_DIMENSIONS_OK(w, h) \ ( ((w) > 0) && ((h) > 0) && ((w) < X_MAX_DIM) && ((h) < X_MAX_DIM) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/modules.c new/imlib2-1.4.9/src/lib/modules.c --- old/imlib2-1.4.8/src/lib/modules.c 1970-01-01 01:00:00.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/modules.c 2016-04-17 08:27:05.000000000 +0200 @@ -0,0 +1,88 @@ +#include "config.h" + +#include <stdlib.h> + +#include "file.h" +#include "image.h" +#include "loaderpath.h" + +static char ** +__imlib_TrimLoaderList(char **list, int *num) +{ + int i, n, size = 0; + + if (!list) + return NULL; + + n = *num; + + for (i = 0; i < n; i++) + { + char *ext; + + if (!list[i]) + continue; + ext = strrchr(list[i], '.'); + if ((ext) && ( +#ifdef __CYGWIN__ + (!strcasecmp(ext, ".dll")) || +#endif + (!strcasecmp(ext, ".so")))) + { + /* Don't add the same loader multiple times... */ + if (!__imlib_ItemInList(list, size, list[i])) + { + list[size++] = list[i]; + continue; + } + } + free(list[i]); + } + if (!size) + { + free(list); + list = NULL; + } + else + { + list = realloc(list, size * sizeof(char *)); + } + *num = size; + return list; +} + +char ** +__imlib_ListModules(const char *what, int *num_ret) +{ + char **list = NULL, **l; + char path[1024]; + int num, i; + + *num_ret = 0; + + snprintf(path, sizeof(path), "%s/%s", SYS_LOADERS_PATH, what); + l = __imlib_FileDir(path, &num); + if (num <= 0) + return NULL; + + list = malloc(num * sizeof(char *)); + if (list) + { + for (i = 0; i < num; i++) + { + snprintf(path, sizeof(path), "%s/%s/%s", + SYS_LOADERS_PATH, what, l[i]); + list[i] = strdup(path); + } + *num_ret = num; + } + __imlib_FileFreeDirList(l, num); + + /* List currently contains *everything in there* we need to weed out + * the .so, .la, .a versions of the same loader or whatever else. + * dlopen can take an extension-less name and do the Right Thing + * with it, so that's what we'll give it. */ + list = __imlib_TrimLoaderList(list, num_ret); + + return list; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/rend.c new/imlib2-1.4.9/src/lib/rend.c --- old/imlib2-1.4.8/src/lib/rend.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/rend.c 2016-04-16 21:11:11.000000000 +0200 @@ -580,6 +580,9 @@ dy1 = 0; } + if (!IMAGE_DIMENSIONS_OK(dw, dh)) + return; + __imlib_GetContext(d, v, cm, depth); back = __imlib_CreateImage(dw, dh, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/updates.c new/imlib2-1.4.9/src/lib/updates.c --- old/imlib2-1.4.8/src/lib/updates.c 2016-02-07 08:10:42.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/updates.c 2016-04-16 21:16:56.000000000 +0200 @@ -109,26 +109,27 @@ { if (T(x, y).used & T_USED) { - int xx, yy, ww, hh, ok; + int xx, yy, ww, hh, ok, xww; for (xx = x + 1, ww = 1; - (T(xx, y).used & T_USED) && (xx < tw); xx++, ww++); + (xx < tw) && (T(xx, y).used & T_USED); xx++, ww++); + xww = x + ww; for (yy = y + 1, hh = 1, ok = 1; (yy < th) && (ok); yy++, hh++) { - for (xx = x; xx < (x + ww); xx++) + for (xx = x; xx < xww; xx++) { if (!(T(xx, yy).used & T_USED)) { ok = 0; - xx = x + ww; hh--; + break; } } } for (yy = y; yy < (y + hh); yy++) { - for (xx = x; xx < (x + ww); xx++) + for (xx = x; xx < xww; xx++) T(xx, yy).used = T_UNUSED; } nu = __imlib_AddUpdate(nu, (x << TB), (y << TB), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/lib/ximage.c new/imlib2-1.4.9/src/lib/ximage.c --- old/imlib2-1.4.8/src/lib/ximage.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/lib/ximage.c 2016-04-16 21:11:11.000000000 +0200 @@ -360,8 +360,10 @@ /* (rather than the Xserver) */ #ifdef WORDS_BIGENDIAN xim->byte_order = MSBFirst; + xim->bitmap_bit_order = MSBFirst; #else xim->byte_order = LSBFirst; + xim->bitmap_bit_order = LSBFirst; #endif /* return out image */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/modules/loaders/loader_gif.c new/imlib2-1.4.9/src/modules/loaders/loader_gif.c --- old/imlib2-1.4.8/src/modules/loaders/loader_gif.c 2016-02-07 08:10:42.000000000 +0100 +++ new/imlib2-1.4.9/src/modules/loaders/loader_gif.c 2016-04-07 20:20:47.000000000 +0200 @@ -141,56 +141,51 @@ if (im->loader || immediate_load || progress) { + DATA32 colormap[256]; + bg = gif->SBackGroundColor; cmap = (gif->Image.ColorMap ? gif->Image.ColorMap : gif->SColorMap); + memset(colormap, 0, sizeof(colormap)); + if (cmap != NULL) + { + for (i = cmap->ColorCount > 256 ? 256 : cmap->ColorCount; i-- > 0;) + { + r = cmap->Colors[i].Red; + g = cmap->Colors[i].Green; + b = cmap->Colors[i].Blue; + colormap[i] = (0xff << 24) | (r << 16) | (g << 8) | b; + } + /* if bg > cmap->ColorCount, it is transparent black already */ + if (transp >= 0 && transp < 256) + colormap[transp] = bg >= 0 && bg < 256 ? + colormap[bg] & 0x00ffffff : 0x00000000; + } im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); if (!im->data) goto quit; - if (!cmap) - { - /* No colormap? Now what?? Let's clear the image (and not segv) */ - memset(im->data, 0, sizeof(DATA32) * w * h); - rc = 1; - goto finish; - } - ptr = im->data; - per_inc = 100.0 / (((float)w) * h); + per_inc = 100.0 / (float)h; for (i = 0; i < h; i++) { for (j = 0; j < w; j++) { - if (rows[i][j] == transp) - { - r = cmap->Colors[bg].Red; - g = cmap->Colors[bg].Green; - b = cmap->Colors[bg].Blue; - *ptr++ = 0x00ffffff & ((r << 16) | (g << 8) | b); - } - else - { - r = cmap->Colors[rows[i][j]].Red; - g = cmap->Colors[rows[i][j]].Green; - b = cmap->Colors[rows[i][j]].Blue; - *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; - } - per += per_inc; - if (progress && (((int)per) != last_per) - && (((int)per) % progress_granularity == 0)) + *ptr++ = colormap[rows[i][j]]; + } + per += per_inc; + if (progress && (((int)per) != last_per) + && (((int)per) % progress_granularity == 0)) + { + last_per = (int)per; + if (!(progress(im, (int)per, 0, last_y, w, i))) { - last_per = (int)per; - if (!(progress(im, (int)per, 0, last_y, w, i))) - { - rc = 2; - goto quit; - } - last_y = i; + rc = 2; + goto quit; } + last_y = i; } } - finish: if (progress) progress(im, 100, 0, last_y, w, h); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/modules/loaders/loader_jpeg.c new/imlib2-1.4.9/src/modules/loaders/loader_jpeg.c --- old/imlib2-1.4.8/src/modules/loaders/loader_jpeg.c 2016-02-09 17:53:53.000000000 +0100 +++ new/imlib2-1.4.9/src/modules/loaders/loader_jpeg.c 2016-04-16 21:03:10.000000000 +0200 @@ -214,10 +214,10 @@ DATA8 *buf; DATA32 *ptr; JSAMPROW *jbuf; - int y = 0, quality = 75, compression = 2; + int y, quality, compression; ImlibImageTag *tag; - int i, j, pl = 0; - char pper = 0; + int i, j, pl; + char pper; /* no image data? abort */ if (!im->data) @@ -257,6 +257,7 @@ /* saver modules */ /* compression */ + compression = 2; tag = __imlib_GetTag(im, "compression"); if (tag) { @@ -279,6 +280,9 @@ quality = 100; /* set up jepg compression parameters */ + y = 0; + pl = 0; + pper = 0; jpeg_set_defaults(&cinfo); jpeg_set_quality(&cinfo, quality, TRUE); jpeg_start_compress(&cinfo, TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/modules/loaders/loader_png.c new/imlib2-1.4.9/src/modules/loaders/loader_png.c --- old/imlib2-1.4.8/src/modules/loaders/loader_png.c 2016-02-07 08:10:42.000000000 +0100 +++ new/imlib2-1.4.9/src/modules/loaders/loader_png.c 2016-03-21 09:16:44.000000000 +0100 @@ -18,7 +18,7 @@ { png_uint_32 w32, h32; int w, h; - char hasa = 0; + char hasa; FILE *f; png_structp png_ptr = NULL; png_infop info_ptr = NULL; @@ -31,7 +31,9 @@ f = fopen(im->real_file, "rb"); if (!f) return 0; + /* read header */ + hasa = 0; if (!im->data) { unsigned char buf[PNG_BYTES_TO_CHECK]; @@ -243,10 +245,8 @@ png_infop info_ptr; DATA32 *ptr; int x, y, j, interlace; - png_bytep row_ptr, data = NULL; + png_bytep row_ptr, data; png_color_8 sig_bit; - int pl = 0; - char pper = 0; ImlibImageTag *tag; int quality = 75, compression = 3, num_passes = 1, pass; @@ -286,6 +286,7 @@ #endif } + data = NULL; png_init_io(png_ptr, f); if (im->flags & F_HAS_ALPHA) { @@ -374,7 +375,7 @@ if (progress) { char per; - int l; + int l, pl = 0, pper = 0; per = 100 * (pass + y / (float)im->h) / num_passes; if ((per - pper) >= progress_granularity) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imlib2-1.4.8/src/modules/loaders/loader_xpm.c new/imlib2-1.4.9/src/modules/loaders/loader_xpm.c --- old/imlib2-1.4.8/src/modules/loaders/loader_xpm.c 2016-02-09 17:53:55.000000000 +0100 +++ new/imlib2-1.4.9/src/modules/loaders/loader_xpm.c 2016-04-16 21:16:10.000000000 +0200 @@ -510,8 +510,7 @@ line = realloc(line, lsz); } - if (((ptr) && ((ptr - im->data) >= (w * h * (int)sizeof(DATA32)))) || - ((context > 1) && (count >= pixels))) + if ((context > 1) && (count >= pixels)) done = 1; }

1 0

commit freetds for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package freetds for openSUSE:Factory checked in at 2016-05-05 13:18:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetds (Old) and /work/SRC/openSUSE:Factory/.freetds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "freetds" Changes: -------- --- /work/SRC/openSUSE:Factory/freetds/freetds.changes 2016-04-28 16:50:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freetds.new/freetds.changes 2016-05-05 13:18:57.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 1 13:08:38 UTC 2016 - mpluskal(a)suse.com + +- Update to 0.95.95 + * See NEWS for a complete list of changes + +------------------------------------------------------------------- Old: ---- freetds-0.95.94.tar.gz New: ---- freetds-0.95.95.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetds.spec ++++++ --- /var/tmp/diff_new_pack.4pff2U/_old 2016-05-05 13:18:58.000000000 +0200 +++ /var/tmp/diff_new_pack.4pff2U/_new 2016-05-05 13:18:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: freetds -Version: 0.95.94 +Version: 0.95.95 Release: 0 Summary: A free re-implementation of the TDS (Tabular Data Stream) protocol License: LGPL-2.1+ and GPL-2.0+ ++++++ freetds-0.95.94.tar.gz -> freetds-0.95.95.tar.gz ++++++ ++++ 6347 lines of diff (skipped)

1 0

commit git for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2016-05-05 13:18:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2016-04-28 16:50:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2016-05-05 13:18:46.000000000 +0200 @@ -1,0 +2,36 @@ +Sat Apr 30 12:15:11 UTC 2016 - astieger(a)suse.com + +- git 2.8.2: + * "index-pack --keep=<msg>" was broken since v2.1.0 timeframe. + * "git config --get-urlmatch", unlike other variants of the "git + config --get" family, did not signal error with its exit status + when there was no matching configuration. + * The "--local-env-vars" and "--resolve-git-dir" options of "git + rev-parse" failed to work outside a repository when the command's + option parsing was rewritten in 1.8.5 era. + * Fetching of history by naming a commit object name directly didn't + work across remote-curl transport. + * A small memory leak in an error codepath has been plugged in xdiff + code. + * "git mergetool" did not work well with conflicts that both sides + deleted. + * "git send-email" had trouble parsing alias file in mailrc format + when lines in it had trailing whitespaces on them. + * When "git merge --squash" stopped due to conflict, the concluding + "git commit" failed to read in the SQUASH_MSG that shows the log + messages from all the squashed commits. + * "git merge FETCH_HEAD" dereferenced NULL pointer when merging + nothing into an unborn history (which is arguably unusual usage, + which perhaps was the reason why nobody noticed it). + * "git diff -M" used to work better when two originally identical + files A and B got renamed to X/A and X/B by pairing A to X/A and B + to X/B, but this was broken in the 2.0 timeframe. + * "git send-pack --all <there>" was broken when its command line + option parsing was written in the 2.6 timeframe. + * When running "git blame $path" with unnormalized data in the index + for the path, the data in the working tree was blamed, even though + "git add" would not have changed what is already in the index, due + to "safe crlf" that disables the line-end conversion. It has been + corrected. + +------------------------------------------------------------------- Old: ---- git-2.8.1.tar.sign git-2.8.1.tar.xz New: ---- git-2.8.2.tar.sign git-2.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.XaUwPH/_old 2016-05-05 13:18:47.000000000 +0200 +++ /var/tmp/diff_new_pack.XaUwPH/_new 2016-05-05 13:18:47.000000000 +0200 @@ -26,7 +26,7 @@ %endif Name: git -Version: 2.8.1 +Version: 2.8.2 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 ++++++ git-2.8.1.tar.xz -> git-2.8.2.tar.xz ++++++ ++++ 3762 lines of diff (skipped)

1 0

commit libgpg-error for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package libgpg-error for openSUSE:Factory checked in at 2016-05-05 13:18:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgpg-error (Old) and /work/SRC/openSUSE:Factory/.libgpg-error.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgpg-error" Changes: -------- --- /work/SRC/openSUSE:Factory/libgpg-error/libgpg-error.changes 2015-12-18 21:49:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgpg-error.new/libgpg-error.changes 2016-05-05 13:18:41.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Apr 29 18:08:07 UTC 2016 - astieger(a)suse.com + +- update to 1.22: + * Support for LeakSanitizer with the gpgrt_annotate_leaked_object + inline function. + * Interface changes relative to the 1.21 release: + GPG_ERR_DB_CORRUPTED NEW. + gpgrt_annotate_leaked_object NEW inline func. + GPGRT_ENABLE_W32_ICONV_MACROS NEW. + gpgrt_w32_iconv_open NEW. + gpgrt_w32_iconv_close NEW. + gpgrt_w32_iconv NEW. + +------------------------------------------------------------------- Old: ---- libgpg-error-1.21.tar.bz2 libgpg-error-1.21.tar.bz2.sig New: ---- libgpg-error-1.22.tar.bz2 libgpg-error-1.22.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgpg-error.spec ++++++ --- /var/tmp/diff_new_pack.pMdNOj/_old 2016-05-05 13:18:42.000000000 +0200 +++ /var/tmp/diff_new_pack.pMdNOj/_new 2016-05-05 13:18:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgpg-error # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX 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,7 +17,7 @@ Name: libgpg-error -Version: 1.21 +Version: 1.22 Release: 0 Summary: Library That Defines Common Error Values for All GnuPG Components License: GPL-2.0+ and LGPL-2.1+ @@ -79,7 +79,7 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install rm %{buildroot}%{_libdir}/libgpg-error.la # Drop the lisp stuff, it depends on ASDF and CFFI # which needs to be packaged first @@ -92,12 +92,10 @@ %{buildroot}/%{_bindir}/gpg-error-config --mt --libs | grep -q "\-lpthread" %post -n libgpg-error0 -p /sbin/ldconfig - %post devel %install_info --info-dir=%{_infodir} %{_infodir}/gpgrt.info.gz %postun -n libgpg-error0 -p /sbin/ldconfig - %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgrt.info.gz ++++++ libgpg-error-1.21.tar.bz2 -> libgpg-error-1.22.tar.bz2 ++++++ ++++ 24642 lines of diff (skipped)

1 0

commit mupdf for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package mupdf for openSUSE:Factory checked in at 2016-05-05 13:18:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mupdf (Old) and /work/SRC/openSUSE:Factory/.mupdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mupdf" Changes: -------- --- /work/SRC/openSUSE:Factory/mupdf/mupdf.changes 2016-04-28 16:50:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mupdf.new/mupdf.changes 2016-05-05 13:18:36.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 22 17:57:34 UTC 2016 - idonmez(a)suse.com + +- Update to version 1.9a + * Fix a regression in text extraction. + +------------------------------------------------------------------- Old: ---- mupdf-1.9-source.tar.gz New: ---- mupdf-1.9a-source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mupdf.spec ++++++ --- /var/tmp/diff_new_pack.fwcBNq/_old 2016-05-05 13:18:38.000000000 +0200 +++ /var/tmp/diff_new_pack.fwcBNq/_new 2016-05-05 13:18:38.000000000 +0200 @@ -18,7 +18,7 @@ Name: mupdf -Version: 1.9 +Version: 1.9a Release: 0 Summary: Lightweight PDF and XPS Viewer and Parser and Rendering Library License: AGPL-3.0+ ++++++ mupdf-1.9-source.tar.gz -> mupdf-1.9a-source.tar.gz ++++++ /work/SRC/openSUSE:Factory/mupdf/mupdf-1.9-source.tar.gz /work/SRC/openSUSE:Factory/.mupdf.new/mupdf-1.9a-source.tar.gz differ: char 5, line 1

1 0

commit sudo for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package sudo for openSUSE:Factory checked in at 2016-05-05 13:18:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sudo (Old) and /work/SRC/openSUSE:Factory/.sudo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sudo" Changes: -------- --- /work/SRC/openSUSE:Factory/sudo/sudo.changes 2016-03-26 15:11:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sudo.new/sudo.changes 2016-05-05 13:18:31.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 29 11:34:18 UTC 2016 - kstreitova(a)suse.com + +- add sudo-1.8.16-pam_groups.patch to do group setup in + policy_init_session() before calling out to the plugin. This makes + it possible for the pam_group module to change the group in + pam_setcred() [fate#318850] + +------------------------------------------------------------------- New: ---- sudo-1.8.16-pam_groups.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sudo.spec ++++++ --- /var/tmp/diff_new_pack.8UyTaq/_old 2016-05-05 13:18:32.000000000 +0200 +++ /var/tmp/diff_new_pack.8UyTaq/_new 2016-05-05 13:18:32.000000000 +0200 @@ -33,6 +33,7 @@ Patch0: sudoers2ldif-env.patch # PATCH-OPENSUSE: the "SUSE" branding of the default sudo config Patch1: sudo-sudoers.patch +Patch2: sudo-1.8.16-pam_groups.patch BuildRequires: audit-devel BuildRequires: groff BuildRequires: libselinux-devel @@ -73,6 +74,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %ifarch s390 s390x %sparc ++++++ sudo-1.8.16-pam_groups.patch ++++++ # HG changeset patch # User Todd C. Miller <Todd.Miller(a)courtesan.com> # Date 1461862918 21600 # Node ID 814cda6025419e40b417f7d797757e11259feef2 # Parent ef0a5428a5744ca1c7fcb1874d1fff37becc6a90 Do group setup in policy_init_session() before calling out to the plugin. This makes it possible for the pam_group module to change the group in pam_setcred(). It's a bit bogus since pam_setcred() is documented as not changing the group or user ID, but pam_group is shipped with stock Linux-PAM so we need to support it. diff -r ef0a5428a574 -r 814cda602541 src/sudo.c --- a/src/sudo.c Tue Apr 26 14:39:42 2016 -0600 +++ b/src/sudo.c Thu Apr 28 11:01:58 2016 -0600 @@ -939,7 +939,8 @@ } /* - * Setup the execution environment immediately prior to the call to execve() + * Setup the execution environment immediately prior to the call to execve(). + * Group setup is performed by policy_init_session(), called earlier. * Returns true on success and false on failure. */ bool @@ -1018,30 +1019,6 @@ #endif /* HAVE_LOGIN_CAP_H */ } - /* - * Set groups, including supplementary group vector. - */ - if (!ISSET(details->flags, CD_PRESERVE_GROUPS)) { - if (details->ngroups >= 0) { - if (sudo_setgroups(details->ngroups, details->groups) < 0) { - sudo_warn(U_("unable to set supplementary group IDs")); - goto done; - } - } - } -#ifdef HAVE_SETEUID - if (ISSET(details->flags, CD_SET_EGID) && setegid(details->egid)) { - sudo_warn(U_("unable to set effective gid to runas gid %u"), - (unsigned int)details->egid); - goto done; - } -#endif - if (ISSET(details->flags, CD_SET_GID) && setgid(details->gid)) { - sudo_warn(U_("unable to set gid to runas gid %u"), - (unsigned int)details->gid); - goto done; - } - if (ISSET(details->flags, CD_SET_PRIORITY)) { if (setpriority(PRIO_PROCESS, 0, details->priority) != 0) { sudo_warn(U_("unable to set process priority")); @@ -1365,6 +1342,35 @@ int rval = true; debug_decl(policy_init_session, SUDO_DEBUG_PCOMM) + /* + * We set groups, including supplementary group vector, + * as part of the session setup. This allows for dynamic + * groups to be set via pam_group(8) in pam_setcred(3). + */ + if (!ISSET(details->flags, CD_PRESERVE_GROUPS)) { + if (details->ngroups >= 0) { + if (sudo_setgroups(details->ngroups, details->groups) < 0) { + sudo_warn(U_("unable to set supplementary group IDs")); + rval = -1; + goto done; + } + } + } +#ifdef HAVE_SETEUID + if (ISSET(details->flags, CD_SET_EGID) && setegid(details->egid)) { + sudo_warn(U_("unable to set effective gid to runas gid %u"), + (unsigned int)details->egid); + rval = -1; + goto done; + } +#endif + if (ISSET(details->flags, CD_SET_GID) && setgid(details->gid)) { + sudo_warn(U_("unable to set gid to runas gid %u"), + (unsigned int)details->gid); + rval = -1; + goto done; + } + if (policy_plugin.u.policy->init_session) { /* * Backwards compatibility for older API versions @@ -1381,6 +1387,7 @@ } sudo_debug_set_active_instance(sudo_debug_instance); } +done: debug_return_int(rval); }

1 0

commit openssh for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at 2016-05-05 13:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssh (Old) and /work/SRC/openSUSE:Factory/.openssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssh" Changes: -------- --- /work/SRC/openSUSE:Factory/openssh/openssh.changes 2016-04-12 18:59:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openssh.new/openssh.changes 2016-05-05 13:18:09.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 29 15:56:38 UTC 2016 - pcerny(a)suse.com + +- update seccomp sandbox that broke after OpenSSL update + (bsc#912436, bsc#977812) + [openssh-6.6p1-seccomp_stat.patch] + +------------------------------------------------------------------- New: ---- openssh-6.6p1-seccomp_stat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass-gnome.spec ++++++ --- /var/tmp/diff_new_pack.kHcar5/_old 2016-05-05 13:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.kHcar5/_new 2016-05-05 13:18:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openssh-askpass-gnome # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.kHcar5/_old 2016-05-05 13:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.kHcar5/_new 2016-05-05 13:18:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openssh # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -149,10 +149,11 @@ Patch34: openssh-6.6p1-sftp_homechroot.patch Patch35: openssh-6.6p1-sftp_force_permissions.patch Patch36: openssh-6.6p1-seccomp_getuid.patch -Patch37: openssh-6.6p1-X_forward_with_disabled_ipv6.patch -Patch38: openssh-6.6p1-fips-checks.patch -Patch39: openssh-6.6p1-ldap.patch -Patch40: CVE-2016-0777_CVE-2016-0778.patch +Patch37: openssh-6.6p1-seccomp_stat.patch +Patch38: openssh-6.6p1-X_forward_with_disabled_ipv6.patch +Patch39: openssh-6.6p1-fips-checks.patch +Patch40: openssh-6.6p1-ldap.patch +Patch41: CVE-2016-0777_CVE-2016-0778.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -228,14 +229,15 @@ %patch37 -p2 %patch38 -p2 %patch39 -p2 -%patch40 -p0 +%patch40 -p2 +%patch41 -p0 cp %{SOURCE3} %{SOURCE4} . %build # set libexec dir in the LDAP patch sed -i.libexec 's,@LIBEXECDIR@,%{_libexecdir}/ssh,' \ $( grep -Rl @LIBEXECDIR@ \ - $( grep "^+++" %{PATCH39} | sed -r 's(a)^.+/([^/\t ]+).*$@\1@' ) + $( grep "^+++" %{PATCH40} | sed -r 's(a)^.+/([^/\t ]+).*$@\1@' ) ) autoreconf -fiv ++++++ openssh-6.6p1-seccomp_stat.patch ++++++ # HG changeset patch # Parent 8c8249d4e830ade9dfa1d2294c6218bbe439cb4a Allow the stat() syscall for OpenSSL re-seed patch (which causes OpenSSL use stat() on some file) bnc#912436 diff --git a/openssh-6.6p1/sandbox-seccomp-filter.c b/openssh-6.6p1/sandbox-seccomp-filter.c --- a/openssh-6.6p1/sandbox-seccomp-filter.c +++ b/openssh-6.6p1/sandbox-seccomp-filter.c @@ -97,16 +97,17 @@ static const struct sock_filter preauth_ SC_ALLOW(gettimeofday), SC_ALLOW(clock_gettime), #ifdef __NR_time /* not defined on EABI ARM */ SC_ALLOW(time), #endif SC_ALLOW(read), SC_ALLOW(write), SC_ALLOW(close), + SC_ALLOW(stat), #ifdef __NR_shutdown /* not defined on archs that go via socketcall(2) */ SC_ALLOW(shutdown), #endif SC_ALLOW(brk), SC_ALLOW(poll), #ifdef __NR__newselect SC_ALLOW(_newselect), #else

1 0

commit libatasmart for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package libatasmart for openSUSE:Factory checked in at 2016-05-05 13:18:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libatasmart (Old) and /work/SRC/openSUSE:Factory/.libatasmart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libatasmart" Changes: -------- --- /work/SRC/openSUSE:Factory/libatasmart/libatasmart.changes 2012-09-17 13:57:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libatasmart.new/libatasmart.changes 2016-05-05 13:18:02.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 29 12:59:30 UTC 2016 - perry.werneck(a)gmail.com + +- Adding "xz" as BuildRequires since it's not default on SLES11 and + using a bigger description. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libatasmart.spec ++++++ --- /var/tmp/diff_new_pack.8MVUmO/_old 2016-05-05 13:18:03.000000000 +0200 +++ /var/tmp/diff_new_pack.8MVUmO/_new 2016-05-05 13:18:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libatasmart # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,16 +22,31 @@ Summary: ATA S.M.A.R.T. Disk Health Monitoring Library License: LGPL-2.1+ Group: System/Libraries -Url: http://git.0pointer.de/?p=libatasmart.git;a=summary +Url: http://git.0pointer.net/libatasmart.git/ Source: http://0pointer.de/public/%{name}-%{version}.tar.xz + BuildRequires: libudev-devel BuildRequires: pkgconfig +BuildRequires: xz + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A small and lightweight parser library for ATA S.M.A.R.T. hard disk health monitoring. +As the name suggests libatasmart only does ATA S.M.A.R.T., +there is no support for SCSI harddisks. SCSI S.M.A.R.T. is a +very different system, support for it should be implemented in +a separate library "libscsismart" if there should ever be +demand for it. + +This library is supposed to be lean and small and thus +supports only a subset of the S.M.A.R.T. functionality. +However, I claim that it implements the relevant part of it. +If you need full control over all S.M.A.R.T. functionality of +your hardware please refer to Buce Allen's smartmontools. + %package -n libatasmart4 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library Group: System/Libraries

1 0

commit suse-xsl-stylesheets for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package suse-xsl-stylesheets for openSUSE:Factory checked in at 2016-05-05 13:17:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suse-xsl-stylesheets" Changes: -------- --- /work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes 2015-12-17 15:51:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes 2016-05-05 13:17:56.000000000 +0200 @@ -1,0 +2,56 @@ +Fri Apr 22 11:39:19 UTC 2016 - toms(a)opensuse.org + +Stable release DAPS 2.0.5: + +Find issues in our GitHub tracker at +https://github.com/openSUSE/suse-xsl/issues/NUMBER + +* Schema + - Add flat SUSEDoc schema for RNC and RNG + - Fix NovDoc/DB4 incompatibility: Phrase is only allowed in + productname, but not in productnumber + +* Spelling + - Fix trailing whitespace + +* Stylesheets (PDF) + - Added missing procedure, itemizedlist, and orderedlist for + intra.title.markup mode (suse-xsl #162, ec0cb3d6) + - Fix Ulink/Link template for DB 5 + - Specifically check for @role='abbrev' + - Fix for vertical spaces on nested lists (#221) + - Question and answers + - Make an answer closer to a question + - Make consistent use of sans-stack for questions + - Use all paras in question consistently + - Italic for question label and first para (#200) + - Clean up web links + - Specifically check for @role='abbrev' + - Fix Ulink/Link template for DB 5 + +* Stylesheets (XHTML) + - Add GitHub URL in titlepage of book and article (suse-xsl #35) + - Fix functionality of "dm:version" + - xref handling + - Improve xref and is.xref.in.samebook template + - Fix xref resolution when $rootid is empty + - Implement vcs.url to fix, remove add.github.url and + bibliosource (suse-xsl #35) + - add actual book title to HTML pages again (suse-xsl #208) + - Fix formatting for intraxref (provides final fix suse-xsl #162) + +* Stylesheets (EPUB) + - Build EPUBs by default without comments + +* Common Stylesheet Changes + - allow intra xref linking for tables, figures, admons (suse-xsl #155) + - Added missing procedure, itemizedlist, and orderedlist for + intra.title.markup mode (suse-xsl #162) + +* Packaging + - Update Requires/Recommends (also fixes suse-xsl #220) + - suse_beta => suse2013 + - Improve package description in Spec file + + +------------------------------------------------------------------- Old: ---- suse-xsl-stylesheets-2.0.4.tar.bz2 New: ---- suse-xsl-stylesheets-2.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.rvHqHn/_old 2016-05-05 13:17:58.000000000 +0200 +++ /var/tmp/diff_new_pack.rvHqHn/_new 2016-05-05 13:17:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: suse-xsl-stylesheets -Version: 2.0.4 +Version: 2.0.5 Release: 0 ############################################################### @@ -46,7 +46,7 @@ %define suse_schema_dir %{suse_xml_dir}/schema %define suse_styles_dir %{db_xml_dir}/stylesheet -Summary: SUSE-branded Docbook stylesheets for XSLT 1.0 +Summary: SUSE-Branded Stylesheets for DocBook License: GPL-2.0 or GPL-3.0 Group: Productivity/Publishing/XML Url: http://sourceforge.net/p/daps/suse-xslt @@ -59,7 +59,9 @@ BuildRequires: aspell BuildRequires: aspell-en BuildRequires: docbook-xsl-stylesheets >= 1.77 +BuildRequires: docbook5-xsl-stylesheets >= 1.77 BuildRequires: fdupes +BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: make # Only needed to fix the "have choice" error between xerces-j2 and crimson @@ -69,13 +71,14 @@ BuildRequires: fontpackages-devel BuildRequires: trang -Requires: docbook-xsl-stylesheets >= 1.77 Requires: docbook_4 +Requires: docbook_5 +Requires: docbook-xsl-stylesheets >= 1.77 +Requires: docbook5-xsl-stylesheets >= 1.77 + Requires: libxslt Recommends: daps -Recommends: docbook_5 -Recommends: docbook5-xsl-stylesheets #------ # Fonts @@ -107,7 +110,7 @@ Recommends: ttf-founder-simplified %endif -# FONTS USED IN suse_beta STYLESHEETS +# FONTS USED IN suse2013 STYLESHEETS # A rather simplistic solution which roughly means that you need M17N:fonts to # build the new stylesheets on older OS's. %if 0%{?suse_version} >= 1220 @@ -131,15 +134,15 @@ # Arabic: Recommends: arabic-amiri-fonts -Obsoletes: susedoc <= 4.3.33 -Provides: susedoc = 4.3.34 %description -SUSE-branded DocBook stylesheets for XSLT 1.0 - -Extensions for the DocBook XSLT 1.0 stylesheets that provide SUSE branding -for PDF, HTML, and ePUB. This package also provides the NovDoc DTD, a subset of -the DocBook 4 DTD and SUSEdoc, a subset of the DocBook 5 schema. +These are SUSE-branded XSLT 1.0 stylesheets for DocBook 4 and 5 that are be used +to create the HTML, PDF, and EPUB versions of SUSE documentation. These +stylesheets are based on the original DocBook XSLT 1.0 stylesheets. + +This package also provides descriptions of two XML formats which authors can +use: The NovDoc DTD, a subset of the DocBook 4 DTD and the SUSEdoc schema, a +subset of the DocBook 5 schema. #-------------------------------------------------------------------------- %prep ++++++ suse-xsl-stylesheets-2.0.4.tar.bz2 -> suse-xsl-stylesheets-2.0.5.tar.bz2 ++++++ ++++ 48163 lines of diff (skipped)

1 0