pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net update xymon + xymonclient to 4.3.28
details: https://anonhg.NetBSD.org/pkgsrc/rev/013a00b381ff
branches: trunk
changeset: 369322:013a00b381ff
user: spz <spz%pkgsrc.org@localhost>
date: Thu Sep 28 10:40:35 2017 +0000
description:
update xymon + xymonclient to 4.3.28
notable changes: OpenSSL 1.1.0 is now supported, and c-ares has been updated
While touching the package anyhow, it has been taught to pass down hardening
flags, so that the various PKGSRC_USE_ flags now have effect.
diffstat:
net/xymon/Makefile | 5 +-
net/xymon/distinfo | 34 +++-
net/xymon/patches/patch-ac | 99 +++++++++++++-
net/xymon/patches/patch-ad | 12 +-
net/xymon/patches/patch-ah | 39 ++++-
net/xymon/patches/patch-build_Makefile.AIX | 15 ++
net/xymon/patches/patch-build_Makefile.Darwin | 18 ++
net/xymon/patches/patch-build_Makefile.FreeBSD | 15 +-
net/xymon/patches/patch-build_Makefile.HP-UX | 18 ++
net/xymon/patches/patch-build_Makefile.IRIX | 15 ++
net/xymon/patches/patch-build_Makefile.Linux | 6 +-
net/xymon/patches/patch-build_Makefile.OSF1 | 15 ++
net/xymon/patches/patch-build_Makefile.OSX | 15 ++
net/xymon/patches/patch-build_Makefile.OpenBSD | 18 ++
net/xymon/patches/patch-build_Makefile.SunOS | 18 ++
net/xymon/patches/patch-build_Makefile.generic | 15 ++
net/xymon/patches/patch-common_Makefile | 59 ++++++++
net/xymon/patches/patch-configure | 3 +-
net/xymon/patches/patch-web_Makefile | 138 +++++++++++++++++++
net/xymon/patches/patch-xymonproxy_Makefile | 19 ++
net/xymonclient/Makefile | 9 +-
net/xymonclient/distinfo | 28 ++-
net/xymonclient/patches/patch-ac | 39 ++++-
net/xymonclient/patches/patch-ae | 12 +-
net/xymonclient/patches/patch-build_Makefile.AIX | 15 ++
net/xymonclient/patches/patch-build_Makefile.Darwin | 18 ++
net/xymonclient/patches/patch-build_Makefile.FreeBSD | 16 +-
net/xymonclient/patches/patch-build_Makefile.HP-UX | 18 ++
net/xymonclient/patches/patch-build_Makefile.IRIX | 15 ++
net/xymonclient/patches/patch-build_Makefile.Linux | 18 ++
net/xymonclient/patches/patch-build_Makefile.OSF1 | 15 ++
net/xymonclient/patches/patch-build_Makefile.OSX | 15 ++
net/xymonclient/patches/patch-build_Makefile.OpenBSD | 18 ++
net/xymonclient/patches/patch-build_Makefile.SunOS | 18 ++
net/xymonclient/patches/patch-build_Makefile.generic | 15 ++
net/xymonclient/patches/patch-client_logfetch.c | 16 ++
net/xymonclient/patches/patch-common_Makefile | 59 ++++++++
37 files changed, 864 insertions(+), 56 deletions(-)
diffs (truncated from 1217 to 300 lines):
diff -r 72e200410840 -r 013a00b381ff net/xymon/Makefile
--- a/net/xymon/Makefile Thu Sep 28 10:33:29 2017 +0000
+++ b/net/xymon/Makefile Thu Sep 28 10:40:35 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2017/09/06 09:03:03 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2017/09/28 10:40:35 spz Exp $
#
-DISTNAME= xymon-4.3.27
-PKGREVISION= 2
+DISTNAME= xymon-4.3.28
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
diff -r 72e200410840 -r 013a00b381ff net/xymon/distinfo
--- a/net/xymon/distinfo Thu Sep 28 10:33:29 2017 +0000
+++ b/net/xymon/distinfo Thu Sep 28 10:40:35 2017 +0000
@@ -1,21 +1,33 @@
-$NetBSD: distinfo,v 1.16 2016/12/09 21:08:34 spz Exp $
+$NetBSD: distinfo,v 1.17 2017/09/28 10:40:35 spz Exp $
-SHA1 (xymon-4.3.27.tar.gz) = 76055c6b1b60f1d2f86859d1de8fec70ce59e538
-RMD160 (xymon-4.3.27.tar.gz) = 585b9e5f49444eee255db62d1510fc67f2539f96
-SHA512 (xymon-4.3.27.tar.gz) = bb48fce02e20f040675d3cf8e32596855b57c8ad1ed12c684550458cc286a6d214814ba596a670539d137e238a9e02ff9f8ffe2522571b95445db5b81b12d0f1
-Size (xymon-4.3.27.tar.gz) = 3000255 bytes
+SHA1 (xymon-4.3.28.tar.gz) = 9b134af41549e46f46f310b315f70ce42e6668a7
+RMD160 (xymon-4.3.28.tar.gz) = 7d2426a6639c52b0a1f6e3d2e5c4e4607090809d
+SHA512 (xymon-4.3.28.tar.gz) = 589230ee05028c2131d1ddf32dd1a5f302bfcdbf8276bc6ee0fb9590ae2bfe218bf49d931cfa68491160c35818d0bee93b7fcea47b85f924a4f991a5ff608477
+Size (xymon-4.3.28.tar.gz) = 3966200 bytes
SHA1 (patch-aa) = 227b631c6e002712ebf6019d8473ca4b44904e4a
SHA1 (patch-ab) = 39a6af51ec216bb8cbdb57a3c07d82fce559b27f
-SHA1 (patch-ac) = a44d1c7471d6aafe36931fa8dd001c0d3b7d7b72
-SHA1 (patch-ad) = 218ef05eb3d51d779230c357d731b2f904d4559f
+SHA1 (patch-ac) = 518abacafb7f082ab2de6bcaace27d3e3d4de633
+SHA1 (patch-ad) = 4b5413ee14d035fb1b588207b86ebaf0ac122951
SHA1 (patch-ae) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b
SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5
-SHA1 (patch-ah) = 03fee4b97cc3301339ace1ce459e7b679b83f96a
-SHA1 (patch-build_Makefile.FreeBSD) = e58b50f35068cba6fed89cc21bcc4eb7d30efd23
-SHA1 (patch-build_Makefile.Linux) = eea6d1ced23a622d115aa97dc10d352f9dd622b0
+SHA1 (patch-ah) = db3ea148759f970d9c5e3ef600836751b7aafe12
+SHA1 (patch-build_Makefile.AIX) = e3a06992b075507a02f77a6b04ee4425cc2f8dd1
+SHA1 (patch-build_Makefile.Darwin) = 3b86292fba80a05c03e8ace424cddfb726a974fc
+SHA1 (patch-build_Makefile.FreeBSD) = 6ebfa5bab2955eaa42b0021de085eb7ba536432b
+SHA1 (patch-build_Makefile.HP-UX) = bdd713b83f3670096bb10def6c59036d0a4aa377
+SHA1 (patch-build_Makefile.IRIX) = b0ce34295d199ffd1e9008569667abbe436a2355
+SHA1 (patch-build_Makefile.Linux) = 3dd75b6613fbf268411ec177f8be5acd48ac8c27
+SHA1 (patch-build_Makefile.OSF1) = 1a7afce4beeef249b2435c2ef14f45b2c2dbf8a2
+SHA1 (patch-build_Makefile.OSX) = a72b748600b043f458452ab37175c38087375559
+SHA1 (patch-build_Makefile.OpenBSD) = cf40c7839ba6290d349328e2e01a20bdaf274fc6
+SHA1 (patch-build_Makefile.SunOS) = 71d134a30825a2d36fbb17731e722c89c79da807
+SHA1 (patch-build_Makefile.generic) = e96d5ee29630c9133caebfa752880be90726607c
SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b
SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f
-SHA1 (patch-configure) = b654e6da62e1aabdad4b8bfb0fd3e87de89de6d5
+SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707
+SHA1 (patch-configure) = 3754b9056c365b8664e5fc9620b17c4e13453b2e
+SHA1 (patch-web_Makefile) = a27fbb7e97ce0c2f30093d5b05b0af2708fb594b
SHA1 (patch-xymond_client_netbsd.c) = 9034777cbf12e3e168cf1598bfd444468e3a5086
SHA1 (patch-xymond_rrd_do__disk.c) = e72cb0364e4e949e02a045da0abca46083624253
SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae
+SHA1 (patch-xymonproxy_Makefile) = 8ecfa4ceb66f66b7d5f40c01339479b26865746e
diff -r 72e200410840 -r 013a00b381ff net/xymon/patches/patch-ac
--- a/net/xymon/patches/patch-ac Thu Sep 28 10:33:29 2017 +0000
+++ b/net/xymon/patches/patch-ac Thu Sep 28 10:40:35 2017 +0000
@@ -1,9 +1,104 @@
-$NetBSD: patch-ac,v 1.5 2014/02/27 20:22:41 spz Exp $
+$NetBSD: patch-ac,v 1.6 2017/09/28 10:40:35 spz Exp $
pkgsrc uses rc.d files to stop/start, don't copy that xymon.sh
+allow hardening
---- xymond/Makefile.orig 2014-01-19 15:23:42.000000000 +0000
+--- xymond/Makefile.orig 2015-03-13 06:15:38.000000000 +0000
+++ xymond/Makefile
+@@ -41,25 +41,25 @@ all: $(PROGRAMS) cfgfiles
+ client: $(CLIENTPROGRAMS)
+
+ xymond: $(XYMONDOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(XYMONDOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(XYMONDOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
+
+ xymond_channel: $(CHANNELOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(CHANNELOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(CHANNELOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
+
+ xymond_locator: $(LOCATOROBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(LOCATOROBJS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(LOCATOROBJS) $(XYMONCOMMLIBS)
+
+ xymond_filestore: $(FILESTOREOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(FILESTOREOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(FILESTOREOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
+
+ xymond_history: $(HISTORYOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(HISTORYOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(HISTORYOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
+
+ xymond_alert: $(ALERTOBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(ALERTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(ALERTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
+
+ xymond_rrd: $(RRDOBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(RRDOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(RRDLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(RRDOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(RRDLIBS) $(PCRELIBS)
+
+ xymond.o: xymond.c
+ $(CC) $(CFLAGS) $(SSLFLAGS) -c -o $@ xymond.c
+@@ -74,22 +74,22 @@ xymond_capture.o: xymond_capture.c
+ $(CC) $(CFLAGS) $(PCREINCDIR) -c -o $@ xymond_capture.c
+
+ xymond_sample: $(SAMPLEOBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(SAMPLEOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(SAMPLEOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
+
+ xymond_capture: $(CAPTUREOBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(CAPTUREOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(CAPTUREOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
+
+ xymond_distribute: $(DISTRIBUTEOBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(DISTRIBUTEOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(DISTRIBUTEOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
+
+ xymond_hostdata: $(HOSTDATAOBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(HOSTDATAOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(HOSTDATAOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
+
+ xymond_client: $(CLIENTOBJS) $(XYMONCOMMLIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(CLIENTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(CLIENTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
+
+ ../client/xymond_client: $(CLIENTOBJS) ../lib/libxymonclientcomm.a ../lib/libxymontime.a ../lib/libxymonclient.a
+- $(CC) -o $@ $(RPATHOPT) $(CLIENTOBJS) ../lib/libxymonclientcomm.a ../lib/libxymontime.a ../lib/libxymonclient.a $(PCRELIBS) $(NETLIBS) $(LIBRTDEF)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(CLIENTOBJS) ../lib/libxymonclientcomm.a ../lib/libxymontime.a ../lib/libxymonclient.a $(PCRELIBS) $(NETLIBS) $(LIBRTDEF)
+
+ xymond_client.o: xymond_client.c client/*.c
+ $(CC) $(CFLAGS) -c -o $@ xymond_client.c
+@@ -98,25 +98,25 @@ combostatus.o: combostatus.c
+ $(CC) $(CFLAGS) $(PCREINCDIR) -c -o $@ $<
+
+ combostatus: $(COMBOTESTOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(LDFLAGS) -o $@ $(RPATHOPT) $(COMBOTESTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(COMBOTESTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(PCRELIBS)
+
+ xymon-mailack.o: xymon-mailack.c
+ $(CC) $(CFLAGS) $(PCREINCDIR) -c -o $@ xymon-mailack.c
+
+ xymon-mailack: $(MAILACKOBJS) $(XYMONCOMMLIB)
+- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(MAILACKOBJS) $(XYMONCOMMLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(MAILACKOBJS) $(XYMONCOMMLIBS) $(PCRELIBS)
+
+ trimhistory: $(TRIMHISTOBJS) $(XYMONCOMMLIB)
+- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(TRIMHISTOBJS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(TRIMHISTOBJS) $(XYMONCOMMLIBS)
+
+ xymonfetch: $(FETCHOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(FETCHOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(FETCHOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
+
+ convertnk: $(CONVERTNKOBJS) $(XYMONCOMMLIB)
+- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(CONVERTNKOBJS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(CONVERTNKOBJS) $(XYMONCOMMLIBS)
+
+ rrdcachectl: $(RRDCACHECTLOBJS) $(XYMONCOMMLIB)
+- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(RRDCACHECTLOBJS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(RRDCACHECTLOBJS) $(XYMONCOMMLIBS)
+
+ xymon.sh: xymon.sh.DIST
+ cat $< | sed -e 's!@XYMONHOME@!$(XYMONHOME)!g' | sed -e 's!@XYMONLOGDIR@!$(XYMONLOGDIR)!g' | sed -e 's!@XYMONUSER@!$(XYMONUSER)!g' | sed -e 's!@RUNTIMEDEFS@!$(RUNTIMEDEFS)!g' >$@
@@ -187,7 +187,9 @@ install-cfg:
cd etcfiles; ../../build/merge-sects graphs.cfg $(INSTALLROOT)$(INSTALLETCDIR)/graphs.cfg
cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv
diff -r 72e200410840 -r 013a00b381ff net/xymon/patches/patch-ad
--- a/net/xymon/patches/patch-ad Thu Sep 28 10:33:29 2017 +0000
+++ b/net/xymon/patches/patch-ad Thu Sep 28 10:40:35 2017 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2012/10/11 18:42:19 spz Exp $
+$NetBSD: patch-ad,v 1.7 2017/09/28 10:40:35 spz Exp $
- netbsd has stdint.h
- remove stray commas
+- make sure hardening flags can be inherited
--- build/Makefile.NetBSD.orig 2012-08-01 08:48:15.000000000 +0000
+++ build/Makefile.NetBSD
@@ -14,15 +15,18 @@
# NETLIBS: None needed
NETLIBS =
-@@ -12,16 +12,16 @@ CC= gcc
+@@ -11,17 +11,17 @@ PKGDIR?=/usr/pkg
+ CC= gcc
GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
ifeq ($(GCCVER),4)
- CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF) \
+- CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF) \
- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
++ CFLAGS += -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF) \
+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
else
- CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
+- CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
++ CFLAGS += -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
endif
RPATH = "-Wl,--rpath,"
diff -r 72e200410840 -r 013a00b381ff net/xymon/patches/patch-ah
--- a/net/xymon/patches/patch-ah Thu Sep 28 10:33:29 2017 +0000
+++ b/net/xymon/patches/patch-ah Thu Sep 28 10:40:35 2017 +0000
@@ -1,13 +1,28 @@
-$NetBSD: patch-ah,v 1.3 2012/10/11 18:42:19 spz Exp $
+$NetBSD: patch-ah,v 1.4 2017/09/28 10:40:35 spz Exp $
the c-ares dependencies are being difficult, manipulate it into working
use a variable for the path to net-snmp-config, for cases with nonstandard
locations
---- xymonnet/Makefile.orig 2012-07-13 16:50:38.000000000 +0000
+allow hardening
+
+--- xymonnet/Makefile.orig 2015-02-26 07:41:56.000000000 +0000
+++ xymonnet/Makefile
-@@ -66,6 +66,8 @@ c-ares/configure: c-ares-$(ARESVER).tar.
+@@ -30,10 +30,10 @@ PINGTESTOBJS = xymonping.o
+ BEASTATOBJS = beastat.o
+
+ xymonnet: $(NETTESTOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB) $(XYMONLIBS)
+- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(NETTESTOBJS) $(CARESLIBS) $(LDAPLIBS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(XYMONLIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(NETTESTOBJS) $(CARESLIBS) $(LDAPLIBS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS) $(XYMONLIBS) $(PCRELIBS)
+
+ xymonping: $(PINGTESTOBJS) $(XYMONTIMELIB) ../lib/libxymon.a
+- $(CC) $(CFLAGS) -o $@ $(PINGTESTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PINGTESTOBJS) $(XYMONTIMELIBS) $(XYMONCOMMLIBS)
+
+ xymonnet.o: xymonnet.c
+ $(CC) $(CFLAGS) $(SSLFLAGS) $(LDAPFLAGS) $(SSLINCDIR) $(LDAPINCDIR) -c -o $@ xymonnet.c
+@@ -71,23 +71,25 @@ c-ares/configure: c-ares-$(ARESVER).tar.
mv c-ares-$(ARESVER) c-ares
# Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file.
touch c-ares/configure
@@ -15,9 +30,21 @@
+ touch c-ares/.libs/libcares.la
beastat: $(BEASTATOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
-@@ -82,7 +84,7 @@ xymon-snmpcollect: xymon-snmpcollect.o $
- $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `net-snmp-config --libs` ../lib/libxymon.a $(XYMONCOMMLIBS) $(XYMONTIMELIBS)
+- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
+
+ beastat.o: beastat.c
+ $(CC) $(CFLAGS) $(PCREINCDIR) -c -o $@ beastat.c
+
+
+ contest: contest.c httptest.o dns.o dns2.o httpcookies.o $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(CFLAGS) -o contest -I../include $(CARESINC) -DSTANDALONE contest.c httptest.o dns.o dns2.o httpcookies.o $(CARESLIBS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o contest -I../include $(CARESINC) -DSTANDALONE contest.c httptest.o dns.o dns2.o httpcookies.o $(CARESLIBS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS)
+
+
+ xymon-snmpcollect: xymon-snmpcollect.o $(XYMONCOMMLIB) $(XYMONTIMELIB)
+- $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `net-snmp-config --libs` ../lib/libxymon.a $(XYMONCOMMLIBS) $(XYMONTIMELIBS)
++ $(CC) $(LDFLAGS) $(LDFLAGS) -o $@ xymon-snmpcollect.o `net-snmp-config --libs` ../lib/libxymon.a $(XYMONCOMMLIBS) $(XYMONTIMELIBS)
xymon-snmpcollect.o: xymon-snmpcollect.c
- $(CC) $(CFLAGS) -I. `net-snmp-config --cflags` -c -o $@ xymon-snmpcollect.c
diff -r 72e200410840 -r 013a00b381ff net/xymon/patches/patch-build_Makefile.AIX
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/xymon/patches/patch-build_Makefile.AIX Thu Sep 28 10:40:35 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_Makefile.AIX,v 1.1 2017/09/28 10:40:35 spz Exp $
+
+make sure hardening flags can be inherited
+
+--- build/Makefile.AIX.orig 2011-03-08 17:20:28.000000000 +0000
++++ build/Makefile.AIX
+@@ -12,7 +12,7 @@ NETLIBS =
+
+ # Compile flags for normal build with IBM compiler
+ CC = cc
+-CFLAGS = -g -O3 -qstrict -qcpluscmt -D_REENTRANT $(LFSDEF) $(OSDEF)
++CFLAGS += -g -O3 -qstrict -qcpluscmt -D_REENTRANT $(LFSDEF) $(OSDEF)
+
+ # Compile flags for debugging
+ # CFLAGS = -g -DDEBUG -D_REENTRANT $(LFSDEF) $(OSDEF)
diff -r 72e200410840 -r 013a00b381ff net/xymon/patches/patch-build_Makefile.Darwin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/xymon/patches/patch-build_Makefile.Darwin Thu Sep 28 10:40:35 2017 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-build_Makefile.Darwin,v 1.1 2017/09/28 10:40:35 spz Exp $
+
+make sure hardening flags can be inherited
+
+--- build/Makefile.Darwin.orig 2012-08-01 08:48:15.000000000 +0000
++++ build/Makefile.Darwin
+@@ -10,9 +10,9 @@ NETLIBS =
+ CC = gcc
+ GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
+ ifeq ($(GCCVER),4)
Home |
Main Index |
Thread Index |
Old Index