From 27ad6a285576ce16e4c74d806efee77166f0c3c6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Feb 2024 17:43:06 +0000 Subject: gentoo auto-resync : 04:02:2024 - 17:43:06 --- media-gfx/Manifest.gz | Bin 37697 -> 37700 bytes media-gfx/gifsicle/Manifest | 3 + .../files/gifsicle-1.94-CVE-2023-46009.patch | 94 ++++++++++++++++ media-gfx/gifsicle/gifsicle-1.94.ebuild | 33 ++++++ media-gfx/valentina/Manifest | 8 +- media-gfx/valentina/metadata.xml | 2 +- media-gfx/valentina/valentina-0.6.1-r1.ebuild | 5 +- media-gfx/valentina/valentina-0.7.52.ebuild | 120 +++++++++++++++++++++ media-gfx/valentina/valentina-9999.ebuild | 8 +- 9 files changed, 261 insertions(+), 12 deletions(-) create mode 100644 media-gfx/gifsicle/files/gifsicle-1.94-CVE-2023-46009.patch create mode 100644 media-gfx/gifsicle/gifsicle-1.94.ebuild create mode 100644 media-gfx/valentina/valentina-0.7.52.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 11ea11ec6bfd..ed5c5f28828a 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest index 226bf6821a76..18fbe7d08947 100644 --- a/media-gfx/gifsicle/Manifest +++ b/media-gfx/gifsicle/Manifest @@ -1,3 +1,6 @@ +AUX gifsicle-1.94-CVE-2023-46009.patch 3192 BLAKE2B 01926ce195db5f9ef1a5e7bd3d10ddb9d537306c036ad827363be8bb0104c32d9b41b1350879807493ae361e1d9a9c2b20bbb83d251dd89286ab6334d2fd1ba1 SHA512 0e1372e5d8b77522869f7bd3fd6ea0f1a2bcc424e30980936bfd61aabe5e6bb2b86c4e63f9d09d3fb9bf14f705ab1acc20fcb7e991059c1e6f9b0c1d1b74ac45 DIST gifsicle-1.93.tar.gz 578194 BLAKE2B c5635fc736e2fd97278ab97377663f9702d2891cab5e19b16fa1aa53412ae48945d82ee42e9690208532cb854c99397ec4c1a11d4521454d8d40efd9adfd9d2a SHA512 1ace2c9597a405d69bb9dfa24764a3d7c7dd9864e1832d25a4a7ad2e32780038206b889711846d6e4dbc7189482d0d03874f18d86966ebffbc4ee10569c390d3 +DIST gifsicle-1.94.tar.gz 579194 BLAKE2B 0d6a734d6340938579633061cbff1f702c33adf7c206d3120488fa4a14eb69ef2f5838ee42b92cb371fa39398b57114c6315308d83fd951c399d9d6c3b3986d0 SHA512 5dc84332d929bc765b642f31fb79ed2998b193985070513cb3e412bca519c7c6065537c14df13e9860ae09dc5c66a06ca5475b1fdee62cd9509d42a5e2d0c9b6 EBUILD gifsicle-1.93.ebuild 639 BLAKE2B 9c8080193dfaf712da47ac9855142d171861e9568849065e30f03fcc6be0318afc62708f3b3795ba49ef0facc375c77f269a6da2915d055d7f85fca2dec683a1 SHA512 cd058a074484f0aab0730acc8b09b79443e8db055d3f0429279fb0f519cbfb1ea4620209fffaf5a2d0d30e2f44c057be7cb36214cf63afd1274c20c616928a2e +EBUILD gifsicle-1.94.ebuild 693 BLAKE2B d44945fbdef73b2eb42bf67af9692a40f76d4a1eb04e9c3cd7da2105b16ac883dd1bce4ba80f31178e1b425ee946ebcc19088a3695f1c912e9bd264df4cae34e SHA512 b34b13802f94bd65239ad6cef8fb105fe1e4a470960661c8709ccdaa1faf9eaf3bd9af15d257ce713dbf0c4108152ca5493ddc432ba733b52070ecf591fe7b65 MISC metadata.xml 248 BLAKE2B da21909c8724c7dd7cf27c3ee2fc6a032610f4863f0ff1fc4ff62d317bd8293b4ce63bf4b2f929d8768dcd449aa00aa927033b26e9dca357247aa9361bc3327e SHA512 28c710eb4b97dc08e939fa72c3ee2f834df2743f0146a7a6163a51bdf1166669bbaf05c4716a208d1b393504118150172b9d744bcc41ce23dd85e90599b731e8 diff --git a/media-gfx/gifsicle/files/gifsicle-1.94-CVE-2023-46009.patch b/media-gfx/gifsicle/files/gifsicle-1.94-CVE-2023-46009.patch new file mode 100644 index 000000000000..6b82c8ecdd0c --- /dev/null +++ b/media-gfx/gifsicle/files/gifsicle-1.94-CVE-2023-46009.patch @@ -0,0 +1,94 @@ +diff -Naurp a/src/giffunc.c b/src/giffunc.c +--- a/src/giffunc.c 2021-09-20 13:19:00.000000000 +0200 ++++ b/src/giffunc.c 2024-02-04 14:05:47.811880522 +0100 +@@ -466,8 +466,10 @@ Gif_CopyImage(Gif_Image *src) + void Gif_MakeImageEmpty(Gif_Image* gfi) { + Gif_ReleaseUncompressedImage(gfi); + Gif_ReleaseCompressedImage(gfi); +- gfi->left = gfi->top = 0; +- gfi->width = gfi->height = 1; ++ gfi->left = gfi->left < 0xFFFE ? gfi->left : 0xFFFE; ++ gfi->top = gfi->top < 0xFFFE ? gfi->top : 0xFFFE; ++ gfi->width = 1; ++ gfi->height = 1; + gfi->transparent = 0; + Gif_CreateUncompressedImage(gfi, 0); + gfi->img[0][0] = 0; +diff -Naurp a/src/support.c b/src/support.c +--- a/src/support.c 2023-06-14 17:47:12.000000000 +0200 ++++ b/src/support.c 2024-02-04 14:05:51.307885109 +0100 +@@ -1421,9 +1421,9 @@ analyze_crop(int nmerger, Gt_Crop* crop, + } + } + +- if (t > b) ++ if (t > b) { + crop->w = crop->h = 0; +- else { ++ } else { + crop->x = l; + crop->y = t; + crop->w = r - l; +@@ -1618,7 +1618,8 @@ merge_frame_interval(Gt_Frameset *fset, + desti->comment = 0; + } + if (fr->comment) { +- if (!desti->comment) desti->comment = Gif_NewComment(); ++ if (!desti->comment) ++ desti->comment = Gif_NewComment(); + merge_comments(desti->comment, fr->comment); + /* delete the comment early to help with memory; set field to 0 so we + don't re-free it later */ +@@ -1628,10 +1629,22 @@ merge_frame_interval(Gt_Frameset *fset, + + if (fr->interlacing >= 0) + desti->interlace = fr->interlacing; +- if (fr->left >= 0) +- desti->left = fr->left + (fr->position_is_offset ? desti->left : 0); +- if (fr->top >= 0) +- desti->top = fr->top + (fr->position_is_offset ? desti->top : 0); ++ if (fr->left >= 0) { ++ int left = fr->left + (fr->position_is_offset ? desti->left : 0); ++ if (left + desti->width > 65535) { ++ error(1, "left position %d out of range", left); ++ return 0; ++ } ++ desti->left = left; ++ } ++ if (fr->top >= 0) { ++ int top = fr->top + (fr->position_is_offset ? desti->top : 0); ++ if (top + desti->height > 65535) { ++ error(1, "top position %d out of range", top); ++ return 0; ++ } ++ desti->top = top; ++ } + + if (fr->delay >= 0) + desti->delay = fr->delay; +diff -Naurp a/src/xform.c b/src/xform.c +--- a/src/xform.c 2023-06-14 17:48:05.000000000 +0200 ++++ b/src/xform.c 2024-02-04 14:05:47.812880524 +0100 +@@ -262,18 +262,18 @@ crop_image(Gif_Image* gfi, Gt_Frame* fr, + gfi->img[j] = old_img[c.y + j] + c.x; + gfi->img[c.h] = 0; + Gif_DeleteArray(old_img); ++ gfi->left += c.x - fr->left_offset; ++ gfi->top += c.y - fr->top_offset; + gfi->width = c.w; + gfi->height = c.h; +- } else if (preserve_total_crop) ++ } else if (preserve_total_crop) { + Gif_MakeImageEmpty(gfi); +- else { ++ } else { + Gif_DeleteArray(gfi->img); + gfi->img = 0; + gfi->width = gfi->height = 0; + } + +- gfi->left += c.x - fr->left_offset; +- gfi->top += c.y - fr->top_offset; + return gfi->img != 0; + } + diff --git a/media-gfx/gifsicle/gifsicle-1.94.ebuild b/media-gfx/gifsicle/gifsicle-1.94.ebuild new file mode 100644 index 000000000000..f5f90f0899a5 --- /dev/null +++ b/media-gfx/gifsicle/gifsicle-1.94.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Create, manipulate, and optimize GIF images and animations" +HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle" +SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz" + +LICENSE="GPL-2 MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="X" + +PATCHES=( "${FILESDIR}/$P-CVE-2023-46009.patch" ) + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" + +DOCS=( + NEWS.md + README.md +) + +src_configure() { + econf $(use_enable X gifview) +} diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 94dacf51f0eb..2cd472c839d6 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -2,6 +2,8 @@ AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404d AUX valentina-0.6.1-disable-vcs-version.patch 2623 BLAKE2B 30ed726eabcbf18269fb41f7cb32230b0f498364b6e2922de415cc93c4fce49dca2b5db7d28cc8fb34efbc11e7b8f136f601fc0d552b52869042c496cf627463 SHA512 906f82b0793919be6a846030b4b5891e716967e9c2bd8b01bf81671383cc5f20d50ddc0c6d174c08b5e5f31522acf7283b2cc6d11e29bca60d45a64cc7418e98 DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720 DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542 -EBUILD valentina-0.6.1-r1.ebuild 2189 BLAKE2B aea847aa2313d46ebf889531806f1f9c2a5e1d4865c78faed42587ff76d5908e3012da8af7add2f794c1aba39e924d88800a638cfdaa6f791275cadb06bb1e9c SHA512 d52df819ca46613b322b6de0470180b689e954334838adddd61b12aae3d3217facb731f957c5799830461caa03deaf8463a89ca3b1767af4bc8e2b4632cdc8ff -EBUILD valentina-9999.ebuild 1945 BLAKE2B ba3f8e84d5654d312910d83d7ba2a2d875477b08e85b140e3e9d9bbf43ae25dcc67b32cc3933dd66bb2201e464b853c935378d70583e7295c3c3269c32311a74 SHA512 10651225c740f0a513c3733b7f6a5417510062a30f08743c0d8e50fa6053ec708c29b7e2ec5740fc8ffbff7333b7a8ec987f758924a9bc25a401fb25dda2bb49 -MISC metadata.xml 335 BLAKE2B a1cfdeebb1f9b105a51b1f9433847ce8f1f551192bb750f9cf7dcbf96c456fcaf62674542af84c9a9945501de6e102e6bb80d38edc2ccce22638c15c09d5b332 SHA512 ee69b43d86c86cd96a3864f499d2d8251df81f0e3a768d76968f0ed01145eb290de43393198b8a928f06950de144ac2f3f4717283fcbdfd65b39df2c84923692 +DIST valentina-v0.7.52.tar.bz2 30819274 BLAKE2B 3b9b2ac2c4083371420dca4911bf5162d9d772ddf0a8b4582dac7ca47e6f027279a99bd3d674a7f0ce15e962cdf1afbdb573f8a14a5f6c02baae1f7a5aae37a1 SHA512 71ff3dc4ccea2ee3df34fda0364b211a80d4f953e6d3b9bf9b40ba1f4d1531e751d077983e8d13acb1f524c9883d2f565289d1b67d5de0a152c9a4df1428d6df +EBUILD valentina-0.6.1-r1.ebuild 2172 BLAKE2B b63a3eb14070d035807174444cf7fdc8458c46bf00598ce536b2acd91ee176b46072d2ce06723b8cd4bfaac8ff05cfdb10298a2b81fcd4ec9ccb357d48e08ff4 SHA512 09c5cbb557a57bad0868e335ae465e1ffcd475070a955ab9db04ca5d0ff317c0a88dd4f5344f275edadb8df456f5602080b53c312b7d358c7722de0f4594f21b +EBUILD valentina-0.7.52.ebuild 2013 BLAKE2B 42d6f8fa863282131a95028c96fcee44607a0cdade9f64f2b2e35b745c4190f7d042f04b567b23fcbcc76855008691ff526130afd2221298e183aadca14e88fc SHA512 f9df543da310fad259ea1853f769f1a32f8d5145fc9cb3ff6418bbfdfd8771485f03ca59b9e4a07e576c8a596271cb12516715d34e327f6a9acc140e0fef3251 +EBUILD valentina-9999.ebuild 1928 BLAKE2B d3f0aad7c7d95a01274351bd9b7b18c493f210960a46bc00ecf83a4f6d3458d83b7d9909ec0c1d38296f9028576117c1c83acf342d0d32c28dc8bfb3d924e7b0 SHA512 68264e82fea642bef07c45a3a9d2ac3775aa34453d931fadabb49d6177f01f7d280e2d2dc11f6a5097e7e118b7708e3e3dd2ed8dfcd7e3ef4dbdc5943d9d3f5c +MISC metadata.xml 338 BLAKE2B e25c965f49a8f8a62e13090a542f31a4dd8e750d22c41f53f786e63508ac714f97bccffa45b980d276674b322c87939220a6ae78710bd3a5cef43fc6220abea6 SHA512 4a08041d3ff622c268d11d6f584ceee0912bfde684519962e942798fe47597b62edc5a00125a497c796b60d29e9f8b20e423ba2ad9ef52fcd7056982236c0851 diff --git a/media-gfx/valentina/metadata.xml b/media-gfx/valentina/metadata.xml index 7d4871b26afb..44ef22747fcb 100644 --- a/media-gfx/valentina/metadata.xml +++ b/media-gfx/valentina/metadata.xml @@ -6,6 +6,6 @@ Miroslav Šulc - dismine/valentina + smart-pattern/valentina diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild index e770ab6d6e98..573945103dcb 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,14 +6,13 @@ EAPI=7 inherit qmake-utils xdg DESCRIPTION="Cloth patternmaking software" -HOMEPAGE="https://valentinaproject.bitbucket.io/" +HOMEPAGE="https://smart-pattern.com.ua/" SRC_URI="https://gitlab.com/smart-pattern/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" diff --git a/media-gfx/valentina/valentina-0.7.52.ebuild b/media-gfx/valentina/valentina-0.7.52.ebuild new file mode 100644 index 000000000000..c44783b0bd50 --- /dev/null +++ b/media-gfx/valentina/valentina-0.7.52.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils xdg + +DESCRIPTION="Cloth patternmaking software" +HOMEPAGE="https://smart-pattern.com.ua/" +SRC_URI="https://gitlab.com/smart-pattern/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" + +for LANG in ${LANGS}; do + IUSE="${IUSE} l10n_${LANG}" +done + +RDEPEND=" + app-text/poppler + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5" +DEPEND=" + ${RDEPEND} + dev-qt/qttest:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 +" + +S=${WORKDIR}/${PN}-v${PV} + +src_configure() { + local locales="" + local locale + + for LANG in ${LANGS}; do + if use l10n_${LANG}; then + case ${LANG} in + "cs") + locale="cs_CZ" + ;; + "de") + locale="de_DE" + ;; + "el") + locale="el_GR" + ;; + "en") + locale="en_CA en_IN en_US" + ;; + "es") + locale="es_ES" + ;; + "fi") + locale="fi_FI" + ;; + "fr") + locale="fr_FR" + ;; + "he") + locale="he_IL" + ;; + "id") + locale="id_ID" + ;; + "it") + locale="it_IT" + ;; + "nl") + locale="nl_NL" + ;; + "pt-BR") + locale="pt_BR" + ;; + "ro") + locale="ro_RO" + ;; + "ru") + locale="ru_RU" + ;; + "uk") + locale="uk_UA" + ;; + "zh-CN") + locale="zh_CN" + ;; + esac + + locales="${locales} ${locale}" + fi + done + + eqmake5 LOCALES="${locales}" "CONFIG+=noDebugSymbols no_ccache noRunPath noTests noWindowsInstaller" Valentina.pro -r +} + +src_install() { + emake install INSTALL_ROOT="${D}" + + dodoc AUTHORS.txt ChangeLog.txt README.txt + + doman dist/debian/${PN}.1 + doman dist/debian/puzzle.1 + doman dist/debian/tape.1 + + cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die + insinto /usr/share/mime/packages + doins dist/debian/${PN}.xml +} diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild index 5a7446534735..6b9c6fa11b44 100644 --- a/media-gfx/valentina/valentina-9999.ebuild +++ b/media-gfx/valentina/valentina-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,14 +6,12 @@ EAPI=7 inherit qmake-utils xdg git-r3 DESCRIPTION="Cloth patternmaking software" -HOMEPAGE="https://gitlab.com/smart-pattern/valentina" +HOMEPAGE="https://smart-pattern.com.ua/" EGIT_REPO_URI="https://gitlab.com/smart-pattern/valentina.git" EGIT_BRANCH="develop" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="" LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" @@ -107,7 +105,7 @@ src_configure() { src_install() { emake install INSTALL_ROOT="${D}" - dodoc AUTHORS.txt ChangeLog.txt README.txt + dodoc AUTHORS.txt ChangeLog.txt CONTRIBUTING.md README.md doman dist/debian/${PN}.1 doman dist/debian/tape.1 -- cgit v1.2.3