CVS commit: pkgsrc/comms/gammu
"Adam Ciarcinski" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: adam
Date: Fri Aug 21 11:52:40 UTC 2026
Modified Files:
pkgsrc/comms/gammu: Makefile PLIST distinfo
pkgsrc/comms/gammu/patches: patch-libgammu_phone_at_at-sms.c
patch-smsd_services_pgsql.c patch-smsd_services_sql.c
Log Message:
gammu: updated to 1.44.1
1.44.1
Harden SMS PDU parsing and encoding against malformed or oversized data.
Fix buffer overflows and size calculations in Unicode conversion.
Accept bare SMS prompts from AT modems.
Fix building the MySQL SMSD backend against MariaDB Connector/C.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/comms/gammu/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/comms/gammu/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/comms/gammu/distinfo
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c \
pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 7.5 KB)
Modified files:
Index: pkgsrc/comms/gammu/Makefile
diff -u pkgsrc/comms/gammu/Makefile:1.69 pkgsrc/comms/gammu/Makefile:1.70
--- pkgsrc/comms/gammu/Makefile:1.69 Thu May 14 16:40:32 2026
+++ pkgsrc/comms/gammu/Makefile Fri Aug 21 11:52:39 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.69 2026/05/14 16:40:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2026/08/21 11:52:39 adam Exp $
-DISTNAME= gammu-1.42.0
-PKGREVISION= 3
+DISTNAME= Gammu-1.44.1
+PKGNAME= ${DISTNAME:tl}
CATEGORIES= comms
-MASTER_SITES= https://dl.cihar.com/gammu/releases/
-EXTRACT_SUFX= .tar.xz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=gammu/}
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
MAINTAINER= [email protected]
HOMEPAGE= https://wammu.eu/gammu/
Index: pkgsrc/comms/gammu/PLIST
diff -u pkgsrc/comms/gammu/PLIST:1.13 pkgsrc/comms/gammu/PLIST:1.14
--- pkgsrc/comms/gammu/PLIST:1.13 Sun Jan 4 19:55:10 2026
+++ pkgsrc/comms/gammu/PLIST Fri Aug 21 11:52:39 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2026/01/04 19:55:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2026/08/21 11:52:39 adam Exp $
bin/gammu
bin/gammu-config
bin/gammu-smsd
@@ -89,8 +89,10 @@ share/doc/gammu/examples/php/smsd-mysql-
share/doc/gammu/examples/sms-read.c
share/doc/gammu/examples/sms-send.c
share/doc/gammu/examples/smsd.c
+share/doc/gammu/examples/sql/mssql.sql
share/doc/gammu/examples/sql/mysql-legacy.sql
share/doc/gammu/examples/sql/mysql.sql
+share/doc/gammu/examples/sql/oracle.sql
share/doc/gammu/examples/sql/pgsql.sql
share/doc/gammu/examples/sql/sqlite.sql
share/doc/gammu/manual/c/api.rst
@@ -173,7 +175,6 @@ share/doc/gammu/manual/protocol/samsung.
share/doc/gammu/manual/protocol/sonim.rst
share/doc/gammu/manual/protocol/tdma_5120.rst
share/doc/gammu/manual/python/data.rst
-share/doc/gammu/manual/python/examples.rst
share/doc/gammu/manual/python/exceptions.rst
share/doc/gammu/manual/python/gammu.rst
share/doc/gammu/manual/python/index.rst
Index: pkgsrc/comms/gammu/distinfo
diff -u pkgsrc/comms/gammu/distinfo:1.25 pkgsrc/comms/gammu/distinfo:1.26
--- pkgsrc/comms/gammu/distinfo:1.25 Sun Jan 4 19:55:10 2026
+++ pkgsrc/comms/gammu/distinfo Fri Aug 21 11:52:39 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2026/01/04 19:55:10 adam Exp $
+$NetBSD: distinfo,v 1.26 2026/08/21 11:52:39 adam Exp $
-BLAKE2s (gammu-1.42.0.tar.xz) = e08b748ecd5007f2d4faf25582b6b1669f4afe0f39303af4dd79ea1c9351edb3
-SHA512 (gammu-1.42.0.tar.xz) = b1826b011b7af15c87bd1e9214536607450553f9b5c7ba9b40ea2a1b9d8dcc8cab61106055fcb4aeb69e78ea29d2f4986ffd7df20210ed76bc6a0c474e140ba1
-Size (gammu-1.42.0.tar.xz) = 1747520 bytes
+BLAKE2s (Gammu-1.44.1.tar.gz) = 5f11d15efced6dbaba899dcbb88015dd40093368e998782644fb91f96e23484d
+SHA512 (Gammu-1.44.1.tar.gz) = a5703b5e0b987efdd8573522ec43e57c43ac4f206bc57c524371b2c610918cf31987ac5f81699bd6eb3c6bba4a3785a70a7da8e740b7444fe162d4088607ef9c
+Size (Gammu-1.44.1.tar.gz) = 3209526 bytes
SHA1 (patch-contrib_smscgi_sms__cgi.c) = 39598119eae4fd27d6d1844ca4a846fc79b126c1
-SHA1 (patch-libgammu_phone_at_at-sms.c) = be863fcb0b227b92f117f8632db3cae5dcbe7d29
-SHA1 (patch-smsd_services_pgsql.c) = 35d30183851c6d6b14e0450b59a56c858889e701
-SHA1 (patch-smsd_services_sql.c) = 62a2c113f18d767360a598284ac1083b9abb1f29
+SHA1 (patch-libgammu_phone_at_at-sms.c) = 551cd6c659bb5aef6b3f02280cc758564d28988e
+SHA1 (patch-smsd_services_pgsql.c) = bf3ffb6598385895782a70be5cacda3f94d8cd4b
+SHA1 (patch-smsd_services_sql.c) = b898e3defa8a9d702f515ac3776c4bdbec6bad34
Index: pkgsrc/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
diff -u pkgsrc/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c:1.4 pkgsrc/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c:1.5
--- pkgsrc/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c:1.4 Sun Sep 24 00:50:48 2023
+++ pkgsrc/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c Fri Aug 21 11:52:39 2026
@@ -1,22 +1,11 @@
-$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.4 2023/09/24 00:50:48 manu Exp $
+$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.5 2026/08/21 11:52:39 adam Exp $
-1) Don't use strcharnul from the helper library, it doesn't end
+Don't use strcharnul from the helper library, it doesn't end
up as PIC when compiled with Clang.
-2) Skip garbage reply on AT+CMGL in PDU mode as in text mode
-
-From upstream https://github.com/gammu/gammu/pull/823
-
-THe D-Link DWM222 4G USB modem sends a garbage line before the reply
-to AT+CMGL. This case was handled in text mode but not in PDU mode,
-and this device exhibit the bad behavior in PDU mode too.
-
-This change brings garbage skip behavior in PDU mode on par with text mode.
-
---- libgammu/phone/at/at-sms.c.orig 2019-09-27 10:55:52.000000000 +0200
-+++ libgammu/phone/at/at-sms.c 2023-09-24 02:44:57.292835696 +0200
-@@ -113,8 +113,11 @@
- }
+--- libgammu/phone/at/at-sms.c.orig 2026-08-19 10:48:50.000000000 +0000
++++ libgammu/phone/at/at-sms.c
+@@ -118,6 +118,9 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_
if (pos_start != NULL) {
/* Detect which memories we can use for saving */
pos_end = strchrnul(pos_start + 1, ')');
@@ -26,19 +15,3 @@ This change brings garbage skip behavior
pos_tmp = strstr(pos_start, "\"SM\"");
if (pos_tmp != NULL && pos_tmp < pos_end) {
- Priv->SIMSaveSMS = AT_AVAILABLE;
-@@ -1144,14 +1147,9 @@
- if (str == NULL) {
- /*
- * Sometimes an SMS message will contain a line break. In SMS text
- * mode we skip to the next line and try again to find +CMGL.
-- * FIXME: Can we do the same for SMS PDU mode?
- */
-- if (Priv->SMSMode == SMS_AT_PDU) {
-- smprintf(s, "Can not find +CMGL:!\n");
-- return ERR_UNKNOWN;
-- }
- continue;
- }
-
- /* Parse reply */
Index: pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c
diff -u pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c:1.1 pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c:1.2
--- pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c:1.1 Tue Jul 31 13:13:46 2018
+++ pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c Fri Aug 21 11:52:39 2026
@@ -1,16 +1,14 @@
-$NetBSD: patch-smsd_services_pgsql.c,v 1.1 2018/07/31 13:13:46 jperkin Exp $
+$NetBSD: patch-smsd_services_pgsql.c,v 1.2 2026/08/21 11:52:39 adam Exp $
-Set _XOPEN_SOURCE correctly.
+_XOPEN_SOURCE is problematic.
---- smsd/services/pgsql.c.orig 2018-01-05 10:14:14.000000000 +0000
+--- smsd/services/pgsql.c.orig 2026-08-19 10:48:50.000000000 +0000
+++ smsd/services/pgsql.c
-@@ -1,7 +1,9 @@
+@@ -1,7 +1,6 @@
/* (c) 2006 by Andrea Riciputi */
/* Copyright (c) 2009 - 2018 Michal Cihar <[email protected]> */
-+#if !defined(__sun)
- #define _XOPEN_SOURCE
-+#endif
+-#define _XOPEN_SOURCE
#define _BSD_SOURCE
#define _DEFAULT_SOURCE
#include <time.h>
Index: pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c
diff -u pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c:1.1 pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c:1.2
--- pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c:1.1 Tue Jul 31 13:13:46 2018
+++ pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c Fri Aug 21 11:52:40 2026
@@ -1,16 +1,14 @@
-$NetBSD: patch-smsd_services_sql.c,v 1.1 2018/07/31 13:13:46 jperkin Exp $
+$NetBSD: patch-smsd_services_sql.c,v 1.2 2026/08/21 11:52:40 adam Exp $
-Set _XOPEN_SOURCE correctly.
+_XOPEN_SOURCE is problematic.
---- smsd/services/sql.c.orig 2018-01-05 10:14:14.000000000 +0000
+--- smsd/services/sql.c.orig 2026-08-19 10:48:50.000000000 +0000
+++ smsd/services/sql.c
-@@ -9,7 +9,9 @@
+@@ -9,7 +9,6 @@
* Licensed under GNU GPL version 2 or later
*/
-+#if !defined(__sun)
- #define _XOPEN_SOURCE
-+#endif
+-#define _XOPEN_SOURCE
#define _BSD_SOURCE
#define _DEFAULT_SOURCE
#include <time.h>