3.0 package upgrades: bmake, brotli, libsoup, rocksdb and systemtap (#7010)
This commit is contained in:
Andrew Phelps
GitHub
Родитель
2f2f16f62f
Коммит
c910ce8bbe
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"bmake-20211221.tar.gz": "c48476c1c52493e61a5342d7d8541608f7852244f3c74ffd7676b6537c475bfb"
|
||||
"bmake-20230723.tar.gz": "c42a0d951ba23f7665331309fbbe21edc01136a23cb9416850b4315be5fb5904"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,16 @@
|
|||
Summary: The NetBSD make(1) tool
|
||||
Name: bmake
|
||||
Version: 20211221
|
||||
Release: 2%{?dist}
|
||||
Version: 20230723
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: https://ftp.netbsd.org/pub/NetBSD/misc/sjg/
|
||||
Source0: %{url}/bmake-%{version}.tar.gz
|
||||
# Certain tests in varmod-localtime.mk will inconsistently fail
|
||||
# on pipeline machines. Disabling with this patch for now, and
|
||||
# tracking this bug in workitem 38644519
|
||||
Patch0: remove-inconsistent-time-tests.patch
|
||||
Requires: mk-files
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: sed
|
||||
BuildRequires: util-linux
|
||||
Requires: mk-files
|
||||
|
||||
%description
|
||||
bmake, the NetBSD make tool, is a program designed to simplify the
|
||||
|
|
@ -39,7 +34,6 @@ shared libraries.
|
|||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}
|
||||
sed -i.timestamp -e 's|cp_f=-f|cp_f=-pf|' mk/install-mk
|
||||
sed -i.python -e '1 s|^#!/usr/bin/env python|#!/usr/bin/python3|' mk/meta2deps.py
|
||||
|
||||
%build
|
||||
|
|
@ -47,9 +41,7 @@ sed -i.python -e '1 s|^#!/usr/bin/env python|#!/usr/bin/python3|' mk/meta2deps.p
|
|||
sh ./make-bootstrap.sh
|
||||
|
||||
%install
|
||||
export STRIP=/bin/true # Make sure binary is not stripped
|
||||
./bmake -m mk install DESTDIR=%{buildroot}
|
||||
mv %{buildroot}%{_mandir}/{cat,man}1
|
||||
./bmake -m mk install DESTDIR=%{buildroot} INSTALL='install -p' STRIP_FLAG=''
|
||||
chmod a-x %{buildroot}%{_datadir}/mk/mkopt.sh
|
||||
|
||||
%files
|
||||
|
|
@ -64,6 +56,9 @@ chmod a-x %{buildroot}%{_datadir}/mk/mkopt.sh
|
|||
%{_datadir}/mk
|
||||
|
||||
%changelog
|
||||
* Fri Dec 08 2023 Andrew Phelps <anphel@microsoft.com> - 20230723-1
|
||||
- Upgrade to version 20230723
|
||||
|
||||
* Tue Mar 22 2022 Cameron Baird <cameronbaird@microsoft.com> - 20211221-2
|
||||
- Add patch remove-inconsistent-time-tests.patch, which disables unreliably failing
|
||||
- tests in varmod-localtime.mk
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
diff --git a/unit-tests/varmod-localtime.mk b/unit-tests/varmod-localtime.mk
|
||||
index ffa09a0b..5903b36e 100644
|
||||
--- a/unit-tests/varmod-localtime.mk
|
||||
+++ b/unit-tests/varmod-localtime.mk
|
||||
@@ -86,28 +86,28 @@
|
||||
.endif
|
||||
|
||||
|
||||
-.if ${:L:localtime=1} != "Thu Jan 1 01:00:01 1970"
|
||||
-. error
|
||||
-.endif
|
||||
-
|
||||
-
|
||||
-# INT32_MAX
|
||||
-.if ${:L:localtime=2147483647} != "Tue Jan 19 04:14:07 2038"
|
||||
-. error
|
||||
-.endif
|
||||
-
|
||||
-
|
||||
-.if ${:L:localtime=2147483648} == "Tue Jan 19 04:14:08 2038"
|
||||
-# All systems that have unsigned time_t or 64-bit time_t.
|
||||
-.elif ${:L:localtime=2147483648} == "Fri Dec 13 21:45:52 1901"
|
||||
-# FreeBSD-12.0-i386 still has 32-bit signed time_t, see
|
||||
-# sys/x86/include/_types.h, __LP64__.
|
||||
-#
|
||||
-# Linux on 32-bit systems may still have 32-bit signed time_t, see
|
||||
-# sysdeps/unix/sysv/linux/generic/bits/typesizes.h, __TIMESIZE.
|
||||
-.else
|
||||
-. error
|
||||
-.endif
|
||||
+# .if ${:L:localtime=1} != "Thu Jan 1 01:00:01 1970"
|
||||
+# . error
|
||||
+# .endif
|
||||
+
|
||||
+
|
||||
+# # INT32_MAX
|
||||
+# .if ${:L:localtime=2147483647} != "Tue Jan 19 04:14:07 2038"
|
||||
+# . error
|
||||
+# .endif
|
||||
+
|
||||
+
|
||||
+# .if ${:L:localtime=2147483648} == "Tue Jan 19 04:14:08 2038"
|
||||
+# # All systems that have unsigned time_t or 64-bit time_t.
|
||||
+# .elif ${:L:localtime=2147483648} == "Fri Dec 13 21:45:52 1901"
|
||||
+# # FreeBSD-12.0-i386 still has 32-bit signed time_t, see
|
||||
+# # sys/x86/include/_types.h, __LP64__.
|
||||
+# #
|
||||
+# # Linux on 32-bit systems may still have 32-bit signed time_t, see
|
||||
+# # sysdeps/unix/sysv/linux/generic/bits/typesizes.h, __TIMESIZE.
|
||||
+# .else
|
||||
+# . error
|
||||
+# .endif
|
||||
|
||||
|
||||
# Integer overflow, at least before var.c 1.631 from 2020-10-31.
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"brotli-1.0.9.tar.gz": "f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46"
|
||||
"brotli-1.1.0.tar.gz": "e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: Lossless compression algorithm
|
||||
Name: brotli
|
||||
Version: 1.0.9
|
||||
Release: 2%{?dist}
|
||||
Version: 1.1.0
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -66,9 +66,6 @@ python3 setup.py build
|
|||
cd build
|
||||
%make_install
|
||||
|
||||
# I couldn't find the option to not build the static libraries
|
||||
rm "%{buildroot}%{_libdir}/"*.a
|
||||
|
||||
cd ..
|
||||
python3 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
|
||||
install -dm755 "%{buildroot}%{_mandir}/man3"
|
||||
|
|
@ -116,6 +113,9 @@ make clean
|
|||
%{_mandir}/man3/constants.h.3brotli*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 13 2023 Andrew Phelps <anphel@microsoft.com> - 1.1.0-1
|
||||
- Upgrade to version 1.1.0
|
||||
|
||||
* Fri Feb 02 2022 Muhammad Falak <mwani@microsoft.com> - 1.0.9-2
|
||||
- Use `make test` instead of `ctest` to fix ptests
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"libsoup-3.0.4.tar.xz": "5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b"
|
||||
"libsoup-3.4.4.tar.xz": "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,41 +1,42 @@
|
|||
%define BaseVersion 3.0
|
||||
%define majmin %(echo %{version} | cut -d. -f1-2)
|
||||
|
||||
Summary: libsoup HTTP client/server library
|
||||
Name: libsoup
|
||||
Version: %{BaseVersion}.4
|
||||
Version: 3.4.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: System Environment/Development
|
||||
URL: https://wiki.gnome.org/LibSoup
|
||||
Source0: https://ftp.gnome.org/pub/GNOME/sources/libsoup/%{BaseVersion}/%{name}-%{version}.tar.xz
|
||||
BuildRequires: meson
|
||||
Source0: https://ftp.gnome.org/pub/GNOME/sources/libsoup/%{majmin}/%{name}-%{version}.tar.xz
|
||||
BuildRequires: autogen
|
||||
BuildRequires: brotli-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: glib-devel
|
||||
BuildRequires: glib-networking
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: httpd
|
||||
BuildRequires: icu-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libnghttp2-devel
|
||||
BuildRequires: libpsl-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: perl(File::Find)
|
||||
BuildRequires: perl(FindBin)
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-libs
|
||||
BuildRequires: python3-pygments
|
||||
BuildRequires: python3-tools
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libnghttp2-devel
|
||||
BuildRequires: brotli-devel
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: vala
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: python3-pygments
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl(FindBin)
|
||||
BuildRequires: perl(File::Find)
|
||||
Requires: glib-networking
|
||||
Requires: libpsl
|
||||
Requires: libxml2
|
||||
|
|
@ -52,14 +53,6 @@ Requires: libxml2-devel
|
|||
%description devel
|
||||
Header files for libsoup.
|
||||
|
||||
%package doc
|
||||
Summary: gtk-doc files for libsoup
|
||||
Group: System Environment/Development
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description doc
|
||||
gtk-doc files for libsoup.
|
||||
|
||||
%package lang
|
||||
Summary: Additional language files for libsoup
|
||||
Group: System Environment/Development
|
||||
|
|
@ -73,11 +66,11 @@ These are the additional language files of libsoup.
|
|||
|
||||
%build
|
||||
%meson \
|
||||
-Dgtk_doc=true \
|
||||
-Dsysprof=disabled \
|
||||
-Dautobahn=disabled \
|
||||
-Dhttp2_tests=disabled \
|
||||
-Dntlm=disabled \
|
||||
-Ddoc_tests=false \
|
||||
-Ddocs=disabled \
|
||||
-Dtests=false
|
||||
%meson_build
|
||||
|
||||
|
|
@ -103,7 +96,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||
%defattr(-,root,root)
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%exclude %{_libdir}/*.a
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_datadir}/gir-1.0/*
|
||||
%dir %{_datadir}/vala
|
||||
|
|
@ -111,20 +103,20 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||
%{_datadir}/vala/vapi/%{name}-%{BaseVersion}.deps
|
||||
%{_datadir}/vala/vapi/%{name}-%{BaseVersion}.vapi
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/gtk-doc/html/*
|
||||
|
||||
%files lang -f %{name}-%{BaseVersion}.lang
|
||||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
* Wed Dec 13 2023 Andrew Phelps <anphel@microsoft.com> - 3.4.4-1
|
||||
- Upgrade to version 3.4.4
|
||||
- Remove doc subpackage
|
||||
|
||||
* Mon Jan 24 2022 Henry Li <lihl@microsoft.com> - 3.0.4-1
|
||||
- Upgrade to version 3.0.4
|
||||
- Add cmake, libnghttp2-devel, brotli-devel, gnutls-devel,
|
||||
- Add cmake, libnghttp2-devel, brotli-devel, gnutls-devel,
|
||||
gtk-doc, vala and python3-pygments as BR
|
||||
- Use meson to build and install
|
||||
- Add additional files to libsoup-devel
|
||||
- Add additional files to libsoup-devel
|
||||
- License Verified
|
||||
|
||||
* Wed Jan 19 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 2.64.0-8
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"rocksdb-6.26.0.tar.gz" : "b793066463da71d31a46f31946e4fca435a7c3e73435e2bb1d062d95e0a20116"
|
||||
"rocksdb-8.9.1.tar.gz" : "c22d2097e7aa75629612fd020499bdae0d3e321c7bc4361960c42aaf9cbd6dc1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@
|
|||
|
||||
Name: rocksdb
|
||||
Summary: A library that provides an embeddable, persistent key-value store for fast storage.
|
||||
Version: 6.26.0
|
||||
Release: 2%{?dist}
|
||||
Version: 8.9.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and ASL 2.0 and BSD
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: https://rocksdb.org
|
||||
#Source0: https://github.com/facebook/%%{name}/archive/v%%{version}.tar.gz
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source0: https://github.com/facebook/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gflags-devel
|
||||
|
|
@ -18,9 +17,9 @@ BuildRequires: gflags-devel
|
|||
RocksDB is developed and maintained by Facebook Database Engineering Team. It is built on
|
||||
earlier work on LevelDB by Sanjay Ghemawat (sanjay@google.com) and Jeff Dean (jeff@google.com)
|
||||
|
||||
This code is a library that forms the core building block for a fast key-value server,
|
||||
This code is a library that forms the core building block for a fast key-value server,
|
||||
especially suited for storing data on flash drives. It has a Log-Structured-Merge-Database
|
||||
(LSM) design with flexible tradeoffs between Write-Amplification-Factor (WAF),
|
||||
(LSM) design with flexible tradeoffs between Write-Amplification-Factor (WAF),
|
||||
Read-Amplification-Factor (RAF) and Space-Amplification-Factor (SAF). It has multi-threaded
|
||||
compactions, making it especially suitable for storing multiple terabytes of data in a single
|
||||
database.
|
||||
|
|
@ -56,8 +55,12 @@ make install DESTDIR=%{buildroot}
|
|||
%{_includedir}/rocksdb
|
||||
%{_libdir}/{*.so,*.a}
|
||||
%{_libdir}/cmake/rocksdb
|
||||
%{_libdir}/pkgconfig/rocksdb.pc
|
||||
|
||||
%changelog
|
||||
* Wed Dec 13 2023 Andrew Phelps <anphel@microsoft.com> - 8.9.1-1
|
||||
- Upgrade to 8.9.1
|
||||
|
||||
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 6.26.0-2
|
||||
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"systemtap-4.9.tar.gz": "d01033baea9d0af52a65e70167816931f4b856427a53ff2ab30e4b45f6ad3a98"
|
||||
"systemtap-5.0.tar.gz": "a8b43408895fee2b0023483b02f861700b0139629050666dfe4dfa1e49d59939"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
%define with_sqlite 1
|
||||
Summary: Programmable system-wide instrumentation system
|
||||
Name: systemtap
|
||||
Version: 4.9
|
||||
Version: 5.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Vendor: Microsoft Corporation
|
||||
|
|
@ -349,6 +349,9 @@ fi
|
|||
%{_mandir}/man8/systemtap-service.8*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 13 2023 Andrew Phelps <anphel@microsoft.com> - 5.0-1
|
||||
- Upgrade to 5.0
|
||||
|
||||
* Mon Nov 06 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 4.9-1
|
||||
- Auto-upgrade to 4.9 - Azure Linux 3.0 - package upgrades
|
||||
|
||||
|
|
|
|||
|
|
@ -1157,8 +1157,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "bmake",
|
||||
"version": "20211221",
|
||||
"downloadUrl": "https://ftp.netbsd.org/pub/NetBSD/misc/sjg//bmake-20211221.tar.gz"
|
||||
"version": "20230723",
|
||||
"downloadUrl": "https://ftp.netbsd.org/pub/NetBSD/misc/sjg//bmake-20230723.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1267,8 +1267,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "brotli",
|
||||
"version": "1.0.9",
|
||||
"downloadUrl": "https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz"
|
||||
"version": "1.1.0",
|
||||
"downloadUrl": "https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -10981,8 +10981,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "libsoup",
|
||||
"version": "3.0.4",
|
||||
"downloadUrl": "https://ftp.gnome.org/pub/GNOME/sources/libsoup/3.0/libsoup-3.0.4.tar.xz"
|
||||
"version": "3.4.4",
|
||||
"downloadUrl": "https://ftp.gnome.org/pub/GNOME/sources/libsoup/3.4/libsoup-3.4.4.tar.xz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -25435,8 +25435,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "rocksdb",
|
||||
"version": "6.26.0",
|
||||
"downloadUrl": "https://github.com/facebook/rocksdb/archive/v6.26.0.tar.gz"
|
||||
"version": "8.9.1",
|
||||
"downloadUrl": "https://github.com/facebook/rocksdb/archive/v8.9.1.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -28197,8 +28197,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "systemtap",
|
||||
"version": "4.9",
|
||||
"downloadUrl": "https://sourceware.org/systemtap/ftp/releases/systemtap-4.9.tar.gz"
|
||||
"version": "5.0",
|
||||
"downloadUrl": "https://sourceware.org/systemtap/ftp/releases/systemtap-5.0.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче