Date: Thu, 24 Feb 2011 12:36:37 +0100 (CET) From: Lapo Luchini <lapo@lapo.it> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tkjacobsen@gmail.com Subject: ports/155001: [PATCH] deskutils/libgcal: upstream crash bugfix Message-ID: <201102241136.p1OBab2S037369@lapo.andxor.it> Resent-Message-ID: <201102241140.p1OBe8gU044004@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155001 >Category: ports >Synopsis: [PATCH] deskutils/libgcal: upstream crash bugfix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 24 11:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Lapo Luchini >Release: FreeBSD 8.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD lapo.andxor.it 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010 >Description: Upstream bugfix for a crash issue: http://gitorious.org/libgcal/libgcal/commit/2ac14a59fd7f9236f19a2625d9b81ec5e676fc18 Also added LICENSE and removed MD5 to please portlint. Added file(s): - files/patch-src_atom_parser.c Port maintainer (tkjacobsen@gmail.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- libgcal-0.9.5_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/deskutils/libgcal/Makefile /home/lapo/ports/libgcal/Makefile --- /usr/ports/deskutils/libgcal/Makefile 2010-07-21 23:56:07.000000000 +0200 +++ /home/lapo/ports/libgcal/Makefile 2011-02-24 12:33:00.729796682 +0100 @@ -7,6 +7,7 @@ PORTNAME= libgcal PORTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -17,6 +18,9 @@ iconv:${PORTSDIR}/converters/libiconv \ xml2:${PORTSDIR}/textproc/libxml2 +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + USE_BZIP2= yes USE_CMAKE= yes CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ diff -ruN --exclude=CVS /usr/ports/deskutils/libgcal/distinfo /home/lapo/ports/libgcal/distinfo --- /usr/ports/deskutils/libgcal/distinfo 2010-07-10 13:16:48.000000000 +0200 +++ /home/lapo/ports/libgcal/distinfo 2011-02-24 12:31:41.427901890 +0100 @@ -1,3 +1,2 @@ -MD5 (libgcal-0.9.5.tar.bz2) = dc6dfabc7c955bd096e7c888a6a18349 SHA256 (libgcal-0.9.5.tar.bz2) = d371139b40f498590f078aaafa82dfab565cd5ded967e6b5e80e74c0d1153a76 SIZE (libgcal-0.9.5.tar.bz2) = 142360 diff -ruN --exclude=CVS /usr/ports/deskutils/libgcal/files/patch-src_atom_parser.c /home/lapo/ports/libgcal/files/patch-src_atom_parser.c --- /usr/ports/deskutils/libgcal/files/patch-src_atom_parser.c 1970-01-01 01:00:00.000000000 +0100 +++ /home/lapo/ports/libgcal/files/patch-src_atom_parser.c 2011-02-24 12:28:53.979695223 +0100 @@ -0,0 +1,32 @@ +--- src/atom_parser.c.orig 2010-06-20 20:26:34.000000000 +0200 ++++ src/atom_parser.c 2011-02-24 12:28:51.710766352 +0100 +@@ -282,7 +282,8 @@ static int extract_and_check_multi(xmlDo + if (attr2) { + if (xmlHasProp(node->nodeTab[i], attr2)) { + tmp = xmlGetProp(node->nodeTab[i], attr2); +- (*types)[i] = strdup(strchr(tmp,'#') + 1); ++ if (strchr(tmp,'#')) ++ (*types)[i] = strdup(strchr(tmp,'#') + 1); + xmlFree(tmp); + } + else +@@ -292,7 +293,8 @@ static int extract_and_check_multi(xmlDo + if (attr3) { + if (xmlHasProp(node->nodeTab[i], attr3)) { + tmp = xmlGetProp(node->nodeTab[i], attr3); +- (*protocols)[i] = strdup(strchr(tmp,'#') + 1); ++ if (strchr(tmp,'#')) ++ (*protocols)[i] = strdup(strchr(tmp,'#') + 1); + xmlFree(tmp); + } + else +@@ -383,7 +385,8 @@ static int extract_and_check_multisub(xm + if (attr1) { + if (xmlHasProp(node->nodeTab[i], attr1)) { + tmp = xmlGetProp(node->nodeTab[i], attr1); +- (*types)[i] = strdup(strchr(tmp,'#') + 1); ++ if (strchr(tmp,'#')) ++ (*types)[i] = strdup(strchr(tmp,'#') + 1); + xmlFree(tmp); + } else + (*types)[i] = strdup(""); --- libgcal-0.9.5_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102241136.p1OBab2S037369>