summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-09-06 10:03:35 +0000
committerAlin Năstac <mrness@gentoo.org>2007-09-06 10:03:35 +0000
commit470619cfa0cacfd37aede78c3b632482ed7f922b (patch)
tree9aa1da088057f34425e31b30f289e9233af97837 /app-mobilephone/gammu
parentversion bump (diff)
downloadhistorical-470619cfa0cacfd37aede78c3b632482ed7f922b.tar.gz
historical-470619cfa0cacfd37aede78c3b632482ed7f922b.tar.bz2
historical-470619cfa0cacfd37aede78c3b632482ed7f922b.zip
Version bump; fix several buffer overflows (#191191).
Package-Manager: portage-2.1.2.12
Diffstat (limited to 'app-mobilephone/gammu')
-rw-r--r--app-mobilephone/gammu/ChangeLog8
-rw-r--r--app-mobilephone/gammu/Manifest28
-rw-r--r--app-mobilephone/gammu/files/digest-gammu-1.13.03
-rw-r--r--app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch113
-rw-r--r--app-mobilephone/gammu/gammu-1.13.0.ebuild81
5 files changed, 224 insertions, 9 deletions
diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 6b0ab92d8485..80900cd5a643 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-mobilephone/gammu
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.44 2007/08/22 07:05:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.45 2007/09/06 10:03:35 mrness Exp $
+
+*gammu-1.13.0 (06 Sep 2007)
+
+ 06 Sep 2007; Alin Năstac <mrness@gentoo.org>
+ +files/gammu-1.13.0-fixups.patch, +gammu-1.13.0.ebuild:
+ Version bump; fix several buffer overflows (#191191).
22 Aug 2007; Christian Faulhammer <opfer@gentoo.org> gammu-1.12.0.ebuild:
stable x86, bug 139308
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 9888843f6c00..7267357d473d 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -9,8 +9,13 @@ AUX gammu-1.12.0-fixups.patch 3077 RMD160 034b194cccc3f82c41c15aefa30dbc85439d12
MD5 f1faf7f99d987e203f3ad1ceeb312cd8 files/gammu-1.12.0-fixups.patch 3077
RMD160 034b194cccc3f82c41c15aefa30dbc85439d1281 files/gammu-1.12.0-fixups.patch 3077
SHA256 5213f663574309ba90af8d9f127b794717cfed668791b1a2fedb5de44b181c47 files/gammu-1.12.0-fixups.patch 3077
+AUX gammu-1.13.0-fixups.patch 3927 RMD160 3e1d92f54e05e8e6d0b3e4483fc207881c523f44 SHA1 31771cdcaf2b86d5d7e32edcb5ff6a2671e7b58a SHA256 850ffc6bf2437a2785dfff0aa2e43bb0512d48e31c39305b6e5328ef5c09ef03
+MD5 35578d3347dda2c59640061358c61edd files/gammu-1.13.0-fixups.patch 3927
+RMD160 3e1d92f54e05e8e6d0b3e4483fc207881c523f44 files/gammu-1.13.0-fixups.patch 3927
+SHA256 850ffc6bf2437a2785dfff0aa2e43bb0512d48e31c39305b6e5328ef5c09ef03 files/gammu-1.13.0-fixups.patch 3927
DIST gammu-1.11.0.tar.bz2 920489 RMD160 903624c472b9d5225783e064d3a393060a4dcc37 SHA1 8bc28d3dbea86c9076ed5712ced316017c47ccaa SHA256 5d18cbf162edb8f54c47621b8dbf0683359e74ad67a985360cfcc4c810f2a086
DIST gammu-1.12.0.tar.bz2 940565 RMD160 a44b351777ab6c5d635401e968eb853d2508102b SHA1 0a4fb2745a90cc503e86ad0bb90a27e5e283d2ca SHA256 4ab84e05440f82bcc440030752fcf482a15d284f40de08f2240d43bc528c4fa1
+DIST gammu-1.13.0.tar.bz2 964504 RMD160 6f9ae52adf89cf5e7d16f9b0531017cd0a5f77d2 SHA1 c0d3e9e31b59241553eee39890e3d4321787760b SHA256 543cd847431d85cbbbd96c7914a2dd4d9fdcf74419dbe5693b93d8dc94ba945a
EBUILD gammu-1.11.0.ebuild 1352 RMD160 8c50aba0a27bd6920a1046a1f396cd15f4fe8b4c SHA1 d80d69d8740d8c17475e88d89f8b1c2acd9b3da4 SHA256 719c8d9d280e1eee1f1c942d52d9012e19baccf42ea7262ca6d51dce365a6d96
MD5 aa00b9f44ffdb7ba372f5dba867347dd gammu-1.11.0.ebuild 1352
RMD160 8c50aba0a27bd6920a1046a1f396cd15f4fe8b4c gammu-1.11.0.ebuild 1352
@@ -19,10 +24,14 @@ EBUILD gammu-1.12.0.ebuild 2040 RMD160 524cb9c575586355861db04424899d7fe352bff5
MD5 a0526ace4073bf172705308ca8574b7d gammu-1.12.0.ebuild 2040
RMD160 524cb9c575586355861db04424899d7fe352bff5 gammu-1.12.0.ebuild 2040
SHA256 e30d1687079eb674b6ff03dcfa3e8da9c34d513d50f9701c0129134814cc4483 gammu-1.12.0.ebuild 2040
-MISC ChangeLog 10149 RMD160 34ab7c222464848d017988a9321a36d554330ee3 SHA1 c73e123d866781cde82f960a72ef6f6e67610d7d SHA256 87f74a389a611e85467f669223d7d630aa56134e69175f802a6e2072c01b38f2
-MD5 5ebbd69ef63731cc6963726097248481 ChangeLog 10149
-RMD160 34ab7c222464848d017988a9321a36d554330ee3 ChangeLog 10149
-SHA256 87f74a389a611e85467f669223d7d630aa56134e69175f802a6e2072c01b38f2 ChangeLog 10149
+EBUILD gammu-1.13.0.ebuild 2042 RMD160 ab38c54ebad39fe1c338b94f19840b761a2de4d5 SHA1 e481ee26655822973553444814192b03a5ac4190 SHA256 a55a32a172bd1c512a448348f86ab52aea37993d5ab850015672a8d66e571293
+MD5 9c12e71121ca156bac4f0532e768e479 gammu-1.13.0.ebuild 2042
+RMD160 ab38c54ebad39fe1c338b94f19840b761a2de4d5 gammu-1.13.0.ebuild 2042
+SHA256 a55a32a172bd1c512a448348f86ab52aea37993d5ab850015672a8d66e571293 gammu-1.13.0.ebuild 2042
+MISC ChangeLog 10342 RMD160 f014f4e2ce53d4fd933a732184a541b9b4c16337 SHA1 fb9e8be5a976d9a18d79b6d3b77440c796237a0c SHA256 e03dc08f7d4e1bc9693b80e291459a5e7cfaa387164271123264c7d6487b1000
+MD5 60525a5ff15bc492b8a64bb58da234c9 ChangeLog 10342
+RMD160 f014f4e2ce53d4fd933a732184a541b9b4c16337 ChangeLog 10342
+SHA256 e03dc08f7d4e1bc9693b80e291459a5e7cfaa387164271123264c7d6487b1000 ChangeLog 10342
MISC metadata.xml 165 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 SHA1 866903a1177187bfcc803fb62e0e3be2a2674481 SHA256 576ea680ccc744a6279987ce542f52f215515a2b4e95bd08c61a66bba9af1c57
MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
RMD160 1bf9089beacb19ba770d553d02356566ecd76892 metadata.xml 165
@@ -33,10 +42,13 @@ SHA256 a6d97b3634b05fbfa6d0ae1fd9aecec5dc0eb3f52264579765f9b848c628f50d files/di
MD5 7318f9f3624fff2a584efafaa8e94338 files/digest-gammu-1.12.0 241
RMD160 7e56e9857a035cf147ebcdff71a324d7f00c9143 files/digest-gammu-1.12.0 241
SHA256 a32ed8faf55d46766d9aaab4314552e297b9f99f21ab846edba1faa81530cd65 files/digest-gammu-1.12.0 241
+MD5 d4a4c86ae5981bb486fd420322babe1e files/digest-gammu-1.13.0 241
+RMD160 3316a0ef6ed31f7d9054a5c21a5f1152dbcd63c5 files/digest-gammu-1.13.0 241
+SHA256 39e102a6cf73983dea4f724f95027379d797a25a3cde2b17122268a0a3d5eef1 files/digest-gammu-1.13.0 241
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
-iD8DBQFGy+A9NQqtfCuFneMRApyBAJ9/OOOjD+g5wQai11Ol8voA5ctS2gCfZIfg
-5p/v4yVqhpb4ag6pHqtZy2o=
-=W8xe
+iD8DBQFG39CRVSA5X31g7/gRAroUAJ92HwqbfLxLMqrCHvZyF9sy0Y9P3QCbBAJe
+gIoPY6ix0gl5JtIbT60yAQA=
+=ypby
-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.13.0 b/app-mobilephone/gammu/files/digest-gammu-1.13.0
new file mode 100644
index 000000000000..95e327ec3d87
--- /dev/null
+++ b/app-mobilephone/gammu/files/digest-gammu-1.13.0
@@ -0,0 +1,3 @@
+MD5 f2a9af55ece850cf5917f1365abd186b gammu-1.13.0.tar.bz2 964504
+RMD160 6f9ae52adf89cf5e7d16f9b0531017cd0a5f77d2 gammu-1.13.0.tar.bz2 964504
+SHA256 543cd847431d85cbbbd96c7914a2dd4d9fdcf74419dbe5693b93d8dc94ba945a gammu-1.13.0.tar.bz2 964504
diff --git a/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch
new file mode 100644
index 000000000000..68f2818a088e
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch
@@ -0,0 +1,113 @@
+diff -Nru gammu-1.13.0.orig/common/misc/misc.h gammu-1.13.0/common/misc/misc.h
+--- gammu-1.13.0.orig/common/misc/misc.h 2007-08-03 12:19:04.000000000 +0300
++++ gammu-1.13.0/common/misc/misc.h 2007-09-06 12:55:36.000000000 +0300
+@@ -22,7 +22,7 @@
+
+ /* ------------------------------------------------------------------------- */
+
+-#define MAX_LINES 50
++#define MAX_LINES 512
+
+ typedef struct {
+ int numbers[MAX_LINES*2];
+diff -Nru gammu-1.13.0.orig/common/service/backup/backtext.c gammu-1.13.0/common/service/backup/backtext.c
+--- gammu-1.13.0.orig/common/service/backup/backtext.c 2007-08-03 16:20:04.000000000 +0300
++++ gammu-1.13.0/common/service/backup/backtext.c 2007-09-06 12:55:36.000000000 +0300
+@@ -903,7 +903,12 @@
+
+ static void SaveRingtoneEntry(FILE *file, GSM_Ringtone *ringtone, bool UseUnicode)
+ {
+- unsigned char buffer[45000];
++ unsigned char *buffer;
++
++ buffer = (unsigned char *)malloc(32 > 2 * ringtone->NokiaBinary.Length ?
++ 32 : 2 * ringtone->NokiaBinary.Length);
++ if (buffer == NULL)
++ return;
+
+ sprintf(buffer,"Location = %i%c%c",ringtone->Location,13,10);
+ SaveBackupText(file, "", buffer, UseUnicode);
+@@ -926,6 +931,8 @@
+ }
+ sprintf(buffer,"%c%c",13,10);
+ SaveBackupText(file, "", buffer, UseUnicode);
++
++ free(buffer);
+ }
+
+ static void SaveOperatorEntry(FILE *file, GSM_Bitmap *bitmap, bool UseUnicode)
+diff -Nru gammu-1.13.0.orig/gammu/backup.c gammu-1.13.0/gammu/backup.c
+--- gammu-1.13.0.orig/gammu/backup.c 2007-08-01 17:36:52.000000000 +0300
++++ gammu-1.13.0/gammu/backup.c 2007-09-06 12:55:36.000000000 +0300
+@@ -165,7 +165,7 @@
+ GSM_FMStation FMStation;
+ GSM_GPRSAccessPoint GPRSPoint;
+ bool DoBackup;
+- char buffer[100];
++ char buffer[GSM_MAX_INFO_LENGTH];
+
+ if (argc == 4 && strcasecmp(argv[3],"-yes") == 0) always_answer_yes = true;
+
+diff -Nru gammu-1.13.0.orig/gammu/common.c gammu-1.13.0/gammu/common.c
+--- gammu-1.13.0.orig/gammu/common.c 2007-08-01 17:36:52.000000000 +0300
++++ gammu-1.13.0/gammu/common.c 2007-09-06 12:55:36.000000000 +0300
+@@ -224,9 +224,10 @@
+ void GSM_Init(bool checkerror)
+ {
+ GSM_File PhoneDB;
+- char model[100];
+- char version[100];
+- unsigned char buff[200], ver[200];
++ char model[GSM_MAX_MODEL_LENGTH];
++ char version[GSM_MAX_VERSION_LENGTH];
++ unsigned char buff[50 + GSM_MAX_MODEL_LENGTH];
++ unsigned char ver[GSM_MAX_VERSION_LENGTH];
+ size_t pos = 0, oldpos = 0, i;
+ GSM_Error error;
+
+diff -Nru gammu-1.13.0.orig/gammu/misc.c gammu-1.13.0/gammu/misc.c
+--- gammu-1.13.0.orig/gammu/misc.c 2007-08-06 12:48:08.000000000 +0300
++++ gammu-1.13.0/gammu/misc.c 2007-09-06 12:55:36.000000000 +0300
+@@ -97,8 +97,8 @@
+
+ void Identify(int argc, char *argv[])
+ {
+- char buffer[100];
+- char date[100];
++ char buffer[GSM_MAX_INFO_LENGTH];
++ char date[GSM_MAX_VERSION_DATE_LENGTH];
+ double num;
+ GSM_Error error;
+
+diff -Nru gammu-1.13.0.orig/gammu/search.c gammu-1.13.0/gammu/search.c
+--- gammu-1.13.0.orig/gammu/search.c 2007-07-31 19:16:08.000000000 +0300
++++ gammu-1.13.0/gammu/search.c 2007-09-06 12:55:36.000000000 +0300
+@@ -60,7 +60,7 @@
+ void SearchPrintPhoneInfo(OneDeviceInfo * Info, int index, GSM_StateMachine *sm)
+ {
+ GSM_Error error;
+- char buffer[100];
++ char buffer[GSM_MAX_INFO_LENGTH];
+
+ error = GSM_GetManufacturer(sm, buffer);
+
+diff -Nru gammu-1.13.0.orig/include/gammu-limits.h gammu-1.13.0/include/gammu-limits.h
+--- gammu-1.13.0.orig/include/gammu-limits.h 2007-07-23 18:31:42.000000000 +0300
++++ gammu-1.13.0/include/gammu-limits.h 2007-09-06 12:55:36.000000000 +0300
+@@ -49,6 +49,16 @@
+ #define GSM_MAX_IMEI_LENGTH 20
+
+ /**
++ * Maximal length of various phone information. Just a shorcut for
++ * functions doing whole identification and use one buffer.
++ *
++ * \ingroup Limits
++ */
++#define GSM_MAX_INFO_LENGTH MAX(MAX(MAX(GSM_MAX_VERSION_LENGTH, \
++ GSM_MAX_IMEI_LENGTH), GSM_MAX_MODEL_LENGTH), \
++ GSM_MAX_MANUFACTURER_LENGTH)
++
++/**
+ * Maximal count of SMS messages in folder.
+ *
+ * \ingroup Limits
diff --git a/app-mobilephone/gammu/gammu-1.13.0.ebuild b/app-mobilephone/gammu/gammu-1.13.0.ebuild
new file mode 100644
index 000000000000..31bb41d3a9e2
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.13.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.13.0.ebuild,v 1.1 2007/09/06 10:03:35 mrness Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
+HOMEPAGE="http://www.gammu.org"
+SRC_URI="ftp://dl.cihar.com/gammu/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug bluetooth irda mysql postgres nls"
+
+RDEPEND="bluetooth? ( net-wireless/bluez-libs )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql )
+ dev-util/dialog"
+DEPEND="${RDEPEND}
+ irda? ( virtual/os-headers )
+ nls? ( sys-devel/gettext )
+ dev-util/cmake"
+
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+MY_AVAILABLE_LINGUAS=" cs de es it pl ru"
+IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
+
+src_unpack() {
+ unpack ${A}
+
+ epatch "${FILESDIR}/${P}-fixups.patch"
+
+ # sys-devel/gettext is needed for creating .mo files
+ cd "${S}"
+ local lang
+ for lang in ${MY_AVAILABLE_LINGUAS} ; do
+ if ! use linguas_${lang} ; then
+ sed -i -e "/^[ \t]*${lang}[ \t]*$/d" CMakeLists.txt
+ fi
+ done
+}
+
+my_use_with() {
+ local WITH_PREFIX
+ if [ -n "${2}" ]; then
+ WITH_PREFIX="-DWITH_${2}"
+ else
+ WITH_PREFIX="-DWITH_${1}"
+ fi
+ if use $1 ; then
+ echo ${WITH_PREFIX}=ON
+ else
+ echo ${WITH_PREFIX}=OFF
+ fi
+}
+
+src_compile() {
+ local myconf="$(my_use_with bluetooth Bluez) \
+ $(my_use_with irda IrDA) \
+ $(my_use_with mysql MySQL) \
+ $(my_use_with postgres Postgres)"
+ use debug && myconf="${myconf} -DCMAKE_BUILD_TYPE=Debug"
+
+ mkdir "${S}/build" && \
+ cd "${S}/build" && \
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DINSTALL_LIB_DIR=/usr/$(get_libdir) \
+ -DINSTALL_DOC_DIR="/usr/share/doc/${P}" \
+ -DENABLE_SHARED=ON \
+ -DHAVE_SIN=NO \
+ ${myconf} || die "cmake failed"
+ emake || die "make failed"
+}
+
+src_install () {
+ cd "${S}/build"
+ make DESTDIR="${D}" install || die "install failed"
+}