CVS commit: pkgsrc/security/pam-af

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Jan  1 12:59:15 UTC 2022

Modified Files:
        pkgsrc/security/pam-af: Makefile distinfo
        pkgsrc/security/pam-af/patches: patch-aa

Log Message:
security/pam-af: fix for PIE build

Use "ld -shared" rather than "ld --shared". The former allows cwrappers to
detect shared lib link mode. This makes it omit "-pie" which would remove
required symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/pam-af/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/pam-af/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/pam-af/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-af/Makefile
diff -u pkgsrc/security/pam-af/Makefile:1.18 pkgsrc/security/pam-af/Makefile:1.19
--- pkgsrc/security/pam-af/Makefile:1.18        Tue Jul  6 20:01:17 2021
+++ pkgsrc/security/pam-af/Makefile     Sat Jan  1 12:59:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2021/07/06 20:01:17 rhialto Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/01 12:59:15 rhialto Exp $
 
 DISTNAME=      pam_af-1.0.2
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    security
 MASTER_SITES=  http://mbsd.msk.ru/dist/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/security/pam-af/distinfo
diff -u pkgsrc/security/pam-af/distinfo:1.15 pkgsrc/security/pam-af/distinfo:1.16
--- pkgsrc/security/pam-af/distinfo:1.15        Tue Oct 26 11:17:34 2021
+++ pkgsrc/security/pam-af/distinfo     Sat Jan  1 12:59:15 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 11:17:34 nia Exp $
+$NetBSD: distinfo,v 1.16 2022/01/01 12:59:15 rhialto Exp $
 
 BLAKE2s (pam_af-1.0.2.tar.bz2) = 2b0dbc65b2bc0122ec68751502769064294839c0215e79b1317141a87f826e1b
 SHA512 (pam_af-1.0.2.tar.bz2) = 89dc8a78e5d888e6cbf84820420201ef19d012d7fbc39f40ede7e7b4cef12a5896bec7a2a6bfc17cf8d111800e54eb2559e55cd3218b04e84cd0a2a24d7dcc01
 Size (pam_af-1.0.2.tar.bz2) = 17991 bytes
-SHA1 (patch-aa) = 9c8e44c7b25e268777967c742a6946abe0c80316
+SHA1 (patch-aa) = 8c707e869aa56f8b0ac8bb624c5fae09bd6b2ef7
 SHA1 (patch-ab) = aec6c301a5e699cd0e39c552748c48bbf77af52d
 SHA1 (patch-ad) = 0f46fecfec3b920a08e2c22c14ada368214d6a69
 SHA1 (patch-common_pam__af.h) = 026b303116b80cb48987c24b5f48677e7581a346

Index: pkgsrc/security/pam-af/patches/patch-aa
diff -u pkgsrc/security/pam-af/patches/patch-aa:1.4 pkgsrc/security/pam-af/patches/patch-aa:1.5
--- pkgsrc/security/pam-af/patches/patch-aa:1.4 Wed Mar 21 18:24:00 2012
+++ pkgsrc/security/pam-af/patches/patch-aa     Sat Jan  1 12:59:15 2022
@@ -1,10 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2012/03/21 18:24:00 hans Exp $
+$NetBSD: patch-aa,v 1.5 2022/01/01 12:59:15 rhialto Exp $
 
 * use gcc flags on SunOS
 * for PKGSRC layout
 * treat *BSDs same as FreeBSD.
+* Use "ld -shared" rather than "ld --shared". The former allows cwrappers to
+  detect shared lib link mode. This makes it omit "-pie" which would remove
+  required symbols.
 
---- Makefile.orig      2006-11-07 00:26:58.000000000 +0000
+--- Makefile.orig      2011-08-24 07:53:32.000000000 +0000
 +++ Makefile
 @@ -69,7 +69,7 @@ CFLAGS = -I./common/ -DPIC
  CFLAGS_GCC =  -O2 -Wall -Werror -Wno-format-y2k                       \
@@ -15,6 +18,15 @@ $NetBSD: patch-aa,v 1.4 2012/03/21 18:24
  CFLAGS_HP = -Ae +w1 +W 474,486,542 +z +O2
  CFLAGS_BSD = -D_HAVE_PATHS_H_ -D_HAVE_ERR_H_ -D_HAVE_GETPROGNAME_ -D_USE_MODULE_ENTRY_ -D_HAVE_SALEN_
  CFLAGS_GNU =  -D_GNU_SOURCE -D_HAVE_PATHS_H_ -D_HAVE_ERR_H_ -D_HAVE_FLOCK_ \
+@@ -79,7 +79,7 @@ LDFLAGS_BSD =
+ LDFLAGS_LINUX = -lgdbm -lgdbm_compat
+ LDFLAGS_SUN = -lnsl -lsocket
+ LDFLAGS_HP =
+-SHLDFLAGS_GCC = -s --shared -lpam -lcrypt
++SHLDFLAGS_GCC = -s -shared -lpam -lcrypt
+ SHLDFLAGS_SUN = -s -G -lpam -lcrypt
+ SHLDFLAGS_HP = -s -b -lpam -lsec
+ 
 @@ -102,16 +102,16 @@ DISTTOOLMAN = pam_af_tool.8
  LIBMAN = $(LIBDIR)/$(DISTLIBMAN)
  TOOLMAN = $(TOOLDIR)/$(DISTTOOLMAN)