From be25e6b67d66dedb7829f0052af371fc1539cafe6d85a82fe17a1902dbd51c91 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 22 Jan 2018 10:40:51 +0000 Subject: [PATCH 1/3] Add new magic format for next ncurses 6.1 compiled format OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=168 --- file-5.32-ncurses-6.1.patch | 24 ++++++++++++++++++++++++ file.changes | 6 ++++++ file.spec | 3 ++- python-magic.spec | 2 +- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 file-5.32-ncurses-6.1.patch diff --git a/file-5.32-ncurses-6.1.patch b/file-5.32-ncurses-6.1.patch new file mode 100644 index 0000000..4c8e445 --- /dev/null +++ b/file-5.32-ncurses-6.1.patch @@ -0,0 +1,24 @@ +--- + magic/Magdir/terminfo | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- magic/Magdir/terminfo ++++ magic/Magdir/terminfo 2018-01-22 10:32:38.596762352 +0000 +@@ -19,6 +19,17 @@ + # no extension + #!:ext + # ++#------------------------------------------------------------------------------ ++# The following was added for ncurses6 development: ++#------------------------------------------------------------------------------ ++# ++0 string \036\002 ++# imitate the legacy compiled-format, to get the entry-name printed ++>16 ubyte >32 ++# namelist, if more than 1 separated by "|" like "st|stterm| simpleterm 0.4.1" ++>>12 regex \^[a-zA-Z0-9][a-zA-Z0-9.][^|]* Compiled 32-bit terminfo entry "%-s" ++!:mime application/x-terminfo2 ++# + # While the compiled terminfo uses little-endian format irregardless of + # platform, SystemV screen dumps do not. They came later, and that detail was + # overlooked. diff --git a/file.changes b/file.changes index 0a199b8..4c2223d 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 22 10:37:39 UTC 2018 - werner@suse.de + +- Add patch file-5.32-ncurses-6.1.patch to support extend magic + format for new ncurses 6.1 + ------------------------------------------------------------------- Sun Oct 8 00:06:58 UTC 2017 - jengelh@inai.de diff --git a/file.spec b/file.spec index a771ae0..7184759 100644 --- a/file.spec +++ b/file.spec @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,6 +62,7 @@ Patch35: file-5.24-nitpick.dif Patch36: file-5.15-clear-invalid.patch Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif +Patch40: file-5.32-ncurses-6.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc diff --git a/python-magic.spec b/python-magic.spec index 26141d0..e610f3e 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 3ff8bd03115a3bc7efca97ca6f113a639876f7532dfcd8594d6880f6a6023c08 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 22 Jan 2018 10:41:22 +0000 Subject: [PATCH 2/3] Add new magic format for next ncurses 6.1 compiled format OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=169 --- file.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/file.spec b/file.spec index 7184759..e1c5da6 100644 --- a/file.spec +++ b/file.spec @@ -131,6 +131,7 @@ to develop applications that require the magic "file" interface. %patch36 -p1 -b .clear %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs +%patch40 -p1 -b .nc61 %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h From 50e03bd4e83c88fc81d6feefa4e14882823ec461d000c50f4a032c3b1636540c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 22 Jan 2018 10:49:22 +0000 Subject: [PATCH 3/3] make it at least apply patches OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=170 --- file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.spec b/file.spec index e1c5da6..070b1bb 100644 --- a/file.spec +++ b/file.spec @@ -131,7 +131,7 @@ to develop applications that require the magic "file" interface. %patch36 -p1 -b .clear %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs -%patch40 -p1 -b .nc61 +%patch40 -p0 -b .nc61 %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h