Received: by mail.netbsd.org (Postfix, from userid 605) id C6CBB84E60; Tue, 12 Dec 2017 07:13:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5227D84E5B for ; Tue, 12 Dec 2017 07:13:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id NEJweKdGpQN7 for ; Tue, 12 Dec 2017 07:13:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8F91184D40 for ; Tue, 12 Dec 2017 07:13:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 825AEFB40; Tue, 12 Dec 2017 07:13:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1513062781236890" MIME-Version: 1.0 Date: Tue, 12 Dec 2017 07:13:01 +0000 From: "S.P.Zeidler" Subject: CVS commit: pkgsrc/chat/icb To: pkgsrc-changes@NetBSD.org Reply-To: spz@netbsd.org X-Mailer: log_accum Message-Id: <20171212071301.825AEFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1513062781236890 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: spz Date: Tue Dec 12 07:13:01 UTC 2017 Modified Files: pkgsrc/chat/icb: Makefile distinfo pkgsrc/chat/icb/patches: patch-bk Added Files: pkgsrc/chat/icb/patches: patch-glob_Makefile patch-icb_Make patch-readline_Make patch-setup Log Message: RELRO & friends To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/chat/icb/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/chat/icb/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/icb/patches/patch-bk cvs rdiff -u -r0 -r1.1 pkgsrc/chat/icb/patches/patch-glob_Makefile \ pkgsrc/chat/icb/patches/patch-icb_Make \ pkgsrc/chat/icb/patches/patch-readline_Make \ pkgsrc/chat/icb/patches/patch-setup Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1513062781236890 Content-Disposition: inline Content-Length: 6886 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/icb/Makefile diff -u pkgsrc/chat/icb/Makefile:1.24 pkgsrc/chat/icb/Makefile:1.25 --- pkgsrc/chat/icb/Makefile:1.24 Thu Oct 9 14:06:02 2014 +++ pkgsrc/chat/icb/Makefile Tue Dec 12 07:13:01 2017 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.24 2014/10/09 14:06:02 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2017/12/12 07:13:01 spz Exp $ # # Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way # older than this here. It's got no readline support, tcl, ... - HF DISTNAME= icb-5.0.9 PKGNAME= icb-5.0.9pl1 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_LOCAL} Index: pkgsrc/chat/icb/distinfo diff -u pkgsrc/chat/icb/distinfo:1.18 pkgsrc/chat/icb/distinfo:1.19 --- pkgsrc/chat/icb/distinfo:1.18 Thu Mar 23 17:06:46 2017 +++ pkgsrc/chat/icb/distinfo Tue Dec 12 07:13:01 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2017/03/23 17:06:46 joerg Exp $ +$NetBSD: distinfo,v 1.19 2017/12/12 07:13:01 spz Exp $ SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf @@ -40,7 +40,7 @@ SHA1 (patch-bg) = 30c13a23de9e1e232e6901 SHA1 (patch-bh) = 5e24c606b9ee9656b15d66a4611d732b563cc831 SHA1 (patch-bi) = cc92516799335123f6ac0d37380a428e9a88063d SHA1 (patch-bj) = af62a5bef6a3bac7cdd22e3aca7f1eeb50b15b29 -SHA1 (patch-bk) = caab3a28f9e05f7e3321d5b56ad3dd47ee3e3b40 +SHA1 (patch-bk) = cf69ae34d58e6c2e4117cd96593bfd5921221728 SHA1 (patch-bl) = cef6d92a02bb6080a9121f2ecbd36c4b15777a68 SHA1 (patch-bm) = 1171ce0885693b198d8d7ad8960c55dec4604aa0 SHA1 (patch-bn) = 57972d7c9712755833dc97559edded528e38aa97 @@ -50,6 +50,8 @@ SHA1 (patch-bq) = df24d4eae25858bb5d0aa0 SHA1 (patch-br) = b0670b6ad7e91d5502598f25f66fc7b5d0b5afb8 SHA1 (patch-bs) = c0b5a045b02e9630d2dda713b5d54b780ed2d5de SHA1 (patch-bt) = 1e16a2fd21f65fb1da680e2ea2e1efd891c40b27 +SHA1 (patch-glob_Makefile) = d8c4f5507ba1bcab648165e2b90912035a0f5119 +SHA1 (patch-icb_Make) = de5502db645922791a183447c57928997feadd5e SHA1 (patch-icb_c__hush.c) = cdfe910a11d3ceace118d01edc4eb0d2f05c4058 SHA1 (patch-icb_c__replay.c) = a1c6b9245202819e5ed79ec99df14abbc010fed0 SHA1 (patch-icb_msgs.c) = 06619b7a260d8f761109f1b54fffa674b71c34d9 @@ -57,6 +59,8 @@ SHA1 (patch-icb_parse.c) = 5ed95b8cbd409 SHA1 (patch-icb_signals.c) = 1b648d7137ad361e43d4cd472fe811d16ec5cac7 SHA1 (patch-murgil_contoport.c) = 2ee05addd21be0d906b5147efac1f48841d72298 SHA1 (patch-murgil_makeport.c) = cacfa30605bcc688a8a48f6152527de82d04a9c8 +SHA1 (patch-readline_Make) = fbc7e816b29ed1ae6ea2beb8f61d269e8248bb11 SHA1 (patch-readline_funmap.c) = 262d16194937918928963d1809f683f91419eff0 SHA1 (patch-readline_keymaps.c) = 3f9534f18bbfbbdb11d66ca9db390524af252ac0 SHA1 (patch-readline_vi__mode.c) = 48ed2f4a0070491014e940bcc9a6edffa986cb2a +SHA1 (patch-setup) = 892743ea97c8b40ee666674995fa2a55df8d2b43 Index: pkgsrc/chat/icb/patches/patch-bk diff -u pkgsrc/chat/icb/patches/patch-bk:1.2 pkgsrc/chat/icb/patches/patch-bk:1.3 --- pkgsrc/chat/icb/patches/patch-bk:1.2 Wed Dec 17 02:19:59 2008 +++ pkgsrc/chat/icb/patches/patch-bk Tue Dec 12 07:13:01 2017 @@ -1,8 +1,14 @@ -$NetBSD: patch-bk,v 1.2 2008/12/17 02:19:59 christos Exp $ +$NetBSD: patch-bk,v 1.3 2017/12/12 07:13:01 spz Exp $ ---- tcl/Make.orig 1995-02-24 16:19:48.000000000 -0500 -+++ tcl/Make 2008-12-16 20:18:01.000000000 -0500 -@@ -11,13 +11,7 @@ +--- tcl/Make.orig 1995-02-24 21:19:48.000000000 +0000 ++++ tcl/Make +@@ -6,18 +6,12 @@ + # You should not need to modify this makefile. + + LIBDIR = .. +-CFLAGS = $(TCLCFLAGS) -I. -DTCL_VERSION=\"3.3\" ++CFLAGS += $(TCLCFLAGS) -I. -DTCL_VERSION=\"3.3\" + #PMAKE = & SRC = \ panic.c \ @@ -16,7 +22,7 @@ $NetBSD: patch-bk,v 1.2 2008/12/17 02:19 tclAssem.c \ tclBasic.c \ tclCmdAH.c \ -@@ -30,13 +24,7 @@ +@@ -30,13 +24,7 @@ SRC = \ OBJ = \ panic.o \ @@ -30,7 +36,7 @@ $NetBSD: patch-bk,v 1.2 2008/12/17 02:19 tclAssem.o \ tclBasic.o \ tclCmdAH.o \ -@@ -80,28 +68,3 @@ +@@ -80,28 +68,3 @@ depend: $(MAKEDEPEND) $(DEPENDFLAGS) *.c # DO NOT DELETE THIS LINE -- make depend depends on it. Added files: Index: pkgsrc/chat/icb/patches/patch-glob_Makefile diff -u /dev/null pkgsrc/chat/icb/patches/patch-glob_Makefile:1.1 --- /dev/null Tue Dec 12 07:13:01 2017 +++ pkgsrc/chat/icb/patches/patch-glob_Makefile Tue Dec 12 07:13:01 2017 @@ -0,0 +1,21 @@ +$NetBSD: patch-glob_Makefile,v 1.1 2017/12/12 07:13:01 spz Exp $ + +--- ./glob/Makefile.orig 1995-02-24 21:20:45.000000000 +0000 ++++ ./glob/Makefile +@@ -1,6 +1,6 @@ + # Makefile for glob source is in -*- text -*- mode. + +-CFLAGS = -g ++CFLAGS += -g + RM = rm -f + OBJECTS = glob.o tilde.o fnmatch.o + +@@ -16,7 +16,7 @@ libglob.a: $(OBJECTS) + -if [ -f "$(RANLIB)" ]; then $(RANLIB) $@; fi + + tilde-test: tilde.c +- $(CC) $(CFLAGS) -o tilde-test -DTEST tilde.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tilde-test -DTEST tilde.c + + fnmatch.o: fnmatch.h + Index: pkgsrc/chat/icb/patches/patch-icb_Make diff -u /dev/null pkgsrc/chat/icb/patches/patch-icb_Make:1.1 --- /dev/null Tue Dec 12 07:13:01 2017 +++ pkgsrc/chat/icb/patches/patch-icb_Make Tue Dec 12 07:13:01 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-icb_Make,v 1.1 2017/12/12 07:13:01 spz Exp $ + +RELRO + +--- icb/Make.orig 1995-02-24 21:20:17.000000000 +0000 ++++ icb/Make +@@ -129,7 +129,7 @@ default: icb + icb: ${PMAKE} $(OBJ) $(LIBS) + + icb: ${PMAKE} $(OBJ) +- $(CC) $(CFLAGS) -o icb $(OBJ) $(LIBS) $(OTHERLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o icb $(OBJ) $(LIBS) $(OTHERLIBS) + + main.o: main.c ../config + $(CC) $(CFLAGS) -c -DDEFAULTHOST=\"${DEFAULTHOST}\" \ Index: pkgsrc/chat/icb/patches/patch-readline_Make diff -u /dev/null pkgsrc/chat/icb/patches/patch-readline_Make:1.1 --- /dev/null Tue Dec 12 07:13:01 2017 +++ pkgsrc/chat/icb/patches/patch-readline_Make Tue Dec 12 07:13:01 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-readline_Make,v 1.1 2017/12/12 07:13:01 spz Exp $ + +--- readline/Make.orig 1995-02-24 21:19:59.000000000 +0000 ++++ readline/Make +@@ -34,8 +34,8 @@ INCDIR = .. + READLINE_DEFINES = $(TYPES) -DVI_MODE + + DEBUG_FLAGS = -g +-LDFLAGS = $(DEBUG_FLAGS) +-CFLAGS = $(DEBUG_FLAGS) $(USG) -I. -I.. ++LDFLAGS += $(DEBUG_FLAGS) ++CFLAGS += $(DEBUG_FLAGS) $(USG) -I. -I.. + + # A good alternative is gcc -traditional. + #CC = gcc -traditional Index: pkgsrc/chat/icb/patches/patch-setup diff -u /dev/null pkgsrc/chat/icb/patches/patch-setup:1.1 --- /dev/null Tue Dec 12 07:13:01 2017 +++ pkgsrc/chat/icb/patches/patch-setup Tue Dec 12 07:13:01 2017 @@ -0,0 +1,13 @@ +$NetBSD: patch-setup,v 1.1 2017/12/12 07:13:01 spz Exp $ + +--- ./setup.orig 1995-02-24 21:19:30.000000000 +0000 ++++ ./setup +@@ -450,7 +450,7 @@ MANDIR = ${mandir} + CC = ${compiler} + + # Compile options. +-CFLAGS = ${extra} ${cflags} ++CFLAGS = ${CFLAGS} ${extra} ${cflags} + TCLCFLAGS = ${extra} ${cflags} + + # Lint flags --_----------=_1513062781236890--