Skip to content

Clean up lua.spec 1.0 to dev merge #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmcilvaney merged 1 commit into from
Oct 30, 2020
+1 −3
Merged

Clean up lua.spec 1.0 to dev merge #318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions SPECS/lua/lua.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Patch0: %{name}-5.3.0-autotoolize.patch
Patch1: %{name}-5.3.0-idsize.patch
Patch2: %{name}-5.2.2-configure-linux.patch
Patch3: %{name}-5.3.0-configure-compat-module.patch
# Fixes CVE-2019-6706
# From http://lua.2524044.n2.nabble.com/CVE-2019-6706-use-after-free-in-lua-upvaluejoin-function-tt7685575.html
Patch4: CVE-2019-6706-use-after-free-lua_upvaluejoin.patch
Patch5: lua-5.3.4-shared_library-1.patch
# CVE-2020-15888 patch taken from Open Embedded's Lua meta layer https://github.com/openembedded/meta-openembedded/blob/master/meta-oe/recipes-devtools/lua/lua/CVE-2020-15888.patch
Expand All @@ -44,7 +44,6 @@ Patch7: CVE-2020-15889.nopatch
# NOTE: Patches needed if updating to 5.4:
# - 34affe7a63fc5d842580a9f23616d057e17dfe27
Patch8: CVE-2020-24342.nopatch
# From http://lua.2524044.n2.nabble.com/CVE-2019-6706-use-after-free-in-lua-upvaluejoin-function-tt7685575.html

BuildRequires: automake autoconf libtool readline-devel ncurses-devel
Requires: lua-libs = %{version}-%{release}
Expand Down Expand Up @@ -174,7 +173,6 @@ install -Dpm 0644 %{SOURCE1000} $RPM_BUILD_ROOT/%{macrosdir}/macros.lua
%changelog
* Thu Oct 01 2020 Daniel McIlvaney <damcilva@microsoft.com> 5.3.5-11
- Nopatch CVE-2020-24342
- Apply patch for CVE-2019-6706 from Lua mailing list
- Apply patch for CVE-2020-15888 from Open Embedded

* Mon Sep 28 2020 Daniel McIlvaney <damcilva@microsoft.com> 5.3.5-10
Expand Down