Deprecate pcre, postfix: upgrade to 3.9.0 (#8808)
Co-authored-by: Betty Lakes <bettylakes@microsoft.com>
This commit is contained in:
Betty
GitHub
Родитель
66ed26f87d
Коммит
62ea9adb8e
|
|
@ -4,5 +4,3 @@ coreutils
|
|||
gmp
|
||||
grep
|
||||
libselinux
|
||||
pcre
|
||||
pcre-libs
|
||||
|
|
|
|||
|
|
@ -4,5 +4,3 @@ coreutils
|
|||
gmp
|
||||
grep
|
||||
libselinux
|
||||
pcre
|
||||
pcre-libs
|
||||
|
|
|
|||
|
|
@ -4,5 +4,3 @@ coreutils
|
|||
gmp
|
||||
grep
|
||||
libselinux
|
||||
pcre
|
||||
pcre-libs
|
||||
|
|
|
|||
|
|
@ -4,5 +4,3 @@ coreutils
|
|||
gmp
|
||||
grep
|
||||
libselinux
|
||||
pcre
|
||||
pcre-libs
|
||||
|
|
|
|||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -2864,7 +2864,6 @@
|
|||
"parted",
|
||||
"patch",
|
||||
"pciutils",
|
||||
"pcre",
|
||||
"perl-Canary-Stability",
|
||||
"perl-CGI",
|
||||
"perl-common-sense",
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"pcre-8.45.tar.bz2": "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,165 +0,0 @@
|
|||
Summary: Grep for perl compatible regular expressions
|
||||
Name: pcre
|
||||
Version: 8.45
|
||||
Release: 2%{?dist}
|
||||
License: BSD
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
Group: Applications/System
|
||||
URL: https://www.pcre.org
|
||||
Source0: https://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
||||
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: readline-devel
|
||||
Requires: libgcc
|
||||
Requires: libstdc++
|
||||
Requires: pcre-libs = %{version}-%{release}
|
||||
Requires: readline
|
||||
|
||||
%description
|
||||
The PCRE package contains Perl Compatible Regular Expression libraries. These are useful for implementing regular expression pattern matching using the same syntax and semantics as Perl 5.
|
||||
|
||||
%package devel
|
||||
Summary: Headers and static lib for pcre development
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: %{name}-static = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Install this package if you want do compile applications using the pcre
|
||||
library.
|
||||
|
||||
%package libs
|
||||
Summary: Libraries for pcre
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description libs
|
||||
This package contains minimal set of shared pcre libraries.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%configure \
|
||||
%ifarch s390 s390x sparc64 sparcv9 riscv64
|
||||
--disable-jit \
|
||||
%else
|
||||
--enable-jit \
|
||||
%endif
|
||||
--docdir=%{_docdir}/pcre-%{version} \
|
||||
--enable-unicode-properties \
|
||||
--enable-pcre16 \
|
||||
--enable-pcre32 \
|
||||
--enable-pcregrep-libz \
|
||||
--enable-pcregrep-libbz2 \
|
||||
--enable-pcretest-libreadline \
|
||||
--with-match-limit-recursion=16000
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
mv -v %{buildroot}%{_libdir}/libpcre.so.* %{buildroot}/lib &&
|
||||
ln -sfv ../../lib/$(readlink %{buildroot}%{_libdir}/libpcre.so) %{buildroot}%{_libdir}/libpcre.so
|
||||
ln -sfv $(readlink %{buildroot}%{_libdir}/libpcre.so) %{buildroot}%{_libdir}/libpcre.so.0
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%check
|
||||
%make_build check
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%{_bindir}/pcregrep
|
||||
%{_bindir}/pcretest
|
||||
%{_mandir}/man1/pcregrep.1*
|
||||
%{_mandir}/man1/pcretest.1*
|
||||
%{_libdir}/*.so.*
|
||||
%exclude %{_libdir}/libpcre.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-, root, root)
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/pcregrep
|
||||
%exclude %{_bindir}/pcretest
|
||||
%{_defaultdocdir}/%{name}-%{version}/*
|
||||
%{_mandir}/*/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.a
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_includedir}/*
|
||||
|
||||
%files libs
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libpcre.so.*
|
||||
|
||||
%changelog
|
||||
* Tue Mar 08 2022 Matt DeVuyst <mattdev@microsoft.com> - 8.45-2
|
||||
- Enable JIT feature on supported architectures (as Fedora does).
|
||||
|
||||
* Thu Feb 10 2022 Max Brodeur-Urbas <maxbr@microsoft.com> - 8.45-1
|
||||
- Upgrading to v8.45
|
||||
- Correcting source URL.
|
||||
|
||||
* Fri Jul 23 2021 Thomas Crain <thcrain@microsoft.com> - 8.44-3
|
||||
- Remove *.la files from devel subpackage
|
||||
- Build static libraries, add compatibility provides for static subpackage
|
||||
- Remove manual pkgconfig provides
|
||||
|
||||
* Mon Apr 26 2021 Thomas Crain <thcrain@microsoft.com> - 8.44-2
|
||||
- Replace incorrect %%{_lib} usage with %%{_libdir}
|
||||
|
||||
* Thu Oct 29 2020 Joe Schmitt <joschmit@microsoft.com> - 8.44-1
|
||||
- Update to version 8.44 to fix CVE-2020-14155.
|
||||
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 8.42-4
|
||||
- Added %%license line automatically
|
||||
|
||||
* Tue Apr 07 2020 Joe Schmitt <joschmit@microsoft.com> - 8.42-3
|
||||
- Update URL.
|
||||
- Update Source0 with valid URL.
|
||||
- Remove sha1 macro.
|
||||
- License verified.
|
||||
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 8.42-2
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
|
||||
* Tue Sep 11 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> - 8.42-1
|
||||
- Update to version 8.42
|
||||
|
||||
* Wed Dec 20 2017 Xiaolin Li <xiaolinl@vmware.com> - 8.41-1
|
||||
- Update to version 8.41
|
||||
|
||||
* Wed Jul 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> - 8.40-4
|
||||
- Added fix for CVE-2017-11164 by adding stack recursion limit
|
||||
|
||||
* Wed May 24 2017 Divya Thaluru <dthaluru@vmware.com> - 8.40-3
|
||||
- Added fixes for CVE-2017-7244, CVE-2017-7245, CVE-2017-7246, CVE-2017-7186
|
||||
|
||||
* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> - 8.40-2
|
||||
- Added -libs subpackage
|
||||
|
||||
* Mon Apr 03 2017 Robert Qi <qij@vmware.com> - 8.40-1
|
||||
- Update to 8.40
|
||||
|
||||
* Wed Oct 05 2016 ChangLee <changlee@vmware.com> - 8.39-2
|
||||
- Modified %%check
|
||||
|
||||
* Fri Sep 9 2016 Xiaolin Li <xiaolinl@vmware.com> - 8.39-1
|
||||
- Update to version 8.39
|
||||
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 8.38-3
|
||||
- GA - Bump release of all rpms
|
||||
|
||||
* Fri Mar 18 2016 Anish Swaminathan <anishs@vmware.com> 8.38-2
|
||||
- Add upstream fixes patch
|
||||
|
||||
* Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> - 8.38-1
|
||||
- Updated to version 8.38
|
||||
|
||||
* Mon Nov 30 2015 Sharath George <sharathg@vmware.com> - 8.36-2
|
||||
- Add symlink for libpcre.so.1
|
||||
|
||||
* Thu Nov 06 2014 Sharath George <sharathg@vmware.com> - 8.36-1
|
||||
- Initial version
|
||||
|
|
@ -51,15 +51,20 @@ conf_check() {
|
|||
}
|
||||
|
||||
make_aliasesdb() {
|
||||
if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
|
||||
local MAP=""
|
||||
local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
|
||||
[ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
|
||||
[ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
|
||||
|
||||
if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
|
||||
then
|
||||
# /etc/aliases.db may be used by other MTA, make sure nothing
|
||||
# /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
|
||||
# has touched it since our last newaliases call
|
||||
[ /etc/aliases -nt /etc/aliases.db ] ||
|
||||
[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
|
||||
[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return
|
||||
[ /etc/aliases -nt /etc/aliases.$MAP ] ||
|
||||
[ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
|
||||
[ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return
|
||||
/usr/bin/newaliases
|
||||
touch -r /etc/aliases.db "$ALIASESDB_STAMP"
|
||||
touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
|
||||
else
|
||||
/usr/bin/newaliases
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -3,15 +3,20 @@
|
|||
ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
|
||||
|
||||
make_aliasesdb() {
|
||||
if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
|
||||
local MAP=""
|
||||
local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
|
||||
[ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
|
||||
[ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
|
||||
|
||||
if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
|
||||
then
|
||||
# /etc/aliases.db may be used by other MTA, make sure nothing
|
||||
# /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
|
||||
# has touched it since our last newaliases call
|
||||
[ /etc/aliases -nt /etc/aliases.db ] ||
|
||||
[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
|
||||
[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return 0
|
||||
[ /etc/aliases -nt /etc/aliases.$MAP ] ||
|
||||
[ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
|
||||
[ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return 0
|
||||
/usr/bin/newaliases
|
||||
touch -r /etc/aliases.db "$ALIASESDB_STAMP"
|
||||
touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
|
||||
else
|
||||
/usr/bin/newaliases
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ PrivateTmp=true
|
|||
CapabilityBoundingSet=~ CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE
|
||||
ProtectSystem=true
|
||||
PrivateDevices=true
|
||||
ExecStartPre=-/usr/sbin/restorecon -R /var/spool/postfix/pid/master.pid
|
||||
ExecStartPre=-/usr/sbin/restorecon -R /var/spool/postfix/pid
|
||||
ExecStartPre=-/usr/libexec/postfix/aliasesdb
|
||||
ExecStartPre=-/usr/libexec/postfix/chroot-update
|
||||
ExecStart=/usr/sbin/postfix start
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
"Signatures": {
|
||||
"README-Postfix-SASL-RedHat.txt": "ee4f586103caeb67439389542f4f4937168a4a34e7576e64060517fb9a216a3f",
|
||||
"pflogsumm-1.1.5.tar.gz": "da6443679117de5109fd7d65fe915286c20ad1ecee63fe07d8cdddd0b75fe466",
|
||||
"postfix-3.7.0.tar.gz": "645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c",
|
||||
"postfix-3.9.0.tar.gz": "56f5e420e7c25455a4e96c19b672f80f9a0a35fb5becc9247c9e3d5dcc617f34",
|
||||
"postfix-chroot-update": "a6180d5b2cb81e8f84388d889fe671c80a5bc953a122ef03633346dc3f21a16a",
|
||||
"postfix-etc-init.d-postfix": "ede617a0d1210d61d3d2557954d16caeccb0bac1137e6b202c5d201be7adfc32",
|
||||
"postfix-etc-init.d-postfix": "61db4e9056c5c345fc8fe301417dba595ad5084cbbe574a14bed0f5c5aeaa3d6",
|
||||
"postfix-pam.conf": "b0fb611f3e88f94068ee2d5b7e26d433283ad2d3c2dbf11c36eceadac6bcc91a",
|
||||
"postfix-sasl.conf": "6617c2faa6edec2450a9cfe004b09f3c37a2ccb4cd6fd2cb945bb95790f96375",
|
||||
"postfix.aliasesdb": "c20e79af7ef43fd79d86b506990a7d57ad56e533595cabbba74c8971d9bbb010",
|
||||
"postfix.service": "e90d00d1560aa5a3298c1bd5ff760e2423d7d9f8b290e1b137845dedf291f136"
|
||||
"postfix.aliasesdb": "2791d10b2d335533456e3d79f4e576eede143d61a7823a8df567fa2de44295ad",
|
||||
"postfix.service": "2d8f604c65075efecd40a81d7a9e7f8fcd9c2e5b6d335561a033ca7b6335495c"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@
|
|||
|
||||
Summary: Postfix Mail Transport Agent
|
||||
Name: postfix
|
||||
Version: 3.7.0
|
||||
Release: 2%{?dist}
|
||||
Version: 3.9.0
|
||||
Release: 1%{?dist}
|
||||
License: (IBM AND GPLv2+) OR (EPL-2.0 AND GPLv2+)
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
|
|
@ -105,7 +105,7 @@ BuildRequires: zlib-devel
|
|||
%{?with_ldap:BuildRequires: openldap-devel}
|
||||
%{?with_lmdb:BuildRequires: lmdb-devel}
|
||||
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
|
||||
%{?with_pcre:BuildRequires: pcre-devel}
|
||||
%{?with_pcre:BuildRequires: pcre2-devel}
|
||||
%{?with_mysql:BuildRequires: mariadb-connector-c-devel}
|
||||
%{?with_pgsql:BuildRequires: libpq-devel}
|
||||
%{?with_sqlite:BuildRequires: sqlite-devel}
|
||||
|
|
@ -274,9 +274,8 @@ CCARGS="${CCARGS} -fsigned-char"
|
|||
AUXLIBS_LMDB="-llmdb"
|
||||
%endif
|
||||
%if %{with pcre}
|
||||
# -I option required for pcre 3.4 (and later?)
|
||||
CCARGS="${CCARGS} -DHAS_PCRE -I%{_includedir}/pcre"
|
||||
AUXLIBS_PCRE="-lpcre"
|
||||
CCARGS="${CCARGS} -DHAS_PCRE=2 `pcre2-config --cflags`"
|
||||
AUXLIBS_PCRE=`pcre2-config --libs8`
|
||||
%endif
|
||||
%if %{with mysql}
|
||||
CCARGS="${CCARGS} -DHAS_MYSQL -I%{_includedir}/mysql"
|
||||
|
|
@ -762,6 +761,9 @@ exit 0
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Apr 15 2024 Betty Lakes <bettylakes@microsoft.com> - 3.9.0-1
|
||||
- Update to version 3.9.0
|
||||
|
||||
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 3.7.0-2
|
||||
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
|
||||
|
||||
|
|
|
|||
|
|
@ -15648,16 +15648,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
"other": {
|
||||
"name": "pcre",
|
||||
"version": "8.45",
|
||||
"downloadUrl": "https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.bz2"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
|
|
@ -21133,8 +21123,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "postfix",
|
||||
"version": "3.7.0",
|
||||
"downloadUrl": "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.7.0.tar.gz"
|
||||
"version": "3.9.0",
|
||||
"downloadUrl": "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.9.0.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
"openssl",
|
||||
"azurelinux-release",
|
||||
"parted",
|
||||
"pcre",
|
||||
"pkg-config",
|
||||
"popt",
|
||||
"readline",
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
"openssl",
|
||||
"azurelinux-release",
|
||||
"parted",
|
||||
"pcre",
|
||||
"pkgconfig",
|
||||
"popt",
|
||||
"readline",
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ remove_packages_for_pkggen_core () {
|
|||
sed -ri '/azurelinux-repos-(debug|extended|extras|microsoft)/d' $TmpPkgGen
|
||||
sed -i '/nghttp2-devel/d' $TmpPkgGen
|
||||
sed -i '/npth-[[:alpha:]]/d' $TmpPkgGen
|
||||
sed -i '/pcre-devel/d' $TmpPkgGen
|
||||
sed -i '/perl-5/d' $TmpPkgGen
|
||||
sed -i '/perl-A/d' $TmpPkgGen
|
||||
sed -i '/perl-a/d' $TmpPkgGen
|
||||
|
|
@ -277,7 +276,6 @@ generate_pkggen_core () {
|
|||
grep "^libsepol-" $TmpPkgGen
|
||||
grep "^glib-" $TmpPkgGen
|
||||
grep "^libltdl-" $TmpPkgGen
|
||||
grep "^pcre-" $TmpPkgGen
|
||||
grep "^lua-" $TmpPkgGen
|
||||
grep "^azurelinux-rpm-macros-" $TmpPkgGen
|
||||
grep "^mariner-check-" $TmpPkgGen
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче