svn commit: r324780 - in branches/RELENG_9_2_0/comms/gnokii: . files
Guido Falsi
madpilot at FreeBSD.org
Thu Aug 15 18:56:02 UTC 2013
Author: madpilot
Date: Thu Aug 15 18:56:01 2013
New Revision: 324780
URL: http://svnweb.freebsd.org/changeset/ports/324780
Log:
Merge r324715 from head:
- Add patch to avoid a bus error while starting the software.
Many thanks to the Mike Bernard for reporting and helping me debug
this problem.
While here remove obsolete MAKE_JOBS_SAFE flag.
Reported by: Mike Barnard Kwatampora <mike.barnardq at gmail.com>
Approved by: portmgr (bdrewery)
Added:
branches/RELENG_9_2_0/comms/gnokii/files/patch-common-cfgreader.c
- copied unchanged from r324715, head/comms/gnokii/files/patch-common-cfgreader.c
Modified:
branches/RELENG_9_2_0/comms/gnokii/Makefile
Directory Properties:
branches/RELENG_9_2_0/ (props changed)
Modified: branches/RELENG_9_2_0/comms/gnokii/Makefile
==============================================================================
--- branches/RELENG_9_2_0/comms/gnokii/Makefile Thu Aug 15 17:51:05 2013 (r324779)
+++ branches/RELENG_9_2_0/comms/gnokii/Makefile Thu Aug 15 18:56:01 2013 (r324780)
@@ -3,7 +3,7 @@
PORTNAME= gnokii
PORTVERSION= 0.6.31
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= comms
MASTER_SITES= http://www.gnokii.org/download/gnokii/ \
@@ -23,7 +23,6 @@ USE_BZIP2= yes
USES= gettext gmake
USE_LDCONFIG= yes
USE_CSTD= gnu89
-MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
USE_GNOME= intltool
GNU_CONFIGURE= yes
Copied: branches/RELENG_9_2_0/comms/gnokii/files/patch-common-cfgreader.c (from r324715, head/comms/gnokii/files/patch-common-cfgreader.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/RELENG_9_2_0/comms/gnokii/files/patch-common-cfgreader.c Thu Aug 15 18:56:01 2013 (r324780, copy of r324715, head/comms/gnokii/files/patch-common-cfgreader.c)
@@ -0,0 +1,20 @@
+--- common/cfgreader.c.orig 2011-12-02 15:53:04.000000000 +0100
++++ common/cfgreader.c 2013-08-13 13:25:46.836652059 +0200
+@@ -991,7 +991,7 @@
+ #define CHECK_SIZE() if (*retval >= size) { \
+ void *aux; \
+ size *= 2; \
+- aux = realloc(config_file_locations, size); \
++ aux = realloc(config_file_locations, size * sizeof(char *)); \
+ if (aux) \
+ config_file_locations = aux; \
+ else {\
+@@ -1107,7 +1107,7 @@
+ if (i >= xcd_size) {
+ void *aux;
+ xcd_size *= 2;
+- aux = realloc(xdg_config_dir, xcd_size);
++ aux = realloc(xdg_config_dir, xcd_size * sizeof(char *));
+ if (aux)
+ xdg_config_dir = aux;
+ else {
More information about the svn-ports-branches
mailing list