CVS commit: pkgsrc/net/proftpd

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Sep 19 17:36:26 UTC 2022

Modified Files:
        pkgsrc/net/proftpd: Makefile Makefile.common

Log Message:
proftpd: Apply CHECK_RELRO_SKIP when building modules to fix their build.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/net/proftpd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/proftpd/Makefile.common

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

Modified files:

Index: pkgsrc/net/proftpd/Makefile
diff -u pkgsrc/net/proftpd/Makefile:1.95 pkgsrc/net/proftpd/Makefile:1.96
--- pkgsrc/net/proftpd/Makefile:1.95    Tue Jun 28 11:35:19 2022
+++ pkgsrc/net/proftpd/Makefile Mon Sep 19 17:36:25 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2022/06/28 11:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2022/09/19 17:36:25 nia Exp $
 
 #PKGREVISION= 2
 PKGREVISION= 1
@@ -54,8 +54,6 @@ INSTALLATION_DIRS+=   lib/proftpd
 INSTALLATION_DIRS+=    share/doc/proftpd
 INSTALLATION_DIRS+=    share/examples/proftpd
 
-CHECK_RELRO_SKIP+=     libexec/proftpd/*.a
-
 post-install:
 .for i in NEWS README.md README.LDAP README.modules
        ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd

Index: pkgsrc/net/proftpd/Makefile.common
diff -u pkgsrc/net/proftpd/Makefile.common:1.13 pkgsrc/net/proftpd/Makefile.common:1.14
--- pkgsrc/net/proftpd/Makefile.common:1.13     Sat Oct 16 19:46:41 2021
+++ pkgsrc/net/proftpd/Makefile.common  Mon Sep 19 17:36:25 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2021/10/16 19:46:41 tm Exp $
+# $NetBSD: Makefile.common,v 1.14 2022/09/19 17:36:25 nia Exp $
 
 # used by net/proftpd/Makefile
 # used by net/proftpd/Makefile.module
@@ -42,6 +42,7 @@ CFLAGS.SunOS+=        -Du_int64_t=uint64_t -Du_
 BUILD_DEFS+=           VARBASE
 
 CHECK_SHLIBS_SKIP=     libexec/proftpd/*.a
+CHECK_RELRO_SKIP+=     libexec/proftpd/*.a
 CHECK_SSP_SKIP=                ${CHECK_SHLIBS_SKIP}
 
 pre-configure: