diff --git a/gsl-2.8-fix-linkage.patch b/gsl-2.8-fix-linkage.patch new file mode 100644 index 0000000000000000000000000000000000000000..678f264f01f99e52668a08496c410ca609845985 --- /dev/null +++ b/gsl-2.8-fix-linkage.patch @@ -0,0 +1,12 @@ +diff -Nrup a/Makefile.am b/Makefile.am +--- a/Makefile.am 2018-11-27 22:51:13.000000000 +0100 ++++ b/Makefile.am 2019-08-27 08:10:26.255435364 +0200 +@@ -4,7 +4,7 @@ + + SUBDIRS = gsl utils sys test err bst const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear filter movstat rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc + +-SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la bst/libgslbst.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la filter/libgslfilter.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la movstat/libgslmovstat.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la ++SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la bst/libgslbst.la cblas/libgslcblas.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la filter/libgslfilter.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la movstat/libgslmovstat.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la + + pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_inline.h + diff --git a/gsl-2.7.tar.gz b/gsl-2.8.tar.gz similarity index 47% rename from gsl-2.7.tar.gz rename to gsl-2.8.tar.gz index 75fb995ecfebd56923b3fb6d9fdea368928e0d3f..e4b0cdb400c649bdb6736a583785b33772433893 100644 Binary files a/gsl-2.7.tar.gz and b/gsl-2.8.tar.gz differ diff --git a/gsl.spec b/gsl.spec index 9d2e3996da02f01fd33d95e154bef8b3568be500..c0707163b2dfa3920b88f5f9d009b18ee89f952f 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,17 +1,18 @@ Name: gsl -Version: 2.7 -Release: 3 +Version: 2.8 +Release: 1 Summary: The GNU Scientific Library for numerical analysis -URL: http://www.gnu.org/software/gsl/ -License: GPLv3 and GFDL-1.3-or-later and BSD -Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz +URL: https://www.gnu.org/software/gsl/ +License: GPL-3.0-or-later +Source: https://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Patch0: gsl-test.patch # backport patch from Debian Patch1: backport-CVE-2024-50610.patch +Patch3: gsl-2.8-fix-linkage.patch -BuildRequires: gcc pkgconfig -BuildRequires: chrpath +BuildRequires: gcc +BuildRequires: autoconf automake libtool %description The GNU Scientific Library (GSL) is a collection of routines for @@ -21,9 +22,6 @@ numerical analysis, written in C. Summary: Libraries and the header files for GSL development Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -Requires: pkgconfig, automake %description devel The gsl-devel package contains the header files necessary for @@ -42,41 +40,24 @@ mv THANKS.aux THANKS %ifarch aarch64 loongarch64 export CFLAGS="$RPM_OPT_FLAGS -ffp-contract=off" %endif -%configure +autoreconf -fi +%configure --disable-static %{make_build} %check -make check || ( cat */test-suite.log && exit 1 ) +%make_build check || ( cat */test-suite.log && exit 1 ) %install %{make_install} -# remove unpackaged files from the buildroot -%install_info_rm -%delete_la_and_a +%delete_la chrpath -d %{buildroot}/%{_bindir}/gsl-randist chrpath -d %{buildroot}/%{_bindir}/gsl-histogram -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post devel -if [ -f %{_infodir}/gsl-ref.info.gz ]; then - /sbin/install-info %{_infodir}/gsl-ref.info %{_infodir}/dir || : -fi - -%preun devel -if [ "$1" = 0 ]; then - if [ -f %{_infodir}/gsl-ref.info.gz ]; then - /sbin/install-info --delete %{_infodir}/gsl-ref.info %{_infodir}/dir || : - fi -fi - %files %license COPYING %doc AUTHORS ChangeLog NEWS README THANKS TODO -%{_libdir}/libgsl.so.25* +%{_libdir}/libgsl.so.28* %{_libdir}/libgslcblas.so.0* %{_bindir}/gsl-histogram %{_bindir}/gsl-randist @@ -96,6 +77,9 @@ fi %{_mandir}/man3/*.3* %changelog +* Mon Nov 04 2024 Funda Wang - 2.8-1 +- update to 2.8 + * Fri Nov 1 2024 liningjie - 2.7-3 - Fix CVE-2024-50610 diff --git a/gsl.yaml b/gsl.yaml index dffd8a45199f2a8f1be791070fad47a5a88e12a7..4329d422620da23c591d88adb524c37b16555ac7 100644 --- a/gsl.yaml +++ b/gsl.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://git.savannah.gnu.org/git/gsl.git tag_prefix: "release-" -seperator: "-" +separator: "-"