merge of f5dd78fd37750576d502b8124f093d45ca992ca6

     and f9869d372bd0705706ba5562f7a5b7bb25208ff3

21 files changed, 1308 insertions, 15 deletions

diff --git a/packages/apex/.mtn2git_empty b/packages/apex/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/apex/.mtn2git_empty
diff --git a/packages/apex/apex_1.2.19.bb b/packages/apex/apex_1.2.19.bb
new file mode 100644
index 0000000000..2b022e94e7
--- /dev/null
+++ b/packages/apex/apex_1.2.19.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "APEX Boot Loader"
+SECTION = ""
+PRIORITY = "optional"
+MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+	   file://defconfig"
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@"
+	make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@" || die "oe_runmake failed"
+}
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	oe_runmake oldconfig
+}
+
+do_populate_staging() {
+	install -d ${STAGING_LOADER_DIR}
+	install -m 0755 src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin
+}
diff --git a/packages/apex/nslu2/.mtn2git_empty b/packages/apex/nslu2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/apex/nslu2/.mtn2git_empty
diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig
new file mode 100644
index 0000000000..138ed749a4
--- /dev/null
+++ b/packages/apex/nslu2/defconfig
@@ -0,0 +1,88 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 
+# Tue May 17 09:42:40 2005
+#
+CONFIG_ARM=y
+# CONFIG_ARCH_LH7952X is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_IXP42X=y
+# CONFIG_EXPERIMENTAL is not set
+
+#
+# General Setup
+#
+CONFIG_CROSS_COMPILE="/usr/armv5b-softfloat-linux/gcc-3.4.2-glibc-2.3.3/bin/armv5b-softfloat-linux-"
+# CONFIG_SMALL is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_SPINNER=y
+CONFIG_ATAG=y
+CONFIG_DISABLE_MMU_AT_BOOT=y
+CONFIG_ATAG_PHYS=0x00000100
+CONFIG_ARCH_NUMBER=597
+CONFIG_APEX_VMA=0x00200000
+CONFIG_KERNEL_LMA=0x00008000
+CONFIG_SDRAM_BANK0=y
+# CONFIG_SDRAM_BANK1 is not set
+CONFIG_NOR_BUSWIDTH=16
+CONFIG_NOR_BANK0=y
+CONFIG_NOR_BANK0_START=0x50000000
+CONFIG_NOR_BANK0_LENGTH=0x00800000
+CONFIG_ENV_STARTUP=""
+CONFIG_MACH="ixp42x"
+CONFIG_MACH_NSLU2=y
+# CONFIG_MACH_AVILA2347 is not set
+
+#
+# Platform Setup
+#
+CONFIG_USE_RAMDISK=y
+CONFIG_RAMDISK_LMA=0x01000000
+CONFIG_SDRAM_BANK_LENGTH=0x02000000
+CONFIG_ARCH_IXP420=y
+
+#
+# Commands
+#
+CONFIG_ALLHELP=y
+CONFIG_CMD_CHECKSUM=y
+CONFIG_CMD_COPY=y
+CONFIG_CMD_COMPARE=y
+CONFIG_CMD_DRVINFO=y
+CONFIG_CMD_DUMP=y
+CONFIG_CMD_ENV=y
+# CONFIG_CMD_ERASEENV is not set
+CONFIG_CMD_SETENV=y
+CONFIG_CMD_ERASE=y
+CONFIG_CMD_FILL=y
+CONFIG_CMD_INFO=y
+CONFIG_CMD_GO=y
+# CONFIG_CMD_PAUSE is not set
+CONFIG_CMD_WAIT=y
+CONFIG_CMD_XRECEIVE=y
+
+#
+# Generic Drivers
+#
+# CONFIG_DRIVER_FAT is not set
+# CONFIG_DRIVER_EXT2 is not set
+# CONFIG_DRIVER_JFFS2 is not set
+CONFIG_DRIVER_NOR_CFI=y
+CONFIG_USES_NOR_CFI=y
+
+#
+# Environment
+#
+CONFIG_NOR_BOOT=y
+# CONFIG_NAND_BOOT is not set
+CONFIG_AUTOBOOT=y
+CONFIG_AUTOBOOT_DELAY=10
+CONFIG_ENV_MUTABLE=y
+CONFIG_ENV_REGION="nor:128k+64k"
+CONFIG_ENV_STARTUP_KERNEL_COPY=y
+CONFIG_ENV_REGION_KERNEL="nor:0x60010+0xffff0"
+CONFIG_ENV_STARTUP_RAMDISK_COPY=y
+CONFIG_ENV_REGION_RAMDISK="nor:0x160010+0x69fff0"
+# CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE is not set
+CONFIG_USES_NOR_BOOTFLASH=y
+CONFIG_BIGENDIAN=y
diff --git a/packages/lineak/.mtn2git_empty b/packages/lineak/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lineak/.mtn2git_empty
diff --git a/packages/lineak/files/.mtn2git_empty b/packages/lineak/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lineak/files/.mtn2git_empty
diff --git a/packages/lineak/files/add-zaurus-remote-support.patch b/packages/lineak/files/add-zaurus-remote-support.patch
new file mode 100644
index 0000000000..a5cfe9f474
--- /dev/null
+++ b/packages/lineak/files/add-zaurus-remote-support.patch
@@ -0,0 +1,26 @@
+--- lineakd-0.8.3/lineakd/lineakkb.def	2005-03-02 04:15:39.000000000 -0800
++++ lineakd-0.8.3/lineakd/lineakkb.def.new	2005-07-14 20:50:40.000000000 -0700
+@@ -1166,6 +1166,23 @@
+ 
+ #### END CodeGen Keyboards ####
+ 
++#### Sharp Zaurus Remotes ####
++
++[CE-RH2]
++  brandname = "Sharp"
++  modelname = "Sharp CE-RH2"
++  [KEYS]
++    AudioPlay|Pause  = 72
++    AudioRaiseVolume = 126
++    AudioLowerVolume = 127
++    AudioMute        = 128
++    AudioStop        = 76
++    AudioPrev        = 124
++    AudioNext        = 116
++  [END KEYS]
++[END CE-RH2]
++
++#### END Sharp Zaurus Remotes ####
+ 
+ #### Compaq keyboards ####
+ 
diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb
new file mode 100644
index 0000000000..7b04db572d
--- /dev/null
+++ b/packages/lineak/lineak_0.8.3.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "lineakd"
+SECTION = "gpe/multimedia"
+HOMEPAGE = "http://lineak.sourceforge.net"
+LICENSE = "GPLv2"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+DEPENDS = "x11 xext"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \
+           file://add-zaurus-remote-support.patch;patch=1"
+
+inherit autotools
+
+do_install () {
+	oe_runmake 'mandir=${D}/usr/share/man' 'pkglibdir=${D}/usr/lib' 'sysconfdir=${D}/etc' 'DESTDIR=${D}' install
+}
+
+PACKAGES += "${PN}-lib"
+
+FILES_${PN}-lib += " \
+  ${libdir}/liblineak*"
+
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
index b6b7cbc17d..8e4712da4f 100644
--- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
@@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-CONFIG_PPP=y
+CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=y
+CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
index fe94202c9d..b8f64bed78 100644
--- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r5"
+PR = "r6"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index e17bfdfe6a..444fb5b7ea 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -1,15 +1,14 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys WRT54 devices"
 HOMEPAGE = "http://openwrt.org"
+DEPENDS = "lzma-native"
 LICENSE = "GPL"
 PR = "r2"
 
-DEPENDS = "lzma-native"
-
 SRC_URI = "http://www.fi.kernel.org/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \
 	cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \
-	http://downloads.openwrt.org/kernel-binary-wl-0.2.tar.gz \
-	http://downloads.openwrt.org/kernel-source-et-0.6.tar.gz \
+	http://downloads.openwrt.org/sources/kernel-binary-wl-0.2.tar.gz \
+	http://downloads.openwrt.org/sources/kernel-source-et-0.6.tar.gz \
 	file://000-linux-mips-2_4_30.patch;patch=1 \
 	file://001-Makefile;patch=1 \
 	file://002-Rules_make;patch=1 \
diff --git a/packages/modutils/files/gcc4.patch b/packages/modutils/files/gcc4.patch
index 187a677158..e204898f05 100644
--- a/packages/modutils/files/gcc4.patch
+++ b/packages/modutils/files/gcc4.patch
@@ -51,3 +51,16 @@
  	xrealloc(a_hdr, a_hdr->total_size);
      p = (char *)a_hdr + a_hdr->symbol_off;
      memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
+--- modutils-2.4.27/obj/obj_mips.c.orig	2003-04-05 00:47:17.000000000 +0200
++++ modutils-2.4.27/obj/obj_mips.c	2005-07-21 12:51:48.000000000 +0200
+@@ -244,7 +244,9 @@
+   archdata_sec->header.sh_size = 0;
+   sec = obj_find_section(f, "__dbe_table");
+   if (sec) {
+-    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
++/*    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/
++    archdata_sec->contents = xmalloc(sizeof(*ad));
++    ad = (struct archdata *) (archdata_sec->contents);
+     memset(ad, 0, sizeof(*ad));
+     archdata_sec->header.sh_size = sizeof(*ad);
+     ad->__start___dbe_table = sec->header.sh_addr;
diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb
index c990b354f3..2b301d7d09 100644
--- a/packages/modutils/modutils-cross_2.4.27.bb
+++ b/packages/modutils/modutils-cross_2.4.27.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 include modutils_${PV}.bb
-PR = "r5"
+PR = "r6"
 inherit cross
 S = "${WORKDIR}/modutils-${PV}"
 DEPENDS = ""
diff --git a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb
index 569bf8dad2..d7b285e8ec 100644
--- a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb
+++ b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb
@@ -1,6 +1,8 @@
-SECTION = "base"
-PN_BASE = "squashfs-tools"
 include ${PN_BASE}_${PV}.bb
+
+DEPENDS = "lzma-native"
+PN_BASE = "squashfs-tools"
+
 inherit native
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN_BASE}-${PV}', '${FILE_DIRNAME}/${PN_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/packages/squashfs-tools/squashfs-tools_2.0r2.bb b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
index f99cdb798e..ccc6b33697 100644
--- a/packages/squashfs-tools/squashfs-tools_2.0r2.bb
+++ b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
@@ -1,7 +1,9 @@
-SECTION = "base"
 DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "lzma"
+SECTION = "base"
 LICENSE = "GPLv2"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \
 	   file://flags.patch;patch=1 \
diff --git a/packages/sylpheed/files/sylpheed-gnutls-extra.patch b/packages/sylpheed/files/sylpheed-gnutls-extra.patch
new file mode 100644
index 0000000000..ba24b5a1d7
--- /dev/null
+++ b/packages/sylpheed/files/sylpheed-gnutls-extra.patch
@@ -0,0 +1,37 @@
+--- sylpheed-2.0.0beta6/src/ssl.c.orig	2005-07-20 15:45:12.882201824 +0100
++++ sylpheed-2.0.0beta6/src/ssl.c	2005-07-20 16:10:04.006516472 +0100
+@@ -54,9 +54,9 @@
+ 		debug_print(_("SSLv23 not available\n"));
+ 	} else {
+ 		debug_print(_("SSLv23 available\n"));
+-		if (certs_dir &&
++		if (certs_dir /*&&
+ 		    !SSL_CTX_load_verify_locations(ssl_ctx_SSLv23, NULL,
+-						   certs_dir))
++						   certs_dir)*/)
+ 			g_warning("SSLv23 SSL_CTX_load_verify_locations failed.\n");
+ 	}
+ 
+@@ -65,9 +65,9 @@
+ 		debug_print(_("TLSv1 not available\n"));
+ 	} else {
+ 		debug_print(_("TLSv1 available\n"));
+-		if (certs_dir &&
++		if (certs_dir /*&&
+ 		    !SSL_CTX_load_verify_locations(ssl_ctx_TLSv1, NULL,
+-						   certs_dir))
++						   certs_dir)*/)
+ 			g_warning("TLSv1 SSL_CTX_load_verify_locations failed.\n");
+ 	}
+ 
+@@ -151,8 +151,8 @@
+ 			g_free(str);
+ 		}
+ 
+-		verify_result = SSL_get_verify_result(sockinfo->ssl);
+-		if (verify_result == X509_V_OK)
++		verify_result = 0; /*SSL_get_verify_result(sockinfo->ssl);*/
++		if (verify_result == 1)
+ 			debug_print("SSL verify OK\n");
+ 		else
+ 			g_warning("%s: SSL certificate verify failed (%ld: %s)\n",
diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb
index 4fab8e8bb8..d95f21f343 100644
--- a/packages/sylpheed/sylpheed_2.0.0beta6.bb
+++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb
@@ -1,12 +1,13 @@
 SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \
-	file://sylpheed-gnutls_2.0.0beta6.patch;patch=1"
+	file://sylpheed-gnutls_2.0.0beta6.patch;patch=1 \
+	file://sylpheed-gnutls-extra.patch;patch=1 "
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN}-doc += "${datadir}"
diff --git a/packages/zlib/zlib-1.2.3/.mtn2git_empty b/packages/zlib/zlib-1.2.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zlib/zlib-1.2.3/.mtn2git_empty
diff --git a/packages/zlib/zlib-1.2.3/visibility.patch b/packages/zlib/zlib-1.2.3/visibility.patch
new file mode 100644
index 0000000000..a4e7ae907a
--- /dev/null
+++ b/packages/zlib/zlib-1.2.3/visibility.patch
@@ -0,0 +1,1034 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- zlib-1.2.3-orig/adler32.c~visibility
++++ zlib-1.2.3-orig/adler32.c
+@@ -54,7 +54,7 @@
+ #endif
+ 
+ /* ========================================================================= */
+-uLong ZEXPORT adler32(adler, buf, len)
++ZEXPORT uLong adler32(adler, buf, len)
+     uLong adler;
+     const Bytef *buf;
+     uInt len;
+--- zlib-1.2.3-orig/compress.c~visibility
++++ zlib-1.2.3-orig/compress.c
+@@ -19,7 +19,7 @@
+    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+    Z_STREAM_ERROR if the level parameter is invalid.
+ */
+-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
++ZEXPORT int compress2 (dest, destLen, source, sourceLen, level)
+     Bytef *dest;
+     uLongf *destLen;
+     const Bytef *source;
+@@ -59,7 +59,7 @@
+ 
+ /* ===========================================================================
+  */
+-int ZEXPORT compress (dest, destLen, source, sourceLen)
++ZEXPORT int compress (dest, destLen, source, sourceLen)
+     Bytef *dest;
+     uLongf *destLen;
+     const Bytef *source;
+@@ -72,7 +72,7 @@
+      If the default memLevel or windowBits for deflateInit() is changed, then
+    this function needs to be updated.
+  */
+-uLong ZEXPORT compressBound (sourceLen)
++ZEXPORT uLong compressBound (sourceLen)
+     uLong sourceLen;
+ {
+     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+--- zlib-1.2.3-orig/crc32.c~visibility
++++ zlib-1.2.3-orig/crc32.c
+@@ -202,7 +202,7 @@
+ /* =========================================================================
+  * This function can be used by asm versions of crc32()
+  */
+-const unsigned long FAR * ZEXPORT get_crc_table()
++ZEXPORT const unsigned long FAR * get_crc_table()
+ {
+ #ifdef DYNAMIC_CRC_TABLE
+     if (crc_table_empty)
+@@ -216,7 +216,7 @@
+ #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+ 
+ /* ========================================================================= */
+-unsigned long ZEXPORT crc32(crc, buf, len)
++ZEXPORT unsigned long crc32(crc, buf, len)
+     unsigned long crc;
+     const unsigned char FAR *buf;
+     unsigned len;
+--- zlib-1.2.3-orig/deflate.c~visibility
++++ zlib-1.2.3-orig/deflate.c
+@@ -201,7 +201,7 @@
+     zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateInit_(strm, level, version, stream_size)
++ZEXPORT int deflateInit_(strm, level, version, stream_size)
+     z_streamp strm;
+     int level;
+     const char *version;
+@@ -213,7 +213,7 @@
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
++ZEXPORT int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                   version, stream_size)
+     z_streamp strm;
+     int  level;
+@@ -312,7 +312,7 @@
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
++ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength)
+     z_streamp strm;
+     const Bytef *dictionary;
+     uInt  dictLength;
+@@ -354,7 +354,7 @@
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateReset (strm)
++ZEXPORT int deflateReset (strm)
+     z_streamp strm;
+ {
+     deflate_state *s;
+@@ -401,7 +401,7 @@
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflatePrime (strm, bits, value)
++ZEXPORT int deflatePrime (strm, bits, value)
+     z_streamp strm;
+     int bits;
+     int value;
+@@ -413,7 +413,7 @@
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateParams(strm, level, strategy)
++ZEXPORT int deflateParams(strm, level, strategy)
+     z_streamp strm;
+     int level;
+     int strategy;
+@@ -486,7 +486,7 @@
+  * But even the conservative upper bound of about 14% expansion does not
+  * seem onerous for output buffer allocation.
+  */
+-uLong ZEXPORT deflateBound(strm, sourceLen)
++ZEXPORT uLong deflateBound(strm, sourceLen)
+     z_streamp strm;
+     uLong sourceLen;
+ {
+@@ -549,7 +549,7 @@
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflate (strm, flush)
++ZEXPORT int deflate (strm, flush)
+     z_streamp strm;
+     int flush;
+ {
+@@ -856,7 +856,7 @@
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateEnd (strm)
++ZEXPORT int deflateEnd (strm)
+     z_streamp strm;
+ {
+     int status;
+@@ -891,7 +891,7 @@
+  * To simplify the source, this is not supported for 16-bit MSDOS (which
+  * doesn't have enough memory anyway to duplicate compression states).
+  */
+-int ZEXPORT deflateCopy (dest, source)
++ZEXPORT int deflateCopy (dest, source)
+     z_streamp dest;
+     z_streamp source;
+ {
+--- zlib-1.2.3-orig/gzio.c~visibility
++++ zlib-1.2.3-orig/gzio.c
+@@ -205,7 +205,7 @@
+ /* ===========================================================================
+      Opens a gzip (.gz) file for reading or writing.
+ */
+-gzFile ZEXPORT gzopen (path, mode)
++ZEXPORT gzFile gzopen (path, mode)
+     const char *path;
+     const char *mode;
+ {
+@@ -216,7 +216,7 @@
+      Associate a gzFile with the file descriptor fd. fd is not dup'ed here
+    to mimic the behavio(u)r of fdopen.
+ */
+-gzFile ZEXPORT gzdopen (fd, mode)
++ZEXPORT gzFile gzdopen (fd, mode)
+     int fd;
+     const char *mode;
+ {
+@@ -231,7 +231,7 @@
+ /* ===========================================================================
+  * Update the compression level and strategy
+  */
+-int ZEXPORT gzsetparams (file, level, strategy)
++ZEXPORT int gzsetparams (file, level, strategy)
+     gzFile file;
+     int level;
+     int strategy;
+@@ -391,7 +391,7 @@
+      Reads the given number of uncompressed bytes from the compressed file.
+    gzread returns the number of bytes actually read (0 for end of file).
+ */
+-int ZEXPORT gzread (file, buf, len)
++ZEXPORT int gzread (file, buf, len)
+     gzFile file;
+     voidp buf;
+     unsigned len;
+@@ -500,7 +500,7 @@
+       Reads one byte from the compressed file. gzgetc returns this byte
+    or -1 in case of end of file or error.
+ */
+-int ZEXPORT gzgetc(file)
++ZEXPORT int gzgetc(file)
+     gzFile file;
+ {
+     unsigned char c;
+@@ -512,7 +512,7 @@
+ /* ===========================================================================
+       Push one byte back onto the stream.
+ */
+-int ZEXPORT gzungetc(c, file)
++ZEXPORT int gzungetc(c, file)
+     int c;
+     gzFile file;
+ {
+@@ -537,7 +537,7 @@
+ 
+       The current implementation is not optimized at all.
+ */
+-char * ZEXPORT gzgets(file, buf, len)
++ZEXPORT char * gzgets(file, buf, len)
+     gzFile file;
+     char *buf;
+     int len;
+@@ -556,7 +556,7 @@
+      Writes the given number of uncompressed bytes into the compressed file.
+    gzwrite returns the number of bytes actually written (0 in case of error).
+ */
+-int ZEXPORT gzwrite (file, buf, len)
++ZEXPORT int gzwrite (file, buf, len)
+     gzFile file;
+     voidpc buf;
+     unsigned len;
+@@ -600,7 +600,7 @@
+ #ifdef STDC
+ #include <stdarg.h>
+ 
+-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
++ZEXPORTVA int gzprintf (gzFile file, const char *format, /* args */ ...)
+ {
+     char buf[Z_PRINTF_BUFSIZE];
+     va_list va;
+@@ -634,7 +634,7 @@
+ }
+ #else /* not ANSI C */
+ 
+-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
++ZEXPORT intVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+                        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+     gzFile file;
+     const char *format;
+@@ -675,7 +675,7 @@
+       Writes c, converted to an unsigned char, into the compressed file.
+    gzputc returns the value that was written, or -1 in case of error.
+ */
+-int ZEXPORT gzputc(file, c)
++ZEXPORT int gzputc(file, c)
+     gzFile file;
+     int c;
+ {
+@@ -690,7 +690,7 @@
+    the terminating null character.
+       gzputs returns the number of characters written, or -1 in case of error.
+ */
+-int ZEXPORT gzputs(file, s)
++ZEXPORT int gzputs(file, s)
+     gzFile file;
+     const char *s;
+ {
+@@ -743,7 +743,7 @@
+     return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+ }
+ 
+-int ZEXPORT gzflush (file, flush)
++ZEXPORT int gzflush (file, flush)
+      gzFile file;
+      int flush;
+ {
+@@ -764,7 +764,7 @@
+       SEEK_END is not implemented, returns error.
+       In this version of the library, gzseek can be extremely slow.
+ */
+-z_off_t ZEXPORT gzseek (file, offset, whence)
++ZEXPORT z_off_t gzseek (file, offset, whence)
+     gzFile file;
+     z_off_t offset;
+     int whence;
+@@ -854,7 +854,7 @@
+ /* ===========================================================================
+      Rewinds input file.
+ */
+-int ZEXPORT gzrewind (file)
++ZEXPORT int gzrewind (file)
+     gzFile file;
+ {
+     gz_stream *s = (gz_stream*)file;
+@@ -878,7 +878,7 @@
+    given compressed file. This position represents a number of bytes in the
+    uncompressed data stream.
+ */
+-z_off_t ZEXPORT gztell (file)
++ZEXPORT z_off_t gztell (file)
+     gzFile file;
+ {
+     return gzseek(file, 0L, SEEK_CUR);
+@@ -888,7 +888,7 @@
+      Returns 1 when EOF has previously been detected reading the given
+    input stream, otherwise zero.
+ */
+-int ZEXPORT gzeof (file)
++ZEXPORT int gzeof (file)
+     gzFile file;
+ {
+     gz_stream *s = (gz_stream*)file;
+@@ -950,7 +950,7 @@
+      Flushes all pending output if necessary, closes the compressed file
+    and deallocates all the (de)compression state.
+ */
+-int ZEXPORT gzclose (file)
++ZEXPORT int gzclose (file)
+     gzFile file;
+ {
+     gz_stream *s = (gz_stream*)file;
+@@ -984,7 +984,7 @@
+    errnum is set to Z_ERRNO and the application may consult errno
+    to get the exact error code.
+ */
+-const char * ZEXPORT gzerror (file, errnum)
++ZEXPORT const char * gzerror (file, errnum)
+     gzFile file;
+     int *errnum;
+ {
+@@ -1014,7 +1014,7 @@
+ /* ===========================================================================
+      Clear the error and end-of-file flags, and do the same for the real file.
+ */
+-void ZEXPORT gzclearerr (file)
++ZEXPORT void gzclearerr (file)
+     gzFile file;
+ {
+     gz_stream *s = (gz_stream*)file;
+--- zlib-1.2.3-orig/infback.c~visibility
++++ zlib-1.2.3-orig/infback.c
+@@ -25,7 +25,7 @@
+    windowBits is in the range 8..15, and window is a user-supplied
+    window and output buffer that is 2**windowBits bytes.
+  */
+-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
++ZEXPORT int inflateBackInit_(strm, windowBits, window, version, stream_size)
+ z_streamp strm;
+ int windowBits;
+ unsigned char FAR *window;
+@@ -238,7 +238,7 @@
+    inflateBack() can also return Z_STREAM_ERROR if the input parameters
+    are not correct, i.e. strm is Z_NULL or the state was not initialized.
+  */
+-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
++ZEXPORT int inflateBack(strm, in, in_desc, out, out_desc)
+ z_streamp strm;
+ in_func in;
+ void FAR *in_desc;
+@@ -611,7 +611,7 @@
+     return ret;
+ }
+ 
+-int ZEXPORT inflateBackEnd(strm)
++ZEXPORT int inflateBackEnd(strm)
+ z_streamp strm;
+ {
+     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+--- zlib-1.2.3-orig/inflate.c~visibility
++++ zlib-1.2.3-orig/inflate.c
+@@ -100,7 +100,7 @@
+ local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+                               unsigned len));
+ 
+-int ZEXPORT inflateReset(strm)
++ZEXPORT int inflateReset(strm)
+ z_streamp strm;
+ {
+     struct inflate_state FAR *state;
+@@ -141,7 +141,7 @@
+     return Z_OK;
+ }
+ 
+-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
++ZEXPORT int inflateInit2_(strm, windowBits, version, stream_size)
+ z_streamp strm;
+ int windowBits;
+ const char *version;
+@@ -184,7 +184,7 @@
+     return inflateReset(strm);
+ }
+ 
+-int ZEXPORT inflateInit_(strm, version, stream_size)
++ZEXPORT int inflateInit_(strm, version, stream_size)
+ z_streamp strm;
+ const char *version;
+ int stream_size;
+@@ -551,7 +551,7 @@
+    will return Z_BUF_ERROR if it has not reached the end of the stream.
+  */
+ 
+-int ZEXPORT inflate(strm, flush)
++ZEXPORT int inflate(strm, flush)
+ z_streamp strm;
+ int flush;
+ {
+@@ -1152,7 +1152,7 @@
+     return ret;
+ }
+ 
+-int ZEXPORT inflateEnd(strm)
++ZEXPORT int inflateEnd(strm)
+ z_streamp strm;
+ {
+     struct inflate_state FAR *state;
+@@ -1166,7 +1166,7 @@
+     return Z_OK;
+ }
+ 
+-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
++ZEXPORT int inflateSetDictionary(strm, dictionary, dictLength)
+ z_streamp strm;
+ const Bytef *dictionary;
+ uInt dictLength;
+@@ -1259,7 +1259,7 @@
+     return next;
+ }
+ 
+-int ZEXPORT inflateSync(strm)
++ZEXPORT int inflateSync(strm)
+ z_streamp strm;
+ {
+     unsigned len;               /* number of bytes to look at or looked at */
+@@ -1310,7 +1310,7 @@
+    block. When decompressing, PPP checks that at the end of input packet,
+    inflate is waiting for these length bytes.
+  */
+-int ZEXPORT inflateSyncPoint(strm)
++ZEXPORT int inflateSyncPoint(strm)
+ z_streamp strm;
+ {
+     struct inflate_state FAR *state;
+@@ -1320,7 +1320,7 @@
+     return state->mode == STORED && state->bits == 0;
+ }
+ 
+-int ZEXPORT inflateCopy(dest, source)
++ZEXPORT int inflateCopy(dest, source)
+ z_streamp dest;
+ z_streamp source;
+ {
+--- zlib-1.2.3-orig/uncompr.c~visibility
++++ zlib-1.2.3-orig/uncompr.c
+@@ -23,7 +23,7 @@
+    enough memory, Z_BUF_ERROR if there was not enough room in the output
+    buffer, or Z_DATA_ERROR if the input data was corrupted.
+ */
+-int ZEXPORT uncompress (dest, de