SF.net SVN: gar:[26637] csw/mgar/pkg/zlib/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri May 8 10:14:26 CEST 2020


Revision: 26637
          http://sourceforge.net/p/gar/code/26637
Author:   dmichelsen
Date:     2020-05-08 08:14:26 +0000 (Fri, 08 May 2020)
Log Message:
-----------
zlib/trunk: Update to 1.2.11

Modified Paths:
--------------
    csw/mgar/pkg/zlib/trunk/Makefile
    csw/mgar/pkg/zlib/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch
    csw/mgar/pkg/zlib/trunk/files/COPYING

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2020-05-06 08:32:22 UTC (rev 26636)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2020-05-08 08:14:26 UTC (rev 26637)
@@ -1,7 +1,7 @@
 #: $Id$
 
 NAME = zlib
-VERSION = 1.2.8
+VERSION = 1.2.11
 GARTYPE = v2
 
 DESCRIPTION = Zlib data compression library
@@ -17,13 +17,12 @@
  in compression
 endef
 
-MASTER_SITES  = http://zlib.net/
+MASTER_SITES += http://zlib.net/
 MASTER_SITES += $(SF_MIRROR)
 SF_PROJECT = libpng
-DISTFILES  = $(DISTNAME).tar.xz
-DISTFILES += COPYING
+DISTFILES += $(DISTNAME).tar.xz
 
-PATCHFILES += 0003-Add-h-to-the-linker-invocation.patch
+LICENSE = README
 
 PACKAGES += CSWlibz1
 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1

Modified: csw/mgar/pkg/zlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/zlib/trunk/checksums	2020-05-06 08:32:22 UTC (rev 26636)
+++ csw/mgar/pkg/zlib/trunk/checksums	2020-05-08 08:14:26 UTC (rev 26637)
@@ -1 +1 @@
-28f1205d8dd2001f26fec1e8c2cebe37  zlib-1.2.8.tar.xz
+85adef240c5f370b308da8c938951a68  zlib-1.2.11.tar.xz

Deleted: csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch	2020-05-06 08:32:22 UTC (rev 26636)
+++ csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch	2020-05-08 08:14:26 UTC (rev 26637)
@@ -1,25 +0,0 @@
-From 028ff36f20ffd5d5edf79af662e34908ce031a36 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Thu, 14 Jun 2012 12:12:06 +0200
-Subject: [PATCH] Add -h to the linker invocation
-
----
- Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 241deed..13bb227 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -160,7 +160,7 @@ minigzip64.o: test/minigzip.c zlib.h zconf.h
- 	- at mv objs/$*.o $@
- 
- placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
--	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
-+	$(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
- 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIBM)
--- 
-1.7.10.3
-

Deleted: csw/mgar/pkg/zlib/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/COPYING	2020-05-06 08:32:22 UTC (rev 26636)
+++ csw/mgar/pkg/zlib/trunk/files/COPYING	2020-05-08 08:14:26 UTC (rev 26637)
@@ -1,32 +0,0 @@
-
-Copyright notice:
-
- (C) 1995-2010 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup at gzip.org          madler at alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list