diff options
Diffstat (limited to 'app-mobilephone/gammu')
| -rw-r--r-- | app-mobilephone/gammu/Manifest | 2 | ||||
| -rw-r--r-- | app-mobilephone/gammu/files/gammu-1.42.0-CMP0110-policy.patch | 12 | ||||
| -rw-r--r-- | app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch | 31 | ||||
| -rw-r--r-- | app-mobilephone/gammu/files/gammu-1.42.0-gammu-detect.patch | 22 | ||||
| -rw-r--r-- | app-mobilephone/gammu/gammu-1.42.0-r1.ebuild (renamed from app-mobilephone/gammu/gammu-1.41.0.ebuild) | 24 | ||||
| -rw-r--r-- | app-mobilephone/gammu/metadata.xml | 10 |
6 files changed, 83 insertions, 18 deletions
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest index 8db479407c06..b083ab159211 100644 --- a/app-mobilephone/gammu/Manifest +++ b/app-mobilephone/gammu/Manifest @@ -1 +1 @@ -DIST gammu-1.41.0.tar.bz2 2167233 BLAKE2B 4b0bf77246cc6a07a52457cff2bae44e63ebfe2715cb0c0b7d89c3d6352bb2df4cd5e7fd9b62d316e316fb1e73108fe561e030b7444eccd601cd0d2541b9f0e9 SHA512 f2c2534d3827216bf015607431938e0cf2524d5f2c670a5f76bb5ab7928962d22de981bbbf2dfa7af833c7903b60a775242048210bac6c35b1a9ee7668db4543 +DIST gammu-1.42.0.tar.xz 1747520 BLAKE2B 13f2627ad189e8ca92da2b16c4f7f5f792f601ca5f7620e251526f79b399b54eb3fb46b420ccb81d4bb44c7777d417c96390001d30dbbe9740eb3d737c574716 SHA512 b1826b011b7af15c87bd1e9214536607450553f9b5c7ba9b40ea2a1b9d8dcc8cab61106055fcb4aeb69e78ea29d2f4986ffd7df20210ed76bc6a0c474e140ba1 diff --git a/app-mobilephone/gammu/files/gammu-1.42.0-CMP0110-policy.patch b/app-mobilephone/gammu/files/gammu-1.42.0-CMP0110-policy.patch new file mode 100644 index 000000000000..b67cebd17a41 --- /dev/null +++ b/app-mobilephone/gammu/files/gammu-1.42.0-CMP0110-policy.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt.orig b/CMakeLists.txt +index 6cffb02..f7993cf 100644 +--- a/CMakeLists.txt.orig ++++ b/CMakeLists.txt +@@ -13,6 +13,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + # Silent some warnings from CMake 2.6 + cmake_policy(SET CMP0003 NEW) + cmake_policy(SET CMP0009 NEW) ++cmake_policy(SET CMP0110 NEW) + + option (COVERAGE "Add flags for Coverage analysis" OFF) + 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 <mliska@suse.cz> +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 <Buffer.1.lto_priv.1> "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/files/gammu-1.42.0-gammu-detect.patch b/app-mobilephone/gammu/files/gammu-1.42.0-gammu-detect.patch new file mode 100644 index 000000000000..03e9ea631732 --- /dev/null +++ b/app-mobilephone/gammu/files/gammu-1.42.0-gammu-detect.patch @@ -0,0 +1,22 @@ +diff --git a/gammu-detect/udev.c.orig b/gammu-detect/udev.c +index 4d25949..e0cd383 100644 +--- a/gammu-detect/udev.c.orig ++++ b/gammu-detect/udev.c +@@ -189,12 +189,12 @@ void udev_detect(void) + client = g_udev_client_new(subsys); + + list = g_udev_client_query_by_subsystem(client, subsys[0]); +- for (iter = list; iter; iter = g_list_next(iter)) { +- dump_device_and_parent(G_UDEV_DEVICE(iter->data), 0); +- if (device_is_valid(G_UDEV_DEVICE(iter->data))) { +- device_dump_config(G_UDEV_DEVICE(iter->data)); ++ for (iter = g_list_first(list); iter; iter = g_list_next(iter)) { ++ dump_device_and_parent(iter->data, 0); ++ if (device_is_valid(iter->data)) { ++ device_dump_config(iter->data); + } +- g_object_unref(G_UDEV_DEVICE(iter->data)); ++ g_object_unref(iter->data); + } + } + diff --git a/app-mobilephone/gammu/gammu-1.41.0.ebuild b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild index 67a45a3dae6a..00ba2ed482b2 100644 --- a/app-mobilephone/gammu/gammu-1.41.0.ebuild +++ b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild @@ -1,38 +1,46 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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" +SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb" -DEPEND=" +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:= ) - irda? ( virtual/os-headers ) 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=" - ${DEPEND} + ${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) @@ -51,7 +59,7 @@ src_configure() { } src_test() { - addwrite "/run/lock/LCK..bar" + addwrite "/var/lock/LCK..bar" LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1 } diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml index d17bdaf5475d..58e4d954b478 100644 --- a/app-mobilephone/gammu/metadata.xml +++ b/app-mobilephone/gammu/metadata.xml @@ -1,16 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ktrace@yandex.ru</email> - <name>Victor Kustov</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <use> - <flag name="bluetooth">Enables bluetooth support</flag> <flag name="curl">Enables curl support</flag> <flag name="irda">Enables infrared support</flag> <flag name="nls">Enable native language support</flag> |