From 67eea5ebc2cc2a67e20bea205228e67c995f7891 Mon Sep 17 00:00:00 2001 From: Mo Zhou Date: Sat, 27 Apr 2019 01:54:13 +0000 Subject: [PATCH] Refresh use-unicode-data.patch; Remove pass-hardening-flags.patch (merged). --- debian/patches/pass-hardening-flags.patch | 69 ----------------------- debian/patches/series | 1 - debian/patches/use-unicode-data.patch | 25 +++----- 3 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 debian/patches/pass-hardening-flags.patch diff --git a/debian/patches/pass-hardening-flags.patch b/debian/patches/pass-hardening-flags.patch deleted file mode 100644 index dccdf08..0000000 --- a/debian/patches/pass-hardening-flags.patch +++ /dev/null @@ -1,69 +0,0 @@ -Description: Pass hardening flags -Forwarded: not-yet -Author: Graham Inggs -Last-Update: 2018-07-27 - ---- a/Makefile -+++ b/Makefile -@@ -11,7 +11,7 @@ - PICFLAG = -fPIC - C99FLAG = -std=c99 - WCFLAGS = -Wall -pedantic --UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS $(UTF8PROC_DEFINES) -+UCFLAGS = $(CPPFLAGS) $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS $(UTF8PROC_DEFINES) - - # shared-library version MAJOR.MINOR.PATCH ... this may be *different* - # from the utf8proc version number because it indicates ABI compatibility, -@@ -115,31 +115,31 @@ - $(CC) $(UCFLAGS) -c -o test/tests.o test/tests.c - - test/normtest: test/normtest.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/normtest.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/normtest.c test/tests.o utf8proc.o -o $@ - - test/graphemetest: test/graphemetest.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/graphemetest.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/graphemetest.c test/tests.o utf8proc.o -o $@ - - test/printproperty: test/printproperty.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/printproperty.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/printproperty.c test/tests.o utf8proc.o -o $@ - - test/charwidth: test/charwidth.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/charwidth.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/charwidth.c test/tests.o utf8proc.o -o $@ - - test/valid: test/valid.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/valid.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/valid.c test/tests.o utf8proc.o -o $@ - - test/iterate: test/iterate.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/iterate.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/iterate.c test/tests.o utf8proc.o -o $@ - - test/case: test/case.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/case.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/case.c test/tests.o utf8proc.o -o $@ - - test/custom: test/custom.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/custom.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/custom.c test/tests.o utf8proc.o -o $@ - - test/misc: test/misc.c test/tests.o utf8proc.o utf8proc.h test/tests.h -- $(CC) $(UCFLAGS) test/misc.c test/tests.o utf8proc.o -o $@ -+ $(CC) $(UCFLAGS) $(LDFLAGS) test/misc.c test/tests.o utf8proc.o -o $@ - - check: test/normtest data/NormalizationTest.txt test/graphemetest data/GraphemeBreakTest.txt test/printproperty test/case test/custom test/charwidth test/misc test/valid test/iterate bench/bench.c bench/util.c bench/util.h utf8proc.o - $(MAKE) -C bench ---- a/bench/Makefile -+++ b/bench/Makefile -@@ -1,7 +1,8 @@ - CURL=curl - - CC = cc --CFLAGS = -O2 -std=c99 -pedantic -Wall -+CFLAGS ?= -O2 -+CFLAGS += -std=c99 -pedantic -Wall - - all: bench - diff --git a/debian/patches/series b/debian/patches/series index 36761a2..6216540 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ use-unicode-data.patch -pass-hardening-flags.patch diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch index 73fc516..fcae2a1 100644 --- a/debian/patches/use-unicode-data.patch +++ b/debian/patches/use-unicode-data.patch @@ -6,23 +6,12 @@ Forwarded: not-needed Last-Update: 2018-07-27 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/data/Makefile -+++ b/data/Makefile -@@ -23,10 +23,10 @@ - UNIFONT_VERSION=11.0.01 - - unifont.ttf: -- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont-$(UNIFONT_VERSION).ttf -+ cp /usr/share/fonts/truetype/unifont/unifont.ttf $@ - - unifont_upper.ttf: -- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont_upper-$(UNIFONT_VERSION).ttf -+ cp /usr/share/fonts/truetype/unifont/unifont_upper.ttf $@ - - %.sfd: %.ttf - $(FONTFORGE) -lang=ff -c "Open(\"$<\");Save(\"$@\");Quit(0);" -@@ -38,31 +38,31 @@ - UNICODE_VERSION=11.0.0 +Index: utf8proc/data/Makefile +=================================================================== +--- utf8proc.orig/data/Makefile ++++ utf8proc/data/Makefile +@@ -25,31 +25,31 @@ CharWidths.txt: charwidths.jl EastAsianW + UNICODE_VERSION=12.0.0 UnicodeData.txt: - $(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt @@ -61,4 +50,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + cp /usr/share/unicode/emoji/emoji-data.txt $@ clean: - rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt unifont*.ttf unifont*.sfd emoji-data.txt + rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt emoji-data.txt -- 2.30.2