Attachment #256686 for bug #283588

Lines 1-5 PORTNAME= libunistring Link Here

(-)./Makefile (-3 / +1 lines)
1	PORTNAME= libunistring	1	PORTNAME= libunistring
2	DISTVERSION= 1.2	2	DISTVERSION= 1.3
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= GNU	4	MASTER_SITES= GNU
5		5
Lines 22-28 OPTIONS_DEFINE= DOCS Link Here
22	TEST_TARGET= check	22	TEST_TARGET= check
23	INFO= ${PORTNAME}	23	INFO= ${PORTNAME}
24	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= DOCS
25
26	TESTING_UNSAFE= test-time.c:46: assertion 'tt3 >= tv2.tv_sec' failed
27		25
28	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1708981678	1	TIMESTAMP = 1735161593
2	SHA256 (libunistring-1.2.tar.xz) = 632bd65ed74a881ca8a0309a1001c428bd1cbd5cd7ddbf8cedcd2e65f4dcdc44	2	SHA256 (libunistring-1.3.tar.xz) = f245786c831d25150f3dfb4317cda1acc5e3f79a5da4ad073ddca58886569527
3	SIZE (libunistring-1.2.tar.xz) = 2502196	3	SIZE (libunistring-1.3.tar.xz) = 2753448




--- lib/unistr/u8-strncpy.c.orig	2024-01-29 00:58:11 UTC
+++ lib/unistr/u8-strncpy.c
@@ -28,10 +28,6 @@
 /* Specification.  */
 #include "unistr.h"
 
-#include <string.h>
-
-uint8_t *
-u8_strncpy (uint8_t *dest, const uint8_t *src, size_t n)
-{
-  return (uint8_t *) strncpy ((char *) dest, (const char *) src, n);
-}
+#define FUNC u8_strncpy
+#define UNIT uint8_t
+#include "u-strncpy.h"

Lines 25-31 include/unistring/inline.h Link Here

(-)./pkg-plist (-2 / +1 lines)
25	%%PORTDOCS%%%%DOCSDIR%%/libunistring_fot.html	25	%%PORTDOCS%%%%DOCSDIR%%/libunistring_fot.html
26	%%PORTDOCS%%%%DOCSDIR%%/libunistring_toc.html	26	%%PORTDOCS%%%%DOCSDIR%%/libunistring_toc.html
27	include/unistring/inline.h	27	include/unistring/inline.h
28	include/unistring/stdbool.h
29	include/unistring/stdint.h	28	include/unistring/stdint.h
30	include/unistring/localcharset.h	29	include/unistring/localcharset.h
31	include/unistring/iconveh.h	30	include/unistring/iconveh.h
Lines 47-50 lib/libunistring.so.5 Link Here
47	include/unigbrk.h	46	include/unigbrk.h
48	lib/libunistring.so	47	lib/libunistring.so
49	lib/libunistring.so.5	48	lib/libunistring.so.5
50	lib/libunistring.so.5.1.0	49	lib/libunistring.so.5.2.0

Return to bug 283588

Line 0 Link Here

(-)./files/patch-lib_unistr_u8-strncpy.c (+16 lines)
	1	--- lib/unistr/u8-strncpy.c.orig 2024-01-29 00:58:11 UTC
	2	+++ lib/unistr/u8-strncpy.c
	3	@@ -28,10 +28,6 @@
	4	/* Specification. */
	5	#include "unistr.h"
	6
	7	-#include <string.h>
	8	-
	9	-uint8_t *
	10	-u8_strncpy (uint8_t dest, const uint8_t src, size_t n)
	11	-{
	12	- return (uint8_t ) strncpy ((char ) dest, (const char *) src, n);
	13	-}
	14	+#define FUNC u8_strncpy
	15	+#define UNIT uint8_t
	16	+#include "u-strncpy.h"