summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2017-09-11 14:59:45 +0000
committerhauke <hauke@pkgsrc.org>2017-09-11 14:59:45 +0000
commitec8b825f55d75a704b1ea05e9a9ebdf766bd62ca (patch)
treeffe163d13786d80260ef512d90c838520de9928f /comms
parent6ee3bb9ec40712bf30599d7c78e45d31fd99a031 (diff)
downloadpkgsrc-ec8b825f55d75a704b1ea05e9a9ebdf766bd62ca.tar.gz
Built with gcc 5.4 on netbsd-8, conserver terminates because of a
buffer overflow in StrTime(), when it tries to stuff a 25 char string into a 25 byte buffer.
Diffstat (limited to 'comms')
-rw-r--r--comms/conserver/Makefile8
-rw-r--r--comms/conserver/distinfo3
-rw-r--r--comms/conserver/patches/patch-conserver_util.c17
3 files changed, 25 insertions, 3 deletions
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 876f88801fa..7cb266c79ea 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2014/10/09 14:06:03 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2017/09/11 15:00:03 hauke Exp $
#
DISTNAME= conserver-7.2.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= comms
MASTER_SITES= http://www.conserver.com/
@@ -27,6 +27,10 @@ CONFIGURE_ARGS+= --with-logfile=${VARBASE}/log/conserver
CONFIGURE_ARGS+= --with-64bit
.endif
+# Debug
+CFLAGS+= -g3
+INSTALL_UNSTRIPPED= yes
+
BUILD_DEFS+= CONSERVER_DEFAULTPORT CONSERVER_DEFAULTHOST
RCD_SCRIPTS= conserver
diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo
index d95a208e275..82c03be3f22 100644
--- a/comms/conserver/distinfo
+++ b/comms/conserver/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:34:53 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/09/11 15:00:03 hauke Exp $
SHA1 (conserver-7.2.7.tar.gz) = e2dfe0d95ceab0e6c2db38161f540ec537d96132
RMD160 (conserver-7.2.7.tar.gz) = 67fe555779293232933b30eea2efd5fcd86b6ea2
@@ -7,3 +7,4 @@ Size (conserver-7.2.7.tar.gz) = 200861 bytes
SHA1 (patch-aa) = 01ab5e3430137e72b786164026785f91295232d4
SHA1 (patch-ab) = 79125fed0be843528dd208664b90323cb23b9e8d
SHA1 (patch-ac) = 45fb5253032347961f123ad9a75b72f7c2f15a2b
+SHA1 (patch-conserver_util.c) = 9bca7aeaa0239017aa5386218abcc0dd8dfd1b31
diff --git a/comms/conserver/patches/patch-conserver_util.c b/comms/conserver/patches/patch-conserver_util.c
new file mode 100644
index 00000000000..a53510eeec2
--- /dev/null
+++ b/comms/conserver/patches/patch-conserver_util.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-conserver_util.c,v 1.1 2017/09/11 14:59:45 hauke Exp $
+
+Built with gcc 5.4 on netbsd-8, conserver terminates because of a
+buffer overflow in StrTime(), when it tries to stuff a 25 char string
+into a 25 byte buffer.
+
+--- conserver/util.c.orig 2003-04-06 12:29:48.000000000 +0000
++++ conserver/util.c
+@@ -77,7 +77,7 @@ StrTime(ltime)
+ time_t *ltime;
+ #endif
+ {
+- static char curtime[25];
++ static char curtime[63];
+ time_t tyme;
+
+ tyme = time((time_t *) 0);