* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gammu/files/, app-mobilephone/gammu/
@ 2022-05-18 15:14 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2022-05-18 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 49ef6c9b1c26984904ff86f75adcc810a1cdbef4
Author: Victor Kustov <ktrace <AT> yandex <DOT> ru>
AuthorDate: Tue May 10 14:08:01 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 18 15:14:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ef6c9b
app-mobilephone/gammu: bump to 1.42.0
- bump version
- fix cmake warning
- fix gammu-detect
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Victor Kustov <ktrace <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/25423
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-mobilephone/gammu/Manifest | 1 +
.../gammu/files/gammu-1.42.0-CMP0110-policy.patch | 12 ++++
.../gammu/files/gammu-1.42.0-gammu-detect.patch | 22 ++++++++
app-mobilephone/gammu/gammu-1.42.0.ebuild | 66 ++++++++++++++++++++++
4 files changed, 101 insertions(+)
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 8db479407c06..471863d305f6 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1 +1,2 @@
DIST gammu-1.41.0.tar.bz2 2167233 BLAKE2B 4b0bf77246cc6a07a52457cff2bae44e63ebfe2715cb0c0b7d89c3d6352bb2df4cd5e7fd9b62d316e316fb1e73108fe561e030b7444eccd601cd0d2541b9f0e9 SHA512 f2c2534d3827216bf015607431938e0cf2524d5f2c670a5f76bb5ab7928962d22de981bbbf2dfa7af833c7903b60a775242048210bac6c35b1a9ee7668db4543
+DIST gammu-1.42.0.tar.bz2 2193946 BLAKE2B 074f870624efbd28aaf9ecb445063ff7ec070cd1498c00a2e93a8842ed2afd5a0bc6475d950885eec883bed158528dda0588809c2d55ef78c83f0eed3e1b4aff SHA512 f440df357578ce7f5ddd17f2f0f6405b4dacbca3e5da65a469f3f1e92c71bf899a7ef0977438c803ed9b1d7d15324d4a43bd9d97d986119a522243e2e6304971
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-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.42.0.ebuild b/app-mobilephone/gammu/gammu-1.42.0.ebuild
new file mode 100644
index 000000000000..ffbcfefd1952
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.42.0.ebuild
@@ -0,0 +1,66 @@
+# 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/
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gammu/files/, app-mobilephone/gammu/
@ 2023-03-07 16:58 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-03-07 16:58 UTC (permalink / raw
To: gentoo-commits
commit: 10727586735882a48d57d0c41cb44a7a535645dd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:38:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:58:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10727586
app-mobilephone/gammu: fix runtime w/ FORTIFY_SOURCE=3
Closes: https://bugs.gentoo.org/854324
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gammu-1.42.0-fortify-source-3.patch | 31 ++++++++++++++++++++++
...{gammu-1.42.0.ebuild => gammu-1.42.0-r1.ebuild} | 9 ++++---
2 files changed, 37 insertions(+), 3 deletions(-)
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/gammu-1.42.0.ebuild b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild
similarity index 88%
rename from app-mobilephone/gammu/gammu-1.42.0.ebuild
rename to app-mobilephone/gammu/gammu-1.42.0-r1.ebuild
index 79bd7daa5e61..ba396cb0f1fc 100644
--- a/app-mobilephone/gammu/gammu-1.42.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -35,8 +35,11 @@ RDEPEND="
${COMMON_DEPEND}
dev-util/dialog
"
-PATCHES=( "${FILESDIR}/${P}-CMP0110-policy.patch"
- "${FILESDIR}/${P}-gammu-detect.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-CMP0110-policy.patch"
+ "${FILESDIR}/${P}-gammu-detect.patch"
+ "${FILESDIR}/${P}-fortify-source-3.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gammu/files/, app-mobilephone/gammu/
@ 2016-02-02 20:13 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2016-02-02 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 19d0a72327ca484229e7a7d95d8b1b2d0e870fd1
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Tue Feb 2 14:25:08 2016 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 14:35:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d0a723
app-mobilephone/gammu: bump to 1.36.8, fix #536722
Python support is now handled by dev-python/python-gammu
Package-Manager: portage-2.2.27
app-mobilephone/gammu/Manifest | 1 +
.../gammu/files/gammu-1.36.8-bashcompdir.patch | 12 ++++
app-mobilephone/gammu/gammu-1.36.8.ebuild | 79 ++++++++++++++++++++++
app-mobilephone/gammu/metadata.xml | 9 ++-
4 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 40e50c6..08f608e 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1 +1,2 @@
DIST gammu-1.33.0.tar.bz2 6535262 SHA256 b326223e36a334dbaed68252a9cf2d90fd898d6de4d1085dcf9c2320881aece3 SHA512 42252a36c7ad5a2945fcf23fcb1b5bb0201d27e8830d3b4a7f4c36bf00f12f5a0f7797e17098bda8d526d4ddc3b1808c0786dfae0feef9424516fa68bf2f3f1e WHIRLPOOL 27c0110da7b686bc7dd19f4f897c59d4e66aa6dbec78dec208fa8c90f70b80c1375c7b8a4b54fe40295d388de61efb11695823a503d1f85a46797c97ddf988fa
+DIST gammu-1.36.8.tar.bz2 2095289 SHA256 0ed9c91b4cc5844cad04531e765bc1194cb02bc3e69e6658cd88bfb1cad74f80 SHA512 4ac86b783570db0105e18ef05fc9408e85d1234ab7de720a232a416ad867d3afbe89db7ed408c06d57f8bb38a2e272f86386f11a89e56f1d750da9e9b579ba09 WHIRLPOOL 36172cbf129647b2de48dbbe14122e71fc4f46e2f6ddb29ce546a1e37ea5c2ee0cad28ee37b29b7ddfb9605e6984c6d80d50108bfe0962417da35a1c5b2688ef
diff --git a/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch b/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch
new file mode 100644
index 0000000..aceef3d
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch
@@ -0,0 +1,12 @@
+diff -BurpN gammu-1.36.8.orig/contrib/CMakeLists.txt gammu-1.36.8/contrib/CMakeLists.txt
+--- gammu-1.36.8.orig/contrib/CMakeLists.txt 2015-12-08 13:38:11.000000000 +0300
++++ gammu-1.36.8/contrib/CMakeLists.txt 2016-01-16 15:49:45.870431342 +0300
+@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES)
+ if (INSTALL_BASH_COMPLETION)
+ macro_optional_find_package (BashCompletion)
+ if (NOT BASH_COMPLETION_FOUND)
+- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
++ set (BASH_COMPLETION_COMPLETIONSDIR "/usr/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d")
+ endif (NOT BASH_COMPLETION_FOUND)
+ install (
+ FILES bash-completion/gammu
diff --git a/app-mobilephone/gammu/gammu-1.36.8.ebuild b/app-mobilephone/gammu/gammu-1.36.8.ebuild
new file mode 100644
index 0000000..2db6755
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.36.8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+DESCRIPTION="A tool to handle your cellular phone"
+HOMEPAGE="http://wammu.eu/gammu/"
+SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth curl dbi debug irda mysql nls postgres usb"
+
+# TODO: figure out a way to disable gudev
+RDEPEND="dev-libs/glib:2=
+ virtual/libgudev:=
+ bluetooth? ( net-wireless/bluez:= )
+ curl? ( net-misc/curl:= )
+ dbi? ( >=dev-db/libdbi-0.8.3:= )
+ mysql? ( virtual/mysql:= )
+ postgres? ( dev-db/postgresql:=[server] )
+ usb? ( virtual/libusb:1= )
+ dev-util/dialog"
+DEPEND="${RDEPEND}
+ irda? ( virtual/os-headers )
+ nls? ( sys-devel/gettext )"
+
+# sys-devel/gettext is needed for creating .mo files
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr zh_CN zh_TW"
+IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-skip-locktest.patch" \
+ "${FILESDIR}/${PN}-1.36.8-bashcompdir.patch"
+
+ local lang support_linguas=no
+ for lang in ${MY_AVAILABLE_LINGUAS} ; do
+ if use linguas_${lang} ; then
+ support_linguas=yes
+ break
+ fi
+ done
+ # install all languages when all selected LINGUAS aren't supported
+ if [ "${support_linguas}" = "yes" ]; then
+ for lang in ${MY_AVAILABLE_LINGUAS} ; do
+ if ! use linguas_${lang} ; then
+ rm -rf locale/${lang} || die
+ fi
+ done
+ fi
+}
+
+src_configure() {
+ # debug flag is used inside cmake-utils.eclass
+ local mycmakeargs=(
+ $(cmake-utils_use_with bluetooth Bluez)
+ $(cmake-utils_use_with irda IRDA)
+ $(cmake-utils_use_with curl CURL)
+ $(cmake-utils_use_with usb USB)
+ $(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_with postgres Postgres)
+ $(cmake-utils_use_with dbi LibDBI)
+ $(cmake-utils_use_with nls GettextLibs)
+ $(cmake-utils_use_with nls Iconv)
+ -DBUILD_SHARED_LIBS=ON
+ -DINSTALL_DOC_DIR="share/doc/${PF}"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/common" cmake-utils_src_test
+}
diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
index 33356c6..65a0f7a 100644
--- a/app-mobilephone/gammu/metadata.xml
+++ b/app-mobilephone/gammu/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<use>
- <flag name="irda">Enables infrared support</flag>
-</use>
+ <use>
+ <flag name="irda">Enables infrared support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">gammu/gammu</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-07 16:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-18 15:14 [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gammu/files/, app-mobilephone/gammu/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-03-07 16:58 Sam James
2016-02-02 20:13 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox