summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 14:32:52 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 14:32:52 -0300
commit2699a201e0f70a2e1c2f7a0cab8725321649893d (patch)
treeb9f1b7eaa65592b658bb922714a975725e244d3c /core
parent8d1750d5bec9ffb69b499a8452d7c2c52cea70e5 (diff)
parent359d940358dec836dd0acfe9d9caf0b1ff0a97fe (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bacula/PKGBUILD community/clementine/PKGBUILD community/dbus-sharp-glib/PKGBUILD community/dockmanager/PKGBUILD community/docky/PKGBUILD community/flightgear-atlas/PKGBUILD community/libdesktop-agnostic/PKGBUILD community/openmovieeditor/PKGBUILD community/perl-crypt-openssl-bignum/PKGBUILD community/perl-crypt-openssl-random/PKGBUILD community/perl-crypt-openssl-rsa/PKGBUILD community/tucan/PKGBUILD core/btrfs-progs-unstable/PKGBUILD core/module-init-tools/PKGBUILD core/sqlite3/PKGBUILD.mips64el extra/bogofilter/PKGBUILD extra/dirmngr/PKGBUILD extra/gluezilla/PKGBUILD extra/gnupg/PKGBUILD extra/gnupg2/PKGBUILD extra/gpgme/PKGBUILD extra/kdeaccessibility/PKGBUILD extra/kdelibs/PKGBUILD extra/kdeutils/PKGBUILD extra/libassuan/PKGBUILD extra/libksba/PKGBUILD extra/oxygen-gtk/PKGBUILD extra/pinentry/PKGBUILD extra/pth/PKGBUILD extra/smplayer-themes/PKGBUILD libre/kdeutils-libre/PKGBUILD libre/linux-libre/linux-libre.preset.mips64el
Diffstat (limited to 'core')
-rw-r--r--core/btrfs-progs-unstable/PKGBUILD25
-rw-r--r--core/btrfs-progs-unstable/btrfs-progs-build-fixes.patch32
-rw-r--r--core/curl/fix-J-with-O-regression.patch142
-rw-r--r--core/glibc/glibc-2.15-math64crash.patch184
-rw-r--r--core/libarchive/release-2.8-fixes.patch234
-rw-r--r--core/libarchive/sparse-file.patch13
-rw-r--r--core/module-init-tools/PKGBUILD49
-rw-r--r--core/module-init-tools/depmod.conf5
-rw-r--r--core/module-init-tools/docfix.patch90
-rw-r--r--core/module-init-tools/modprobe.conf3
-rw-r--r--core/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch162
-rw-r--r--core/udev/81-arch.rules9
-rw-r--r--core/zlib/zlib-1.2.5-lfs-decls.patch13
13 files changed, 0 insertions, 961 deletions
diff --git a/core/btrfs-progs-unstable/PKGBUILD b/core/btrfs-progs-unstable/PKGBUILD
deleted file mode 100644
index 12699158a..000000000
--- a/core/btrfs-progs-unstable/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 142300 2011-11-08 06:06:06Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=btrfs-progs-unstable
-pkgver=0.19.20101006
-pkgrel=2.1
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64 'mips64el')
-depends=('glibc' 'e2fsprogs')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2)
-url="http://btrfs.wiki.kernel.org/"
-license=('GPL2')
-
-build() {
- cd $srcdir/$pkgname
- make CFLAGS="$CFLAGS" all convert
-}
-
-package() {
- cd $srcdir/$pkgname
- make prefix=$pkgdir/usr bindir=$pkgdir/sbin install
- # fix manpage
- mkdir -p $pkgdir/usr/share/
- mv $pkgdir/usr/man $pkgdir/usr/share/man
-}
-md5sums=('6bce610ed1720e6b9dc9fa96cbd8b73e')
diff --git a/core/btrfs-progs-unstable/btrfs-progs-build-fixes.patch b/core/btrfs-progs-unstable/btrfs-progs-build-fixes.patch
deleted file mode 100644
index d189c5a77..000000000
--- a/core/btrfs-progs-unstable/btrfs-progs-build-fixes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- btrfs-progs-0.19/btrfsck.c
-+++ btrfs-progs-0.19/btrfsck.c
-@@ -21,6 +21,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"
---- btrfs-progs-0.19/mkfs.c
-+++ btrfs-progs-0.19/mkfs.c
-@@ -341,7 +341,7 @@ int main(int ac, char **av)
- u64 alloc_start = 0;
- u64 metadata_profile = BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_DUP;
- u64 data_profile = BTRFS_BLOCK_GROUP_RAID0;
-- u32 leafsize = getpagesize();
-+ u32 leafsize = sysconf(_SC_PAGESIZE);
- u32 sectorsize = 4096;
- u32 nodesize = leafsize;
- u32 stripesize = 4096;
-@@ -398,7 +398,7 @@ int main(int ac, char **av)
- print_usage();
- }
- }
-- sectorsize = max(sectorsize, (u32)getpagesize());
-+ sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
- if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) {
- fprintf(stderr, "Illegal leafsize %u\n", leafsize);
- exit(1);
diff --git a/core/curl/fix-J-with-O-regression.patch b/core/curl/fix-J-with-O-regression.patch
deleted file mode 100644
index 4b7de1a23..000000000
--- a/core/curl/fix-J-with-O-regression.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Sun, 20 Nov 2011 23:33:46 +0100
-Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
-
-A regression between 7.22.0 and 7.23.0 -- downloading a file with the
-flags -O and -J results in the content being written to stdout if and
-only if there was no Content-Disposition header in the http response. If
-there is a C-D header with a filename attribute, the output is correctly
-written.
-
-Reported by: Dave Reisner
-Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
----
- src/tool_cb_hdr.c | 3 +-
- src/tool_operate.c | 59 ++++++++++++++++++++++----------------------
- src/tool_operhlp.c | 18 +++++++++++++
- tests/data/Makefile.am | 2 +-
- tests/data/test1210 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 112 insertions(+), 33 deletions(-)
- create mode 100644 tests/data/test1210
-
-diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
-index fb24b45..dea7338 100644
---- a/src/tool_cb_hdr.c
-+++ b/src/tool_cb_hdr.c
-@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata)
- }
- #endif
-
-- if(!outs->filename && (cb > 20) &&
-- checkprefix("Content-disposition:", str)) {
-+ if((cb > 20) && checkprefix("Content-disposition:", str)) {
- const char *p = str + 20;
-
- /* look for the 'filename=' parameter
-diff --git a/src/tool_operate.c b/src/tool_operate.c
-index 7ab815f..1e88120 100644
---- a/src/tool_operate.c
-+++ b/src/tool_operate.c
-@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
-
- if((urlnode->flags & GETOUT_USEREMOTE)
- && config->content_disposition) {
-- /* Our header callback sets the filename */
-+ /* Our header callback MIGHT set the filename */
- DEBUGASSERT(!outs.filename);
- }
-- else {
-- if(config->resume_from_current) {
-- /* We're told to continue from where we are now. Get the size
-- of the file as it is now and open it for append instead */
-- struct_stat fileinfo;
-- /* VMS -- Danger, the filesize is only valid for stream files */
-- if(0 == stat(outfile, &fileinfo))
-- /* set offset to current file size: */
-- config->resume_from = fileinfo.st_size;
-- else
-- /* let offset be 0 */
-- config->resume_from = 0;
-- }
-
-- if(config->resume_from) {
-- /* open file for output: */
-- FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
-- if(!file) {
-- helpf(config->errors, "Can't open '%s'!\n", outfile);
-- res = CURLE_WRITE_ERROR;
-- goto quit_urls;
-- }
-- outs.fopened = TRUE;
-- outs.stream = file;
-- outs.init = config->resume_from;
-- }
-- else {
-- outs.stream = NULL; /* open when needed */
-+ if(config->resume_from_current) {
-+ /* We're told to continue from where we are now. Get the size
-+ of the file as it is now and open it for append instead */
-+ struct_stat fileinfo;
-+ /* VMS -- Danger, the filesize is only valid for stream files */
-+ if(0 == stat(outfile, &fileinfo))
-+ /* set offset to current file size: */
-+ config->resume_from = fileinfo.st_size;
-+ else
-+ /* let offset be 0 */
-+ config->resume_from = 0;
-+ }
-+
-+ if(config->resume_from) {
-+ /* open file for output: */
-+ FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
-+ if(!file) {
-+ helpf(config->errors, "Can't open '%s'!\n", outfile);
-+ res = CURLE_WRITE_ERROR;
-+ goto quit_urls;
- }
-- outs.filename = outfile;
-- outs.s_isreg = TRUE;
-+ outs.fopened = TRUE;
-+ outs.stream = file;
-+ outs.init = config->resume_from;
-+ }
-+ else {
-+ outs.stream = NULL; /* open when needed */
- }
-+ outs.filename = outfile;
-+ outs.s_isreg = TRUE;
- }
-
- if(uploadfile && !stdin_upload(uploadfile)) {
-diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
-index 808d2d5..4c1697b 100644
---- a/src/tool_operhlp.c
-+++ b/src/tool_operhlp.c
-@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url)
- return CURLE_OUT_OF_MEMORY;
- }
- }
-+
-+ /* in case we built debug enabled, we allow an environment variable
-+ * named CURL_TESTDIR to prefix the given file name to put it into a
-+ * specific directory
-+ */
-+#ifdef DEBUGBUILD
-+ {
-+ char *tdir = curlx_getenv("CURL_TESTDIR");
-+ if(tdir) {
-+ char buffer[512]; /* suitably large */
-+ snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename);
-+ Curl_safefree(*filename);
-+ *filename = strdup(buffer); /* clone the buffer */
-+ curl_free(tdir);
-+ }
-+ }
-+#endif
-+
- return CURLE_OK;
- }
-
---
-1.7.7.3
diff --git a/core/glibc/glibc-2.15-math64crash.patch b/core/glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/core/glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
-
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
-- .type __ceil, @gnu_indirect_function
-- call __get_cpu_features@plt
-- movq %rax, %rdx
-- leaq __ceil_sse41(%rip), %rax
-- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
-- jnz 2f
-- leaq __ceil_c(%rip), %rax
--2: ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
-- roundsd $2, %xmm0, %xmm0
-- ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
-- .type __floor, @gnu_indirect_function
-- call __get_cpu_features@plt
-- movq %rax, %rdx
-- leaq __floor_sse41(%rip), %rax
-- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
-- jnz 2f
-- leaq __floor_c(%rip), %rax
--2: ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
-- roundsd $1, %xmm0, %xmm0
-- ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--# undef HAS_FMA4
--# define HAS_FMA4 0
--# define __cos_fma4 ((void *) 0)
--# define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--# undef HAS_FMA4
--# define HAS_FMA4 0
--# define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/core/libarchive/release-2.8-fixes.patch b/core/libarchive/release-2.8-fixes.patch
deleted file mode 100644
index c21eeaa7b..000000000
--- a/core/libarchive/release-2.8-fixes.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-Index: build/cmake/config.h.in
-===================================================================
---- build/cmake/config.h.in (revision 3670)
-+++ build/cmake/config.h.in (revision 3737)
-@@ -1,5 +1,8 @@
- /* config.h. Generated from config.h.cmake by cmake configure */
-
-+/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
-+#cmakedefine ZLIB_WINAPI 1
-+
- /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
- #cmakedefine ARCHIVE_HASH_MD5_LIBC
-
-Index: libarchive/archive_read_support_format_all.c
-===================================================================
---- libarchive/archive_read_support_format_all.c (revision 3670)
-+++ libarchive/archive_read_support_format_all.c (revision 3737)
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2003-2007 Tim Kientzle
-+ * Copyright (c) 2003-2011 Tim Kientzle
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
-@@ -39,5 +39,13 @@
- archive_read_support_format_tar(a);
- archive_read_support_format_xar(a);
- archive_read_support_format_zip(a);
-+
-+ /* Note: We always return ARCHIVE_OK here, even if some of the
-+ * above return ARCHIVE_WARN. The intent here is to enable
-+ * "as much as possible." Clients who need specific
-+ * compression should enable those individually so they can
-+ * verify the level of support. */
-+ /* Clear any warning messages set by the above functions. */
-+ archive_clear_error(a);
- return (ARCHIVE_OK);
- }
-Index: libarchive/archive_write_disk.c
-===================================================================
---- libarchive/archive_write_disk.c (revision 3670)
-+++ libarchive/archive_write_disk.c (revision 3737)
-@@ -1513,6 +1513,22 @@
- }
-
- #if defined(_WIN32) || defined(__CYGWIN__)
-+static int
-+guidword(const char *p, int n)
-+{
-+ int i;
-+
-+ for (i = 0; i < n; i++) {
-+ if ((*p >= '0' && *p <= '9') ||
-+ (*p >= 'a' && *p <= 'f') ||
-+ (*p >= 'A' && *p <= 'F'))
-+ p++;
-+ else
-+ return (-1);
-+ }
-+ return (0);
-+}
-+
- /*
- * 1. Convert a path separator from '\' to '/' .
- * We shouldn't check multi-byte character directly because some
-@@ -1521,26 +1537,92 @@
- * 2. Replace unusable characters in Windows with underscore('_').
- * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
- */
--static void
-+static int
- cleanup_pathname_win(struct archive_write_disk *a)
- {
- wchar_t wc;
- char *p;
- size_t alen, l;
-
-- alen = 0;
-- l = 0;
-- for (p = a->name; *p != '\0'; p++) {
-- ++alen;
-- if (*p == '\\')
-- l = 1;
-+ p = a->name;
-+ /* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
-+ * "\\?\Volume{GUID}\"
-+ * (absolute path prefixes used by Windows API) */
-+ if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
-+ (p[2] == '.' || p[2] == '?') && (p[3] == '\\' || p[3] == '/'))
-+ {
-+ /* A path begin with "\\?\UNC\" */
-+ if (p[2] == '?' &&
-+ (p[4] == 'U' || p[4] == 'u') &&
-+ (p[5] == 'N' || p[5] == 'n') &&
-+ (p[6] == 'C' || p[6] == 'c') &&
-+ (p[7] == '\\' || p[7] == '/'))
-+ p += 8;
-+ /* A path begin with "\\?\Volume{GUID}\" */
-+ else if (p[2] == '?' &&
-+ (p[4] == 'V' || p[4] == 'v') &&
-+ (p[5] == 'O' || p[5] == 'o') &&
-+ (p[6] == 'L' || p[6] == 'l') &&
-+ (p[7] == 'U' || p[7] == 'u') &&
-+ (p[8] == 'M' || p[8] == 'm') &&
-+ (p[9] == 'E' || p[9] == 'e') &&
-+ p[10] == '{') {
-+ if (guidword(p+11, 8) == 0 && p[19] == '-' &&
-+ guidword(p+20, 4) == 0 && p[24] == '-' &&
-+ guidword(p+25, 4) == 0 && p[29] == '-' &&
-+ guidword(p+30, 4) == 0 && p[34] == '-' &&
-+ guidword(p+35, 12) == 0 && p[47] == '}' &&
-+ (p[48] == '\\' || p[48] == '/'))
-+ p += 49;
-+ else
-+ p += 4;
-+ /* A path begin with "\\.\PhysicalDriveX" */
-+ } else if (p[2] == '.' &&
-+ (p[4] == 'P' || p[4] == 'p') &&
-+ (p[5] == 'H' || p[5] == 'h') &&
-+ (p[6] == 'Y' || p[6] == 'y') &&
-+ (p[7] == 'S' || p[7] == 's') &&
-+ (p[8] == 'I' || p[8] == 'i') &&
-+ (p[9] == 'C' || p[9] == 'c') &&
-+ (p[9] == 'A' || p[9] == 'a') &&
-+ (p[9] == 'L' || p[9] == 'l') &&
-+ (p[9] == 'D' || p[9] == 'd') &&
-+ (p[9] == 'R' || p[9] == 'r') &&
-+ (p[9] == 'I' || p[9] == 'i') &&
-+ (p[9] == 'V' || p[9] == 'v') &&
-+ (p[9] == 'E' || p[9] == 'e') &&
-+ (p[10] >= '0' && p[10] <= '9') &&
-+ p[11] == '\0') {
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+ "Path is a physical drive name");
-+ return (ARCHIVE_FAILED);
-+ } else
-+ p += 4;
-+ }
-+
-+ /* Skip leading drive letter from archives created
-+ * on Windows. */
-+ if (((p[0] >= 'a' && p[0] <= 'z') ||
-+ (p[0] >= 'A' && p[0] <= 'Z')) &&
-+ p[1] == ':') {
-+ if (p[2] == '\0') {
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+ "Path is a drive name");
-+ return (ARCHIVE_FAILED);
-+ }
-+ if (p[2] == '\\' || p[2] == '/')
-+ p += 3;
-+ }
-+
-+ for (; *p != '\0'; p++) {
- /* Rewrite the path name if its character is a unusable. */
- if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
- *p == '<' || *p == '>' || *p == '|')
- *p = '_';
- }
-- if (alen == 0 || l == 0)
-- return;
-+ alen = p - a->name;
-+ if (alen == 0 || strchr(a->name, '\\') == NULL)
-+ return (ARCHIVE_OK);
- /*
- * Convert path separator.
- */
-@@ -1560,6 +1642,7 @@
- p += l;
- alen -= l;
- }
-+ return (ARCHIVE_OK);
- }
- #endif
-
-@@ -1583,7 +1666,8 @@
- }
-
- #if defined(_WIN32) || defined(__CYGWIN__)
-- cleanup_pathname_win(a);
-+ if (cleanup_pathname_win(a) != ARCHIVE_OK)
-+ return (ARCHIVE_FAILED);
- #endif
- /* Skip leading '/'. */
- if (*src == '/')
-Index: libarchive/archive_util.c
-===================================================================
---- libarchive/archive_util.c (revision 3670)
-+++ libarchive/archive_util.c (revision 3737)
-@@ -155,6 +155,7 @@
- {
- archive_string_empty(&a->error_string);
- a->error = NULL;
-+ a->archive_error_number = 0;
- }
-
- void
-Index: libarchive/archive_read_extract.c
-===================================================================
---- libarchive/archive_read_extract.c (revision 3670)
-+++ libarchive/archive_read_extract.c (revision 3737)
-@@ -108,7 +108,7 @@
- if (r != ARCHIVE_OK)
- /* If _write_header failed, copy the error. */
- archive_copy_error(&a->archive, ad);
-- else if (archive_entry_size(entry) > 0)
-+ else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
- /* Otherwise, pour data into the entry. */
- r = copy_data(_a, ad);
- r2 = archive_write_finish_entry(ad);
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt (revision 3670)
-+++ CMakeLists.txt (revision 3737)
-@@ -154,6 +154,13 @@
- SET(HAVE_ZLIB_H 1)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
- LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+ IF(WIN32 AND NOT CYGWIN)
-+ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-+ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
-+ CHECK_C_SOURCE_Runs(
-+ "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
-+ ZLIB_WINAPI)
-+ ENDIF(WIN32 AND NOT CYGWIN)
- ENDIF(ZLIB_FOUND)
- MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
- MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
-
-Property changes on: .
-___________________________________________________________________
-Modified: svn:mergeinfo
- Merged /trunk:r1989,3247,3722
-
diff --git a/core/libarchive/sparse-file.patch b/core/libarchive/sparse-file.patch
deleted file mode 100644
index e7d3e473b..000000000
--- a/core/libarchive/sparse-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libarchive/archive_write_set_format_pax.c
-===================================================================
---- libarchive/archive_write_set_format_pax.c (revision 4094)
-+++ libarchive/archive_write_set_format_pax.c (working copy)
-@@ -1647,7 +1647,7 @@
- return (total);
-
- p = ((const unsigned char *)buff) + total;
-- ws = s;
-+ ws = s - total;
- if (ws > pax->sparse_list->remaining)
- ws = pax->sparse_list->remaining;
-
diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD
deleted file mode 100644
index 1e3b467f9..000000000
--- a/core/module-init-tools/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 144465 2011-12-06 10:57:39Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=module-init-tools
-pkgver=3.16
-pkgrel=3
-pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://modules.wiki.kernel.org"
-license=('GPL')
-depends=('glibc')
-makedepends=('docbook2x')
-backup=('etc/modprobe.d/modprobe.conf'
- 'etc/depmod.d/depmod.conf')
-source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2"
- modprobe.conf
- depmod.conf
- docfix.patch)
-md5sums=('bc44832c6e41707b8447e2847d2019f5'
- '325657db471b3190f685e5a89c9b90e3'
- '4b8cbcbc54b9029c99fd730e257d4436'
- '4320d19902ded43bed55c804b065cdc7')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # fix headers in SGML manpage sources and an XML typo
- patch -Np0 < "$srcdir/docfix.patch"
-
- ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR=$pkgdir install
-
- # extra modprobe.d and depmod.d conf dirs
- install -dm755 "$pkgdir/lib/modprobe.d" "$pkgdir/etc/depmod.d"
-
- # Install custom depmod config to allow searching extramodules/
- install -Dm644 "$srcdir/depmod.conf" "$pkgdir/etc/depmod.d/depmod.conf"
-
- # Install our custom (empty) modprobe.conf
- install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf"
-}
diff --git a/core/module-init-tools/depmod.conf b/core/module-init-tools/depmod.conf
deleted file mode 100644
index 3feb67b05..000000000
--- a/core/module-init-tools/depmod.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /etc/depmod.d/depmod.conf
-#
-
-search updates extramodules built-in
diff --git a/core/module-init-tools/docfix.patch b/core/module-init-tools/docfix.patch
deleted file mode 100644
index 0151ca3f1..000000000
--- a/core/module-init-tools/docfix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/depmod.conf.sgml.orig 2011-06-25 10:07:15.897805024 -0400
-+++ doc/depmod.conf.sgml 2011-06-25 10:07:48.810805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/depmod.sgml.orig 2011-06-25 10:07:15.898805024 -0400
-+++ doc/depmod.sgml 2011-06-25 10:07:56.636805021 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
-@@ -52,7 +52,7 @@
- <arg><option>-n</option></arg>
- <arg><option>-v</option></arg>
- <arg><option>-P <replaceable>prefix</replaceable></option></arg>
-- <arg><option>-w</option><arg>
-+ <arg><option>-w</option></arg>
- <arg><option><replaceable>version</replaceable></option></arg>
- <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
- </cmdsynopsis>
---- doc/insmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400
-+++ doc/insmod.sgml 2011-06-25 10:07:59.228805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/lsmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400
-+++ doc/lsmod.sgml 2011-06-25 10:08:04.804805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modinfo.sgml.orig 2011-06-25 10:07:15.900805024 -0400
-+++ doc/modinfo.sgml 2011-06-25 10:08:07.630805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modprobe.conf.sgml.orig 2011-06-25 10:07:15.901805024 -0400
-+++ doc/modprobe.conf.sgml 2011-06-25 10:08:10.173805018 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modprobe.sgml.orig 2011-06-25 10:07:15.902805024 -0400
-+++ doc/modprobe.sgml 2011-06-25 10:08:13.623805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modules.dep.sgml.orig 2011-06-25 10:07:15.903805024 -0400
-+++ doc/modules.dep.sgml 2011-06-25 10:08:19.323805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/rmmod.sgml.orig 2011-06-25 10:07:15.904805024 -0400
-+++ doc/rmmod.sgml 2011-06-25 10:08:27.691805017 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
diff --git a/core/module-init-tools/modprobe.conf b/core/module-init-tools/modprobe.conf
deleted file mode 100644
index 551bdfbdf..000000000
--- a/core/module-init-tools/modprobe.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/modprobe.d/modprobe.conf
-#
diff --git a/core/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch b/core/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
deleted file mode 100644
index 3ff89ae43..000000000
--- a/core/udev/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Wed, 18 Jan 2012 05:06:18 +0100
-Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
-
-Some broken kernel drivers load firmware synchronously in the module init
-path and block modprobe until the firmware request is fulfilled.
-
-The modprobe-generated firmware request is a direct child device of the
-device which caused modprobe to run. Child device event are blocked until
-the parent device is handled. This dead-locks until the kernel firmware
-loading timeout of 60 seconds is reached.
-
-The hanging modprobe event should now time-out and allow the firmware
-event to run before the 60 second kernel timeout.
----
- src/udev-event.c | 2 +-
- src/udevd.c | 62 +++++++++++++++++++++++++++++++++++++++++++----------
- 2 files changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/udev-event.c b/src/udev-event.c
-index 9bdc518..f0b9548 100644
---- a/src/udev-event.c
-+++ b/src/udev-event.c
-@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
- udev_list_init(udev, &event->run_list, false);
- event->fd_signal = -1;
- event->birth_usec = now_usec();
-- event->timeout_usec = 60 * 1000 * 1000;
-+ event->timeout_usec = 30 * 1000 * 1000;
- dbg(event->udev, "allocated event %p\n", event);
- return event;
- }
-diff --git a/src/udevd.c b/src/udevd.c
-index 11ab19a..77a1e79 100644
---- a/src/udevd.c
-+++ b/src/udevd.c
-@@ -133,6 +133,7 @@ struct worker {
- struct udev_monitor *monitor;
- enum worker_state state;
- struct event *event;
-+ unsigned long long event_start_usec;
- };
-
- /* passed from worker to main process */
-@@ -372,6 +373,7 @@ out:
- close(fd_inotify);
- close(worker_watch[WRITE_END]);
- udev_rules_unref(rules);
-+ udev_builtin_exit(udev);
- udev_monitor_unref(worker_monitor);
- udev_unref(udev);
- udev_log_close();
-@@ -389,6 +391,7 @@ out:
- worker->monitor = worker_monitor;
- worker->pid = pid;
- worker->state = WORKER_RUNNING;
-+ worker->event_start_usec = now_usec();
- worker->event = event;
- event->state = EVENT_RUNNING;
- udev_list_node_append(&worker->node, &worker_list);
-@@ -419,6 +422,7 @@ static void event_run(struct event *event)
- worker_ref(worker);
- worker->event = event;
- worker->state = WORKER_RUNNING;
-+ worker->event_start_usec = now_usec();
- event->state = EVENT_RUNNING;
- return;
- }
-@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
- continue;
-
- /* worker returned */
-- worker->event->exitcode = msg.exitcode;
-- event_queue_delete(worker->event, true);
-- worker->event = NULL;
-+ if (worker->event) {
-+ worker->event->exitcode = msg.exitcode;
-+ event_queue_delete(worker->event, true);
-+ worker->event = NULL;
-+ }
- if (worker->state != WORKER_KILLED)
- worker->state = WORKER_IDLE;
- worker_unref(worker);
-@@ -796,7 +802,7 @@ static void handle_signal(struct udev *udev, int signo)
- }
-
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-- if (worker->event != NULL) {
-+ if (worker->event) {
- err(udev, "worker [%u] failed while handling '%s'\n",
- pid, worker->event->devpath);
- worker->event->exitcode = -32;
-@@ -1574,25 +1580,57 @@ int main(int argc, char *argv[])
- break;
-
- /* timeout at exit for workers to finish */
-- timeout = 60 * 1000;
-- } else if (udev_list_node_is_empty(&event_list) && children > 2) {
-- /* set timeout to kill idle workers */
-- timeout = 3 * 1000;
-- } else {
-+ timeout = 30 * 1000;
-+ } else if (udev_list_node_is_empty(&event_list) && children <= 2) {
-+ /* we are idle */
- timeout = -1;
-+ } else {
-+ /* kill idle or hanging workers */
-+ timeout = 3 * 1000;
- }
- fdcount = epoll_wait(fd_ep, ev, ARRAY_SIZE(ev), timeout);
- if (fdcount < 0)
- continue;
-
- if (fdcount == 0) {
-+ struct udev_list_node *loop;
-+
-+ /* timeout */
- if (udev_exit) {
-- info(udev, "timeout, giving up waiting for workers to finish\n");
-+ err(udev, "timeout, giving up waiting for workers to finish\n");
- break;
- }
-
-- /* timeout - kill idle workers */
-- worker_kill(udev, 2);
-+ /* kill idle workers */
-+ if (udev_list_node_is_empty(&event_list)) {
-+ info(udev, "cleanup idle workers\n");
-+ worker_kill(udev, 2);
-+ }
-+
-+ /* check for hanging events */
-+ udev_list_node_foreach(loop, &worker_list) {
-+ struct worker *worker = node_to_worker(loop);
-+
-+ if (worker->state != WORKER_RUNNING)
-+ continue;
-+
-+ if ((now_usec() - worker->event_start_usec) > 30 * 1000 * 1000) {
-+ err(udev, "worker [%u] timeout, kill it\n", worker->pid,
-+ worker->event ? worker->event->devpath : "<idle>");
-+ kill(worker->pid, SIGKILL);
-+ worker->state = WORKER_KILLED;
-+ /* drop reference taken for state 'running' */
-+ worker_unref(worker);
-+ if (worker->event) {
-+ err(udev, "seq %llu '%s' killed\n",
-+ udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
-+ worker->event->exitcode = -64;
-+ event_queue_delete(worker->event, true);
-+ worker->event = NULL;
-+ }
-+ }
-+ }
-+
- }
-
- is_worker = is_signal = is_inotify = is_netlink = is_ctrl = false;
---
-1.7.8.3
-
diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules
deleted file mode 100644
index 6bdf4e249..000000000
--- a/core/udev/81-arch.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# do not edit this file, it will be overwritten on update
-# this file is going away in the near future
-
-# this might belong in <http://aur.archlinux.org/packages.php?ID=22698>
-# see also /usr/src/*/Documentation/laptops/sonypi.txt
-KERNEL=="sonypi", MODE="0666"
-
-# this might belong in <https://aur.archlinux.org/packages.php?ID=18393>
-KERNEL=="legousbtower*", MODE="0666"
diff --git a/core/zlib/zlib-1.2.5-lfs-decls.patch b/core/zlib/zlib-1.2.5-lfs-decls.patch
deleted file mode 100644
index 36e26af03..000000000
--- a/core/zlib/zlib-1.2.5-lfs-decls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: zlib-1.2.5/zlib.h
-===================================================================
---- zlib-1.2.5.orig/zlib.h
-+++ zlib-1.2.5/zlib.h
-@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
- # define gzoffset gzoffset64
- # define adler32_combine adler32_combine64
- # define crc32_combine crc32_combine64
--# ifdef _LARGEFILE64_SOURCE
-+# ifndef _LARGEFILE64_SOURCE
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
- ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
- ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));