[pkgsrc/trunk]: pkgsrc/misc Support RELRO

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f62af0df7fa
branches:  trunk
changeset: 770184:3f62af0df7fa
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Nov 27 05:51:04 2021 +0000

description:
Support RELRO

diffstat:

 misc/gkrellm-moon/Makefile            |   5 +++--
 misc/gkrellm-moon/distinfo            |   4 ++--
 misc/gkrellm-moon/patches/patch-aa    |  19 +++++++++++++++----
 misc/gkrellm-weather/Makefile         |   5 +++--
 misc/gkrellm-weather/distinfo         |   4 ++--
 misc/gkrellm-weather/patches/patch-ab |   5 +++--
 6 files changed, 28 insertions(+), 14 deletions(-)

diffs (129 lines):

diff -r 1d64363a0f88 -r 3f62af0df7fa misc/gkrellm-moon/Makefile
--- a/misc/gkrellm-moon/Makefile        Sat Nov 27 05:37:59 2021 +0000
+++ b/misc/gkrellm-moon/Makefile        Sat Nov 27 05:51:04 2021 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.62 2020/08/17 20:19:30 leot Exp $
+# $NetBSD: Makefile,v 1.63 2021/11/27 05:51:04 pho Exp $
 #
 
 DISTNAME=              gkrellmoon-0.6
 PKGNAME=               gkrellm-moon-0.6
-PKGREVISION=           43
+PKGREVISION=           44
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://gkrellmoon.sourceforge.net/
 COMMENT=               GKrellM2 moonclock plugin
+LICENSE=               gnu-gpl-v2
 
 USE_TOOLS+=            pkg-config
 BUILD_TARGET=          gkrellmoon.so
diff -r 1d64363a0f88 -r 3f62af0df7fa misc/gkrellm-moon/distinfo
--- a/misc/gkrellm-moon/distinfo        Sat Nov 27 05:37:59 2021 +0000
+++ b/misc/gkrellm-moon/distinfo        Sat Nov 27 05:51:04 2021 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:59:04 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/11/27 05:51:04 pho Exp $
 
 BLAKE2s (gkrellmoon-0.6.tar.gz) = 7e4d6590d412be95d2ab272f9d63b0acbdc939ed37ef29863fe67c3b6905f0e0
 SHA512 (gkrellmoon-0.6.tar.gz) = d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
 Size (gkrellmoon-0.6.tar.gz) = 55035 bytes
-SHA1 (patch-aa) = d2d78944247972c2cc3c7eed4310d4ec80287305
+SHA1 (patch-aa) = 823759c9e9169db8c328ef9c837129d35990a8c5
diff -r 1d64363a0f88 -r 3f62af0df7fa misc/gkrellm-moon/patches/patch-aa
--- a/misc/gkrellm-moon/patches/patch-aa        Sat Nov 27 05:37:59 2021 +0000
+++ b/misc/gkrellm-moon/patches/patch-aa        Sat Nov 27 05:51:04 2021 +0000
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:26 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2021/11/27 05:51:04 pho Exp $
 
---- Makefile.orig      2002-12-11 04:36:06.000000000 +0100
+* Change the hard-coded installation path.
+* Change the hard-coded C compiler.
+* Honor LDFLAGS so that flags like -Wl,-zrelro can be used.
+* Use BSD_INSTALL_LIB to install the plugin .so file.
+
+--- Makefile.orig      2002-12-11 03:36:06.000000000 +0000
 +++ Makefile
-@@ -1,14 +1,14 @@
+@@ -1,19 +1,19 @@
  GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
  GTK_LIB = `pkg-config gtk+-2.0 --libs`
  
@@ -19,10 +24,16 @@
  
  OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
  
+ gkrellmoon.so: $(OBJS)
+-      $(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
++      $(CC) $(OBJS) -o gkrellmoon.so $(LDFLAGS) $(LFLAGS) $(LIBS)
+ 
+ clean:
+       rm -f *.o core *.so* *.bak *~
 @@ -23,4 +23,5 @@ gkrellmoon.o: gkrellmoon.c moon_60.xpm
  # %.o: %.c
  
  install: gkrellmoon.so
 -      install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
 +      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALLDIR)
-+      $(BSD_INSTALL_DATA) gkrellmoon.so ${DESTDIR}$(INSTALLDIR)
++      $(BSD_INSTALL_LIB) gkrellmoon.so ${DESTDIR}$(INSTALLDIR)
diff -r 1d64363a0f88 -r 3f62af0df7fa misc/gkrellm-weather/Makefile
--- a/misc/gkrellm-weather/Makefile     Sat Nov 27 05:37:59 2021 +0000
+++ b/misc/gkrellm-weather/Makefile     Sat Nov 27 05:51:04 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2021/05/24 19:53:05 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2021/11/27 05:58:50 pho Exp $
 
 DISTNAME=      gkrellweather-2.0.7
 PKGNAME=       gkrellm-weather-2.0.7
-PKGREVISION=   48
+PKGREVISION=   49
 CATEGORIES=    misc
 #MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 EXTRACT_SUFX=  .tgz
@@ -10,6 +10,7 @@
 MAINTAINER=    tripledes%eslack.org@localhost
 #HOMEPAGE=     http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 COMMENT=       Gkrellm2 weather plugin
+LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      wget>=1.8:../../net/wget
 
diff -r 1d64363a0f88 -r 3f62af0df7fa misc/gkrellm-weather/distinfo
--- a/misc/gkrellm-weather/distinfo     Sat Nov 27 05:37:59 2021 +0000
+++ b/misc/gkrellm-weather/distinfo     Sat Nov 27 05:51:04 2021 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:59:04 nia Exp $
+$NetBSD: distinfo,v 1.10 2021/11/27 05:58:50 pho Exp $
 
 BLAKE2s (gkrellweather-2.0.7.tgz) = 24eeb8b0719c502354e33899d7d43c30e4ee09623043cf062e5b12b7200d8a61
 SHA512 (gkrellweather-2.0.7.tgz) = 103212f5d8c66c512cf22689f5e64e886e2df57b963a2c01873f6d2044653653d2bd8d5804ed788f202e2bb2b7289090198434ddad363c124c047bcc530e04e3
 Size (gkrellweather-2.0.7.tgz) = 19968 bytes
 SHA1 (patch-aa) = 2c4850e84b873c3b3dbc2d1cf41123a9e2fffbce
-SHA1 (patch-ab) = e7ee2c8b3f4302b4b733ed668fae25746530cd8c
+SHA1 (patch-ab) = d223c10869a7c4ec6338ac39a56a4bc300857bea
diff -r 1d64363a0f88 -r 3f62af0df7fa misc/gkrellm-weather/patches/patch-ab
--- a/misc/gkrellm-weather/patches/patch-ab     Sat Nov 27 05:37:59 2021 +0000
+++ b/misc/gkrellm-weather/patches/patch-ab     Sat Nov 27 05:51:04 2021 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2010/11/28 20:52:44 dholland Exp $
+$NetBSD: patch-ab,v 1.3 2021/11/27 05:58:50 pho Exp $
 
 - use pkgsrc-provided PREFIX and LOCALEDIR
 - fix pthread linkage
+- Honor LDFLAGS so that flags like -Wl,-zrelro can be used.
 
 --- Makefile.orig      2005-02-27 13:54:47.000000000 +0000
 +++ Makefile
@@ -30,7 +31,7 @@
  gkrellweather.so: $(OBJS)
        (cd po && ${MAKE} all )
 -      $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread
-+      $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
++      $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LDFLAGS) $(LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
  clean:
        (cd po && ${MAKE} clean )