Skip to content

Commit f4498be

Browse files
madlermadler
committed
zlib 1.2.4.3
1 parent 7147f24 commit f4498be

File tree

24 files changed

+122
-73
lines changed

24 files changed

+122
-73
lines changed

‎ChangeLog

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11

22
ChangeLog file for zlib
33

4+
Changes in 1.2.4.3 (10 Apr 2010)
5+
- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
6+
- Use CROSS_PREFIX for nm [Bar-Lev]
7+
- Assume _LARGEFILE64_SOURCE defined is equivalent to true
8+
- Avoid use of undefined symbols in #if with && and ||
9+
- Make *64 prototypes in gzguts.h consistent with functions
10+
- Add -shared load option for MinGW in configure [Bowler]
11+
- Move z_off64_t to public interface, use instead of off64_t
12+
- Remove ! from shell test in configure (not portable to Solaris)
13+
- Change +0 macro tests to -0 for possibly increased portability
14+
415
Changes in 1.2.4.2 (9 Apr 2010)
516
- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
617
- Really provide prototypes for *64 functions when building without LFS

‎Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CPP=$(CC) -E
3232

3333
STATICLIB=libz.a
3434
SHAREDLIB=libz.so
35-
SHAREDLIBV=libz.so.1.2.4.2
35+
SHAREDLIBV=libz.so.1.2.4.3
3636
SHAREDLIBM=libz.so.1
3737
LIBS=$(STATICLIB) $(SHAREDLIBV)
3838

‎README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZLIB DATA COMPRESSION LIBRARY
22

3-
zlib 1.2.4.2 is a general purpose data compression library. All the code is
3+
zlib 1.2.4.3 is a general purpose data compression library. All the code is
44
thread safe. The data format used by the zlib library is described by RFCs
55
(Request for Comments) 1950 to 1952 in the files
66
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -31,7 +31,7 @@ Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
3131
issue of Dr. Dobb's Journal; a copy of the article is available at
3232
http://marknelson.us/1997/01/01/zlib-engine/ .
3333

34-
The changes made in version 1.2.4.2 are documented in the file ChangeLog.
34+
The changes made in version 1.2.4.3 are documented in the file ChangeLog.
3535

3636
Unsupported third party contributions are provided in directory contrib/ .
3737

‎configure

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@
1313
# If you have problems, try without defining CC and CFLAGS before reporting
1414
# an error.
1515

16-
# make sure we are running under a compatible shell (stolen from ffmpeg and libnfo)
16+
# make sure we are running under a compatible shell (stolen from ffmpeg and libnfo,
17+
# except their's wasn't portable enough due to ! usage, so this is better)
1718
if test "0$ZLIB_CONFIGURE_EXEC" -lt 1; then
1819
unset foo
19-
(: ${foo%%bar}) 2>/dev/null && ! (: ${foo?}) 2>/dev/null
20+
try=0
21+
(: ${foo%%bar}) 2>/dev/null
2022
if test "$?" -ne 0; then
23+
try=1
24+
else
25+
(: ${foo?}) 2>/dev/null
26+
if test "$?" -eq 0; then
27+
try=1
28+
fi
29+
fi
30+
if test "$try" -eq 1; then
2131
ZLIB_CONFIGURE_EXEC=1
2232
export ZLIB_CONFIGURE_EXEC
2333
type "bash" > /dev/null 2>&1 && exec bash "$0" "$@"
@@ -29,6 +39,7 @@ if test "0$ZLIB_CONFIGURE_EXEC" -lt 1; then
2939
# exit 1
3040
# we could give up here, but go ahead and give their old sh a try
3141
fi
42+
unset try
3243
fi
3344

3445
if [ -n "${CHOST}" ]; then
@@ -42,10 +53,22 @@ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
4253
VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
4354
VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
4455
VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
45-
AR=${AR-"${CROSS_PREFIX}ar"}
56+
if [ -x "${CROSS_PREFIX}ar" ]; then
57+
AR=${AR-"${CROSS_PREFIX}ar"}
58+
else
59+
AR=${AR-"ar"}
60+
fi
4661
AR_RC="${AR} rc"
47-
RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
48-
NM=${NM-"nm"}
62+
if [ -x "${CROSS_PREFIX}ranlib" ]; then
63+
RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
64+
else
65+
RANLIB=${RANLIB-"ranlib"}
66+
fi
67+
if [ -x "${CROSS_PREFIX}nm" ]; then
68+
NM=${NM-"${CROSS_PREFIX}nm"}
69+
else
70+
NM=${NM-"nm"}
71+
fi
4972
LDCONFIG=${LDCONFIG-"ldconfig"}
5073
LDSHAREDLIBC="${LDSHAREDLIBC-"-lc"}"
5174
prefix=${prefix-/usr/local}
@@ -121,6 +144,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
121144
CYGWIN* | Cygwin* | cygwin* | OS/2*)
122145
EXE='.exe' ;;
123146
MINGW*)
147+
LDSHARED=${LDSHARED-"$cc -shared"}
124148
LDSHAREDLIBC=""
125149
EXE='.exe' ;;
126150
QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4

‎contrib/delphi/ZLib.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152152
const OutBuf: Pointer; BufSize: Integer);
153153

154154
const
155-
zlib_version = '1.2.4.2';
155+
zlib_version = '1.2.4.3';
156156

157157
type
158158
EZlibError = class(Exception);

‎contrib/dotzlib/DotZLib/UnitTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public class InfoTests
156156
public void Info_Version()
157157
{
158158
Info info = new Info();
159-
Assert.AreEqual("1.2.4.2", Info.Version);
159+
Assert.AreEqual("1.2.4.3", Info.Version);
160160
Assert.AreEqual(32, info.SizeOfUInt);
161161
Assert.AreEqual(32, info.SizeOfULong);
162162
Assert.AreEqual(32, info.SizeOfPointer);
@@ -271,4 +271,4 @@ public void GZipStream_WriteRead()
271271
}
272272
}
273273

274-
#endif
274+
#endif

‎contrib/infback9/inftree9.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define MAXBITS 15
1010

1111
const char inflate9_copyright[] =
12-
" inflate9 1.2.4.2 Copyright 1995-2010 Mark Adler ";
12+
" inflate9 1.2.4.3 Copyright 1995-2010 Mark Adler ";
1313
/*
1414
If you use the zlib library in a product, an acknowledgment is welcome
1515
in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
6464
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
6565
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
6666
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67-
133, 133, 133, 133, 144, 202, 75};
67+
133, 133, 133, 133, 144, 195, 66};
6868
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
6969
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
7070
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,

‎contrib/pascal/zlibpas.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
interface
1111

1212
const
13-
ZLIB_VERSION = '1.2.4.2';
13+
ZLIB_VERSION = '1.2.4.3';
1414

1515
type
1616
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;

‎contrib/vstudio/vc10/zlib.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1,2,4,2
6-
PRODUCTVERSION 1,2,4,2
5+
FILEVERSION 1,2,4,3
6+
PRODUCTVERSION 1,2,4,3
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.4.2\0"
20+
VALUE "FileVersion", "1.2.4.3\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlib.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎contrib/vstudio/vc9/zlib.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1,2,4,2
6-
PRODUCTVERSION 1,2,4,2
5+
FILEVERSION 1,2,4,3
6+
PRODUCTVERSION 1,2,4,3
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.4.2\0"
20+
VALUE "FileVersion", "1.2.4.3\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlib.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

0 commit comments

Comments
 (0)