[arch-commits] Commit in imagemagick/repos (4 files)

[Eric Bélanger]

    Date: Friday, June 5, 2009 @ 23:03:41
  Author: eric
Revision: 41634

Merged revisions 41629 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/imagemagick/trunk

........
  r41629 | eric | 2009-06-05 22:00:46 -0400 (Fri, 05 Jun 2009) | 2 lines
  
  upgpkg: imagemagick 6.5.3.2-1
      Upstream update, Removed insecure RPATH (close FS#14843)
........

Added:
  imagemagick/repos/extra-i686/perlmagick.rpath.patch
    (from rev 41629, imagemagick/trunk/perlmagick.rpath.patch)
Modified:
  imagemagick/repos/extra-i686/	(properties)
  imagemagick/repos/extra-i686/ChangeLog
  imagemagick/repos/extra-i686/PKGBUILD

------------------------+
 ChangeLog              |    6 ++++++
 PKGBUILD               |   16 +++++++++-------
 perlmagick.rpath.patch |   10 ++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)


Property changes on: imagemagick/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /imagemagick/trunk:1-39875
   + /imagemagick/trunk:1-41633

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-06-06 02:28:35 UTC (rev 41633)
+++ extra-i686/ChangeLog	2009-06-06 03:03:41 UTC (rev 41634)
@@ -1,3 +1,9 @@
+2009-06-05  Eric Belanger  <eric at archlinux.org>
+
+	* imagemagick 6.5.3.2-1
+	* Upstream update
+	* Removed insecure RPATH (close FS#14843)
+
 2009-05-21  Eric Belanger  <eric at archlinux.org>
 
 	* imagemagick 6.5.2.7-1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-06 02:28:35 UTC (rev 41633)
+++ extra-i686/PKGBUILD	2009-06-06 03:03:41 UTC (rev 41634)
@@ -8,7 +8,7 @@
 # install old package, build new package, install new package, rebuild
 
 pkgname=imagemagick
-pkgver=6.5.2.7
+pkgver=6.5.3.2
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
@@ -18,12 +18,13 @@
 #makedepends=('ghostscript' 'openexr')
 options=('!makeflags' '!docs')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 \
-        libpng_mmx_patch_x86_64.patch add_delegate.patch)
-md5sums=('267b5671220098369eeb6f7436701cda' '069980fc2590c02aed86420996259302'\
-         '7f5851c4450b73d52df55c7e806cc316')
-sha1sums=('289084e4091ffcc2bb687a3e193580a585810c19'
+        libpng_mmx_patch_x86_64.patch add_delegate.patch perlmagick.rpath.patch)
+md5sums=('eabd6431db7d5c3ef6661b0e5062e238' '069980fc2590c02aed86420996259302'\
+         '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb')
+sha1sums=('8563f665b4f87c50b876ccdff2d16b967bbdae17'
           'e42f3acbe85b6098af75c5cecc9a254baaa0482c'
-          '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5')
+          '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5'
+          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
   cd "${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}"
@@ -33,6 +34,7 @@
   fi
 
   patch -p0 < ../add_delegate.patch || return 1
+  patch -p0 < ../perlmagick.rpath.patch || return 1
   sed -i "s/with_autotrace='no'/with_autotrace='yes'/" configure || return 1
 
  # When there is a soname bump, remove 'LIBS=-lMagickWand' from configure line and build/install. Then, readd 'LIBS=-lMagickWand' and build/install twice.
@@ -40,7 +42,7 @@
               --with-x --with-wmf --with-openexr --with-xml \
               --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
               --with-perl --with-perl-options="INSTALLDIRS=vendor" \
-              --without-gvc --without-djvu --with-jp2 \
+              --without-gvc --without-djvu --without-autotrace --with-jp2 \
               --without-jbig --without-fpx --without-dps || return 1
 
   make || return 1

Copied: imagemagick/repos/extra-i686/perlmagick.rpath.patch (from rev 41629, imagemagick/trunk/perlmagick.rpath.patch)
===================================================================
--- extra-i686/perlmagick.rpath.patch	                        (rev 0)
+++ extra-i686/perlmagick.rpath.patch	2009-06-06 03:03:41 UTC (rev 41634)
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
++++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
+@@ -10067,6 +10067,7 @@
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
++ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install