diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
| commit | 034c59cb79a203034d52da011c33ad328b86f6e6 (patch) | |
| tree | e48d23a9776aba421ecf745cd90e427624ebf714 /zlib | |
| parent | 41355ba9bcddb7f83f4e0d2211e4ea26cce328ec (diff) | |
| parent | 1a7789b3a5dcab90b2746d699c224d34293a098f (diff) | |
ause110: update to DEV300_m74
Diffstat (limited to 'zlib')
| -rwxr-xr-x | zlib/make_patched_header.pl | 6 | ||||
| -rw-r--r-- | zlib/makefile.mk | 6 | ||||
| -rw-r--r-- | zlib/zlib-1.1.4.patch | 18 |
3 files changed, 8 insertions, 22 deletions
diff --git a/zlib/make_patched_header.pl b/zlib/make_patched_header.pl index f0ff00f4baad..41dbdc5fbb96 100755 --- a/zlib/make_patched_header.pl +++ b/zlib/make_patched_header.pl @@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: make_patched_header.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/zlib/makefile.mk b/zlib/makefile.mk index baf39ed17fef..389a68eb9c52 100644 --- a/zlib/makefile.mk +++ b/zlib/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/zlib/zlib-1.1.4.patch b/zlib/zlib-1.1.4.patch index 6b76c9114e6e..19d1cd5904ea 100644 --- a/zlib/zlib-1.1.4.patch +++ b/zlib/zlib-1.1.4.patch @@ -1,15 +1,9 @@ --- misc/zlib-1.1.4/makefile.mk Fri Mar 14 10:17:06 2008 +++ misc/build/zlib-1.1.4/makefile.mk Fri Mar 14 10:16:56 2008 -@@ -1 +1,79 @@ +@@ -1 +1,73 @@ -dummy +#************************************************************************* +# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.8 $ -+# -+# last change: $Author: mtg $ $Date: 2000/11/09 10:19:32 $ -+# +# Copyright according the GNU Public License. +# +#************************************************************************* @@ -192,7 +186,7 @@ + also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html +*/ +/* -+ crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h] ++ crypt.c (full version) by Info-ZIP. Last revised: [see info_zip_crypt.h] + + The encryption/decryption parts of this source code (as opposed to the + non-echoing password parts) were originally written in Europe. The @@ -334,7 +328,7 @@ +#ifndef NOUNCRYPT -+#include "crypt.h" ++#include "info_zip_crypt.h" +#endif + /* =========================================================================== @@ -2855,10 +2849,10 @@ #ifdef __cplusplus } #endif - --- misc/zlib-1.1.4/contrib/minizip/crypt.h 2009-07-17 11:13:37.281250000 +0200 -+++ misc/build/zlib-1.1.4/contrib/minizip/crypt.h 2009-07-17 10:58:41.843750000 +0200 +--- misc/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 11:13:37.281250000 +0200 ++++ misc/build/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 10:58:41.843750000 +0200 @@ -0,0 +1,132 @@ -+/* crypt.h -- base code for crypt/uncrypt ZIPfile ++/* info_zip_crypt.h -- base code for crypt/uncrypt ZIPfile + + + Version 1.01e, February 12th, 2005 |