Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id AAA021A923A for ; Sat, 6 Nov 2021 09:46:33 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DC94884F75; Sat, 6 Nov 2021 09:46:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 21CA984F74 for ; Sat, 6 Nov 2021 09:46:32 +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 lEznrKCefq_5 for ; Sat, 6 Nov 2021 09:46:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6F4A684EBB for ; Sat, 6 Nov 2021 09:46:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 63CE5FAEC; Sat, 6 Nov 2021 09:46:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636191991270010" MIME-Version: 1.0 Date: Sat, 6 Nov 2021 09:46:31 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/archivers/9e To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20211106094631.63CE5FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636191991270010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Nov 6 09:46:31 UTC 2021 Modified Files: pkgsrc/archivers/9e: Makefile distinfo pkgsrc/archivers/9e/patches: patch-ab Added Files: pkgsrc/archivers/9e/patches: patch-Makefile Log Message: 9e: Honor CFLAGS/LDFLAGS. Fixes RELRO build. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/9e/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/archivers/9e/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/9e/patches/patch-Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/9e/patches/patch-ab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636191991270010 Content-Disposition: inline Content-Length: 3228 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/9e/Makefile diff -u pkgsrc/archivers/9e/Makefile:1.13 pkgsrc/archivers/9e/Makefile:1.14 --- pkgsrc/archivers/9e/Makefile:1.13 Thu Dec 3 13:08:49 2020 +++ pkgsrc/archivers/9e/Makefile Sat Nov 6 09:46:31 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2020/12/03 13:08:49 zafer Exp $ +# $NetBSD: Makefile,v 1.14 2021/11/06 09:46:31 nia Exp $ DISTNAME= 9e PKGNAME= 9e-1.0 -CATEGORIES= plan9 archivers +CATEGORIES= archivers plan9 MASTER_SITES= https://www.aydogan.net/distfiles/archivers/ MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/archivers/9e/distinfo diff -u pkgsrc/archivers/9e/distinfo:1.6 pkgsrc/archivers/9e/distinfo:1.7 --- pkgsrc/archivers/9e/distinfo:1.6 Tue Oct 26 09:57:04 2021 +++ pkgsrc/archivers/9e/distinfo Sat Nov 6 09:46:31 2021 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 09:57:04 nia Exp $ +$NetBSD: distinfo,v 1.7 2021/11/06 09:46:31 nia Exp $ BLAKE2s (9e.tar.gz) = 51703ebf41ca22ebadf137ed9f1b744a28c6f00614eaf8867bd12c9f5f2929cb SHA512 (9e.tar.gz) = 742f7fd4e8801a63c000d1fccaa9ae851e74ceaa2cdf2c41cbfc7e647a52f6c0ac2843b87320fb7d821f7bf0112323e1b67ca4d998fcc703711dc1868d8d0516 Size (9e.tar.gz) = 2019 bytes -SHA1 (patch-aa) = 5d5982bfc544910f3d36eb40a9de9c5caa8432fd -SHA1 (patch-ab) = 7c81596f86905d6b9a42cab77fbfad6b15c911c3 +SHA1 (patch-Makefile) = bfcd5c3580449e2a36398233fb757b5d426f7a48 +SHA1 (patch-ab) = 3f46fec41407f00232c44447360e911b09cde8bb Index: pkgsrc/archivers/9e/patches/patch-ab diff -u pkgsrc/archivers/9e/patches/patch-ab:1.2 pkgsrc/archivers/9e/patches/patch-ab:1.3 --- pkgsrc/archivers/9e/patches/patch-ab:1.2 Thu Feb 6 15:06:18 2003 +++ pkgsrc/archivers/9e/patches/patch-ab Sat Nov 6 09:46:31 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2003/02/06 15:06:18 yyamano Exp $ +$NetBSD: patch-ab,v 1.3 2021/11/06 09:46:31 nia Exp $ ---- 9e.c.orig Thu Jun 15 22:40:52 2000 +--- 9e.c.orig 2000-06-15 13:40:52.000000000 +0000 +++ 9e.c -@@ -1,6 +1,9 @@ +@@ -1,9 +1,13 @@ /* 9e.c */ #include @@ -12,7 +12,11 @@ $NetBSD: patch-ab,v 1.2 2003/02/06 15:06 #include #include #include -@@ -139,17 +142,16 @@ ++#include + #include + #include + #include +@@ -139,17 +143,16 @@ void do_file(char *file, FILE *fin) { } if(Hdrs) { Added files: Index: pkgsrc/archivers/9e/patches/patch-Makefile diff -u /dev/null pkgsrc/archivers/9e/patches/patch-Makefile:1.1 --- /dev/null Sat Nov 6 09:46:31 2021 +++ pkgsrc/archivers/9e/patches/patch-Makefile Sat Nov 6 09:46:31 2021 @@ -0,0 +1,37 @@ +$NetBSD: patch-Makefile,v 1.1 2021/11/06 09:46:31 nia Exp $ + +Honor CC, CFLAGS, LDFLAGS. + +--- Makefile.orig 2000-06-15 13:40:52.000000000 +0000 ++++ Makefile +@@ -1,14 +1,7 @@ + # Makefile for 9e + +-CC = gcc +- +-CFLAGS = -g3 -ggdb +- + .PHONY: all clean distclean + +-LIBS = -lefence +- +-HDRS = 9a.h + SRCS = 9e.c + OBJS = 9e.o + +@@ -17,7 +10,7 @@ BINARIES = 9e + all: $(BINARIES) + + 9e: $(OBJS) +- $(CC) -o 9e 9e.o $(LIBS) ++ $(CC) $(LDFLAGS) -o 9e 9e.o + + clean: + rm -f *.o *~ a.out +@@ -26,4 +19,4 @@ clean: + distclean: clean + rm -f ${BINARIES} + +-# EOF +\ No newline at end of file ++# EOF --_----------=_1636191991270010--