From 06a5fa6da374cc3dafd95295c5e7448f1cea9f88 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 6 Apr 2021 22:01:59 +0000 Subject: Tue Apr 6 22:01:59 UTC 2021 a/sysvinit-scripts-2.1-noarch-41.txz: Rebuilt. rc.S: don't clear /var/run. Thanks to upnort. kde/digikam-7.2.0-x86_64-2.txz: Rebuilt. Recompiled against opencv-4.5.2 (apparently the ABI changed). Thanks to etienne. --- .../1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch (limited to 'source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch') diff --git a/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch b/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch new file mode 100644 index 000000000..47c8c2aed --- /dev/null +++ b/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch @@ -0,0 +1,33 @@ +From 1c677c04c0fa43ecfeccdb9705dbbd19fb356891 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sun, 4 Apr 2021 21:02:19 +0000 +Subject: [PATCH] Don't count each byte encounter as 1, count the total number + of bytes found (Anatol Belski). This makes it behave like 5.39. + +--- + src/encoding.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/encoding.c b/src/encoding.c +index c8b404390..c66703bb6 100644 +--- a/src/encoding.c ++++ b/src/encoding.c +@@ -35,7 +35,7 @@ + #include "file.h" + + #ifndef lint +-FILE_RCSID("@(#)$File: encoding.c,v 1.27 2021/02/05 21:33:49 christos Exp $") ++FILE_RCSID("@(#)$File: encoding.c,v 1.28 2021/04/04 21:02:19 christos Exp $") + #endif /* lint */ + + #include "magic.h" +@@ -282,8 +282,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \ + } \ + u = 0; \ + for (i = 0; i < __arraycount(dist); i++) { \ +- if (dist[i]) \ +- u++; \ ++ u+= dist[i]; \ + } \ + if (u < 3) \ + return 0; \ -- cgit v1.2.3-80-g2a13