Chiebot-Mirror
/
zlib
mirror of https://github.com/madler/zlib.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change version number to 1.2.6.1.

Browse Source
pull/3/head^2
Mark Adler 13 years ago
parent e75de023b6
commit 7b3f71ba5f
20 changed files with 41 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ChangeLog
  2. 2
      Makefile.in
  3. 4
      README
  4. 2
      as400/compile.clp
  5. 2
      as400/readme.txt
  6. 8
      as400/zlib.inc
  7. 2
      contrib/delphi/ZLib.pas
  8. 2
      contrib/dotzlib/DotZLib/UnitTests.cs
  9. 4
      contrib/infback9/inftree9.c
  10. 2
      contrib/minizip/configure.ac
  11. 4
      contrib/pascal/zlibpas.pas
  12. 6
      contrib/vstudio/vc10/zlib.rc
  13. 6
      contrib/vstudio/vc9/zlib.rc
  14. 2
      deflate.c
  15. 4
      inftrees.c
  16. 10
      qnx/package.qpg
  17. 4
      treebuild.xml
  18. 4
      zlib.3
  19. BIN
      zlib.3.pdf
  20. 8
      zlib.h

3
ChangeLog
Unescape View File

@ -1,6 +1,9 @@
ChangeLog file for zlib
Changes in 1.2.6.1 (xx Jan 2012)
-
Changes in 1.2.6 (29 Jan 2012)
- Update the Pascal interface in contrib/pascal
- Fix function numbers for gzgetc_ in zlibvc.def files

2
Makefile.in
Unescape View File

@ -32,7 +32,7 @@ CPP=$(CC) -E
STATICLIB=libz.a
SHAREDLIB=libz.so
SHAREDLIBV=libz.so.1.2.6
SHAREDLIBV=libz.so.1.2.6.1
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)

4
README
Unescape View File

@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
zlib 1.2.6 is a general purpose data compression library. All the code is
zlib 1.2.6.1 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
issue of Dr. Dobb's Journal; a copy of the article is available at
http://marknelson.us/1997/01/01/zlib-engine/ .
The changes made in version 1.2.6 are documented in the file ChangeLog.
The changes made in version 1.2.6.1 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .

2
as400/compile.clp
Unescape View File

@ -105,6 +105,6 @@
&MODLIB/TREES &MODLIB/UNCOMPR +
&MODLIB/ZUTIL) +
SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC) +
TEXT('ZLIB 1.2.6') TGTRLS(&TGTRLS)
TEXT('ZLIB 1.2.6.1') TGTRLS(&TGTRLS)
ENDPGM

2
as400/readme.txt
Unescape View File

@ -1,4 +1,4 @@
ZLIB version 1.2.6 for AS400 installation instructions
ZLIB version 1.2.6.1 for AS400 installation instructions
I) From an AS400 *SAVF file:

8
as400/zlib.inc
Unescape View File

@ -1,7 +1,7 @@
* ZLIB.INC - Interface to the general purpose compression library
*
* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
* Version 1.2.6
* Version 1.2.6.1
*
*
* WARNING:
@ -22,14 +22,14 @@
*
* Versioning information.
*
D ZLIB_VERSION C '1.2.6'
D ZLIB_VERNUM C X'1260'
D ZLIB_VERSION C '1.2.6.1'
D ZLIB_VERNUM C X'1261'
D ZLIB_VER_MAJOR C 1
D ZLIB_VER_MINOR C 2
D ZLIB_VER_REVISION...
D C 6
D ZLIB_VER_SUBREVISION...
D C 0
D C 1
*
* Other equates.
*

2
contrib/delphi/ZLib.pas
Unescape View File

@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
const OutBuf: Pointer; BufSize: Integer);
const
zlib_version = '1.2.6';
zlib_version = '1.2.6.1';
type
EZlibError = class(Exception);

2
contrib/dotzlib/DotZLib/UnitTests.cs
Unescape View File

@ -156,7 +156,7 @@ namespace DotZLibTests
public void Info_Version()
{
Info info = new Info();
Assert.AreEqual("1.2.6", Info.Version);
Assert.AreEqual("1.2.6.1", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);

4
contrib/infback9/inftree9.c
Unescape View File

@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate9_copyright[] =
" inflate9 1.2.6 Copyright 1995-2012 Mark Adler ";
" inflate9 1.2.6.1 Copyright 1995-2012 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@ -64,7 +64,7 @@ unsigned short FAR *work;
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
133, 133, 133, 133, 144, 203, 69};
133, 133, 133, 133, 144, 207, 66};
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,

2
contrib/minizip/configure.ac
Unescape View File

@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_INIT([minizip], [1.2.6], [bugzilla.redhat.com])
AC_INIT([minizip], [1.2.6.1], [bugzilla.redhat.com])
AC_CONFIG_SRCDIR([minizip.c])
AM_INIT_AUTOMAKE([foreign])
LT_INIT

4
contrib/pascal/zlibpas.pas
Unescape View File

@ -10,8 +10,8 @@ unit zlibpas;
interface
const
ZLIB_VERSION = '1.2.6';
ZLIB_VERNUM = $1260;
ZLIB_VERSION = '1.2.6.1';
ZLIB_VERNUM = $1261;
type
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;

6
contrib/vstudio/vc10/zlib.rc
Unescape View File

@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
FILEVERSION 1.2.6,1
PRODUCTVERSION 1.2.6,1
FILEVERSION 1.2.6.1,1
PRODUCTVERSION 1.2.6.1,1
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
VALUE "FileVersion", "1.2.6\0"
VALUE "FileVersion", "1.2.6.1\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"

6
contrib/vstudio/vc9/zlib.rc
Unescape View File

@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
FILEVERSION 1.2.6,1
PRODUCTVERSION 1.2.6,1
FILEVERSION 1.2.6.1,1
PRODUCTVERSION 1.2.6.1,1
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
VALUE "FileVersion", "1.2.6\0"
VALUE "FileVersion", "1.2.6.1\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"

2
deflate.c
Unescape View File

@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
" deflate 1.2.6 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
" deflate 1.2.6.1 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot

4
inftrees.c
Unescape View File

@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate_copyright[] =
" inflate 1.2.6 Copyright 1995-2012 Mark Adler ";
" inflate 1.2.6.1 Copyright 1995-2012 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@ -62,7 +62,7 @@ unsigned short FAR *work;
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 69};
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 207, 66};
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

10
qnx/package.qpg
Unescape View File

@ -25,10 +25,10 @@
<QPG:Files>
<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
<QPG:Add file="../libz.so.1.2.6" install="/opt/lib/" user="root:bin" permission="644"/>
<QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.6"/>
<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.6"/>
<QPG:Add file="../libz.so.1.2.6" install="/opt/lib/" component="slib"/>
<QPG:Add file="../libz.so.1.2.6.1" install="/opt/lib/" user="root:bin" permission="644"/>
<QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.6.1"/>
<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.6.1"/>
<QPG:Add file="../libz.so.1.2.6.1" install="/opt/lib/" component="slib"/>
</QPG:Files>
<QPG:PackageFilter>
@ -63,7 +63,7 @@
</QPM:ProductDescription>
<QPM:ReleaseDescription>
<QPM:ReleaseVersion>1.2.6</QPM:ReleaseVersion>
<QPM:ReleaseVersion>1.2.6.1</QPM:ReleaseVersion>
<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>

4
treebuild.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<package name="zlib" version="1.2.6">
<library name="zlib" dlversion="1.2.6" dlname="z">
<package name="zlib" version="1.2.6.1">
<library name="zlib" dlversion="1.2.6.1" dlname="z">
<property name="description"> zip compression library </property>
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />

4
zlib.3
Unescape View File

@ -1,4 +1,4 @@
.TH ZLIB 3 "29 Jan 2012"
.TH ZLIB 3 "xx Jan 2012"
.SH NAME
zlib \- compression/decompression library
.SH SYNOPSIS
@ -125,7 +125,7 @@ before asking for help.
Send questions and/or comments to zlib@gzip.org,
or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
.SH AUTHORS
Version 1.2.6
Version 1.2.6.1
Copyright (C) 1995-2012 Jean-loup Gailly (jloup@gzip.org)
and Mark Adler (madler@alumni.caltech.edu).
.LP

BIN
zlib.3.pdf
View File

Binary file not shown.

8
zlib.h
Unescape View File

@ -1,5 +1,5 @@
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.6, January 29th, 2012
version 1.2.6.1, January xxth, 2012
Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
@ -37,12 +37,12 @@
extern "C" {
#endif
#define ZLIB_VERSION "1.2.6"
#define ZLIB_VERNUM 0x1260
#define ZLIB_VERSION "1.2.6.1-motley"
#define ZLIB_VERNUM 0x1261
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
#define ZLIB_VER_REVISION 6
#define ZLIB_VER_SUBREVISION 0
#define ZLIB_VER_SUBREVISION 1
/*
The 'zlib' compression library provides in-memory compression and

Write Preview
Loading…
Cancel
Save