diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/deb_0000_at_configure.diff | 53 | ||||
| -rw-r--r-- | debian/patches/deb_0001_at_config_h_in.diff | 14 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 61 insertions, 8 deletions
diff --git a/debian/patches/deb_0000_at_configure.diff b/debian/patches/deb_0000_at_configure.diff index 7d4602029..0a0a8ecf2 100644 --- a/debian/patches/deb_0000_at_configure.diff +++ b/debian/patches/deb_0000_at_configure.diff @@ -1,13 +1,13 @@ Patch to generate `configure'. -Created by `at2quilt' on Thu, 24 Feb 2011 22:03:49 CET. +Created by `at2quilt' on Thu, 02 Jun 2011 10:50:44 CEST. Note: Never *ever* refresh this patch. Things will break. Index: pkg-zsh/configure ---- pkg-zsh.orig/configure 2011-01-31 20:40:34.619230074 +0100 -+++ pkg-zsh/configure 2011-02-24 22:03:49.000000000 +0100 -@@ -0,0 +1,14034 @@ +--- pkg-zsh.orig/configure 2011-05-26 15:03:35.965237415 +0200 ++++ pkg-zsh/configure 2011-06-02 10:50:43.000000000 +0200 +@@ -0,0 +1,14079 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.67. @@ -660,6 +660,7 @@ Index: pkg-zsh/configure +FUNCTIONS_SUBDIRS +sitefndir +fndir ++additionalfpath +zlogout +zlogin +zprofile @@ -727,6 +728,7 @@ Index: pkg-zsh/configure +enable_zsh_mem_debug +enable_zsh_mem_warning +enable_zsh_secure_free ++enable_zsh_heap_debug +enable_zsh_hash_debug +enable_etcdir +enable_zshenv @@ -741,6 +743,7 @@ Index: pkg-zsh/configure +enable_fndir +enable_site_fndir +enable_function_subdirs ++enable_additional_fpath +enable_scriptdir +enable_site_scriptdir +enable_custom_patchlevel @@ -754,6 +757,7 @@ Index: pkg-zsh/configure +with_term_lib +with_tcsetpgrp +enable_multibyte ++enable_libc_musl +enable_dynamic_nss +' + ac_precious_vars='build_alias @@ -1394,6 +1398,7 @@ Index: pkg-zsh/configure + print warnings for errors in memory allocation + --enable-zsh-secure-free + turn on error checking for free() ++ --enable-zsh-heap-debug turn on error checking for heap allocation + --enable-zsh-hash-debug turn on debugging of internal hash tables + --enable-etcdir=DIR the default directory for global zsh scripts + --enable-zshenv=FILE the full pathname of the global zshenv script @@ -1409,6 +1414,8 @@ Index: pkg-zsh/configure + --enable-site-fndir=DIR same for site functions (not version specific) + --enable-function-subdirs + install functions in subdirectories ++ --enable-additional-fpath=DIR ++ add directories to default function path + --enable-scriptdir=DIR the directory in which to install scripts + --enable-site-scriptdir=DIR + same for site scripts (not version specific) @@ -1427,6 +1434,7 @@ Index: pkg-zsh/configure + --disable-gdbm turn off search for gdbm library + --disable-largefile omit support for large files + --enable-multibyte support multibyte characters ++ --enable-libc-musl compile with musl as the C library + --disable-dynamic-nss do not call functions that will require dynamic NSS + modules + @@ -2618,6 +2626,16 @@ Index: pkg-zsh/configure + + + ++# Check whether --enable-zsh-heap-debug was given. ++if test "${enable_zsh_heap_debug+set}" = set; then : ++ enableval=$enable_zsh_heap_debug; if test x$enableval = xyes; then ++ $as_echo "#define ZSH_HEAP_DEBUG 1" >>confdefs.h ++ ++fi ++fi ++ ++ ++ +# Check whether --enable-zsh-hash-debug was given. +if test "${enable_zsh_hash_debug+set}" = set; then : + enableval=$enable_zsh_hash_debug; if test x$enableval = xyes; then @@ -2813,6 +2831,18 @@ Index: pkg-zsh/configure + FUNCTIONS_SUBDIRS=no +fi + ++# Check whether --enable-additional-fpath was given. ++if test "${enable_additional_fpath+set}" = set; then : ++ enableval=$enable_additional_fpath; if test x$enableval = xyes; then ++ additionalfpath="" ++else ++ additionalfpath="${enableval}" ++fi ++else ++ additionalfpath="" ++fi ++ ++ + + +# Check whether --enable-scriptdir was given. @@ -7435,6 +7465,7 @@ Index: pkg-zsh/configure +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ ++#define _POSIX_C_SOURCE 200809L +#include <sys/types.h> +#include <signal.h> +int @@ -7551,6 +7582,7 @@ Index: pkg-zsh/configure + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + ++#define _GNU_SOURCE 1 +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif @@ -11250,6 +11282,16 @@ Index: pkg-zsh/configure + fi +fi + ++ ++# Check whether --enable-libc-musl was given. ++if test "${enable_libc_musl+set}" = set; then : ++ enableval=$enable_libc_musl; if test x$enableval = xyes; then ++ $as_echo "#define LIBC_MUSL 1" >>confdefs.h ++ ++fi ++fi ++ ++ +# Check whether --enable-dynamic-nss was given. +if test "${enable_dynamic_nss+set}" = set; then : + enableval=$enable_dynamic_nss; zsh_cv_c_dynamic_nss=$enableval @@ -14029,6 +14071,9 @@ Index: pkg-zsh/configure +if test "$zshfndir" != no; then + echo "functions install path : ${zshfndir}" +fi ++if test "x$additionalfpath" != x; then ++ echo "additional fpath entries : ${additionalfpath}" ++fi +echo "See config.modules for installed modules and functions. +" + diff --git a/debian/patches/deb_0001_at_config_h_in.diff b/debian/patches/deb_0001_at_config_h_in.diff index e12b562fe..f0161f8b6 100644 --- a/debian/patches/deb_0001_at_config_h_in.diff +++ b/debian/patches/deb_0001_at_config_h_in.diff @@ -1,13 +1,13 @@ Patch to generate `config.h.in'. -Created by `at2quilt' on Thu, 24 Feb 2011 22:03:49 CET. +Created by `at2quilt' on Thu, 02 Jun 2011 10:50:44 CEST. Note: Never *ever* refresh this patch. Things will break. Index: pkg-zsh/config.h.in ---- pkg-zsh.orig/config.h.in 2011-01-31 20:40:34.619230074 +0100 -+++ pkg-zsh/config.h.in 2011-02-24 22:03:49.000000000 +0100 -@@ -0,0 +1,1150 @@ +--- pkg-zsh.orig/config.h.in 2011-05-26 15:03:35.965237415 +0200 ++++ pkg-zsh/config.h.in 2011-06-02 10:50:44.000000000 +0200 +@@ -0,0 +1,1156 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/***** begin user configuration section *****/ @@ -940,6 +940,9 @@ Index: pkg-zsh/config.h.in + ioctl(). */ +#undef IOCTL_IN_SYS_IOCTL + ++/* Define to 1 if musl is being used as the C library */ ++#undef LIBC_MUSL ++ +/* Definitions used when a long is less than eight byte, to try to provide + some support for eight byte operations. Note that ZSH_64_BIT_TYPE, + OFF_T_IS_64_BIT, INO_T_IS_64_BIT do *not* get defined if long is already 64 @@ -1105,6 +1108,9 @@ Index: pkg-zsh/config.h.in +/* Define to 1 if some variant of term.h can be included */ +#undef ZSH_HAVE_TERM_H + ++/* Define to 1 if you want to turn on error checking for heap allocation. */ ++#undef ZSH_HEAP_DEBUG ++ +/* Define to 1 if you want to use zsh's own memory allocation routines */ +#undef ZSH_MEM + diff --git a/debian/patches/series b/debian/patches/series index e69de29bb..1404d2b83 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1,2 @@ +deb_0000_at_configure.diff +deb_0001_at_config_h_in.diff |