Package: gridengine Version: 6.2u5-7.1 Severity: normal Tags: patch pending
Dear maintainer, As stated in my last comment to bug 701446 [1] I would prepare an NMU. Now I've prepared an NMU for gridengine (versioned as 6.2u5-7.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701446 diff -u gridengine-6.2u5/debian/control gridengine-6.2u5/debian/control --- gridengine-6.2u5/debian/control +++ gridengine-6.2u5/debian/control @@ -4,8 +4,8 @@ Maintainer: Debian Grid Engine Maintainers <[email protected]> Uploaders: Michael Banck <[email protected]>, Mark Hymers <[email protected]> Build-Depends: debhelper (>= 4.0.0), csh, groff, libdb5.1-dev, libssl-dev, - libncurses5-dev, libpam0g-dev, libxt-dev, lesstif2-dev, libxpm-dev, libxmu-dev, - po-debconf, quilt, default-jdk, ant, ant-optional, junit, javacc + libncurses5-dev, libpam0g-dev, libxt-dev, libmotif-dev, libxpm-dev, libxmu-dev, + po-debconf, quilt, default-jdk, ant, ant-optional, junit, javacc, libxft-dev Standards-Version: 3.8.3 Homepage: http://gridengine.sunsource.net Vcs-Browser: http://git.debian.org/git/users/mhy/gridengine-debian.git diff -u gridengine-6.2u5/debian/rules gridengine-6.2u5/debian/rules --- gridengine-6.2u5/debian/rules +++ gridengine-6.2u5/debian/rules @@ -21,6 +21,8 @@ PRECMD=sh $(CURDIR)/debian/linux32-wrapper +export MY_XINCD=/usr/include/freetype2 + build: build-stamp build-stamp: $(QUILT_STAMPFN) dh_testdir diff -u gridengine-6.2u5/debian/changelog gridengine-6.2u5/debian/changelog --- gridengine-6.2u5/debian/changelog +++ gridengine-6.2u5/debian/changelog @@ -1,3 +1,15 @@ +gridengine (6.2u5-7.2) unstable; urgency=low + + * Non-maintainer upload. + * Migrate motif build dependency from lesstif2-dev to libmotif-dev + (Closes: #714661) + * Add explicite build dependency on libxft-dev (Closes: #707937) + * Remove libxp-dev as requirement (Closes: #623642) + * Specify freetype2 include directory + * Fix FTBFS on newer eglibc and/or GCC (Closes: #701446) + + -- Paul Gevers <[email protected]> Mon, 02 Dec 2013 21:03:10 +0100 + gridengine (6.2u5-7.1) unstable; urgency=high * Non-maintainer upload by the Security Team. diff -u gridengine-6.2u5/debian/patches/series gridengine-6.2u5/debian/patches/series --- gridengine-6.2u5/debian/patches/series +++ gridengine-6.2u5/debian/patches/series @@ -20,0 +21,2 @@ +130-dont-link-against-unused-libraries.diff +140-fix-ftbfs-gcc-elibc-issue.diff only in patch2: unchanged: --- gridengine-6.2u5.orig/debian/patches/140-fix-ftbfs-gcc-elibc-issue.diff +++ gridengine-6.2u5/debian/patches/140-fix-ftbfs-gcc-elibc-issue.diff @@ -0,0 +1,54 @@ +Description: gridengine ftbfs with eglibc-2.17 and/or GCC4-8 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701446 +Source: https://arc.liv.ac.uk/trac/SGE/changeset/3671/sge +--- a/source/3rdparty/jemalloc/jemalloc.c ++++ b/source/3rdparty/jemalloc/jemalloc.c +@@ -6336,28 +6336,31 @@ + sizeof(malloc_zone_t *) * (malloc_num_zones - 1)); + malloc_zones[0] = &zone; + } ++ ++#ifdef HAVE_LIBDL ++# include <dlfcn.h> + #endif + +-#include <dlfcn.h> +-#include <malloc.h> ++#elif defined(__GLIBC__) && !defined(__UCLIBC__) + /* + * glibc provides the RTLD_DEEPBIND flag for dlopen which can make it possible + * to inconsistently reference libc's malloc(3)-compatible functions ++ * (Mozilla bug 493541). ++ * ++ * These definitions interpose hooks in glibc. The functions are actually ++ * passed an extra argument for the caller return address, which will be ++ * ignored. + */ +-#ifdef RTLD_DEEPBIND +-# if defined(__GLIBC__) && !defined(__UCLIBC__) +- +-/* +- * These interpose hooks in glibc. +- */ +-static void sge_init_hook(void){ +- __malloc_hook = malloc; +- __realloc_hook = realloc; +- __memalign_hook = memalign; +-} ++void (*__free_hook)(void *ptr) = free; ++void *(*__malloc_hook)(size_t size) = malloc; ++void *(*__realloc_hook)(void *ptr, size_t size) = realloc; ++void *(*__memalign_hook)(size_t alignment, size_t size) = memalign; + +-void (*__malloc_initialize_hook) (void) = sge_init_hook; +-# elif !defined(malloc) +-# error "Interposing malloc is unsafe on this system without libc malloc hooks." +-# endif ++#elif defined(RTLD_DEEPBIND) ++ /* ++ * XXX On systems that support RTLD_GROUP or DF_1_GROUP, do their ++ * implementations permit similar inconsistencies? Should STV_SINGLETON ++ * visibility be used for interposition where available? ++ */ ++# error "Interposing malloc is unsafe on this system without libc malloc hooks." + #endif only in patch2: unchanged: --- gridengine-6.2u5.orig/debian/patches/130-dont-link-against-unused-libraries.diff +++ gridengine-6.2u5/debian/patches/130-dont-link-against-unused-libraries.diff @@ -0,0 +1,16 @@ +Description: Gridengine should no longer link against libXp as that + is going to be removed from Debian +Author: Paul Gevers <[email protected]> +Bug-Debian: http://bugs.debian.org/623642 + +--- a/source/aimk ++++ b/source/aimk +@@ -1509,7 +1509,7 @@ + if ($BUILDARCH != ALINUX) then + set XINCD = "$XMTINCD $XINCD -I/usr/X11R6/include" + set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" +- set XLIBS = "-lXm -lXpm -lXt -lXext -lXmu -lX11 -lSM -lICE -lXp" ++ set XLIBS = "-lXm -lXt -lXext -lX11" + else + set XINCD = "$XMTINCD $XINCD" + set XCFLAGS = "-DNeedFunctionPrototypes -Wno-error $XMTDEF $XINCD" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
