开源软件构建与测试

Changes of Revision 2

_service:tar_scm:ImageMagick.spec Changed

@@ -1,12 +1,16 @@
+# Disable automatic .la file removal
+%global __brp_remove_la_files %nil
+
 Name:           ImageMagick
 Epoch:          1
-Version:        7.1.1.15
+Version:        7.1.1.35
 Release:        1
 Summary:        Create, edit, compose, or convert bitmap images
 License:        ImageMagick and MIT
-Url:            http://www.imagemagick.org/
-Source0:        https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-15.tar.gz
-Patch1:         CVE-2023-5341.patch
+Url:            https://www.imagemagick.org/
+%global VER %(foo=%{version}; echo ${foo:0:5})
+%global Patchlevel %(foo=%{version}; echo ${foo:6})
+Source0:        https://imagemagick.org/archive/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz
 
 BuildRequires:  bzip2-devel freetype-devel libjpeg-devel libpng-devel perl-generators
 BuildRequires:  libtiff-devel giflib-devel zlib-devel perl-devel >= 5.8.1 jbigkit-devel
@@ -73,11 +77,13 @@
 Development files for ImageMagick-c++.
 
 %prep
-%autosetup -n ImageMagick-7.1.1-15 -p1
+%autosetup -n %{name}-%{VER}-%{Patchlevel} -p1
 
 install -d Magick++/examples
 cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
 
+sed -e '/INSTALL_BASE/d' -i  PerlMagick/Makefile.PL*
+
 %build
 autoconf -f -i
 export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
@@ -85,6 +91,7 @@
         --with-threads --with-magick_plus_plus --with-gslib --with-wmf --with-webp \
         --with-openexr --with-rsvg --with-xml --without-dps --without-gcc-arch \
         --with-jbig --with-openjp2 \
+        --with-perl \
         --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'"
 %make_build
 
@@ -93,29 +100,37 @@
 cp -a www/source %{buildroot}%{_datadir}/doc/ImageMagick-7.1.1
 rm %{buildroot}%{_libdir}/*.la
 
-%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
+# fix weird perl module permissions
+chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Q16HDRI/Q16HDRI.so
 
-find %{buildroot} -name "*.bs" -exec rm {} \;
-find %{buildroot} -name ".packlist" -exec rm {} \;
-find %{buildroot} -name "perllocal.pod" -exec rm {} \;
+# perlmagick: fix perl path of demo files
+%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
 
-printf "%defattr(-,root,root,-)\n" > perl-pkg-files
-find %{buildroot}/%{_libdir}/perl* -type f -print | sed "s@^%{buildroot}@@g" > perl-pkg-files
-find %{buildroot}%{perl_vendorarch} -type d -print | sed "s@^%{buildroot}@%dir @g" \
-        | grep -v '^%dir %{perl_vendorarch}$' | grep -v '/auto$' >> perl-pkg-files
+# perlmagick: cleanup various perl tempfiles from the build which get installed
+find %{buildroot} -name "*.bs" |xargs rm -f
+find %{buildroot} -name ".packlist" |xargs rm -f
+find %{buildroot} -name "perllocal.pod" |xargs rm -f
+
+# perlmagick: build files list
+find %{buildroot}/%{_libdir}/perl* -type f -print \
+        | sed "s@^%{buildroot}@@g" > perl-pkg-files
+find %{buildroot}%{perl_vendorarch} -type d -print \
+        | sed "s@^%{buildroot}@%dir @g" \
+        | grep -v '^%dir %{perl_vendorarch}$' \
+        | grep -v '/auto$' >> perl-pkg-files
+if  -z perl-pkg-files  ; then
+        echo "ERROR: EMPTY FILE LIST"
+        exit -1
+fi
 
 %check
 export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
-make %{?_smp_mflags} check
+%make_build check
 rm PerlMagick/demo/Generic.ttf
 
-%post
-/sbin/ldconfig
-%postun
-/sbin/ldconfig
-
 %files
-%doc LICENSE NOTICE AUTHORS.txt
+%license LICENSE
+%doc NOTICE AUTHORS.txt
 %{_bindir}/a-z*
 %{_libdir}/libMagickCore-7.Q16HDRI.so.10*
 %{_libdir}/libMagickWand-7.Q16HDRI.so.10*
@@ -133,27 +148,25 @@
 %{_libdir}/pkgconfig/ImageMagick*.pc
 %{_libdir}/pkgconfig/MagickWand*
 %dir %{_includedir}/ImageMagick-7
-%{_includedir}/%{name}-7/MagickWand/*
-%{_includedir}/%{name}-7/MagickCore/*
+%{_includedir}/%{name}-7/MagickWand
+%{_includedir}/%{name}-7/MagickCore
 
 %files help
-%doc README.txt NEWS.txt QuickStart.txt
+%doc README.md
 %doc %{_datadir}/doc/ImageMagick-7
 %doc %{_datadir}/doc/ImageMagick-7.1.1
-%{_mandir}/man145/a-z*
-%{_mandir}/man1/*
-%{_mandir}/man3/*
+%{_mandir}/man?/*
 
 %files perl -f perl-pkg-files
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %files c++
-%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README
-%doc www/Magick++/COPYING
+%license Magick++/LICENSE
+%doc Magick++/AUTHORS
 %{_libdir}/libMagick++-7.Q16HDRI.so.5*
 
 %files c++-devel
-%doc Magick++/examples
+%doc Magick++/demo
 %{_bindir}/Magick++-config
 %{_includedir}/ImageMagick-7/Magick++*
 %{_libdir}/libMagick++-7.Q16HDRI.so
@@ -161,6 +174,12 @@
 %{_libdir}/pkgconfig/ImageMagick*
 
 %changelog
+* Thu Jul 25 2024 Funda Wang <fundawang@yeah.net> - 1:7.1.1.35-1
+- Update to 7.1.1-35
+
+* Thu Jul 18 2024 wangkai <13474090681@163.com> - 1:7.1.1.15-2
+- Fix build error for autoconf-2.72
+
 * Mon Oct 23 2023 wulei <wu_lei@hoperun.com> - 1:7.1.1.15-1
 - Update to 7.1.1.15

_service:tar_scm:CVE-2023-5341.patch Deleted

@@ -1,27 +0,0 @@
-From 97b99a741321c9a89491ebb6dab66d1215413595 Mon Sep 17 00:00:00 2001
-From: Cristy <urban-warrior@imagemagick.org>
-Date: Sat, 7 Oct 2023 10:22:57 +0800
-Subject: PATCH check for BMP file size, poc provided by Hardik Shah of
- Vehere (Dawn Treaders team)
-
----
- coders/bmp.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/coders/bmp.c b/coders/bmp.c
-index 8ff76bb..bb9ce2f 100644
---- a/coders/bmp.c
-+++ b/coders/bmp.c
-@@ -629,6 +629,9 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
-         "  BMP header size: %u",bmp_info.size);
-     if (bmp_info.size > 124)
-       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
-+    if ((bmp_info.file_size != 0) &&
-+        ((MagickSizeType) bmp_info.file_size > GetBlobSize(image)))
-+      ThrowReaderException(CorruptImageError,"ImproperImageHeader");
-     if (bmp_info.offset_bits < bmp_info.size)
-       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
-     bmp_info.offset_bits=MagickMax(14+bmp_info.size,bmp_info.offset_bits);
--- 
-2.27.0
-

_service Changed

_service:tar_scm:7.1.1-15.tar.gz Deleted

_service:tar_scm:ImageMagick-7.1.1-35.tar.xz Added