diff options
| author | Andrew Pantyukhin <sat@FreeBSD.org> | 2007-07-20 10:04:53 +0000 |
|---|---|---|
| committer | Andrew Pantyukhin <sat@FreeBSD.org> | 2007-07-20 10:04:53 +0000 |
| commit | 6795d530d4b04d7ba5a6275598b7a02754f32ecd (patch) | |
| tree | bd04db7a8190454728e74a67698993a330b6ede4 /net-im | |
| parent | cac5744ca73eac53c2043c82a1d858363cd586c4 (diff) | |
| download | ports-6795d530d4b04d7ba5a6275598b7a02754f32ecd.tar.gz ports-6795d530d4b04d7ba5a6275598b7a02754f32ecd.zip | |
- Fix a buffer overflow [1]
- Fix installation while I'm here
PR: ports/114327 (based on)
Submitted by: Bartek Rutkowski <r@robakdesign.com> (maintainer)
Obtained from: jGGtrans SVN [1]
Security: http://jggtrans.jajcus.net/trac/changeset/694
Notes
Notes:
svn path=/head/; revision=195941
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jggtrans/Makefile | 7 | ||||
| -rw-r--r-- | net-im/jggtrans/files/patch-src__encoding.c | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile index ed7ce0d94bee..4c50c2f535f6 100644 --- a/net-im/jggtrans/Makefile +++ b/net-im/jggtrans/Makefile @@ -6,7 +6,7 @@ PORTNAME= jggtrans PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im polish MASTER_SITES= http://jggtrans.jajcus.net/downloads/ \ http://freebsd.e.pl/distfiles/ @@ -28,8 +28,6 @@ MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ USE_RC_SUBR= jggtrans.sh -USE_LDCONFIG= yes - OPTIONS= NODEBUG "Turn off debugging code" off \ EJABBERD "Use transport with ejabberd" off @@ -50,7 +48,8 @@ SUB_LIST+= JABBER_REQUIRE=jabberd SUB_LIST+= JABBER_USER=${JABBER_USER} post-install: - @if [ ! -f ${PREFIX}/etc/jggtrans.xml ]; then ${CP} -p ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml.sample ; fi + @${INSTALL_DATA} ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml.sample + @${CP} -n ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net-im/jggtrans/files/patch-src__encoding.c b/net-im/jggtrans/files/patch-src__encoding.c new file mode 100644 index 000000000000..ccb8eb916398 --- /dev/null +++ b/net-im/jggtrans/files/patch-src__encoding.c @@ -0,0 +1,11 @@ +--- ./src/encoding.c.orig 2007-07-20 13:49:39.000000000 +0400 ++++ ./src/encoding.c 2007-07-20 13:50:00.000000000 +0400 +@@ -97,7 +97,7 @@ + int i; + + if (str==NULL) return NULL; +- if (buf_len<(strlen(str)+1)){ ++ if (buf_len<(strlen(str)*2+1)){ + buf_len=strlen(str)*2+1; /* this should always be enough */ + buf=(char *)g_realloc(buf,buf_len); + assert(buf!=NULL); |