From bc75b42f7650c33ffdb61e5e29b0b96cb9111932 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 Mar 2023 17:57:54 +0000 Subject: gentoo auto-resync : 07:03:2023 - 17:57:54 --- app-mobilephone/gammu/Manifest | 3 +- .../files/gammu-1.42.0-fortify-source-3.patch | 31 ++++++++++ app-mobilephone/gammu/gammu-1.42.0-r1.ebuild | 69 ++++++++++++++++++++++ app-mobilephone/gammu/gammu-1.42.0.ebuild | 66 --------------------- 4 files changed, 102 insertions(+), 67 deletions(-) create mode 100644 app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch create mode 100644 app-mobilephone/gammu/gammu-1.42.0-r1.ebuild delete mode 100644 app-mobilephone/gammu/gammu-1.42.0.ebuild (limited to 'app-mobilephone/gammu') diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest index 4e63dc24e4e1..a7d062b2d766 100644 --- a/app-mobilephone/gammu/Manifest +++ b/app-mobilephone/gammu/Manifest @@ -1,5 +1,6 @@ AUX gammu-1.42.0-CMP0110-policy.patch 390 BLAKE2B 549412ca85f7dce8a91afb1b4a558e78a827177f102a8fd6c04ed55bcbae5bd850762710296acf3abef30607381371497d933c1414444afd7dfd639e4b037d2c SHA512 6a043905a3d19b3643b34e01e0870d92b5ba9d1947e9c1ef0daec5e95d7ac49badb0313c2cfeff5ab6e3fd43ded0741d8634cd6e8e501ee2dd6abdcfd377274f +AUX gammu-1.42.0-fortify-source-3.patch 888 BLAKE2B fd67c24cdac37d05c7c489b8ed58f3621872ecc92b35c591c78aa7c0a124fe8e46ef987e38071b46c686aa1b45e0b56f7287f48470d15a720bac04a77ad85d58 SHA512 35897ddd3c79b221456bb0721deccaf8ae6f34d5ef09868d2774038075a9acbf36d5defbe654782f757c0a591a5fb1be57030a839f695162b6654639844b0bce AUX gammu-1.42.0-gammu-detect.patch 784 BLAKE2B 93392d9fb812f19b6053f8c8246ce4442274ad467355859e52263cd98594fffc131c3919f7088b5340bcbe92d94f7193c5d47337bb5686ddbdc99fce73f6ded9 SHA512 cfcacc96f1dbd9f9d480a0a7f1019484b4c8474980f2c69897bfbca091997a9fcdd7a93f893f9c49220f1094944831bccf3c37410e36c8d2701a790711fc76a8 DIST gammu-1.42.0.tar.bz2 2193946 BLAKE2B 074f870624efbd28aaf9ecb445063ff7ec070cd1498c00a2e93a8842ed2afd5a0bc6475d950885eec883bed158528dda0588809c2d55ef78c83f0eed3e1b4aff SHA512 f440df357578ce7f5ddd17f2f0f6405b4dacbca3e5da65a469f3f1e92c71bf899a7ef0977438c803ed9b1d7d15324d4a43bd9d97d986119a522243e2e6304971 -EBUILD gammu-1.42.0.ebuild 1494 BLAKE2B ce5eccb051b0f739f49f1cae1d3e6df68e60537e94327c8d4e6fe6a52191c322abce4dfe3da178239eddcb7680e518fbe22ea0dafa845bb4fc49a6ed43a6f6ab SHA512 c43a58102ce60185822107f70d505f26ae0a8ccf5fb0fd7a29f808c0e196fa04e5fb0d05c759d6305268f97be7266eceed93e36af76da4a1aeebf1c780d64447 +EBUILD gammu-1.42.0-r1.ebuild 1543 BLAKE2B dfc28830a9d0f0046d8b976fe0610b28900a45ca8617c5dcbb381edb6bbb62d984eae7e690c21904b4dc7a72f0c7b658ba86e016abd8568be3dcfab01500fc66 SHA512 8d3f75bb807d6ab5ac01dce0dae1a57d61802b725e4d020251478c8c142c69d838f8bd26259d2fb1fab0d2b75f8f6513adc8ae07a8c44db0939cc3c56fdd03e5 MISC metadata.xml 693 BLAKE2B 77bb0614028aa94495a11559877ae2bd9b48b823dc573f32a9f7eb2dd65b0fbb3cdd57ebbc597f5d572f2532e84aea88a5150b353b6ff3019d655502af9d38f8 SHA512 dd61359bec371f9f970c77440fca2ea960e01afc040234351dde63ac2d5aa5ac850a5e38945d19cb73e74e32eabff2afb63e9ea94aa7330d28d7c11c1e75fc42 diff --git a/app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch b/app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch new file mode 100644 index 000000000000..dba1ca50ec6d --- /dev/null +++ b/app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/854324 +https://github.com/gammu/gammu/commit/a37e5d8054f863fa71e38e244dd4da13eee6e251 + +From a37e5d8054f863fa71e38e244dd4da13eee6e251 Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Mon, 20 Jun 2022 10:24:13 +0200 +Subject: [PATCH] Fix buffer overflow in Backup.Creator + +I noticed that while testing the upcoming GCC 12 with -D_FORTIFY_SOURCE=3: +here I have + +$1 = 0x7ffff7f0f940 "Linux, kernel 5.16.14-1-default (#1 SMP PREEMPT Fri Mar 11 12:33:34 UTC 2022 (80acc65))" +(gdb) p (int)strlen(GetOS()) +$3 = 87 +so GetOS() returns 87 chars while: + +include/gammu-backup.h: char Creator[80]; + +Fixes: #701 +--- a/include/gammu-backup.h ++++ b/include/gammu-backup.h +@@ -218,7 +218,7 @@ typedef struct { + /** + * Name of program which created backup + */ +- char Creator[80]; ++ char Creator[512]; + /** + * Timestamp of backup + */ + diff --git a/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild new file mode 100644 index 000000000000..ba396cb0f1fc --- /dev/null +++ b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A tool to handle your cellular phone" +HOMEPAGE="https://wammu.eu/gammu/" +SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb" + +COMMON_DEPEND=" + dev-libs/glib:2= + dev-libs/libgudev:= + virtual/libiconv + bluetooth? ( net-wireless/bluez:= ) + curl? ( net-misc/curl:= ) + dbi? ( >=dev-db/libdbi-0.8.3:= ) + mysql? ( dev-db/mysql-connector-c:= ) + nls? ( sys-devel/gettext ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql:= ) + usb? ( virtual/libusb:1= ) +" +DEPEND=" + ${COMMON_DEPEND} + irda? ( virtual/os-headers ) +" +RDEPEND=" + ${COMMON_DEPEND} + dev-util/dialog +" +PATCHES=( + "${FILESDIR}/${P}-CMP0110-policy.patch" + "${FILESDIR}/${P}-gammu-detect.patch" + "${FILESDIR}/${P}-fortify-source-3.patch" +) + +src_configure() { + local mycmakeargs=( + -DWITH_BLUETOOTH=$(usex bluetooth) + -DWITH_CURL=$(usex curl) + -DWITH_Gettext=$(usex nls) + -DWITH_Iconv=$(usex nls) + -DWITH_IRDA=$(usex irda) + -DWITH_LibDBI=$(usex dbi) + -DWITH_MySQL=$(usex mysql) + -DWITH_ODBC=$(usex odbc) + -DWITH_Postgres=$(usex postgres) + -DWITH_USB=$(usex usb) + -DINSTALL_DOC_DIR="share/doc/${PF}" + ) + cmake_src_configure +} + +src_test() { + addwrite "/var/lock/LCK..bar" + LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1 +} + +src_install() { + cmake_src_install + docompress -x /usr/share/doc/${PF}/examples/ +} diff --git a/app-mobilephone/gammu/gammu-1.42.0.ebuild b/app-mobilephone/gammu/gammu-1.42.0.ebuild deleted file mode 100644 index 79bd7daa5e61..000000000000 --- a/app-mobilephone/gammu/gammu-1.42.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="A tool to handle your cellular phone" -HOMEPAGE="https://wammu.eu/gammu/" -SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb" - -COMMON_DEPEND=" - dev-libs/glib:2= - dev-libs/libgudev:= - virtual/libiconv - bluetooth? ( net-wireless/bluez:= ) - curl? ( net-misc/curl:= ) - dbi? ( >=dev-db/libdbi-0.8.3:= ) - mysql? ( dev-db/mysql-connector-c:= ) - nls? ( sys-devel/gettext ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:= ) - usb? ( virtual/libusb:1= ) -" -DEPEND=" - ${COMMON_DEPEND} - irda? ( virtual/os-headers ) -" -RDEPEND=" - ${COMMON_DEPEND} - dev-util/dialog -" -PATCHES=( "${FILESDIR}/${P}-CMP0110-policy.patch" - "${FILESDIR}/${P}-gammu-detect.patch" ) - -src_configure() { - local mycmakeargs=( - -DWITH_BLUETOOTH=$(usex bluetooth) - -DWITH_CURL=$(usex curl) - -DWITH_Gettext=$(usex nls) - -DWITH_Iconv=$(usex nls) - -DWITH_IRDA=$(usex irda) - -DWITH_LibDBI=$(usex dbi) - -DWITH_MySQL=$(usex mysql) - -DWITH_ODBC=$(usex odbc) - -DWITH_Postgres=$(usex postgres) - -DWITH_USB=$(usex usb) - -DINSTALL_DOC_DIR="share/doc/${PF}" - ) - cmake_src_configure -} - -src_test() { - addwrite "/var/lock/LCK..bar" - LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1 -} - -src_install() { - cmake_src_install - docompress -x /usr/share/doc/${PF}/examples/ -} -- cgit v1.2.3