diff options
| author | nia <nia@pkgsrc.org> | 2022-04-02 11:12:01 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-04-02 11:12:01 +0000 |
| commit | af17067fa2bb5f626c181bfe788922273e71e7c9 (patch) | |
| tree | 271da4e8367cd526cb952c45ff791dcc1c112923 /security | |
| parent | 9cccf445de36c4b3b2144e84b4bd9db290a76ce3 (diff) | |
| download | pkgsrc-af17067fa2bb5f626c181bfe788922273e71e7c9.tar.gz | |
pam-af: Respect LDFLAGS. Fixes RELRO build.
Diffstat (limited to 'security')
| -rw-r--r-- | security/pam-af/distinfo | 4 | ||||
| -rw-r--r-- | security/pam-af/patches/patch-Makefile (renamed from security/pam-af/patches/patch-aa) | 38 |
2 files changed, 37 insertions, 5 deletions
diff --git a/security/pam-af/distinfo b/security/pam-af/distinfo index 27b1605d79c..bfe1132ee49 100644 --- a/security/pam-af/distinfo +++ b/security/pam-af/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2022/01/01 12:59:15 rhialto Exp $ +$NetBSD: distinfo,v 1.17 2022/04/02 11:12:01 nia 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) = 8c707e869aa56f8b0ac8bb624c5fae09bd6b2ef7 +SHA1 (patch-Makefile) = 52068696340f09a640e8872b639a632661e2c224 SHA1 (patch-ab) = aec6c301a5e699cd0e39c552748c48bbf77af52d SHA1 (patch-ad) = 0f46fecfec3b920a08e2c22c14ada368214d6a69 SHA1 (patch-common_pam__af.h) = 026b303116b80cb48987c24b5f48677e7581a346 diff --git a/security/pam-af/patches/patch-aa b/security/pam-af/patches/patch-Makefile index a7685d8031a..ea752dce8a7 100644 --- a/security/pam-af/patches/patch-aa +++ b/security/pam-af/patches/patch-Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2022/01/01 12:59:15 rhialto Exp $ +$NetBSD: patch-Makefile,v 1.1 2022/04/02 11:12:02 nia Exp $ * use gcc flags on SunOS * for PKGSRC layout @@ -6,6 +6,7 @@ $NetBSD: patch-aa,v 1.5 2022/01/01 12:59:15 rhialto Exp $ * 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. +* Do not override LDFLAGS. --- Makefile.orig 2011-08-24 07:53:32.000000000 +0000 +++ Makefile @@ -27,7 +28,7 @@ $NetBSD: patch-aa,v 1.5 2022/01/01 12:59:15 rhialto Exp $ SHLDFLAGS_SUN = -s -G -lpam -lcrypt SHLDFLAGS_HP = -s -b -lpam -lsec -@@ -102,16 +102,16 @@ DISTTOOLMAN = pam_af_tool.8 +@@ -102,39 +102,39 @@ DISTTOOLMAN = pam_af_tool.8 LIBMAN = $(LIBDIR)/$(DISTLIBMAN) TOOLMAN = $(TOOLDIR)/$(DISTTOOLMAN) @@ -47,5 +48,36 @@ $NetBSD: patch-aa,v 1.5 2022/01/01 12:59:15 rhialto Exp $ - if [ "`$(UNAME)`" = "FreeBSD" ]; then \ + if [ "`$(UNAME)`" = "FreeBSD" -o "`$(UNAME)`" = "NetBSD" -o "`$(UNAME)`" = "OpenBSD" -o "`$(UNAME)`" = "DragonFly" ]; then \ $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_GCC) $(CFLAGS_BSD)" \ - LD=ld LDFLAGS="$(LDFLAGS_BSD) $(SHLDFLAGS_GCC)" \ +- LD=ld LDFLAGS="$(LDFLAGS_BSD) $(SHLDFLAGS_GCC)" \ ++ LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_BSD) $(SHLDFLAGS_GCC)" \ $(LIBBIN); \ + $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_GCC) $(CFLAGS_BSD)" \ +- LDFLAGS="$(LDFLAGS_BSD)" $(TOOLBIN); \ ++ LDFLAGS="$(LDFLAGS) $(LDFLAGS_BSD)" $(TOOLBIN); \ + elif [ "`$(UNAME)`" = "Linux" ]; then \ + $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_GCC) $(CFLAGS_GNU)" \ +- LD=ld LDFLAGS="$(LDFLAGS_LINUX) $(SHLDFLAGS_GCC)" \ ++ LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_LINUX) $(SHLDFLAGS_GCC)" \ + $(LIBBIN); \ + $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_GCC) $(CFLAGS_GNU)" \ +- LDFLAGS="$(LDFLAGS_LINUX)" $(TOOLBIN); \ ++ LDFLAGS="$(LDFLAGS) $(LDFLAGS_LINUX)" $(TOOLBIN); \ + elif [ "`$(UNAME)`" = "SunOS" ]; then \ + $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_SUN)" \ +- LD=ld LDFLAGS="$(LDFLAGS_SUN) $(SHLDFLAGS_SUN)" \ ++ LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_SUN) $(SHLDFLAGS_SUN)" \ + $(LIBBIN); \ + $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_SUN)" \ +- LDFLAGS="$(LDFLAGS_SUN)" $(TOOLBIN); \ ++ LDFLAGS="$(LDFLAGS) $(LDFLAGS_SUN)" $(TOOLBIN); \ + elif [ "`$(UNAME)`" = "HP-UX" ]; then \ + $(MAKE) CFLAGS="$(CFLAGS_HP)" \ +- LD=ld LDFLAGS="$(LDFLAGS_HP) $(SHLDFLAGS_HP)" \ ++ LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_HP) $(SHLDFLAGS_HP)" \ + $(LIBBIN); \ + $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_HP)" \ +- LDFLAGS="$(LDFLAGS_HP)" $(TOOLBIN); \ ++ LDFLAGS="$(LDFLAGS) $(LDFLAGS_HP)" $(TOOLBIN); \ + else \ + $(MAKE) $(LIBBIN); \ + $(MAKE) $(TOOLBIN); \ |