From 220851b17a8050d16228ec341629f90413a8be2e Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 10 Sep 2013 14:43:23 +0000
Subject: Drop -Wno-traditional for clang. Detect invalid client messages
 instead of segfaulting. Bump revision.

---
 sysutils/fscd/Makefile                  |  8 +++++++-
 sysutils/fscd/distinfo                  |  3 ++-
 sysutils/fscd/patches/patch-fscd_fscd.c | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 sysutils/fscd/patches/patch-fscd_fscd.c

(limited to 'sysutils')

diff --git a/sysutils/fscd/Makefile b/sysutils/fscd/Makefile
index bfee1e3dbfb..5ba3b74f2c2 100644
--- a/sysutils/fscd/Makefile
+++ b/sysutils/fscd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/11/12 10:37:10 jdf Exp $
+# $NetBSD: Makefile,v 1.5 2013/09/10 14:43:23 joerg Exp $
 #
 
 DISTNAME=	fscd-1.1
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://komkon2.de/
 
@@ -17,6 +18,11 @@ ONLY_FOR_PLATFORM=	NetBSD-[2-9].*-* FreeBSD-[4-9].*-* OpenBSD-*-* DragonFly-*-*
 RCD_SCRIPTS=	fscd
 INSTALLATION_DIRS=	bin sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+BUILDLINK_TRANSFORM+=	rm:-Wno-traditional
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fscadm/fscadm ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/fscadm/fscadm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
diff --git a/sysutils/fscd/distinfo b/sysutils/fscd/distinfo
index b05b6ca319f..614dd801d8e 100644
--- a/sysutils/fscd/distinfo
+++ b/sysutils/fscd/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/11/12 10:37:10 jdf Exp $
+$NetBSD: distinfo,v 1.4 2013/09/10 14:43:23 joerg Exp $
 
 SHA1 (fscd-1.1.tar.gz) = 8d17ec035fbe7b90aeefdff23042a07a7d65c2c7
 RMD160 (fscd-1.1.tar.gz) = 0c9aae223825e5fda61d88007b7abb4c30a61c18
 Size (fscd-1.1.tar.gz) = 16295 bytes
+SHA1 (patch-fscd_fscd.c) = 1091b8ee612d100287fde6c38a0b3d46e98f5eb9
diff --git a/sysutils/fscd/patches/patch-fscd_fscd.c b/sysutils/fscd/patches/patch-fscd_fscd.c
new file mode 100644
index 00000000000..6753af1f275
--- /dev/null
+++ b/sysutils/fscd/patches/patch-fscd_fscd.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-fscd_fscd.c,v 1.1 2013/09/10 14:43:23 joerg Exp $
+
+--- fscd/fscd.c.orig	2012-11-12 00:12:33.000000000 +0000
++++ fscd/fscd.c
+@@ -1067,6 +1067,10 @@ handle_task(struct fscd_cfg *config, cha
+ 		print_status(config, sock_fd);
+ 		pthread_mutex_unlock(&config->service_mtx);
+ 		return 0;
++	} else {
++		printlog(LOG_ERR, "received invalid message from client.");
++		pthread_mutex_unlock(&config->service_mtx);
++		return -1;
+ 	}
+ 	pthread_mutex_unlock(&config->service_mtx);
+ 
-- 
cgit v1.2.3