CVS commit: pkgsrc/net

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Mon Jun 27 20:59:40 UTC 2022

Modified Files:
        pkgsrc/net/samba: Makefile hacks.mk
        pkgsrc/net/samba4: Makefile hacks.mk

Log Message:
net/samba{,4}: Restrict ``disabling PIE hack'' for NetBSD/powerpc
prior to 9.0.

ld.elf_so(1) for 9.0 and later support R_PPC_ADDR16_HA (== 6) and
friends:

http://cvsweb.netbsd.org/bsdweb.cgi/src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c#rev1.58.2.1

Bump revision.

Close PR pkg/38961.


To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 pkgsrc/net/samba/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/samba/hacks.mk
cvs rdiff -u -r1.142 -r1.143 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/samba4/hacks.mk

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

Modified files:

Index: pkgsrc/net/samba/Makefile
diff -u pkgsrc/net/samba/Makefile:1.291 pkgsrc/net/samba/Makefile:1.292
--- pkgsrc/net/samba/Makefile:1.291     Wed Dec  8 16:06:07 2021
+++ pkgsrc/net/samba/Makefile   Mon Jun 27 20:59:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.291 2021/12/08 16:06:07 adam Exp $
+# $NetBSD: Makefile,v 1.292 2022/06/27 20:59:39 rin Exp $
 
 DISTNAME=      samba-${VERSION}
 CATEGORIES=    net
@@ -10,7 +10,7 @@ COMMENT=      SMB/CIFS protocol server suite
 LICENSE=       gnu-gpl-v3
 
 VERSION=       3.6.25
-PKGREVISION=   31
+PKGREVISION=   32
 
 CONFLICTS+=    ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 

Index: pkgsrc/net/samba/hacks.mk
diff -u pkgsrc/net/samba/hacks.mk:1.1 pkgsrc/net/samba/hacks.mk:1.2
--- pkgsrc/net/samba/hacks.mk:1.1       Mon Mar  8 22:19:07 2010
+++ pkgsrc/net/samba/hacks.mk   Mon Jun 27 20:59:39 2022
@@ -1,8 +1,8 @@
-# $NetBSD: hacks.mk,v 1.1 2010/03/08 22:19:07 jmmv Exp $
+# $NetBSD: hacks.mk,v 1.2 2022/06/27 20:59:39 rin Exp $
 
 # Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT
-# relocations' error under NetBSD/macppc.
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
+# relocations' error under NetBSD/powerpc < 9.0.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-8].*-powerpc)
 PKG_HACKS+=            pie
 CONFIGURE_ARGS+=       --disable-pie
 .endif

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.142 pkgsrc/net/samba4/Makefile:1.143
--- pkgsrc/net/samba4/Makefile:1.142    Thu Mar 24 10:16:13 2022
+++ pkgsrc/net/samba4/Makefile  Mon Jun 27 20:59:40 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.142 2022/03/24 10:16:13 hauke Exp $
+# $NetBSD: Makefile,v 1.143 2022/06/27 20:59:40 rin Exp $
 
 DISTNAME=      samba-4.15.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 

Index: pkgsrc/net/samba4/hacks.mk
diff -u pkgsrc/net/samba4/hacks.mk:1.2 pkgsrc/net/samba4/hacks.mk:1.3
--- pkgsrc/net/samba4/hacks.mk:1.2      Tue Jun 21 09:47:49 2022
+++ pkgsrc/net/samba4/hacks.mk  Mon Jun 27 20:59:40 2022
@@ -1,8 +1,8 @@
-# $NetBSD: hacks.mk,v 1.2 2022/06/21 09:47:49 he Exp $
+# $NetBSD: hacks.mk,v 1.3 2022/06/27 20:59:40 rin Exp $
 
 # Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT
-# relocations' error under NetBSD/macppc.
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
+# relocations' error under NetBSD/powerpc < 9.0.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-8].*-powerpc)
 PKG_HACKS+=            pie
 CONFIGURE_ARGS+=       --without-pie
 .endif