|
|
|
|
Index: src/stdint_.h
|
|
|
|
|
--- src/stdint_.h.orig 2003-12-22 22:19:59.000000000 +0100
|
|
|
|
|
+++ src/stdint_.h 2004-01-03 09:45:26.000000000 +0100
|
|
|
|
|
@@ -75,6 +75,13 @@
|
|
|
|
|
typedef u_int64_t uint64_t;
|
|
|
|
|
# define STDINT_TYPES_DEFINED
|
|
|
|
|
# endif
|
|
|
|
|
+#ifdef __sun__
|
|
|
|
|
+# include <sys/int_types.h>
|
|
|
|
|
+# define STDINT_TYPES_DEFINED
|
|
|
|
|
+#endif
|
|
|
|
|
+#ifdef __FreeBSD__
|
|
|
|
|
+# define STDINT_TYPES_DEFINED
|
|
|
|
|
+#endif
|
|
|
|
|
/* other archs may want to add defines here,
|
|
|
|
|
or use the fallbacks in std.h */
|
|
|
|
|
#endif /* !HAVE_STDINT_H */
|
|
|
|
|
|
|
|
|
|
-----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
Port to ZLIB 1.2.1
|
|
|
|
|
|
|
|
|
|
Index: src/zlib.mak
|
|
|
|
|
--- src/zlib.mak.orig 2002-05-09 18:29:16.000000000 +0200
|
|
|
|
|
+++ src/zlib.mak 2004-01-03 09:39:03.000000000 +0100
|
|
|
|
|
@@ -84,7 +84,7 @@
|
|
|
|
|
$(ZGEN)zlibe_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
|
|
|
|
|
$(SETMOD) $(ZGEN)zlibe_1 -lib $(ZLIB_NAME)
|
|
|
|
|
|
|
|
|
|
-zlibe_=$(ZOBJ)adler32.$(OBJ) $(ZOBJ)deflate.$(OBJ) $(ZOBJ)trees.$(OBJ)
|
|
|
|
|
+zlibe_=$(ZOBJ)adler32.$(OBJ) $(ZOBJ)deflate.$(OBJ) $(ZOBJ)compress.$(OBJ) $(ZOBJ)trees.$(OBJ)
|
|
|
|
|
$(ZGEN)zlibe_0.dev : $(ZLIB_MAK) $(ECHOGS_XE) $(ZGEN)zlibc.dev $(zlibe_)
|
|
|
|
|
$(SETMOD) $(ZGEN)zlibe_0 $(zlibe_)
|
|
|
|
|
$(ADDMOD) $(ZGEN)zlibe_0 -include $(ZGEN)zlibc.dev
|
|
|
|
|
@@ -95,6 +95,9 @@
|
|
|
|
|
$(ZOBJ)deflate.$(OBJ) : $(ZSRC)deflate.c $(ZDEP)
|
|
|
|
|
$(ZCC) $(ZO_)deflate.$(OBJ) $(C_) $(ZSRC)deflate.c
|
|
|
|
|
|
|
|
|
|
+$(ZOBJ)compress.$(OBJ) : $(ZSRC)compress.c $(ZDEP)
|
|
|
|
|
+ $(ZCC) $(ZO_)compress.$(OBJ) $(C_) $(ZSRC)compress.c
|
|
|
|
|
+
|
|
|
|
|
$(ZOBJ)trees.$(OBJ) : $(ZSRC)trees.c $(ZDEP)
|
|
|
|
|
$(ZCC) $(ZO_)trees.$(OBJ) $(C_) $(ZSRC)trees.c
|
|
|
|
|
|
|
|
|
|
@@ -123,8 +126,8 @@
|
|
|
|
|
$(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
|
|
|
|
|
$(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME)
|
|
|
|
|
|
|
|
|
|
-zlibd1_=$(ZOBJ)infblock.$(OBJ) $(ZOBJ)infcodes.$(OBJ) $(ZOBJ)inffast.$(OBJ)
|
|
|
|
|
-zlibd2_=$(ZOBJ)inflate.$(OBJ) $(ZOBJ)inftrees.$(OBJ) $(ZOBJ)infutil.$(OBJ)
|
|
|
|
|
+zlibd1_=$(ZOBJ)inffast.$(OBJ)
|
|
|
|
|
+zlibd2_=$(ZOBJ)inflate.$(OBJ) $(ZOBJ)inftrees.$(OBJ)
|
|
|
|
|
zlibd_ = $(zlibd1_) $(zlibd2_)
|
|
|
|
|
$(ZGEN)zlibd_0.dev : $(ZLIB_MAK) $(ECHOGS_XE) $(ZGEN)zlibc.dev $(zlibd_)
|
|
|
|
|
$(SETMOD) $(ZGEN)zlibd_0 $(zlibd1_)
|
|
|
|
|
|
|
|
|
|
-----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
Security Bugfixes (CAN-2004-0797, OpenPKG-SA-2004.038-zlib):
|
|
|
|
|
|
|
|
|
|
Index: zlib/infback.c
|
|
|
|
|
--- zlib/infback.c.orig 2003-08-12 01:48:06 +0200
|
|
|
|
|
+++ zlib/infback.c 2004-08-25 12:37:07 +0200
|
|
|
|
|
@@ -434,6 +434,9 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (state->mode == BAD)
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
|
|
/* build code tables */
|
|
|
|
|
state->next = state->codes;
|
|
|
|
|
state->lencode = (code const FAR *)(state->next);
|
|
|
|
|
Index: zlib/inflate.c
|
|
|
|
|
--- zlib/inflate.c.orig 2003-10-26 07:15:36 +0100
|
|
|
|
|
+++ zlib/inflate.c 2004-08-25 12:37:07 +0200
|
|
|
|
|
@@ -861,6 +861,9 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (state->mode == BAD)
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
|
|
/* build code tables */
|
|
|
|
|
state->next = state->codes;
|
|
|
|
|
state->lencode = (code const FAR *)(state->next);
|
|
|
|
|
|
