CVS commit: pkgsrc/security/lua-cyrussasl

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Aug  6 10:14:50 UTC 2023

Modified Files:
        pkgsrc/security/lua-cyrussasl: Makefile distinfo
        pkgsrc/security/lua-cyrussasl/patches: patch-Makefile

Log Message:
lua-cyrussasl: Ensure objects used in shared libraries are built with -fPIC.

Do not invoke git during builds.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/lua-cyrussasl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/lua-cyrussasl/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/lua-cyrussasl/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/security/lua-cyrussasl/Makefile
diff -u pkgsrc/security/lua-cyrussasl/Makefile:1.2 pkgsrc/security/lua-cyrussasl/Makefile:1.3
--- pkgsrc/security/lua-cyrussasl/Makefile:1.2  Mon May  9 00:41:57 2022
+++ pkgsrc/security/lua-cyrussasl/Makefile      Sun Aug  6 10:14:50 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/05/09 00:41:57 khorben Exp $
+# $NetBSD: Makefile,v 1.3 2023/08/06 10:14:50 nia Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       ${LUA_PKGPREFIX}-${GITHUB_PROJECT:S/lua-//}-1.1.0
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=JorjBauer/}
 GITHUB_PROJECT=        lua-cyrussasl
@@ -16,8 +17,9 @@ USE_LANGUAGES=        c
 
 .include "../../mk/bsd.prefs.mk"
 
+CFLAGS+=       -fPIC
 MAKE_FLAGS+=   CPATH="${DESTDIR}${PREFIX}/${LUA_CDIR}"
-MAKE_FLAGS+=   LDFLAGS="-shared -lsasl2 -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/${LUA_LDIR}"
+MAKE_FLAGS+=   LDFLAGS="-shared -lsasl2 -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/${LUA_LDIR} ${LDFLAGS}"
 
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../lang/lua/module.mk"

Index: pkgsrc/security/lua-cyrussasl/distinfo
diff -u pkgsrc/security/lua-cyrussasl/distinfo:1.1 pkgsrc/security/lua-cyrussasl/distinfo:1.2
--- pkgsrc/security/lua-cyrussasl/distinfo:1.1  Mon May  9 00:37:58 2022
+++ pkgsrc/security/lua-cyrussasl/distinfo      Sun Aug  6 10:14:50 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/05/09 00:37:58 khorben Exp $
+$NetBSD: distinfo,v 1.2 2023/08/06 10:14:50 nia Exp $
 
 BLAKE2s (lua-cyrussasl-1.1.0.tar.gz) = a2ced3c0ea7bef8afd61592ea7b8ab1b91c3460811cf094d256d46b99ef3030b
 SHA512 (lua-cyrussasl-1.1.0.tar.gz) = 2262dd1e403bd0825b714253dc03844aad20525b206d8fb16196b2647b642a45d137b18bdd89920d95c168b99c5e6b36d73b7cdaa6ec91d3ad2673360307e0ee
 Size (lua-cyrussasl-1.1.0.tar.gz) = 14325 bytes
-SHA1 (patch-Makefile) = 8dc1f2bbe6b507dd4c792a14925692e5d008404d
+SHA1 (patch-Makefile) = b35c5a19d0c66afa25eeb4a1e5b069e402f02e87

Index: pkgsrc/security/lua-cyrussasl/patches/patch-Makefile
diff -u pkgsrc/security/lua-cyrussasl/patches/patch-Makefile:1.1 pkgsrc/security/lua-cyrussasl/patches/patch-Makefile:1.2
--- pkgsrc/security/lua-cyrussasl/patches/patch-Makefile:1.1    Mon May  9 00:37:59 2022
+++ pkgsrc/security/lua-cyrussasl/patches/patch-Makefile        Sun Aug  6 10:14:50 2023
@@ -1,7 +1,9 @@
-$NetBSD: patch-Makefile,v 1.1 2022/05/09 00:37:59 khorben Exp $
+$NetBSD: patch-Makefile,v 1.2 2023/08/06 10:14:50 nia Exp $
 
 Allow using the right compilation flags and installation path
 
+Do not invoke git.
+
 --- Makefile.orig      2015-08-21 22:24:54.000000000 +0000
 +++ Makefile
 @@ -17,11 +17,11 @@
@@ -29,3 +31,9 @@ Allow using the right compilation flags 
        cp $(TARGET) $(CPATH)
  
  clean:
+@@ -67,5 +68,4 @@ context.c: context.h
+ version:
+       @if ! test -f $(BUILD_VERSION); then echo 0 > $(BUILD_VERSION); fi
+       @echo $$(($$(cat $(BUILD_VERSION)) + 1)) > $(BUILD_VERSION)
+-      @if ! test -f $(BRANCH_VERSION); then git log --pretty=oneline -1|cut -c1-8 > $(BRANCH_VERSION); fi
+