CVS commit: pkgsrc/security/pam-passwdqc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr  2 11:08:47 UTC 2022

Modified Files:
        pkgsrc/security/pam-passwdqc: distinfo
Added Files:
        pkgsrc/security/pam-passwdqc/patches: patch-Makefile
Removed Files:
        pkgsrc/security/pam-passwdqc/patches: patch-aa

Log Message:
pam-passwdqc: Respect LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/pam-passwdqc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pam-passwdqc/patches/patch-Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/security/pam-passwdqc/patches/patch-aa

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

Modified files:

Index: pkgsrc/security/pam-passwdqc/distinfo
diff -u pkgsrc/security/pam-passwdqc/distinfo:1.5 pkgsrc/security/pam-passwdqc/distinfo:1.6
--- pkgsrc/security/pam-passwdqc/distinfo:1.5   Tue Oct 26 11:17:34 2021
+++ pkgsrc/security/pam-passwdqc/distinfo       Sat Apr  2 11:08:47 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:17:34 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/04/02 11:08:47 nia Exp $
 
 BLAKE2s (passwdqc-1.1.4.tar.gz) = ed7d45a28e4a2122bfd1a545fac29f4e943cd04e9b39d1df8e9f06db285e20b8
 SHA512 (passwdqc-1.1.4.tar.gz) = c5a8e6eb857bda1c829df837e490121fe31719cecf57b85c7959efc3533cac5885c8762150d57e656802ce878822de505672383a620c047641fa1608bd8bfaea
 Size (passwdqc-1.1.4.tar.gz) = 41760 bytes
-SHA1 (patch-aa) = 2a631c17278783cab5203199bff29ead3623a5f1
+SHA1 (patch-Makefile) = 0f0b95d644086ba3bb808189e76fd00c401c3aa3

Added files:

Index: pkgsrc/security/pam-passwdqc/patches/patch-Makefile
diff -u /dev/null pkgsrc/security/pam-passwdqc/patches/patch-Makefile:1.1
--- /dev/null   Sat Apr  2 11:08:47 2022
+++ pkgsrc/security/pam-passwdqc/patches/patch-Makefile Sat Apr  2 11:08:47 2022
@@ -0,0 +1,60 @@
+$NetBSD: patch-Makefile,v 1.1 2022/04/02 11:08:47 nia Exp $
+
+Honor settings from environment.
+
+--- Makefile.orig      2009-10-27 01:45:50.000000000 +0000
++++ Makefile
+@@ -30,32 +30,32 @@ INCLUDEDIR = /usr/include
+ MANDIR = /usr/share/man
+ DESTDIR =
+ 
+-CC = gcc
+-LD = $(CC)
++#CC = gcc
++#LD = $(CC)
+ LD_lib = $(LD)
+ RM = rm -f
+ LN_s = ln -s -f
+ MKDIR = umask 022 && mkdir -p
+ INSTALL = install -c
+-CFLAGS = -Wall -O2
++#CFLAGS = -Wall -O2
+ CFLAGS_lib = $(CFLAGS) -fPIC
+ CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer
+ 
+-LDFLAGS =
++#LDFLAGS =
+ LDFLAGS_shared = --shared
+ LDFLAGS_shared_LINUX = --shared
+ LDFLAGS_shared_SUN = -G
+ LDFLAGS_shared_HP = -b
+-LDFLAGS_lib = $(LDFLAGS_shared)
+-LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \
++LDFLAGS_lib = $(LDFLAGS) $(LDFLAGS_shared)
++LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \
+       -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB)
+-LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN)
+-LDFLAGS_lib_HP = $(LDFLAGS_shared_HP)
+-LDFLAGS_pam = $(LDFLAGS_shared)
+-LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \
++LDFLAGS_lib_SUN = $(LDFLAGS) $(LDFLAGS_shared_SUN)
++LDFLAGS_lib_HP = $(LDFLAGS) $(LDFLAGS_shared_HP)
++LDFLAGS_pam = $(LDFLAGS) $(LDFLAGS_shared)
++LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \
+       -Wl,--version-script,$(MAP_PAM)
+-LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN)
+-LDFLAGS_pam_HP = $(LDFLAGS_shared_HP)
++LDFLAGS_pam_SUN = $(LDFLAGS) $(LDFLAGS_shared_SUN)
++LDFLAGS_pam_HP = $(LDFLAGS) $(LDFLAGS_shared_HP)
+ 
+ LDLIBS_lib =
+ LDLIBS_pam = -lpam -lcrypt
+@@ -119,7 +119,7 @@ $(DEVEL_LIB): $(SHARED_LIB)
+       $(LN_s) $(SHARED_LIB) $(DEVEL_LIB)
+ 
+ $(SHARED_PAM): $(OBJS_PAM) $(MAP_PAM) $(DEVEL_LIB)
+-      $(LD_lib) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM)
++      $(LD_lib) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -Wl,-R${PREFIX}/lib -lpasswdqc -o $(SHARED_PAM)
+ 
+ pwqgen: $(OBJS_GEN) $(DEVEL_LIB)
+       $(LD) $(LDFLAGS) $(OBJS_GEN) -L. -lpasswdqc -o $@