From 305be10f1fa65db6d147544e3840e7aec5934ca9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 13 Sep 2021 09:53:02 +0100
Subject: [PATCH] Remove unused ntfsprogs/boot.c replacement

I checked the current ntfsprogs/boot.c from the tarball and it is
correctly licensed so the GPL replacement is no longer required.
---
 boot-gpl.c   | 101 ---------------------------------------------------
 ntfs-3g.spec |   5 ++-
 2 files changed, 4 insertions(+), 102 deletions(-)
 delete mode 100644 boot-gpl.c

diff --git a/boot-gpl.c b/boot-gpl.c
deleted file mode 100644
index cde65cc..0000000
--- a/boot-gpl.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *		NTFS bootsector, adapted from the vfat one.
- */
-
-/* mkfs.fat.c - utility to create FAT/MS-DOS filesystems
-Copyright (C) 1991 Linus Torvalds <torvalds@klaava.helsinki.fi>
-Copyright (C) 1992-1993 Remy Card <card@masi.ibp.fr>
-Copyright (C) 1993-1994 David Hudson <dave@humbug.demon.co.uk>
-Copyright (C) 1998 H. Peter Anvin <hpa@zytor.com>
-Copyright (C) 1998-2005 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
-Copyright (C) 2008-2014 Daniel Baumann <mail@daniel-baumann.ch>
-Copyright (C) 2015 Andreas Bombe <aeb@debian.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-The complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL-3 file.
-*/
-
-#include "boot.h"
-
-#define BOOTCODE_SIZE 4136
-
-/* The "boot code" we put into the filesystem... it writes a message and
-tells the user to try again */
-
-#define MSG_OFFSET_OFFSET 3
-
-const unsigned char boot_array[BOOTCODE_SIZE] =
-
-"\xeb\x52\x90"   /* jump to code at 0x54 (0x7c54) */
-"NTFS    \0"     /* NTFS signature */
-
-"\0\0\0\0\0\0\0\0\0\0\0\0"     /* 72 bytes for device parameters */
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-                               /* Boot code run at location 0x7c54 */
-"\x0e"		/* push cs */
-"\x1f"		/* pop ds */
-"\xbe\x71\x7c"	/* mov si, offset message_txt (at location 0x7c71) */
-						/* write_msg: */
-"\xac"		/* lodsb */
-"\x22\xc0"	/* and al, al */
-"\x74\x0b"	/* jz key_press */
-"\x56"		/* push si */
-"\xb4\x0e"	/* mov ah, 0eh */
-"\xbb\x07\x00"	/* mov bx, 0007h */
-"\xcd\x10"	/* int 10h */
-"\x5e"		/* pop si */
-"\xeb\xf0"	/* jmp write_msg */
-						/* key_press: */
-"\x32\xe4"	/* xor ah, ah */
-"\xcd\x16"	/* int 16h */
-"\xcd\x19"	/* int 19h */
-"\xeb\xfe"	/* foo: jmp foo */
-/* message_txt: */
-"This is not a bootable disk. Please insert a bootable floppy and\r\n"
-"press any key to try again ... \r\n"
-				/* At location 0xd4, 298 bytes to reach 0x1fe */
-				/* 298 = 4 blocks of 72 then 10 */
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0"
-
-"\0\0\0\0\0\0\0\0\0\0"
-					/* Boot signature at 0x1fe */
-"\x55\xaa";
diff --git a/ntfs-3g.spec b/ntfs-3g.spec
index 6859851..c3c0588 100644
--- a/ntfs-3g.spec
+++ b/ntfs-3g.spec
@@ -8,7 +8,7 @@
 Name:		ntfs-3g
 Summary:	Linux NTFS userspace driver
 Version:	2021.8.22
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Source0:	http://tuxera.com/opensource/%{name}_ntfsprogs-%{version}%{?subver}.tgz
 URL:		https://www.tuxera.com/company/open-source/
@@ -188,6 +188,9 @@ rm -rf %{buildroot}%{_defaultdocdir}/%{name}/README
 %exclude %{_mandir}/man8/ntfs-3g*
 
 %changelog
+* Mon Sep 13 2021 Richard W.M. Jones <rjones@redhat.com> - 2:2021.8.22-3
+- Remove unused ntfsprogs/boot.c replacement
+
 * Wed Sep  8 2021 Tom Callaway <spot@fedoraproject.org> - 2:2021.8.22-2
 - remove incorrect obsoletes