CVS commit: pkgsrc/sysutils/tiramisu

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct 24 07:47:41 UTC 2021

Modified Files:
        pkgsrc/sysutils/tiramisu: Makefile distinfo
Added Files:
        pkgsrc/sysutils/tiramisu/patches: patch-Makefile

Log Message:
tiramisu: Fix RELRO build properly (honor CFLAGS/LDFLAGS).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/tiramisu/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/tiramisu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/tiramisu/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/tiramisu/Makefile
diff -u pkgsrc/sysutils/tiramisu/Makefile:1.7 pkgsrc/sysutils/tiramisu/Makefile:1.8
--- pkgsrc/sysutils/tiramisu/Makefile:1.7       Sat Oct 23 19:28:35 2021
+++ pkgsrc/sysutils/tiramisu/Makefile   Sun Oct 24 07:47:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/10/23 19:28:35 pin Exp $
+# $NetBSD: Makefile,v 1.8 2021/10/24 07:47:41 nia Exp $
 
 DISTNAME=      tiramisu-2.0.20211019
 CATEGORIES=    sysutils
@@ -15,8 +15,6 @@ USE_TOOLS+=   pkg-config gmake
 
 MAKE_ENV+=             PREFIX=${PREFIX}
 
-CHECK_RELRO_SKIP+=     bin/tiramisu
-
 TOOL_DEPENDS+= vala-[0-9]*:../../lang/vala
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/sysutils/tiramisu/distinfo
diff -u pkgsrc/sysutils/tiramisu/distinfo:1.5 pkgsrc/sysutils/tiramisu/distinfo:1.6
--- pkgsrc/sysutils/tiramisu/distinfo:1.5       Wed Oct 20 13:07:46 2021
+++ pkgsrc/sysutils/tiramisu/distinfo   Sun Oct 24 07:47:41 2021
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/20 13:07:46 pin Exp $
+$NetBSD: distinfo,v 1.6 2021/10/24 07:47:41 nia Exp $
 
 RMD160 (tiramisu-2.0.20211019.tar.gz) = e9bca815a1727a7a652fa204c2450292ae617322
 SHA512 (tiramisu-2.0.20211019.tar.gz) = 47c2cbaa0619c6db6ef02c1c522133077d82e5f0498a3ffca87f94d625e2ecf74031279ac47f4b262f7cf444b3fc4bdc2dcfd92cee17b2d02a5f5f0fecb17186
 Size (tiramisu-2.0.20211019.tar.gz) = 3061568 bytes
+SHA1 (patch-Makefile) = f9495bbda84042e8bf4242bfbab645de86867ad8

Added files:

Index: pkgsrc/sysutils/tiramisu/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/tiramisu/patches/patch-Makefile:1.1
--- /dev/null   Sun Oct 24 07:47:41 2021
+++ pkgsrc/sysutils/tiramisu/patches/patch-Makefile     Sun Oct 24 07:47:41 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2021/10/24 07:47:41 nia Exp $
+
+We need valac to honor CFLAGS and LDFLAGS so pkgsrc hardening
+features are applied.
+
+--- Makefile.orig      2021-10-20 00:56:11.000000000 +0000
++++ Makefile
+@@ -13,7 +13,7 @@ LFLAGS   = `pkg-config --libs glib-2.0 g
+ all: $(TARGET)
+ 
+ $(TARGET): $(SRC)
+-      $(VALAC) $(IFLAGS) $(SRC) -o $(TARGET)
++      $(VALAC) --cc="cc $(CFLAGS) $(LDFLAGS)" $(IFLAGS) $(SRC) -o $(TARGET)
+ #     $(CC) $(CFLAGS) $(IFLAGS) $(SRC) $(LFLAGS) $(LDFLAGS) -o $(TARGET)
+ 
+ install: $(TARGET)