From cbe4f1b4fae72a54e610725d3304fefd37aa4495 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 12 Oct 2008 18:29:36 +0200 Subject: [PATCH] Move zlib to top-level root. --- {source4/lib => lib}/zlib/ChangeLog | 0 {source4/lib => lib}/zlib/FAQ | 0 {source4/lib => lib}/zlib/INDEX | 0 {source4/lib => lib}/zlib/Makefile | 0 {source4/lib => lib}/zlib/Makefile.in | 0 {source4/lib => lib}/zlib/README | 0 {source4/lib => lib}/zlib/adler32.c | 0 {source4/lib => lib}/zlib/algorithm.txt | 0 {source4/lib => lib}/zlib/amiga/Makefile.pup | 0 {source4/lib => lib}/zlib/amiga/Makefile.sas | 0 {source4/lib => lib}/zlib/as400/bndsrc | 0 {source4/lib => lib}/zlib/as400/compile.clp | 0 {source4/lib => lib}/zlib/as400/readme.txt | 0 {source4/lib => lib}/zlib/as400/zlib.inc | 0 {source4/lib => lib}/zlib/compress.c | 0 {source4/lib => lib}/zlib/contrib/README.contrib | 0 .../lib => lib}/zlib/contrib/ada/buffer_demo.adb | 0 {source4/lib => lib}/zlib/contrib/ada/mtest.adb | 0 {source4/lib => lib}/zlib/contrib/ada/read.adb | 0 {source4/lib => lib}/zlib/contrib/ada/readme.txt | 0 {source4/lib => lib}/zlib/contrib/ada/test.adb | 0 .../zlib/contrib/ada/zlib-streams.adb | 0 .../zlib/contrib/ada/zlib-streams.ads | 0 .../lib => lib}/zlib/contrib/ada/zlib-thin.adb | 0 .../lib => lib}/zlib/contrib/ada/zlib-thin.ads | 0 {source4/lib => lib}/zlib/contrib/ada/zlib.adb | 0 {source4/lib => lib}/zlib/contrib/ada/zlib.ads | 0 {source4/lib => lib}/zlib/contrib/ada/zlib.gpr | 0 .../lib => lib}/zlib/contrib/asm586/README.586 | 0 {source4/lib => lib}/zlib/contrib/asm586/match.S | 0 .../lib => lib}/zlib/contrib/asm686/README.686 | 0 {source4/lib => lib}/zlib/contrib/asm686/match.S | 0 {source4/lib => lib}/zlib/contrib/blast/Makefile | 0 {source4/lib => lib}/zlib/contrib/blast/README | 0 {source4/lib => lib}/zlib/contrib/blast/blast.c | 0 {source4/lib => lib}/zlib/contrib/blast/blast.h | 0 {source4/lib => lib}/zlib/contrib/blast/test.pk | Bin {source4/lib => lib}/zlib/contrib/blast/test.txt | 0 .../lib => lib}/zlib/contrib/delphi/ZLib.pas | 0 .../zlib/contrib/delphi/ZLibConst.pas | 0 .../lib => lib}/zlib/contrib/delphi/readme.txt | 0 .../lib => lib}/zlib/contrib/delphi/zlibd32.mak | 0 .../zlib/contrib/dotzlib/DotZLib.build | 0 .../lib => lib}/zlib/contrib/dotzlib/DotZLib.chm | Bin .../lib => lib}/zlib/contrib/dotzlib/DotZLib.sln | 0 .../zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs | 0 .../zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs | 0 .../contrib/dotzlib/DotZLib/CircularBuffer.cs | 0 .../zlib/contrib/dotzlib/DotZLib/CodecBase.cs | 0 .../zlib/contrib/dotzlib/DotZLib/Deflater.cs | 0 .../zlib/contrib/dotzlib/DotZLib/DotZLib.cs | 0 .../zlib/contrib/dotzlib/DotZLib/DotZLib.csproj | 0 .../zlib/contrib/dotzlib/DotZLib/GZipStream.cs | 0 .../zlib/contrib/dotzlib/DotZLib/Inflater.cs | 0 .../zlib/contrib/dotzlib/DotZLib/UnitTests.cs | 0 .../zlib/contrib/dotzlib/LICENSE_1_0.txt | 0 .../lib => lib}/zlib/contrib/dotzlib/readme.txt | 0 .../lib => lib}/zlib/contrib/infback9/README | 0 .../lib => lib}/zlib/contrib/infback9/infback9.c | 0 .../lib => lib}/zlib/contrib/infback9/infback9.h | 0 .../lib => lib}/zlib/contrib/infback9/inffix9.h | 0 .../lib => lib}/zlib/contrib/infback9/inflate9.h | 0 .../lib => lib}/zlib/contrib/infback9/inftree9.c | 0 .../lib => lib}/zlib/contrib/infback9/inftree9.h | 0 .../zlib/contrib/inflate86/inffas86.c | 0 .../lib => lib}/zlib/contrib/inflate86/inffast.S | 0 .../lib => lib}/zlib/contrib/iostream/test.cpp | 0 .../zlib/contrib/iostream/zfstream.cpp | 0 .../lib => lib}/zlib/contrib/iostream/zfstream.h | 0 .../lib => lib}/zlib/contrib/iostream2/zstream.h | 0 .../zlib/contrib/iostream2/zstream_test.cpp | 0 .../lib => lib}/zlib/contrib/iostream3/README | 0 {source4/lib => lib}/zlib/contrib/iostream3/TODO | 0 .../lib => lib}/zlib/contrib/iostream3/test.cc | 0 .../zlib/contrib/iostream3/zfstream.cc | 0 .../zlib/contrib/iostream3/zfstream.h | 0 .../lib => lib}/zlib/contrib/masm686/match.asm | 0 .../zlib/contrib/masmx64/bld_ml64.bat | 0 .../lib => lib}/zlib/contrib/masmx64/gvmat64.asm | 0 .../lib => lib}/zlib/contrib/masmx64/gvmat64.obj | Bin .../zlib/contrib/masmx64/inffas8664.c | 0 .../zlib/contrib/masmx64/inffasx64.asm | 0 .../zlib/contrib/masmx64/inffasx64.obj | Bin .../lib => lib}/zlib/contrib/masmx64/readme.txt | 0 .../zlib/contrib/masmx86/bld_ml32.bat | 0 .../lib => lib}/zlib/contrib/masmx86/gvmat32.asm | 0 .../lib => lib}/zlib/contrib/masmx86/gvmat32.obj | Bin .../lib => lib}/zlib/contrib/masmx86/gvmat32c.c | 0 .../zlib/contrib/masmx86/inffas32.asm | 0 .../zlib/contrib/masmx86/inffas32.obj | Bin .../lib => lib}/zlib/contrib/masmx86/mkasm.bat | 0 .../lib => lib}/zlib/contrib/masmx86/readme.txt | 0 .../zlib/contrib/minizip/ChangeLogUnzip | 0 .../lib => lib}/zlib/contrib/minizip/Makefile | 0 .../lib => lib}/zlib/contrib/minizip/crypt.h | 0 .../lib => lib}/zlib/contrib/minizip/ioapi.c | 0 .../lib => lib}/zlib/contrib/minizip/ioapi.h | 0 .../lib => lib}/zlib/contrib/minizip/iowin32.c | 0 .../lib => lib}/zlib/contrib/minizip/iowin32.h | 0 .../lib => lib}/zlib/contrib/minizip/miniunz.c | 0 .../lib => lib}/zlib/contrib/minizip/minizip.c | 0 .../lib => lib}/zlib/contrib/minizip/mztools.c | 0 .../lib => lib}/zlib/contrib/minizip/mztools.h | 0 .../lib => lib}/zlib/contrib/minizip/unzip.c | 0 .../lib => lib}/zlib/contrib/minizip/unzip.h | 0 {source4/lib => lib}/zlib/contrib/minizip/zip.c | 0 {source4/lib => lib}/zlib/contrib/minizip/zip.h | 0 .../lib => lib}/zlib/contrib/pascal/example.pas | 0 .../lib => lib}/zlib/contrib/pascal/readme.txt | 0 .../lib => lib}/zlib/contrib/pascal/zlibd32.mak | 0 .../lib => lib}/zlib/contrib/pascal/zlibpas.pas | 0 {source4/lib => lib}/zlib/contrib/puff/Makefile | 0 {source4/lib => lib}/zlib/contrib/puff/README | 0 {source4/lib => lib}/zlib/contrib/puff/puff.c | 0 {source4/lib => lib}/zlib/contrib/puff/puff.h | 0 {source4/lib => lib}/zlib/contrib/puff/zeros.raw | Bin .../lib => lib}/zlib/contrib/testzlib/testzlib.c | 0 .../zlib/contrib/testzlib/testzlib.txt | 0 {source4/lib => lib}/zlib/contrib/untgz/Makefile | 0 .../lib => lib}/zlib/contrib/untgz/Makefile.msc | 0 {source4/lib => lib}/zlib/contrib/untgz/untgz.c | 0 .../lib => lib}/zlib/contrib/vstudio/readme.txt | 0 .../zlib/contrib/vstudio/vc7/miniunz.vcproj | 0 .../zlib/contrib/vstudio/vc7/minizip.vcproj | 0 .../zlib/contrib/vstudio/vc7/testzlib.vcproj | 0 .../lib => lib}/zlib/contrib/vstudio/vc7/zlib.rc | 0 .../zlib/contrib/vstudio/vc7/zlibstat.vcproj | 0 .../zlib/contrib/vstudio/vc7/zlibvc.def | 0 .../zlib/contrib/vstudio/vc7/zlibvc.sln | 0 .../zlib/contrib/vstudio/vc7/zlibvc.vcproj | 0 .../zlib/contrib/vstudio/vc8/miniunz.vcproj | 0 .../zlib/contrib/vstudio/vc8/minizip.vcproj | 0 .../zlib/contrib/vstudio/vc8/testzlib.vcproj | 0 .../zlib/contrib/vstudio/vc8/testzlibdll.vcproj | 0 .../lib => lib}/zlib/contrib/vstudio/vc8/zlib.rc | 0 .../zlib/contrib/vstudio/vc8/zlibstat.vcproj | 0 .../zlib/contrib/vstudio/vc8/zlibvc.def | 0 .../zlib/contrib/vstudio/vc8/zlibvc.sln | 0 .../zlib/contrib/vstudio/vc8/zlibvc.vcproj | 0 {source4/lib => lib}/zlib/crc32.c | 0 {source4/lib => lib}/zlib/crc32.h | 0 {source4/lib => lib}/zlib/deflate.c | 0 {source4/lib => lib}/zlib/deflate.h | 0 {source4/lib => lib}/zlib/example.c | 0 .../lib => lib}/zlib/examples/README.examples | 0 {source4/lib => lib}/zlib/examples/fitblk.c | 0 {source4/lib => lib}/zlib/examples/gun.c | 0 {source4/lib => lib}/zlib/examples/gzappend.c | 0 {source4/lib => lib}/zlib/examples/gzjoin.c | 0 {source4/lib => lib}/zlib/examples/gzlog.c | 0 {source4/lib => lib}/zlib/examples/gzlog.h | 0 {source4/lib => lib}/zlib/examples/zlib_how.html | 0 {source4/lib => lib}/zlib/examples/zpipe.c | 0 {source4/lib => lib}/zlib/examples/zran.c | 0 {source4/lib => lib}/zlib/gzio.c | 0 {source4/lib => lib}/zlib/infback.c | 0 {source4/lib => lib}/zlib/inffast.c | 0 {source4/lib => lib}/zlib/inffast.h | 0 {source4/lib => lib}/zlib/inffixed.h | 0 {source4/lib => lib}/zlib/inflate.c | 0 {source4/lib => lib}/zlib/inflate.h | 0 {source4/lib => lib}/zlib/inftrees.c | 0 {source4/lib => lib}/zlib/inftrees.h | 0 {source4/lib => lib}/zlib/make_vms.com | 0 {source4/lib => lib}/zlib/minigzip.c | 0 {source4/lib => lib}/zlib/msdos/Makefile.bor | 0 {source4/lib => lib}/zlib/msdos/Makefile.dj2 | 0 {source4/lib => lib}/zlib/msdos/Makefile.emx | 0 {source4/lib => lib}/zlib/msdos/Makefile.msc | 0 {source4/lib => lib}/zlib/msdos/Makefile.tc | 0 {source4/lib => lib}/zlib/old/Makefile.riscos | 0 {source4/lib => lib}/zlib/old/README | 0 {source4/lib => lib}/zlib/old/descrip.mms | 0 {source4/lib => lib}/zlib/old/os2/Makefile.os2 | 0 {source4/lib => lib}/zlib/old/os2/zlib.def | 0 {source4/lib => lib}/zlib/old/visual-basic.txt | 0 {source4/lib => lib}/zlib/old/zlib.html | 0 .../lib => lib}/zlib/projects/README.projects | 0 .../zlib/projects/visualc6/README.txt | 0 .../zlib/projects/visualc6/example.dsp | 0 .../zlib/projects/visualc6/minigzip.dsp | 0 .../lib => lib}/zlib/projects/visualc6/zlib.dsp | 0 .../lib => lib}/zlib/projects/visualc6/zlib.dsw | 0 {source4/lib => lib}/zlib/qnx/package.qpg | 0 {source4/lib => lib}/zlib/trees.c | 0 {source4/lib => lib}/zlib/trees.h | 0 {source4/lib => lib}/zlib/uncompr.c | 0 {source4/lib => lib}/zlib/win32/DLL_FAQ.txt | 0 {source4/lib => lib}/zlib/win32/Makefile.bor | 0 {source4/lib => lib}/zlib/win32/Makefile.emx | 0 {source4/lib => lib}/zlib/win32/Makefile.gcc | 0 {source4/lib => lib}/zlib/win32/Makefile.msc | 0 {source4/lib => lib}/zlib/win32/VisualC.txt | 0 {source4/lib => lib}/zlib/win32/zlib.def | 0 {source4/lib => lib}/zlib/win32/zlib1.rc | 0 {source4/lib => lib}/zlib/zconf.h | 0 {source4/lib => lib}/zlib/zconf.in.h | 0 {source4/lib => lib}/zlib/zlib.h | 0 {source4/lib => lib}/zlib/zutil.c | 0 {source4/lib => lib}/zlib/zutil.h | 0 source3/samba4.mk | 2 +- source3/torture/torture.c | 15 +++------------ source4/Makefile | 2 +- 203 files changed, 5 insertions(+), 14 deletions(-) rename {source4/lib => lib}/zlib/ChangeLog (100%) rename {source4/lib => lib}/zlib/FAQ (100%) rename {source4/lib => lib}/zlib/INDEX (100%) rename {source4/lib => lib}/zlib/Makefile (100%) rename {source4/lib => lib}/zlib/Makefile.in (100%) rename {source4/lib => lib}/zlib/README (100%) rename {source4/lib => lib}/zlib/adler32.c (100%) rename {source4/lib => lib}/zlib/algorithm.txt (100%) rename {source4/lib => lib}/zlib/amiga/Makefile.pup (100%) rename {source4/lib => lib}/zlib/amiga/Makefile.sas (100%) rename {source4/lib => lib}/zlib/as400/bndsrc (100%) rename {source4/lib => lib}/zlib/as400/compile.clp (100%) rename {source4/lib => lib}/zlib/as400/readme.txt (100%) rename {source4/lib => lib}/zlib/as400/zlib.inc (100%) rename {source4/lib => lib}/zlib/compress.c (100%) rename {source4/lib => lib}/zlib/contrib/README.contrib (100%) rename {source4/lib => lib}/zlib/contrib/ada/buffer_demo.adb (100%) rename {source4/lib => lib}/zlib/contrib/ada/mtest.adb (100%) rename {source4/lib => lib}/zlib/contrib/ada/read.adb (100%) rename {source4/lib => lib}/zlib/contrib/ada/readme.txt (100%) rename {source4/lib => lib}/zlib/contrib/ada/test.adb (100%) rename {source4/lib => lib}/zlib/contrib/ada/zlib-streams.adb (100%) rename {source4/lib => lib}/zlib/contrib/ada/zlib-streams.ads (100%) rename {source4/lib => lib}/zlib/contrib/ada/zlib-thin.adb (100%) rename {source4/lib => lib}/zlib/contrib/ada/zlib-thin.ads (100%) rename {source4/lib => lib}/zlib/contrib/ada/zlib.adb (100%) rename {source4/lib => lib}/zlib/contrib/ada/zlib.ads (100%) rename {source4/lib => lib}/zlib/contrib/ada/zlib.gpr (100%) rename {source4/lib => lib}/zlib/contrib/asm586/README.586 (100%) rename {source4/lib => lib}/zlib/contrib/asm586/match.S (100%) rename {source4/lib => lib}/zlib/contrib/asm686/README.686 (100%) rename {source4/lib => lib}/zlib/contrib/asm686/match.S (100%) rename {source4/lib => lib}/zlib/contrib/blast/Makefile (100%) rename {source4/lib => lib}/zlib/contrib/blast/README (100%) rename {source4/lib => lib}/zlib/contrib/blast/blast.c (100%) rename {source4/lib => lib}/zlib/contrib/blast/blast.h (100%) rename {source4/lib => lib}/zlib/contrib/blast/test.pk (100%) rename {source4/lib => lib}/zlib/contrib/blast/test.txt (100%) rename {source4/lib => lib}/zlib/contrib/delphi/ZLib.pas (100%) rename {source4/lib => lib}/zlib/contrib/delphi/ZLibConst.pas (100%) rename {source4/lib => lib}/zlib/contrib/delphi/readme.txt (100%) rename {source4/lib => lib}/zlib/contrib/delphi/zlibd32.mak (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib.build (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib.chm (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib.sln (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/CodecBase.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/Deflater.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/DotZLib.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/GZipStream.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/Inflater.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/DotZLib/UnitTests.cs (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/LICENSE_1_0.txt (100%) rename {source4/lib => lib}/zlib/contrib/dotzlib/readme.txt (100%) rename {source4/lib => lib}/zlib/contrib/infback9/README (100%) rename {source4/lib => lib}/zlib/contrib/infback9/infback9.c (100%) rename {source4/lib => lib}/zlib/contrib/infback9/infback9.h (100%) rename {source4/lib => lib}/zlib/contrib/infback9/inffix9.h (100%) rename {source4/lib => lib}/zlib/contrib/infback9/inflate9.h (100%) rename {source4/lib => lib}/zlib/contrib/infback9/inftree9.c (100%) rename {source4/lib => lib}/zlib/contrib/infback9/inftree9.h (100%) rename {source4/lib => lib}/zlib/contrib/inflate86/inffas86.c (100%) rename {source4/lib => lib}/zlib/contrib/inflate86/inffast.S (100%) rename {source4/lib => lib}/zlib/contrib/iostream/test.cpp (100%) rename {source4/lib => lib}/zlib/contrib/iostream/zfstream.cpp (100%) rename {source4/lib => lib}/zlib/contrib/iostream/zfstream.h (100%) rename {source4/lib => lib}/zlib/contrib/iostream2/zstream.h (100%) rename {source4/lib => lib}/zlib/contrib/iostream2/zstream_test.cpp (100%) rename {source4/lib => lib}/zlib/contrib/iostream3/README (100%) rename {source4/lib => lib}/zlib/contrib/iostream3/TODO (100%) rename {source4/lib => lib}/zlib/contrib/iostream3/test.cc (100%) rename {source4/lib => lib}/zlib/contrib/iostream3/zfstream.cc (100%) rename {source4/lib => lib}/zlib/contrib/iostream3/zfstream.h (100%) rename {source4/lib => lib}/zlib/contrib/masm686/match.asm (100%) rename {source4/lib => lib}/zlib/contrib/masmx64/bld_ml64.bat (100%) rename {source4/lib => lib}/zlib/contrib/masmx64/gvmat64.asm (100%) rename {source4/lib => lib}/zlib/contrib/masmx64/gvmat64.obj (100%) rename {source4/lib => lib}/zlib/contrib/masmx64/inffas8664.c (100%) rename {source4/lib => lib}/zlib/contrib/masmx64/inffasx64.asm (100%) rename {source4/lib => lib}/zlib/contrib/masmx64/inffasx64.obj (100%) rename {source4/lib => lib}/zlib/contrib/masmx64/readme.txt (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/bld_ml32.bat (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/gvmat32.asm (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/gvmat32.obj (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/gvmat32c.c (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/inffas32.asm (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/inffas32.obj (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/mkasm.bat (100%) rename {source4/lib => lib}/zlib/contrib/masmx86/readme.txt (100%) rename {source4/lib => lib}/zlib/contrib/minizip/ChangeLogUnzip (100%) rename {source4/lib => lib}/zlib/contrib/minizip/Makefile (100%) rename {source4/lib => lib}/zlib/contrib/minizip/crypt.h (100%) rename {source4/lib => lib}/zlib/contrib/minizip/ioapi.c (100%) rename {source4/lib => lib}/zlib/contrib/minizip/ioapi.h (100%) rename {source4/lib => lib}/zlib/contrib/minizip/iowin32.c (100%) rename {source4/lib => lib}/zlib/contrib/minizip/iowin32.h (100%) rename {source4/lib => lib}/zlib/contrib/minizip/miniunz.c (100%) rename {source4/lib => lib}/zlib/contrib/minizip/minizip.c (100%) rename {source4/lib => lib}/zlib/contrib/minizip/mztools.c (100%) rename {source4/lib => lib}/zlib/contrib/minizip/mztools.h (100%) rename {source4/lib => lib}/zlib/contrib/minizip/unzip.c (100%) rename {source4/lib => lib}/zlib/contrib/minizip/unzip.h (100%) rename {source4/lib => lib}/zlib/contrib/minizip/zip.c (100%) rename {source4/lib => lib}/zlib/contrib/minizip/zip.h (100%) rename {source4/lib => lib}/zlib/contrib/pascal/example.pas (100%) rename {source4/lib => lib}/zlib/contrib/pascal/readme.txt (100%) rename {source4/lib => lib}/zlib/contrib/pascal/zlibd32.mak (100%) rename {source4/lib => lib}/zlib/contrib/pascal/zlibpas.pas (100%) rename {source4/lib => lib}/zlib/contrib/puff/Makefile (100%) rename {source4/lib => lib}/zlib/contrib/puff/README (100%) rename {source4/lib => lib}/zlib/contrib/puff/puff.c (100%) rename {source4/lib => lib}/zlib/contrib/puff/puff.h (100%) rename {source4/lib => lib}/zlib/contrib/puff/zeros.raw (100%) rename {source4/lib => lib}/zlib/contrib/testzlib/testzlib.c (100%) rename {source4/lib => lib}/zlib/contrib/testzlib/testzlib.txt (100%) rename {source4/lib => lib}/zlib/contrib/untgz/Makefile (100%) rename {source4/lib => lib}/zlib/contrib/untgz/Makefile.msc (100%) rename {source4/lib => lib}/zlib/contrib/untgz/untgz.c (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/readme.txt (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/miniunz.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/minizip.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/testzlib.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/zlib.rc (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/zlibstat.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/zlibvc.def (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/zlibvc.sln (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc7/zlibvc.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/miniunz.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/minizip.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/testzlib.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/testzlibdll.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/zlib.rc (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/zlibstat.vcproj (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/zlibvc.def (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/zlibvc.sln (100%) rename {source4/lib => lib}/zlib/contrib/vstudio/vc8/zlibvc.vcproj (100%) rename {source4/lib => lib}/zlib/crc32.c (100%) rename {source4/lib => lib}/zlib/crc32.h (100%) rename {source4/lib => lib}/zlib/deflate.c (100%) rename {source4/lib => lib}/zlib/deflate.h (100%) rename {source4/lib => lib}/zlib/example.c (100%) rename {source4/lib => lib}/zlib/examples/README.examples (100%) rename {source4/lib => lib}/zlib/examples/fitblk.c (100%) rename {source4/lib => lib}/zlib/examples/gun.c (100%) rename {source4/lib => lib}/zlib/examples/gzappend.c (100%) rename {source4/lib => lib}/zlib/examples/gzjoin.c (100%) rename {source4/lib => lib}/zlib/examples/gzlog.c (100%) rename {source4/lib => lib}/zlib/examples/gzlog.h (100%) rename {source4/lib => lib}/zlib/examples/zlib_how.html (100%) rename {source4/lib => lib}/zlib/examples/zpipe.c (100%) rename {source4/lib => lib}/zlib/examples/zran.c (100%) rename {source4/lib => lib}/zlib/gzio.c (100%) rename {source4/lib => lib}/zlib/infback.c (100%) rename {source4/lib => lib}/zlib/inffast.c (100%) rename {source4/lib => lib}/zlib/inffast.h (100%) rename {source4/lib => lib}/zlib/inffixed.h (100%) rename {source4/lib => lib}/zlib/inflate.c (100%) rename {source4/lib => lib}/zlib/inflate.h (100%) rename {source4/lib => lib}/zlib/inftrees.c (100%) rename {source4/lib => lib}/zlib/inftrees.h (100%) rename {source4/lib => lib}/zlib/make_vms.com (100%) rename {source4/lib => lib}/zlib/minigzip.c (100%) rename {source4/lib => lib}/zlib/msdos/Makefile.bor (100%) rename {source4/lib => lib}/zlib/msdos/Makefile.dj2 (100%) rename {source4/lib => lib}/zlib/msdos/Makefile.emx (100%) rename {source4/lib => lib}/zlib/msdos/Makefile.msc (100%) rename {source4/lib => lib}/zlib/msdos/Makefile.tc (100%) rename {source4/lib => lib}/zlib/old/Makefile.riscos (100%) rename {source4/lib => lib}/zlib/old/README (100%) rename {source4/lib => lib}/zlib/old/descrip.mms (100%) rename {source4/lib => lib}/zlib/old/os2/Makefile.os2 (100%) rename {source4/lib => lib}/zlib/old/os2/zlib.def (100%) rename {source4/lib => lib}/zlib/old/visual-basic.txt (100%) rename {source4/lib => lib}/zlib/old/zlib.html (100%) rename {source4/lib => lib}/zlib/projects/README.projects (100%) rename {source4/lib => lib}/zlib/projects/visualc6/README.txt (100%) rename {source4/lib => lib}/zlib/projects/visualc6/example.dsp (100%) rename {source4/lib => lib}/zlib/projects/visualc6/minigzip.dsp (100%) rename {source4/lib => lib}/zlib/projects/visualc6/zlib.dsp (100%) rename {source4/lib => lib}/zlib/projects/visualc6/zlib.dsw (100%) rename {source4/lib => lib}/zlib/qnx/package.qpg (100%) rename {source4/lib => lib}/zlib/trees.c (100%) rename {source4/lib => lib}/zlib/trees.h (100%) rename {source4/lib => lib}/zlib/uncompr.c (100%) rename {source4/lib => lib}/zlib/win32/DLL_FAQ.txt (100%) rename {source4/lib => lib}/zlib/win32/Makefile.bor (100%) rename {source4/lib => lib}/zlib/win32/Makefile.emx (100%) rename {source4/lib => lib}/zlib/win32/Makefile.gcc (100%) rename {source4/lib => lib}/zlib/win32/Makefile.msc (100%) rename {source4/lib => lib}/zlib/win32/VisualC.txt (100%) rename {source4/lib => lib}/zlib/win32/zlib.def (100%) rename {source4/lib => lib}/zlib/win32/zlib1.rc (100%) rename {source4/lib => lib}/zlib/zconf.h (100%) rename {source4/lib => lib}/zlib/zconf.in.h (100%) rename {source4/lib => lib}/zlib/zlib.h (100%) rename {source4/lib => lib}/zlib/zutil.c (100%) rename {source4/lib => lib}/zlib/zutil.h (100%) diff --git a/source4/lib/zlib/ChangeLog b/lib/zlib/ChangeLog similarity index 100% rename from source4/lib/zlib/ChangeLog rename to lib/zlib/ChangeLog diff --git a/source4/lib/zlib/FAQ b/lib/zlib/FAQ similarity index 100% rename from source4/lib/zlib/FAQ rename to lib/zlib/FAQ diff --git a/source4/lib/zlib/INDEX b/lib/zlib/INDEX similarity index 100% rename from source4/lib/zlib/INDEX rename to lib/zlib/INDEX diff --git a/source4/lib/zlib/Makefile b/lib/zlib/Makefile similarity index 100% rename from source4/lib/zlib/Makefile rename to lib/zlib/Makefile diff --git a/source4/lib/zlib/Makefile.in b/lib/zlib/Makefile.in similarity index 100% rename from source4/lib/zlib/Makefile.in rename to lib/zlib/Makefile.in diff --git a/source4/lib/zlib/README b/lib/zlib/README similarity index 100% rename from source4/lib/zlib/README rename to lib/zlib/README diff --git a/source4/lib/zlib/adler32.c b/lib/zlib/adler32.c similarity index 100% rename from source4/lib/zlib/adler32.c rename to lib/zlib/adler32.c diff --git a/source4/lib/zlib/algorithm.txt b/lib/zlib/algorithm.txt similarity index 100% rename from source4/lib/zlib/algorithm.txt rename to lib/zlib/algorithm.txt diff --git a/source4/lib/zlib/amiga/Makefile.pup b/lib/zlib/amiga/Makefile.pup similarity index 100% rename from source4/lib/zlib/amiga/Makefile.pup rename to lib/zlib/amiga/Makefile.pup diff --git a/source4/lib/zlib/amiga/Makefile.sas b/lib/zlib/amiga/Makefile.sas similarity index 100% rename from source4/lib/zlib/amiga/Makefile.sas rename to lib/zlib/amiga/Makefile.sas diff --git a/source4/lib/zlib/as400/bndsrc b/lib/zlib/as400/bndsrc similarity index 100% rename from source4/lib/zlib/as400/bndsrc rename to lib/zlib/as400/bndsrc diff --git a/source4/lib/zlib/as400/compile.clp b/lib/zlib/as400/compile.clp similarity index 100% rename from source4/lib/zlib/as400/compile.clp rename to lib/zlib/as400/compile.clp diff --git a/source4/lib/zlib/as400/readme.txt b/lib/zlib/as400/readme.txt similarity index 100% rename from source4/lib/zlib/as400/readme.txt rename to lib/zlib/as400/readme.txt diff --git a/source4/lib/zlib/as400/zlib.inc b/lib/zlib/as400/zlib.inc similarity index 100% rename from source4/lib/zlib/as400/zlib.inc rename to lib/zlib/as400/zlib.inc diff --git a/source4/lib/zlib/compress.c b/lib/zlib/compress.c similarity index 100% rename from source4/lib/zlib/compress.c rename to lib/zlib/compress.c diff --git a/source4/lib/zlib/contrib/README.contrib b/lib/zlib/contrib/README.contrib similarity index 100% rename from source4/lib/zlib/contrib/README.contrib rename to lib/zlib/contrib/README.contrib diff --git a/source4/lib/zlib/contrib/ada/buffer_demo.adb b/lib/zlib/contrib/ada/buffer_demo.adb similarity index 100% rename from source4/lib/zlib/contrib/ada/buffer_demo.adb rename to lib/zlib/contrib/ada/buffer_demo.adb diff --git a/source4/lib/zlib/contrib/ada/mtest.adb b/lib/zlib/contrib/ada/mtest.adb similarity index 100% rename from source4/lib/zlib/contrib/ada/mtest.adb rename to lib/zlib/contrib/ada/mtest.adb diff --git a/source4/lib/zlib/contrib/ada/read.adb b/lib/zlib/contrib/ada/read.adb similarity index 100% rename from source4/lib/zlib/contrib/ada/read.adb rename to lib/zlib/contrib/ada/read.adb diff --git a/source4/lib/zlib/contrib/ada/readme.txt b/lib/zlib/contrib/ada/readme.txt similarity index 100% rename from source4/lib/zlib/contrib/ada/readme.txt rename to lib/zlib/contrib/ada/readme.txt diff --git a/source4/lib/zlib/contrib/ada/test.adb b/lib/zlib/contrib/ada/test.adb similarity index 100% rename from source4/lib/zlib/contrib/ada/test.adb rename to lib/zlib/contrib/ada/test.adb diff --git a/source4/lib/zlib/contrib/ada/zlib-streams.adb b/lib/zlib/contrib/ada/zlib-streams.adb similarity index 100% rename from source4/lib/zlib/contrib/ada/zlib-streams.adb rename to lib/zlib/contrib/ada/zlib-streams.adb diff --git a/source4/lib/zlib/contrib/ada/zlib-streams.ads b/lib/zlib/contrib/ada/zlib-streams.ads similarity index 100% rename from source4/lib/zlib/contrib/ada/zlib-streams.ads rename to lib/zlib/contrib/ada/zlib-streams.ads diff --git a/source4/lib/zlib/contrib/ada/zlib-thin.adb b/lib/zlib/contrib/ada/zlib-thin.adb similarity index 100% rename from source4/lib/zlib/contrib/ada/zlib-thin.adb rename to lib/zlib/contrib/ada/zlib-thin.adb diff --git a/source4/lib/zlib/contrib/ada/zlib-thin.ads b/lib/zlib/contrib/ada/zlib-thin.ads similarity index 100% rename from source4/lib/zlib/contrib/ada/zlib-thin.ads rename to lib/zlib/contrib/ada/zlib-thin.ads diff --git a/source4/lib/zlib/contrib/ada/zlib.adb b/lib/zlib/contrib/ada/zlib.adb similarity index 100% rename from source4/lib/zlib/contrib/ada/zlib.adb rename to lib/zlib/contrib/ada/zlib.adb diff --git a/source4/lib/zlib/contrib/ada/zlib.ads b/lib/zlib/contrib/ada/zlib.ads similarity index 100% rename from source4/lib/zlib/contrib/ada/zlib.ads rename to lib/zlib/contrib/ada/zlib.ads diff --git a/source4/lib/zlib/contrib/ada/zlib.gpr b/lib/zlib/contrib/ada/zlib.gpr similarity index 100% rename from source4/lib/zlib/contrib/ada/zlib.gpr rename to lib/zlib/contrib/ada/zlib.gpr diff --git a/source4/lib/zlib/contrib/asm586/README.586 b/lib/zlib/contrib/asm586/README.586 similarity index 100% rename from source4/lib/zlib/contrib/asm586/README.586 rename to lib/zlib/contrib/asm586/README.586 diff --git a/source4/lib/zlib/contrib/asm586/match.S b/lib/zlib/contrib/asm586/match.S similarity index 100% rename from source4/lib/zlib/contrib/asm586/match.S rename to lib/zlib/contrib/asm586/match.S diff --git a/source4/lib/zlib/contrib/asm686/README.686 b/lib/zlib/contrib/asm686/README.686 similarity index 100% rename from source4/lib/zlib/contrib/asm686/README.686 rename to lib/zlib/contrib/asm686/README.686 diff --git a/source4/lib/zlib/contrib/asm686/match.S b/lib/zlib/contrib/asm686/match.S similarity index 100% rename from source4/lib/zlib/contrib/asm686/match.S rename to lib/zlib/contrib/asm686/match.S diff --git a/source4/lib/zlib/contrib/blast/Makefile b/lib/zlib/contrib/blast/Makefile similarity index 100% rename from source4/lib/zlib/contrib/blast/Makefile rename to lib/zlib/contrib/blast/Makefile diff --git a/source4/lib/zlib/contrib/blast/README b/lib/zlib/contrib/blast/README similarity index 100% rename from source4/lib/zlib/contrib/blast/README rename to lib/zlib/contrib/blast/README diff --git a/source4/lib/zlib/contrib/blast/blast.c b/lib/zlib/contrib/blast/blast.c similarity index 100% rename from source4/lib/zlib/contrib/blast/blast.c rename to lib/zlib/contrib/blast/blast.c diff --git a/source4/lib/zlib/contrib/blast/blast.h b/lib/zlib/contrib/blast/blast.h similarity index 100% rename from source4/lib/zlib/contrib/blast/blast.h rename to lib/zlib/contrib/blast/blast.h diff --git a/source4/lib/zlib/contrib/blast/test.pk b/lib/zlib/contrib/blast/test.pk similarity index 100% rename from source4/lib/zlib/contrib/blast/test.pk rename to lib/zlib/contrib/blast/test.pk diff --git a/source4/lib/zlib/contrib/blast/test.txt b/lib/zlib/contrib/blast/test.txt similarity index 100% rename from source4/lib/zlib/contrib/blast/test.txt rename to lib/zlib/contrib/blast/test.txt diff --git a/source4/lib/zlib/contrib/delphi/ZLib.pas b/lib/zlib/contrib/delphi/ZLib.pas similarity index 100% rename from source4/lib/zlib/contrib/delphi/ZLib.pas rename to lib/zlib/contrib/delphi/ZLib.pas diff --git a/source4/lib/zlib/contrib/delphi/ZLibConst.pas b/lib/zlib/contrib/delphi/ZLibConst.pas similarity index 100% rename from source4/lib/zlib/contrib/delphi/ZLibConst.pas rename to lib/zlib/contrib/delphi/ZLibConst.pas diff --git a/source4/lib/zlib/contrib/delphi/readme.txt b/lib/zlib/contrib/delphi/readme.txt similarity index 100% rename from source4/lib/zlib/contrib/delphi/readme.txt rename to lib/zlib/contrib/delphi/readme.txt diff --git a/source4/lib/zlib/contrib/delphi/zlibd32.mak b/lib/zlib/contrib/delphi/zlibd32.mak similarity index 100% rename from source4/lib/zlib/contrib/delphi/zlibd32.mak rename to lib/zlib/contrib/delphi/zlibd32.mak diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib.build b/lib/zlib/contrib/dotzlib/DotZLib.build similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib.build rename to lib/zlib/contrib/dotzlib/DotZLib.build diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib.chm b/lib/zlib/contrib/dotzlib/DotZLib.chm similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib.chm rename to lib/zlib/contrib/dotzlib/DotZLib.chm diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib.sln b/lib/zlib/contrib/dotzlib/DotZLib.sln similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib.sln rename to lib/zlib/contrib/dotzlib/DotZLib.sln diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs rename to lib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs rename to lib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs rename to lib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs rename to lib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs rename to lib/zlib/contrib/dotzlib/DotZLib/Deflater.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs rename to lib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj b/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj rename to lib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs rename to lib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs rename to lib/zlib/contrib/dotzlib/DotZLib/Inflater.cs diff --git a/source4/lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs rename to lib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs diff --git a/source4/lib/zlib/contrib/dotzlib/LICENSE_1_0.txt b/lib/zlib/contrib/dotzlib/LICENSE_1_0.txt similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/LICENSE_1_0.txt rename to lib/zlib/contrib/dotzlib/LICENSE_1_0.txt diff --git a/source4/lib/zlib/contrib/dotzlib/readme.txt b/lib/zlib/contrib/dotzlib/readme.txt similarity index 100% rename from source4/lib/zlib/contrib/dotzlib/readme.txt rename to lib/zlib/contrib/dotzlib/readme.txt diff --git a/source4/lib/zlib/contrib/infback9/README b/lib/zlib/contrib/infback9/README similarity index 100% rename from source4/lib/zlib/contrib/infback9/README rename to lib/zlib/contrib/infback9/README diff --git a/source4/lib/zlib/contrib/infback9/infback9.c b/lib/zlib/contrib/infback9/infback9.c similarity index 100% rename from source4/lib/zlib/contrib/infback9/infback9.c rename to lib/zlib/contrib/infback9/infback9.c diff --git a/source4/lib/zlib/contrib/infback9/infback9.h b/lib/zlib/contrib/infback9/infback9.h similarity index 100% rename from source4/lib/zlib/contrib/infback9/infback9.h rename to lib/zlib/contrib/infback9/infback9.h diff --git a/source4/lib/zlib/contrib/infback9/inffix9.h b/lib/zlib/contrib/infback9/inffix9.h similarity index 100% rename from source4/lib/zlib/contrib/infback9/inffix9.h rename to lib/zlib/contrib/infback9/inffix9.h diff --git a/source4/lib/zlib/contrib/infback9/inflate9.h b/lib/zlib/contrib/infback9/inflate9.h similarity index 100% rename from source4/lib/zlib/contrib/infback9/inflate9.h rename to lib/zlib/contrib/infback9/inflate9.h diff --git a/source4/lib/zlib/contrib/infback9/inftree9.c b/lib/zlib/contrib/infback9/inftree9.c similarity index 100% rename from source4/lib/zlib/contrib/infback9/inftree9.c rename to lib/zlib/contrib/infback9/inftree9.c diff --git a/source4/lib/zlib/contrib/infback9/inftree9.h b/lib/zlib/contrib/infback9/inftree9.h similarity index 100% rename from source4/lib/zlib/contrib/infback9/inftree9.h rename to lib/zlib/contrib/infback9/inftree9.h diff --git a/source4/lib/zlib/contrib/inflate86/inffas86.c b/lib/zlib/contrib/inflate86/inffas86.c similarity index 100% rename from source4/lib/zlib/contrib/inflate86/inffas86.c rename to lib/zlib/contrib/inflate86/inffas86.c diff --git a/source4/lib/zlib/contrib/inflate86/inffast.S b/lib/zlib/contrib/inflate86/inffast.S similarity index 100% rename from source4/lib/zlib/contrib/inflate86/inffast.S rename to lib/zlib/contrib/inflate86/inffast.S diff --git a/source4/lib/zlib/contrib/iostream/test.cpp b/lib/zlib/contrib/iostream/test.cpp similarity index 100% rename from source4/lib/zlib/contrib/iostream/test.cpp rename to lib/zlib/contrib/iostream/test.cpp diff --git a/source4/lib/zlib/contrib/iostream/zfstream.cpp b/lib/zlib/contrib/iostream/zfstream.cpp similarity index 100% rename from source4/lib/zlib/contrib/iostream/zfstream.cpp rename to lib/zlib/contrib/iostream/zfstream.cpp diff --git a/source4/lib/zlib/contrib/iostream/zfstream.h b/lib/zlib/contrib/iostream/zfstream.h similarity index 100% rename from source4/lib/zlib/contrib/iostream/zfstream.h rename to lib/zlib/contrib/iostream/zfstream.h diff --git a/source4/lib/zlib/contrib/iostream2/zstream.h b/lib/zlib/contrib/iostream2/zstream.h similarity index 100% rename from source4/lib/zlib/contrib/iostream2/zstream.h rename to lib/zlib/contrib/iostream2/zstream.h diff --git a/source4/lib/zlib/contrib/iostream2/zstream_test.cpp b/lib/zlib/contrib/iostream2/zstream_test.cpp similarity index 100% rename from source4/lib/zlib/contrib/iostream2/zstream_test.cpp rename to lib/zlib/contrib/iostream2/zstream_test.cpp diff --git a/source4/lib/zlib/contrib/iostream3/README b/lib/zlib/contrib/iostream3/README similarity index 100% rename from source4/lib/zlib/contrib/iostream3/README rename to lib/zlib/contrib/iostream3/README diff --git a/source4/lib/zlib/contrib/iostream3/TODO b/lib/zlib/contrib/iostream3/TODO similarity index 100% rename from source4/lib/zlib/contrib/iostream3/TODO rename to lib/zlib/contrib/iostream3/TODO diff --git a/source4/lib/zlib/contrib/iostream3/test.cc b/lib/zlib/contrib/iostream3/test.cc similarity index 100% rename from source4/lib/zlib/contrib/iostream3/test.cc rename to lib/zlib/contrib/iostream3/test.cc diff --git a/source4/lib/zlib/contrib/iostream3/zfstream.cc b/lib/zlib/contrib/iostream3/zfstream.cc similarity index 100% rename from source4/lib/zlib/contrib/iostream3/zfstream.cc rename to lib/zlib/contrib/iostream3/zfstream.cc diff --git a/source4/lib/zlib/contrib/iostream3/zfstream.h b/lib/zlib/contrib/iostream3/zfstream.h similarity index 100% rename from source4/lib/zlib/contrib/iostream3/zfstream.h rename to lib/zlib/contrib/iostream3/zfstream.h diff --git a/source4/lib/zlib/contrib/masm686/match.asm b/lib/zlib/contrib/masm686/match.asm similarity index 100% rename from source4/lib/zlib/contrib/masm686/match.asm rename to lib/zlib/contrib/masm686/match.asm diff --git a/source4/lib/zlib/contrib/masmx64/bld_ml64.bat b/lib/zlib/contrib/masmx64/bld_ml64.bat similarity index 100% rename from source4/lib/zlib/contrib/masmx64/bld_ml64.bat rename to lib/zlib/contrib/masmx64/bld_ml64.bat diff --git a/source4/lib/zlib/contrib/masmx64/gvmat64.asm b/lib/zlib/contrib/masmx64/gvmat64.asm similarity index 100% rename from source4/lib/zlib/contrib/masmx64/gvmat64.asm rename to lib/zlib/contrib/masmx64/gvmat64.asm diff --git a/source4/lib/zlib/contrib/masmx64/gvmat64.obj b/lib/zlib/contrib/masmx64/gvmat64.obj similarity index 100% rename from source4/lib/zlib/contrib/masmx64/gvmat64.obj rename to lib/zlib/contrib/masmx64/gvmat64.obj diff --git a/source4/lib/zlib/contrib/masmx64/inffas8664.c b/lib/zlib/contrib/masmx64/inffas8664.c similarity index 100% rename from source4/lib/zlib/contrib/masmx64/inffas8664.c rename to lib/zlib/contrib/masmx64/inffas8664.c diff --git a/source4/lib/zlib/contrib/masmx64/inffasx64.asm b/lib/zlib/contrib/masmx64/inffasx64.asm similarity index 100% rename from source4/lib/zlib/contrib/masmx64/inffasx64.asm rename to lib/zlib/contrib/masmx64/inffasx64.asm diff --git a/source4/lib/zlib/contrib/masmx64/inffasx64.obj b/lib/zlib/contrib/masmx64/inffasx64.obj similarity index 100% rename from source4/lib/zlib/contrib/masmx64/inffasx64.obj rename to lib/zlib/contrib/masmx64/inffasx64.obj diff --git a/source4/lib/zlib/contrib/masmx64/readme.txt b/lib/zlib/contrib/masmx64/readme.txt similarity index 100% rename from source4/lib/zlib/contrib/masmx64/readme.txt rename to lib/zlib/contrib/masmx64/readme.txt diff --git a/source4/lib/zlib/contrib/masmx86/bld_ml32.bat b/lib/zlib/contrib/masmx86/bld_ml32.bat similarity index 100% rename from source4/lib/zlib/contrib/masmx86/bld_ml32.bat rename to lib/zlib/contrib/masmx86/bld_ml32.bat diff --git a/source4/lib/zlib/contrib/masmx86/gvmat32.asm b/lib/zlib/contrib/masmx86/gvmat32.asm similarity index 100% rename from source4/lib/zlib/contrib/masmx86/gvmat32.asm rename to lib/zlib/contrib/masmx86/gvmat32.asm diff --git a/source4/lib/zlib/contrib/masmx86/gvmat32.obj b/lib/zlib/contrib/masmx86/gvmat32.obj similarity index 100% rename from source4/lib/zlib/contrib/masmx86/gvmat32.obj rename to lib/zlib/contrib/masmx86/gvmat32.obj diff --git a/source4/lib/zlib/contrib/masmx86/gvmat32c.c b/lib/zlib/contrib/masmx86/gvmat32c.c similarity index 100% rename from source4/lib/zlib/contrib/masmx86/gvmat32c.c rename to lib/zlib/contrib/masmx86/gvmat32c.c diff --git a/source4/lib/zlib/contrib/masmx86/inffas32.asm b/lib/zlib/contrib/masmx86/inffas32.asm similarity index 100% rename from source4/lib/zlib/contrib/masmx86/inffas32.asm rename to lib/zlib/contrib/masmx86/inffas32.asm diff --git a/source4/lib/zlib/contrib/masmx86/inffas32.obj b/lib/zlib/contrib/masmx86/inffas32.obj similarity index 100% rename from source4/lib/zlib/contrib/masmx86/inffas32.obj rename to lib/zlib/contrib/masmx86/inffas32.obj diff --git a/source4/lib/zlib/contrib/masmx86/mkasm.bat b/lib/zlib/contrib/masmx86/mkasm.bat similarity index 100% rename from source4/lib/zlib/contrib/masmx86/mkasm.bat rename to lib/zlib/contrib/masmx86/mkasm.bat diff --git a/source4/lib/zlib/contrib/masmx86/readme.txt b/lib/zlib/contrib/masmx86/readme.txt similarity index 100% rename from source4/lib/zlib/contrib/masmx86/readme.txt rename to lib/zlib/contrib/masmx86/readme.txt diff --git a/source4/lib/zlib/contrib/minizip/ChangeLogUnzip b/lib/zlib/contrib/minizip/ChangeLogUnzip similarity index 100% rename from source4/lib/zlib/contrib/minizip/ChangeLogUnzip rename to lib/zlib/contrib/minizip/ChangeLogUnzip diff --git a/source4/lib/zlib/contrib/minizip/Makefile b/lib/zlib/contrib/minizip/Makefile similarity index 100% rename from source4/lib/zlib/contrib/minizip/Makefile rename to lib/zlib/contrib/minizip/Makefile diff --git a/source4/lib/zlib/contrib/minizip/crypt.h b/lib/zlib/contrib/minizip/crypt.h similarity index 100% rename from source4/lib/zlib/contrib/minizip/crypt.h rename to lib/zlib/contrib/minizip/crypt.h diff --git a/source4/lib/zlib/contrib/minizip/ioapi.c b/lib/zlib/contrib/minizip/ioapi.c similarity index 100% rename from source4/lib/zlib/contrib/minizip/ioapi.c rename to lib/zlib/contrib/minizip/ioapi.c diff --git a/source4/lib/zlib/contrib/minizip/ioapi.h b/lib/zlib/contrib/minizip/ioapi.h similarity index 100% rename from source4/lib/zlib/contrib/minizip/ioapi.h rename to lib/zlib/contrib/minizip/ioapi.h diff --git a/source4/lib/zlib/contrib/minizip/iowin32.c b/lib/zlib/contrib/minizip/iowin32.c similarity index 100% rename from source4/lib/zlib/contrib/minizip/iowin32.c rename to lib/zlib/contrib/minizip/iowin32.c diff --git a/source4/lib/zlib/contrib/minizip/iowin32.h b/lib/zlib/contrib/minizip/iowin32.h similarity index 100% rename from source4/lib/zlib/contrib/minizip/iowin32.h rename to lib/zlib/contrib/minizip/iowin32.h diff --git a/source4/lib/zlib/contrib/minizip/miniunz.c b/lib/zlib/contrib/minizip/miniunz.c similarity index 100% rename from source4/lib/zlib/contrib/minizip/miniunz.c rename to lib/zlib/contrib/minizip/miniunz.c diff --git a/source4/lib/zlib/contrib/minizip/minizip.c b/lib/zlib/contrib/minizip/minizip.c similarity index 100% rename from source4/lib/zlib/contrib/minizip/minizip.c rename to lib/zlib/contrib/minizip/minizip.c diff --git a/source4/lib/zlib/contrib/minizip/mztools.c b/lib/zlib/contrib/minizip/mztools.c similarity index 100% rename from source4/lib/zlib/contrib/minizip/mztools.c rename to lib/zlib/contrib/minizip/mztools.c diff --git a/source4/lib/zlib/contrib/minizip/mztools.h b/lib/zlib/contrib/minizip/mztools.h similarity index 100% rename from source4/lib/zlib/contrib/minizip/mztools.h rename to lib/zlib/contrib/minizip/mztools.h diff --git a/source4/lib/zlib/contrib/minizip/unzip.c b/lib/zlib/contrib/minizip/unzip.c similarity index 100% rename from source4/lib/zlib/contrib/minizip/unzip.c rename to lib/zlib/contrib/minizip/unzip.c diff --git a/source4/lib/zlib/contrib/minizip/unzip.h b/lib/zlib/contrib/minizip/unzip.h similarity index 100% rename from source4/lib/zlib/contrib/minizip/unzip.h rename to lib/zlib/contrib/minizip/unzip.h diff --git a/source4/lib/zlib/contrib/minizip/zip.c b/lib/zlib/contrib/minizip/zip.c similarity index 100% rename from source4/lib/zlib/contrib/minizip/zip.c rename to lib/zlib/contrib/minizip/zip.c diff --git a/source4/lib/zlib/contrib/minizip/zip.h b/lib/zlib/contrib/minizip/zip.h similarity index 100% rename from source4/lib/zlib/contrib/minizip/zip.h rename to lib/zlib/contrib/minizip/zip.h diff --git a/source4/lib/zlib/contrib/pascal/example.pas b/lib/zlib/contrib/pascal/example.pas similarity index 100% rename from source4/lib/zlib/contrib/pascal/example.pas rename to lib/zlib/contrib/pascal/example.pas diff --git a/source4/lib/zlib/contrib/pascal/readme.txt b/lib/zlib/contrib/pascal/readme.txt similarity index 100% rename from source4/lib/zlib/contrib/pascal/readme.txt rename to lib/zlib/contrib/pascal/readme.txt diff --git a/source4/lib/zlib/contrib/pascal/zlibd32.mak b/lib/zlib/contrib/pascal/zlibd32.mak similarity index 100% rename from source4/lib/zlib/contrib/pascal/zlibd32.mak rename to lib/zlib/contrib/pascal/zlibd32.mak diff --git a/source4/lib/zlib/contrib/pascal/zlibpas.pas b/lib/zlib/contrib/pascal/zlibpas.pas similarity index 100% rename from source4/lib/zlib/contrib/pascal/zlibpas.pas rename to lib/zlib/contrib/pascal/zlibpas.pas diff --git a/source4/lib/zlib/contrib/puff/Makefile b/lib/zlib/contrib/puff/Makefile similarity index 100% rename from source4/lib/zlib/contrib/puff/Makefile rename to lib/zlib/contrib/puff/Makefile diff --git a/source4/lib/zlib/contrib/puff/README b/lib/zlib/contrib/puff/README similarity index 100% rename from source4/lib/zlib/contrib/puff/README rename to lib/zlib/contrib/puff/README diff --git a/source4/lib/zlib/contrib/puff/puff.c b/lib/zlib/contrib/puff/puff.c similarity index 100% rename from source4/lib/zlib/contrib/puff/puff.c rename to lib/zlib/contrib/puff/puff.c diff --git a/source4/lib/zlib/contrib/puff/puff.h b/lib/zlib/contrib/puff/puff.h similarity index 100% rename from source4/lib/zlib/contrib/puff/puff.h rename to lib/zlib/contrib/puff/puff.h diff --git a/source4/lib/zlib/contrib/puff/zeros.raw b/lib/zlib/contrib/puff/zeros.raw similarity index 100% rename from source4/lib/zlib/contrib/puff/zeros.raw rename to lib/zlib/contrib/puff/zeros.raw diff --git a/source4/lib/zlib/contrib/testzlib/testzlib.c b/lib/zlib/contrib/testzlib/testzlib.c similarity index 100% rename from source4/lib/zlib/contrib/testzlib/testzlib.c rename to lib/zlib/contrib/testzlib/testzlib.c diff --git a/source4/lib/zlib/contrib/testzlib/testzlib.txt b/lib/zlib/contrib/testzlib/testzlib.txt similarity index 100% rename from source4/lib/zlib/contrib/testzlib/testzlib.txt rename to lib/zlib/contrib/testzlib/testzlib.txt diff --git a/source4/lib/zlib/contrib/untgz/Makefile b/lib/zlib/contrib/untgz/Makefile similarity index 100% rename from source4/lib/zlib/contrib/untgz/Makefile rename to lib/zlib/contrib/untgz/Makefile diff --git a/source4/lib/zlib/contrib/untgz/Makefile.msc b/lib/zlib/contrib/untgz/Makefile.msc similarity index 100% rename from source4/lib/zlib/contrib/untgz/Makefile.msc rename to lib/zlib/contrib/untgz/Makefile.msc diff --git a/source4/lib/zlib/contrib/untgz/untgz.c b/lib/zlib/contrib/untgz/untgz.c similarity index 100% rename from source4/lib/zlib/contrib/untgz/untgz.c rename to lib/zlib/contrib/untgz/untgz.c diff --git a/source4/lib/zlib/contrib/vstudio/readme.txt b/lib/zlib/contrib/vstudio/readme.txt similarity index 100% rename from source4/lib/zlib/contrib/vstudio/readme.txt rename to lib/zlib/contrib/vstudio/readme.txt diff --git a/source4/lib/zlib/contrib/vstudio/vc7/miniunz.vcproj b/lib/zlib/contrib/vstudio/vc7/miniunz.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/miniunz.vcproj rename to lib/zlib/contrib/vstudio/vc7/miniunz.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc7/minizip.vcproj b/lib/zlib/contrib/vstudio/vc7/minizip.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/minizip.vcproj rename to lib/zlib/contrib/vstudio/vc7/minizip.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc7/testzlib.vcproj b/lib/zlib/contrib/vstudio/vc7/testzlib.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/testzlib.vcproj rename to lib/zlib/contrib/vstudio/vc7/testzlib.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlib.rc b/lib/zlib/contrib/vstudio/vc7/zlib.rc similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/zlib.rc rename to lib/zlib/contrib/vstudio/vc7/zlib.rc diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj b/lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj rename to lib/zlib/contrib/vstudio/vc7/zlibstat.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.def b/lib/zlib/contrib/vstudio/vc7/zlibvc.def similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/zlibvc.def rename to lib/zlib/contrib/vstudio/vc7/zlibvc.def diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.sln b/lib/zlib/contrib/vstudio/vc7/zlibvc.sln similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/zlibvc.sln rename to lib/zlib/contrib/vstudio/vc7/zlibvc.sln diff --git a/source4/lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj b/lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj rename to lib/zlib/contrib/vstudio/vc7/zlibvc.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc8/miniunz.vcproj b/lib/zlib/contrib/vstudio/vc8/miniunz.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/miniunz.vcproj rename to lib/zlib/contrib/vstudio/vc8/miniunz.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc8/minizip.vcproj b/lib/zlib/contrib/vstudio/vc8/minizip.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/minizip.vcproj rename to lib/zlib/contrib/vstudio/vc8/minizip.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc8/testzlib.vcproj b/lib/zlib/contrib/vstudio/vc8/testzlib.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/testzlib.vcproj rename to lib/zlib/contrib/vstudio/vc8/testzlib.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj b/lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj rename to lib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlib.rc b/lib/zlib/contrib/vstudio/vc8/zlib.rc similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/zlib.rc rename to lib/zlib/contrib/vstudio/vc8/zlib.rc diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj b/lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj rename to lib/zlib/contrib/vstudio/vc8/zlibstat.vcproj diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.def b/lib/zlib/contrib/vstudio/vc8/zlibvc.def similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/zlibvc.def rename to lib/zlib/contrib/vstudio/vc8/zlibvc.def diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.sln b/lib/zlib/contrib/vstudio/vc8/zlibvc.sln similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/zlibvc.sln rename to lib/zlib/contrib/vstudio/vc8/zlibvc.sln diff --git a/source4/lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj b/lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj similarity index 100% rename from source4/lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj rename to lib/zlib/contrib/vstudio/vc8/zlibvc.vcproj diff --git a/source4/lib/zlib/crc32.c b/lib/zlib/crc32.c similarity index 100% rename from source4/lib/zlib/crc32.c rename to lib/zlib/crc32.c diff --git a/source4/lib/zlib/crc32.h b/lib/zlib/crc32.h similarity index 100% rename from source4/lib/zlib/crc32.h rename to lib/zlib/crc32.h diff --git a/source4/lib/zlib/deflate.c b/lib/zlib/deflate.c similarity index 100% rename from source4/lib/zlib/deflate.c rename to lib/zlib/deflate.c diff --git a/source4/lib/zlib/deflate.h b/lib/zlib/deflate.h similarity index 100% rename from source4/lib/zlib/deflate.h rename to lib/zlib/deflate.h diff --git a/source4/lib/zlib/example.c b/lib/zlib/example.c similarity index 100% rename from source4/lib/zlib/example.c rename to lib/zlib/example.c diff --git a/source4/lib/zlib/examples/README.examples b/lib/zlib/examples/README.examples similarity index 100% rename from source4/lib/zlib/examples/README.examples rename to lib/zlib/examples/README.examples diff --git a/source4/lib/zlib/examples/fitblk.c b/lib/zlib/examples/fitblk.c similarity index 100% rename from source4/lib/zlib/examples/fitblk.c rename to lib/zlib/examples/fitblk.c diff --git a/source4/lib/zlib/examples/gun.c b/lib/zlib/examples/gun.c similarity index 100% rename from source4/lib/zlib/examples/gun.c rename to lib/zlib/examples/gun.c diff --git a/source4/lib/zlib/examples/gzappend.c b/lib/zlib/examples/gzappend.c similarity index 100% rename from source4/lib/zlib/examples/gzappend.c rename to lib/zlib/examples/gzappend.c diff --git a/source4/lib/zlib/examples/gzjoin.c b/lib/zlib/examples/gzjoin.c similarity index 100% rename from source4/lib/zlib/examples/gzjoin.c rename to lib/zlib/examples/gzjoin.c diff --git a/source4/lib/zlib/examples/gzlog.c b/lib/zlib/examples/gzlog.c similarity index 100% rename from source4/lib/zlib/examples/gzlog.c rename to lib/zlib/examples/gzlog.c diff --git a/source4/lib/zlib/examples/gzlog.h b/lib/zlib/examples/gzlog.h similarity index 100% rename from source4/lib/zlib/examples/gzlog.h rename to lib/zlib/examples/gzlog.h diff --git a/source4/lib/zlib/examples/zlib_how.html b/lib/zlib/examples/zlib_how.html similarity index 100% rename from source4/lib/zlib/examples/zlib_how.html rename to lib/zlib/examples/zlib_how.html diff --git a/source4/lib/zlib/examples/zpipe.c b/lib/zlib/examples/zpipe.c similarity index 100% rename from source4/lib/zlib/examples/zpipe.c rename to lib/zlib/examples/zpipe.c diff --git a/source4/lib/zlib/examples/zran.c b/lib/zlib/examples/zran.c similarity index 100% rename from source4/lib/zlib/examples/zran.c rename to lib/zlib/examples/zran.c diff --git a/source4/lib/zlib/gzio.c b/lib/zlib/gzio.c similarity index 100% rename from source4/lib/zlib/gzio.c rename to lib/zlib/gzio.c diff --git a/source4/lib/zlib/infback.c b/lib/zlib/infback.c similarity index 100% rename from source4/lib/zlib/infback.c rename to lib/zlib/infback.c diff --git a/source4/lib/zlib/inffast.c b/lib/zlib/inffast.c similarity index 100% rename from source4/lib/zlib/inffast.c rename to lib/zlib/inffast.c diff --git a/source4/lib/zlib/inffast.h b/lib/zlib/inffast.h similarity index 100% rename from source4/lib/zlib/inffast.h rename to lib/zlib/inffast.h diff --git a/source4/lib/zlib/inffixed.h b/lib/zlib/inffixed.h similarity index 100% rename from source4/lib/zlib/inffixed.h rename to lib/zlib/inffixed.h diff --git a/source4/lib/zlib/inflate.c b/lib/zlib/inflate.c similarity index 100% rename from source4/lib/zlib/inflate.c rename to lib/zlib/inflate.c diff --git a/source4/lib/zlib/inflate.h b/lib/zlib/inflate.h similarity index 100% rename from source4/lib/zlib/inflate.h rename to lib/zlib/inflate.h diff --git a/source4/lib/zlib/inftrees.c b/lib/zlib/inftrees.c similarity index 100% rename from source4/lib/zlib/inftrees.c rename to lib/zlib/inftrees.c diff --git a/source4/lib/zlib/inftrees.h b/lib/zlib/inftrees.h similarity index 100% rename from source4/lib/zlib/inftrees.h rename to lib/zlib/inftrees.h diff --git a/source4/lib/zlib/make_vms.com b/lib/zlib/make_vms.com similarity index 100% rename from source4/lib/zlib/make_vms.com rename to lib/zlib/make_vms.com diff --git a/source4/lib/zlib/minigzip.c b/lib/zlib/minigzip.c similarity index 100% rename from source4/lib/zlib/minigzip.c rename to lib/zlib/minigzip.c diff --git a/source4/lib/zlib/msdos/Makefile.bor b/lib/zlib/msdos/Makefile.bor similarity index 100% rename from source4/lib/zlib/msdos/Makefile.bor rename to lib/zlib/msdos/Makefile.bor diff --git a/source4/lib/zlib/msdos/Makefile.dj2 b/lib/zlib/msdos/Makefile.dj2 similarity index 100% rename from source4/lib/zlib/msdos/Makefile.dj2 rename to lib/zlib/msdos/Makefile.dj2 diff --git a/source4/lib/zlib/msdos/Makefile.emx b/lib/zlib/msdos/Makefile.emx similarity index 100% rename from source4/lib/zlib/msdos/Makefile.emx rename to lib/zlib/msdos/Makefile.emx diff --git a/source4/lib/zlib/msdos/Makefile.msc b/lib/zlib/msdos/Makefile.msc similarity index 100% rename from source4/lib/zlib/msdos/Makefile.msc rename to lib/zlib/msdos/Makefile.msc diff --git a/source4/lib/zlib/msdos/Makefile.tc b/lib/zlib/msdos/Makefile.tc similarity index 100% rename from source4/lib/zlib/msdos/Makefile.tc rename to lib/zlib/msdos/Makefile.tc diff --git a/source4/lib/zlib/old/Makefile.riscos b/lib/zlib/old/Makefile.riscos similarity index 100% rename from source4/lib/zlib/old/Makefile.riscos rename to lib/zlib/old/Makefile.riscos diff --git a/source4/lib/zlib/old/README b/lib/zlib/old/README similarity index 100% rename from source4/lib/zlib/old/README rename to lib/zlib/old/README diff --git a/source4/lib/zlib/old/descrip.mms b/lib/zlib/old/descrip.mms similarity index 100% rename from source4/lib/zlib/old/descrip.mms rename to lib/zlib/old/descrip.mms diff --git a/source4/lib/zlib/old/os2/Makefile.os2 b/lib/zlib/old/os2/Makefile.os2 similarity index 100% rename from source4/lib/zlib/old/os2/Makefile.os2 rename to lib/zlib/old/os2/Makefile.os2 diff --git a/source4/lib/zlib/old/os2/zlib.def b/lib/zlib/old/os2/zlib.def similarity index 100% rename from source4/lib/zlib/old/os2/zlib.def rename to lib/zlib/old/os2/zlib.def diff --git a/source4/lib/zlib/old/visual-basic.txt b/lib/zlib/old/visual-basic.txt similarity index 100% rename from source4/lib/zlib/old/visual-basic.txt rename to lib/zlib/old/visual-basic.txt diff --git a/source4/lib/zlib/old/zlib.html b/lib/zlib/old/zlib.html similarity index 100% rename from source4/lib/zlib/old/zlib.html rename to lib/zlib/old/zlib.html diff --git a/source4/lib/zlib/projects/README.projects b/lib/zlib/projects/README.projects similarity index 100% rename from source4/lib/zlib/projects/README.projects rename to lib/zlib/projects/README.projects diff --git a/source4/lib/zlib/projects/visualc6/README.txt b/lib/zlib/projects/visualc6/README.txt similarity index 100% rename from source4/lib/zlib/projects/visualc6/README.txt rename to lib/zlib/projects/visualc6/README.txt diff --git a/source4/lib/zlib/projects/visualc6/example.dsp b/lib/zlib/projects/visualc6/example.dsp similarity index 100% rename from source4/lib/zlib/projects/visualc6/example.dsp rename to lib/zlib/projects/visualc6/example.dsp diff --git a/source4/lib/zlib/projects/visualc6/minigzip.dsp b/lib/zlib/projects/visualc6/minigzip.dsp similarity index 100% rename from source4/lib/zlib/projects/visualc6/minigzip.dsp rename to lib/zlib/projects/visualc6/minigzip.dsp diff --git a/source4/lib/zlib/projects/visualc6/zlib.dsp b/lib/zlib/projects/visualc6/zlib.dsp similarity index 100% rename from source4/lib/zlib/projects/visualc6/zlib.dsp rename to lib/zlib/projects/visualc6/zlib.dsp diff --git a/source4/lib/zlib/projects/visualc6/zlib.dsw b/lib/zlib/projects/visualc6/zlib.dsw similarity index 100% rename from source4/lib/zlib/projects/visualc6/zlib.dsw rename to lib/zlib/projects/visualc6/zlib.dsw diff --git a/source4/lib/zlib/qnx/package.qpg b/lib/zlib/qnx/package.qpg similarity index 100% rename from source4/lib/zlib/qnx/package.qpg rename to lib/zlib/qnx/package.qpg diff --git a/source4/lib/zlib/trees.c b/lib/zlib/trees.c similarity index 100% rename from source4/lib/zlib/trees.c rename to lib/zlib/trees.c diff --git a/source4/lib/zlib/trees.h b/lib/zlib/trees.h similarity index 100% rename from source4/lib/zlib/trees.h rename to lib/zlib/trees.h diff --git a/source4/lib/zlib/uncompr.c b/lib/zlib/uncompr.c similarity index 100% rename from source4/lib/zlib/uncompr.c rename to lib/zlib/uncompr.c diff --git a/source4/lib/zlib/win32/DLL_FAQ.txt b/lib/zlib/win32/DLL_FAQ.txt similarity index 100% rename from source4/lib/zlib/win32/DLL_FAQ.txt rename to lib/zlib/win32/DLL_FAQ.txt diff --git a/source4/lib/zlib/win32/Makefile.bor b/lib/zlib/win32/Makefile.bor similarity index 100% rename from source4/lib/zlib/win32/Makefile.bor rename to lib/zlib/win32/Makefile.bor diff --git a/source4/lib/zlib/win32/Makefile.emx b/lib/zlib/win32/Makefile.emx similarity index 100% rename from source4/lib/zlib/win32/Makefile.emx rename to lib/zlib/win32/Makefile.emx diff --git a/source4/lib/zlib/win32/Makefile.gcc b/lib/zlib/win32/Makefile.gcc similarity index 100% rename from source4/lib/zlib/win32/Makefile.gcc rename to lib/zlib/win32/Makefile.gcc diff --git a/source4/lib/zlib/win32/Makefile.msc b/lib/zlib/win32/Makefile.msc similarity index 100% rename from source4/lib/zlib/win32/Makefile.msc rename to lib/zlib/win32/Makefile.msc diff --git a/source4/lib/zlib/win32/VisualC.txt b/lib/zlib/win32/VisualC.txt similarity index 100% rename from source4/lib/zlib/win32/VisualC.txt rename to lib/zlib/win32/VisualC.txt diff --git a/source4/lib/zlib/win32/zlib.def b/lib/zlib/win32/zlib.def similarity index 100% rename from source4/lib/zlib/win32/zlib.def rename to lib/zlib/win32/zlib.def diff --git a/source4/lib/zlib/win32/zlib1.rc b/lib/zlib/win32/zlib1.rc similarity index 100% rename from source4/lib/zlib/win32/zlib1.rc rename to lib/zlib/win32/zlib1.rc diff --git a/source4/lib/zlib/zconf.h b/lib/zlib/zconf.h similarity index 100% rename from source4/lib/zlib/zconf.h rename to lib/zlib/zconf.h diff --git a/source4/lib/zlib/zconf.in.h b/lib/zlib/zconf.in.h similarity index 100% rename from source4/lib/zlib/zconf.in.h rename to lib/zlib/zconf.in.h diff --git a/source4/lib/zlib/zlib.h b/lib/zlib/zlib.h similarity index 100% rename from source4/lib/zlib/zlib.h rename to lib/zlib/zlib.h diff --git a/source4/lib/zlib/zutil.c b/lib/zlib/zutil.c similarity index 100% rename from source4/lib/zlib/zutil.c rename to lib/zlib/zutil.c diff --git a/source4/lib/zlib/zutil.h b/lib/zlib/zutil.h similarity index 100% rename from source4/lib/zlib/zutil.h rename to lib/zlib/zutil.h diff --git a/source3/samba4.mk b/source3/samba4.mk index d3804a5d94a..15774d9a942 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -62,7 +62,7 @@ include $(pidldir)/config.mk include samba4-config.mk include samba4-templates.mk -zlibsrcdir := $(samba4srcdir)/lib/zlib +zlibsrcdir := $(samba4srcdir)/../lib/zlib dynconfigsrcdir := $(samba4srcdir)/dynconfig heimdalsrcdir := $(samba4srcdir)/heimdal dsdbsrcdir := $(samba4srcdir)/dsdb diff --git a/source3/torture/torture.c b/source3/torture/torture.c index d8942e42b9b..25b042177d9 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -294,15 +294,6 @@ static bool torture_open_connection_share(struct cli_state **c, return True; } -void torture_open_connection_free_unclist(char **unc_list) -{ - if (unc_list!=NULL) - { - SAFE_FREE(unc_list[0]); - SAFE_FREE(unc_list); - } -} - bool torture_open_connection(struct cli_state **c, int conn_index) { char **unc_list = NULL; @@ -311,7 +302,7 @@ bool torture_open_connection(struct cli_state **c, int conn_index) if (use_multishare_conn==True) { char *h, *s; - unc_list = file_lines_load(multishare_conn_fname, &num_unc_names, 0); + unc_list = file_lines_load(multishare_conn_fname, &num_unc_names, 0, NULL); if (!unc_list || num_unc_names <= 0) { printf("Failed to load unc names list from '%s'\n", multishare_conn_fname); exit(1); @@ -321,14 +312,14 @@ bool torture_open_connection(struct cli_state **c, int conn_index) NULL, &h, &s)) { printf("Failed to parse UNC name %s\n", unc_list[conn_index % num_unc_names]); - torture_open_connection_free_unclist(unc_list); + TALLOC_FREE(unc_list); exit(1); } result = torture_open_connection_share(c, h, s); /* h, s were copied earlier */ - torture_open_connection_free_unclist(unc_list); + TALLOC_FREE(unc_list); return result; } diff --git a/source4/Makefile b/source4/Makefile index abb010e7608..7dae4729b74 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -48,7 +48,7 @@ endif include $(srcdir)/build/make/rules.mk include $(srcdir)/build/make/python.mk -zlibsrcdir := lib/zlib +zlibsrcdir := ../lib/zlib dynconfigsrcdir := dynconfig heimdalsrcdir := heimdal dsdbsrcdir := dsdb -- 2.34.1