rpms/elinks/F-9 elinks-0.11.4-deflate.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 elinks.spec, 1.52, 1.53 sources, 1.22, 1.23

[Kamil Dudka (kdudka)]

Author: kdudka

Update of /cvs/extras/rpms/elinks/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23512

Modified Files:
	.cvsignore elinks.spec sources 
Added Files:
	elinks-0.11.4-deflate.patch 
Log Message:
new version of deflate.c taken from elinks-0.12pre1(#446026)

elinks-0.11.4-deflate.patch:

--- NEW FILE elinks-0.11.4-deflate.patch ---
diff -ruN elinks-0.11.4rc1/src/encoding/deflate.c elinks-0.11.4rc1.deflate/src/encoding/deflate.c
--- elinks-0.11.4rc1/src/encoding/deflate.c	2008-07-10 15:13:21.000000000 +0200
+++ elinks-0.11.4rc1.deflate/src/encoding/deflate.c	2008-07-10 15:15:09.000000000 +0200
@@ -38,7 +38,7 @@
 };
 
 static int
-deflate_open(struct stream_encoded *stream, int fd)
+deflate_open(int window_size, struct stream_encoded *stream, int fd)
 {
 	/* A zero-initialized z_stream.  The compiler ensures that all
 	 * pointer members in it are null.  (Can't do this with memset
@@ -60,7 +60,7 @@
 	data->fdread = fd;
 	data->last_read = 0;
 
-	err = inflateInit2(&data->deflate_stream, MAX_WBITS | 32);
+	err = inflateInit2(&data->deflate_stream, window_size);
 	if (err != Z_OK) {
 		mem_free(data);
 		return -1;
@@ -71,6 +71,20 @@
 }
 
 static int
+deflate_raw_open(struct stream_encoded *stream, int fd)
+{
+	/* raw DEFLATE with neither zlib nor gzip header */
+	return deflate_open(-MAX_WBITS, stream, fd);
+}
+
+static int
+deflate_gzip_open(struct stream_encoded *stream, int fd)
+{
+	/* detect gzip header, else assume zlib header */
+	return deflate_open(MAX_WBITS + 32, stream, fd);
+}
+
+static int
 deflate_read(struct stream_encoded *stream, unsigned char *buf, int len)
 {
 	struct deflate_enc_data *data = (struct deflate_enc_data *) stream->data;
@@ -117,7 +131,7 @@
 }
 
 static unsigned char *
-deflate_decode_buffer(unsigned char *data, int len, int *new_len)
+deflate_decode_buffer(int window_size, unsigned char *data, int len, int *new_len)
 {
 	z_stream stream;
 	unsigned char *buffer = NULL;
@@ -130,7 +144,7 @@
 	stream.next_in = data;
 	stream.avail_in = len;
 
-	if (inflateInit2(&stream, MAX_WBITS | 32) != Z_OK)
+	if (inflateInit2(&stream, window_size) != Z_OK)
 		return NULL;
 
 	do {
@@ -165,6 +179,20 @@
 	}
 }
 
+static unsigned char *
+deflate_raw_decode_buffer(unsigned char *data, int len, int *new_len)
+{
+	/* raw DEFLATE with neither zlib nor gzip header */
+	return deflate_decode_buffer(-MAX_WBITS, data, len, new_len);
+}
+
+static unsigned char *
+deflate_gzip_decode_buffer(unsigned char *data, int len, int *new_len)
+{
+	/* detect gzip header, else assume zlib header */
+	return deflate_decode_buffer(MAX_WBITS + 32, data, len, new_len);
+}
+
 static void
 deflate_close(struct stream_encoded *stream)
 {
@@ -183,9 +211,9 @@
 const struct decoding_backend deflate_decoding_backend = {
 	"deflate",
 	deflate_extensions,
-	deflate_open,
+	deflate_raw_open,
 	deflate_read,
-	deflate_decode_buffer,
+	deflate_raw_decode_buffer,
 	deflate_close,
 };
 
@@ -194,8 +222,8 @@
 const struct decoding_backend gzip_decoding_backend = {
 	"gzip",
 	gzip_extensions,
-	deflate_open,
+	deflate_gzip_open,
 	deflate_read,
-	deflate_decode_buffer,
+	deflate_gzip_decode_buffer,
 	deflate_close,
 };


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	6 Mar 2008 15:31:00 -0000	1.22
+++ .cvsignore	11 Jul 2008 09:01:30 -0000	1.23
@@ -1 +1 @@
-elinks-0.11.4rc1.tar.bz2
+elinks-0.11.4.tar.bz2


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-9/elinks.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- elinks.spec	6 Mar 2008 15:31:00 -0000	1.52
+++ elinks.spec	11 Jul 2008 09:01:30 -0000	1.53
@@ -1,11 +1,11 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.11.4
-Release:   0.4.rc1%{?dist}
+Release:   1%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
-Source:    http://elinks.or.cz/download/elinks-%{version}rc1.tar.bz2
+Source:    http://elinks.or.cz/download/elinks-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake
@@ -29,6 +29,7 @@
 Patch7: elinks-0.11.1-negotiate.patch
 Patch8: elinks-0.11.3-macropen.patch
 Patch9: elinks-0.11.4rc0-chunkedgzip.patch
+Patch10: elinks-0.11.4-deflate.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -37,7 +38,7 @@
 quickly and swiftly displays Web pages.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}
 
 # Prevent crash when HOME is unset (bug #90663).
 %patch0 -p1
@@ -58,6 +59,8 @@
 %patch8 -p1
 # fix for broken gzip compression for chunked pages
 %patch9 -p1
+# new version of deflate.c taken from elinks-0.12pre1
+%patch10 -p1
 
 %build
 ./autogen.sh
@@ -88,6 +91,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Jul 11 2008 Kamil Dudka <kdudka at redhat.com> 0.11.4-1
+- new version of deflate.c taken from elinks-0.12pre1(#446026)
+
 * Thu Mar  6 2008 Ondrej Vasik <ovasik at redhat.com> 0.11.4-0.4.rc1
 - new upstream release candidate marked stable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	6 Mar 2008 15:31:00 -0000	1.22
+++ sources	11 Jul 2008 09:01:30 -0000	1.23
@@ -1 +1 @@
-7fc7c36844be9c528c2ef28dbd4c5e6f  elinks-0.11.4rc1.tar.bz2
+88036a518ebc4f1150a7e14b29f9d8db  elinks-0.11.4.tar.bz2