From fe7b83a3842ea7df4bc09af48b69ad594852108d Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 25 Jul 2014 18:39:20 -0600 Subject: [PATCH] Move 08-Junction_Points to ntdll-Junction_Points. --- patches/Makefile | 50 +++++++++---------- ...-support-for-junction-point-creation.patch | 0 ...-support-for-reading-junction-points.patch | 0 ...support-for-deleting-junction-points.patch | 0 ...tise-that-a-file-is-a-junction-point.patch | 0 ...dd-support-for-deleting-junction-poi.patch | 0 ...l32-Advertise-junction-point-support.patch | 0 ...test-for-deleting-junction-point-tar.patch | 0 .../definition | 0 9 files changed, 25 insertions(+), 25 deletions(-) rename patches/{08-Junction_Points => ntdll-Junction_Points}/0001-ntdll-Add-support-for-junction-point-creation.patch (100%) rename patches/{08-Junction_Points => ntdll-Junction_Points}/0002-ntdll-Add-support-for-reading-junction-points.patch (100%) rename patches/{08-Junction_Points => ntdll-Junction_Points}/0003-ntdll-Add-support-for-deleting-junction-points.patch (100%) rename patches/{08-Junction_Points => ntdll-Junction_Points}/0004-ntdll-Advertise-that-a-file-is-a-junction-point.patch (100%) rename patches/{08-Junction_Points => ntdll-Junction_Points}/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch (100%) rename patches/{08-Junction_Points => ntdll-Junction_Points}/0006-kernel32-Advertise-junction-point-support.patch (100%) rename patches/{08-Junction_Points => ntdll-Junction_Points}/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch (100%) rename patches/{08-Junction_Points => ntdll-Junction_Points}/definition (100%) diff --git a/patches/Makefile b/patches/Makefile index 5c8f956e..82d044b2 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -5,8 +5,7 @@ CURDIR ?= ${.CURDIR} PATCH := $(CURDIR)/../debian/tools/gitapply.sh -d $(DESTDIR) -PATCHLIST := 08-Junction_Points.ok \ - 09-TransmitFile.ok \ +PATCHLIST := 09-TransmitFile.ok \ 10-Missing_Fonts.ok \ 12-FD_Cache.ok \ 13-Misc_ACL.ok \ @@ -21,6 +20,7 @@ PATCHLIST := 08-Junction_Points.ok \ kernel32-GetVolumePathName.ok \ kernel32-Named_Pipe.ok \ loader-Cmdline_Diagnostics.ok \ + ntdll-Junction_Points.ok \ server-ACL_Compat.ok \ server-Address_Change_Notification.ok \ server-Inherited_ACLs.ok \ @@ -48,29 +48,6 @@ clean: .NOTPARALLEL: -# Patchset 08-Junction_Points -# | -# | Included patches: -# | * Support for junction points/reparse points. [by Erich E. Hoover] -# | -# | This patchset fixes the following Wine bugs: -# | * [#12401] Support junction points, i.e. DeviceIoCtl(FSCTL_SET_REPARSE_POINT/FSCTL_GET_REPARSE_POINT) -# | -# | Modified files: -# | * dlls/kernel32/path.c, dlls/kernel32/volume.c, dlls/ntdll/file.c, dlls/ntdll/tests/file.c, include/ntifs.h -# | -08-Junction_Points.ok: - $(PATCH) < 08-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch - $(PATCH) < 08-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch - $(PATCH) < 08-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch - $(PATCH) < 08-Junction_Points/0004-ntdll-Advertise-that-a-file-is-a-junction-point.patch - $(PATCH) < 08-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch - $(PATCH) < 08-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch - $(PATCH) < 08-Junction_Points/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch - ( \ - echo "+ { \"08-Junction_Points\", \"Erich E. Hoover\", \"Support for junction points/reparse points.\" },"; \ - ) > 08-Junction_Points.ok - # Patchset 09-TransmitFile # | # | Included patches: @@ -355,6 +332,29 @@ loader-Cmdline_Diagnostics.ok: echo "+ { \"loader-Cmdline_Diagnostics\", \"Michael Müller\", \"Add commandline option --check-libs to test if shared libraries are installed.\" },"; \ ) > loader-Cmdline_Diagnostics.ok +# Patchset ntdll-Junction_Points +# | +# | Included patches: +# | * Support for junction points/reparse points. [by Erich E. Hoover] +# | +# | This patchset fixes the following Wine bugs: +# | * [#12401] Support junction points, i.e. DeviceIoCtl(FSCTL_SET_REPARSE_POINT/FSCTL_GET_REPARSE_POINT) +# | +# | Modified files: +# | * dlls/kernel32/path.c, dlls/kernel32/volume.c, dlls/ntdll/file.c, dlls/ntdll/tests/file.c, include/ntifs.h +# | +ntdll-Junction_Points.ok: + $(PATCH) < ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch + $(PATCH) < ntdll-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch + $(PATCH) < ntdll-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch + $(PATCH) < ntdll-Junction_Points/0004-ntdll-Advertise-that-a-file-is-a-junction-point.patch + $(PATCH) < ntdll-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch + $(PATCH) < ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch + $(PATCH) < ntdll-Junction_Points/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch + ( \ + echo "+ { \"ntdll-Junction_Points\", \"Erich E. Hoover\", \"Support for junction points/reparse points.\" },"; \ + ) > ntdll-Junction_Points.ok + # Patchset server-ACL_Compat # | # | Included patches: diff --git a/patches/08-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch similarity index 100% rename from patches/08-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch rename to patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch diff --git a/patches/08-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch b/patches/ntdll-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch similarity index 100% rename from patches/08-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch rename to patches/ntdll-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch diff --git a/patches/08-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch b/patches/ntdll-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch similarity index 100% rename from patches/08-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch rename to patches/ntdll-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch diff --git a/patches/08-Junction_Points/0004-ntdll-Advertise-that-a-file-is-a-junction-point.patch b/patches/ntdll-Junction_Points/0004-ntdll-Advertise-that-a-file-is-a-junction-point.patch similarity index 100% rename from patches/08-Junction_Points/0004-ntdll-Advertise-that-a-file-is-a-junction-point.patch rename to patches/ntdll-Junction_Points/0004-ntdll-Advertise-that-a-file-is-a-junction-point.patch diff --git a/patches/08-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch b/patches/ntdll-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch similarity index 100% rename from patches/08-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch rename to patches/ntdll-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch diff --git a/patches/08-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch b/patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch similarity index 100% rename from patches/08-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch rename to patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch diff --git a/patches/08-Junction_Points/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch b/patches/ntdll-Junction_Points/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch similarity index 100% rename from patches/08-Junction_Points/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch rename to patches/ntdll-Junction_Points/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch diff --git a/patches/08-Junction_Points/definition b/patches/ntdll-Junction_Points/definition similarity index 100% rename from patches/08-Junction_Points/definition rename to patches/ntdll-Junction_Points/definition