pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/jxrlib
Module Name: pkgsrc
Committed By: prlw1
Date: Sat Nov 21 17:08:10 UTC 2026
Modified Files:
pkgsrc/graphics/jxrlib: Makefile distinfo
pkgsrc/graphics/jxrlib/patches: patch-Makefile
Log Message:
jxrlib: RELRO fix
Don't just pass the relro flags to the binaries. Also do same for the
libraries. Spotted by wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/jxrlib/Makefile \
pkgsrc/graphics/jxrlib/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/jxrlib/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/graphics/jxrlib/Makefile
diff -u pkgsrc/graphics/jxrlib/Makefile:1.5 pkgsrc/graphics/jxrlib/Makefile:1.6
--- pkgsrc/graphics/jxrlib/Makefile:1.5 Fri Oct 30 10:32:52 2026
+++ pkgsrc/graphics/jxrlib/Makefile Sat Nov 21 17:08:10 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2026/10/30 10:32:52 prlw1 Exp $
+# $NetBSD: Makefile,v 1.6 2026/11/21 17:08:10 prlw1 Exp $
DISTNAME= jxrlib-1.4.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=mircomir/}
Index: pkgsrc/graphics/jxrlib/distinfo
diff -u pkgsrc/graphics/jxrlib/distinfo:1.5 pkgsrc/graphics/jxrlib/distinfo:1.6
--- pkgsrc/graphics/jxrlib/distinfo:1.5 Fri Oct 30 10:32:52 2026
+++ pkgsrc/graphics/jxrlib/distinfo Sat Nov 21 17:08:10 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2026/10/30 10:32:52 prlw1 Exp $
+$NetBSD: distinfo,v 1.6 2026/11/21 17:08:10 prlw1 Exp $
BLAKE2s (jxrlib-1.4.4.tar.gz) = c7d602a96ae482ef88a73c1ab3ddfa835fa8a74634c95cb5aa86e4ee9855c862
SHA512 (jxrlib-1.4.4.tar.gz) = 3b77a2cbcf000b6decf006097f415d86156ab6dc70d3fa3069ddee31f04e610e2d644dec0fae96bf73ee4e5d1ca0390129fc650356da3e7446d6211b22d7df99
Size (jxrlib-1.4.4.tar.gz) = 352758 bytes
-SHA1 (patch-Makefile) = 2dee098ecb785a307efe3bfce6f7a00692a40b61
+SHA1 (patch-Makefile) = a59c2f7a6cb5320004eb64c082c8d9b705cad4cc
Index: pkgsrc/graphics/jxrlib/patches/patch-Makefile
diff -u pkgsrc/graphics/jxrlib/patches/patch-Makefile:1.2 pkgsrc/graphics/jxrlib/patches/patch-Makefile:1.3
--- pkgsrc/graphics/jxrlib/patches/patch-Makefile:1.2 Fri Oct 30 10:32:52 2026
+++ pkgsrc/graphics/jxrlib/patches/patch-Makefile Sat Nov 21 17:08:10 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.2 2026/10/30 10:32:52 prlw1 Exp $
+$NetBSD: patch-Makefile,v 1.3 2026/11/21 17:08:10 prlw1 Exp $
- Avoid depending on python to create .pc file
- pass in LDFLAGS for rpath and relro
---- Makefile.orig 2026-10-30 08:23:51.992400861 +0000
+--- Makefile.orig 2026-11-21 13:28:24.860633344 +0000
+++ Makefile
@@ -84,7 +84,7 @@ endif
LIBRARIES=$(STATIC_LIBRARIES)
@@ -14,6 +14,24 @@ $NetBSD: patch-Makefile,v 1.2 2026/10/30
##--------------------------------
##
+@@ -133,7 +133,7 @@ $(DIR_BUILD)/libjpegxr.so: $(OBJ_ENC) $(OBJ_DEC) $(OBJ
+
+ $(DIR_BUILD)/libjpegxr.so: $(OBJ_ENC) $(OBJ_DEC) $(OBJ_SYS)
+ $(MK_DIR) $(@D)
+- $(CC) -shared $? -o $@
++ $(CC) -shared $? $(LDFLAGS) -o $@
+
+ ##--------------------------------
+ ##
+@@ -171,7 +171,7 @@ $(DIR_BUILD)/libjxrglue.so: $(OBJ_GLUE) $(OBJ_TEST)
+
+ $(DIR_BUILD)/libjxrglue.so: $(OBJ_GLUE) $(OBJ_TEST)
+ $(MK_DIR) $(@D)
+- $(CC) -shared $? -o $@
++ $(CC) -shared $? $(LDFLAGS) -o $@
+
+ ##--------------------------------
+ ##
@@ -206,10 +206,10 @@ $(DIR_BUILD)/libjxr.pc: $(DIR_SRC)/libjxr.pc.in
$(DIR_BUILD)/libjxr.pc: $(DIR_SRC)/libjxr.pc.in
@python -c 'import os; d = { "DIR_INSTALL": "$(DIR_INSTALL)", "JXR_VERSION": "$(JXR_VERSION)", "JXR_ENDIAN": "$(ENDIANFLAG)" }; fin = open("$<", "r"); fout = open("$@", "w+");
fout.writelines( [ l % d for l in fin.readlines()])'
Home |
Main Index |
Thread Index |
Old Index