Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 149 → Rev 180

/tags/7.8.700-7/debian/control
3,19 → 3,19
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Henrik Andreasson <debian@han.pp.se>
Standards-Version: 3.9.3
Standards-Version: 3.9.4
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 5), bison, sharutils, bc, pkg-config,
libgmp10-dev, nettle-dev (>= 2.1~), zlib1g-dev | libz-dev,
libbz2-dev, libgdbm-dev, libiodbc2-dev, libmysqlclient-dev,
libbz2-dev, libgdbm-dev, unixodbc-dev, libmysqlclient-dev,
libpq-dev, libsqlite3-dev, libpcre3-dev, libsdl-mixer1.2-dev,
libsdl1.2-dev, libsane-dev, x11proto-gl-dev, libxpm-dev,
libglade2-dev, libfreetype6-dev, freeglut3-dev, libjpeg-dev,
libtiff4-dev, librsvg2-dev (>= 2.7), libgnomeui-dev,
libtiff-dev, librsvg2-dev (>= 2.7), libgnomeui-dev,
libfuse-dev, libfftw3-dev, libavahi-compat-libdnssd-dev
Build-Conflicts: libutahglx-dev
Homepage: http://pike.ida.liu.se/
Vcs-Svn: svn://svn.debian.org/pkg-pike/branches/7.8-stable
Vcs-Browser: http://svn.debian.org/pkg-pike
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-pike/
 
Package: pike7.8-core
Architecture: any
110,8 → 110,9
Package: pike7.8-mysql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: MySQL module for Pike
This Pike module provides access to MySQL databases.
Description: MySQL modules for Pike
This package contains Pike modules providing access to MySQL
databases: Mysql and Sql.mysql(s).
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
119,9 → 120,13
Package: pike7.8-pg
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: PostgreSQL module for Pike
This Pike module provides access to PostgreSQL databases.
Description: PostgreSQL modules for Pike
This package contains Pike module providing access to PostgreSQL
databases: Postgres, Sql.postgres, and Sql.postgres_result.
.
Note: These modules are deprecated in favour of the pure Pike
Sql.pgsql module, which is included in the core package.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
 
128,8 → 133,9
Package: pike7.8-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: ODBC module for Pike
This Pike module provides glue to the iODBC interface.
Description: ODBC modules for Pike
This package contains Pike modules providing glue to the ODBC
interface: Odbc, Sql.odbc, and Sql.odbc_result.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
139,9 → 145,9
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Suggests: pike7.8-image (= ${source:Version})
Description: SVG format support for Pike
This module provides an SVG graphics format module. It has
been separated from the pike7.8-image module because of its
quite extensive dependencies.
This package provides an SVG graphics format module, Image.SVG. It
has been separated from the pike7.8-image module because of its quite
extensive dependencies.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
149,12 → 155,13
Package: pike7.8-image
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Replaces: pike7.8-core (<< 7.8.352-dfsg-6)
Breaks: pike7.8-core (<< 7.8.352-dfsg-6)
Replaces: pike7.8-core (<< 7.8.700-6)
Breaks: pike7.8-core (<< 7.8.700-6)
Suggests: pike7.8-svg (= ${source:Version})
Description: Image module for Pike
This module provides many powerful image processing functions to
Pike programs.
Description: Image modules for Pike
This package provides many powerful image processing functions to
Pike programs. It contains the modules Image (except Image.SVG),
Graphics, Colors, and Protocols.X.XImage.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
179,7 → 186,10
 
Package: pike7.8-gtk
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version}),
pike7.8-image (= ${binary:Version})
Replaces: pike7.8-core (<< 7.8.700-5)
Breaks: pike7.8-core (<< 7.8.700-5)
Description: GTK+ 2.0 module for Pike
This Pike module provides access to the GTK+ 2.0 library.
.
189,8 → 199,10
Package: pike7.8-gl
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: Mesa module for Pike
This Pike module provides access to the Mesa 3D graphics library.
Description: Mesa modules for Pike
This package contains the Pike modules providing access to the Mesa
3D graphics library: GL, GLU (GL Utilities), and GLUE (GL Universal
Environment).
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
208,8 → 220,9
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: PCRE module for Pike
This Pike module enables one to use the PCRE (Perl compatible regular
expressions) library from within the Pike programs.
This Pike module (Regexp.PCRE) enables one to use the PCRE (Perl
compatible regular expressions) library from within the Pike
programs.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
/tags/7.8.700-7/debian/patches/misplaced_MAXPATHLEN.patch
14,7 → 14,7
struct array *encode_stat(PIKE_STAT_T *s)
{
struct array *a;
@@ -1520,9 +1524,6 @@ void f_getcwd(INT32 args)
@@ -1524,9 +1528,6 @@ void f_getcwd(INT32 args)
size*=2;
} while (size < 10000);
#else
/tags/7.8.700-7/debian/patches/reg_enum_conflict.patch
0,0 → 1,117
Description: Rename enum constants in src/code/ia32.c
They conflict with /usr/include/i386-linux-gnu/sys/ucontext.h of newer eglibc
Author: Magnus Holmgren
Bug-Debian: http://bugs.debian.org/708366
Forwarded: yes
 
--- a/src/code/ia32.c
+++ b/src/code/ia32.c
@@ -14,14 +14,9 @@
#include "object.h"
#include "builtin_functions.h"
-/* This is defined on windows */
-#ifdef REG_NONE
-#undef REG_NONE
-#endif
-
-enum ia32_reg {REG_EAX = 0, REG_EBX = 3, REG_ECX = 1, REG_EDX = 2, REG_NONE = 4};
+enum ia32_reg {PIKE_REG_EAX = 0, PIKE_REG_EBX = 3, PIKE_REG_ECX = 1, PIKE_REG_EDX = 2, PIKE_REG_NONE = 4};
-#define REG_BITMASK ((1 << REG_NONE) - 1)
+#define REG_BITMASK ((1 << PIKE_REG_NONE) - 1)
/* #define REGISTER_DEBUG */
@@ -71,7 +66,7 @@ static int alloc_regs = 0, valid_regs =
#define MOV_ABSADDR_TO_REG(ADDR, REG) do { \
MAKE_VALID_REG (REG); \
/* movl addr,%reg */ \
- if ((REG) == REG_EAX) \
+ if ((REG) == PIKE_REG_EAX) \
add_to_program (0xa1); /* Move dword at address to EAX. */ \
else { \
add_to_program (0x8b); /* Move r/m32 to r32. */ \
@@ -83,7 +78,7 @@ static int alloc_regs = 0, valid_regs =
#define MOV_REG_TO_ABSADDR(REG, ADDR) do { \
CHECK_VALID_REG (REG); \
/* movl %reg,addr */ \
- if ((REG) == REG_EAX) \
+ if ((REG) == PIKE_REG_EAX) \
add_to_program (0xa3); /* Move EAX to dword at address. */ \
else { \
add_to_program (0x89); /* Move r32 to r/m32. */ \
@@ -217,7 +212,7 @@ static int alloc_regs = 0, valid_regs =
add_to_program (0x48 | (REG)); /* Decrement r32. */ \
else if (val_ < -128 || val_ > 127) { \
/* addl $val,%reg */ \
- if ((REG) == REG_EAX) \
+ if ((REG) == PIKE_REG_EAX) \
add_to_program (0x05); /* Add imm32 to EAX. */ \
else { \
add_to_program (0x81); /* Add imm32 to r/m32. */ \
@@ -334,8 +329,8 @@ ptrdiff_t ia32_prev_stored_pc; /* PROG_P
void ia32_flush_code_generator(void)
{
- next_reg = REG_EAX;
- sp_reg = fp_reg = mark_sp_reg = REG_NONE;
+ next_reg = PIKE_REG_EAX;
+ sp_reg = fp_reg = mark_sp_reg = PIKE_REG_NONE;
CLEAR_REGS();
ia32_prev_stored_pc = -1;
}
@@ -351,7 +346,7 @@ static enum ia32_reg alloc_reg (int avoi
/* There's a free register. */
for (reg = next_reg; (1 << reg) & used_regs;) {
- reg = (reg + 1) % REG_NONE;
+ reg = (reg + 1) % PIKE_REG_NONE;
#ifdef PIKE_DEBUG
if (reg == next_reg) Pike_fatal ("Failed to find a free register.\n");
#endif
@@ -364,15 +359,15 @@ static enum ia32_reg alloc_reg (int avoi
* probably be replaced with an LRU strategy. */
for (reg = next_reg; (1 << reg) & avoid_regs;) {
- reg = (reg + 1) % REG_NONE;
+ reg = (reg + 1) % PIKE_REG_NONE;
#ifdef PIKE_DEBUG
if (reg == next_reg) Pike_fatal ("Failed to find a non-excluded register.\n");
#endif
}
- if (sp_reg == reg) {sp_reg = REG_NONE; DEALLOC_REG (reg);}
- else if (fp_reg == reg) {fp_reg = REG_NONE; DEALLOC_REG (reg);}
- else if (mark_sp_reg == reg) {mark_sp_reg = REG_NONE; DEALLOC_REG (reg);}
+ if (sp_reg == reg) {sp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);}
+ else if (fp_reg == reg) {fp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);}
+ else if (mark_sp_reg == reg) {mark_sp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);}
}
#ifdef REGISTER_DEBUG
@@ -386,11 +381,11 @@ static enum ia32_reg alloc_reg (int avoi
#define DEF_LOAD_REG(REG, SET) \
static void PIKE_CONCAT(load_,REG) (int avoid_regs) \
{ \
- if (REG == REG_NONE) { \
+ if (REG == PIKE_REG_NONE) { \
REG = alloc_reg (avoid_regs); \
/* Update the round robin pointer here so that we disregard */ \
/* the direct calls to alloc_reg for temporary registers. */ \
- next_reg = (REG + 1) % REG_NONE; \
+ next_reg = (REG + 1) % PIKE_REG_NONE; \
{SET;} \
} \
else \
@@ -410,8 +405,8 @@ DEF_LOAD_REG (mark_sp_reg, {
static void ia32_call_c_function(void *addr)
{
CALL_RELATIVE(addr);
- next_reg = REG_EAX;
- sp_reg = fp_reg = mark_sp_reg = REG_NONE;
+ next_reg = PIKE_REG_EAX;
+ sp_reg = fp_reg = mark_sp_reg = PIKE_REG_NONE;
CLEAR_REGS();
}
/tags/7.8.700-7/debian/patches/pthread_stub.patch
1,7 → 1,7
--- a/src/configure
+++ b/src/configure
@@ -62495,6 +62495,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -90560,6 +90560,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pthread.h>
+#if defined(__stub_pthread_atfork) || defined(__stub___pthread_atfork)
12,7 → 12,7
int
--- a/src/configure.in
+++ b/src/configure.in
@@ -3953,6 +3953,9 @@ pthread_t gazonk;
@@ -3977,6 +3977,9 @@ pthread_t gazonk;
AC_MSG_CHECKING(for pthread_atfork)
AC_CACHE_VAL(pike_cv_have_pthread_atfork,[
AC_TRY_LINK([#include <pthread.h>
/tags/7.8.700-7/debian/patches/no_dump_modules.patch
3,7 → 3,7
 
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -2945,7 +2945,6 @@ the PRIVATE_CRT stuff in install.pike.\n
@@ -2980,7 +2980,6 @@ the PRIVATE_CRT stuff in install.pike.\n
{
do_export();
}else{
/tags/7.8.700-7/debian/patches/series
7,5 → 7,9
misplaced_MAXPATHLEN.patch
pthread_stub.patch
unbreak_cross_compilation.patch
nettle-2.1.patch
dump_timeout.patch
reg_enum_conflict.patch
hurd.patch
nettle_crypt_md5_buffer_size.patch
pcre_info_obsolete.patch
undefined_htons.patch
/tags/7.8.700-7/debian/patches/unbreak_cross_compilation.patch
8,7 → 8,7
@DPATCH@
--- a/src/configure
+++ b/src/configure
@@ -7348,7 +7348,7 @@ if test "x$enable_binary" = "xno"; then
@@ -8718,7 +8718,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
17,12 → 17,12
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -73133,7 +73133,7 @@ EOF
@@ -106150,7 +106150,7 @@ EOF
;;
esac
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then
- pike_cv_sys_dynamic_loading=no
+ pike_cv_sys_dynamic_loading=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
/tags/7.8.700-7/debian/patches/module-layout.patch
3,13 → 3,13
 
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -2113,6 +2113,10 @@ protected void create()
@@ -2137,6 +2137,10 @@ protected void create()
add_module_path("#lib_prefix#/modules");
#endif
+ // Debian paths
+ add_include_path("/usr/local/lib/pike"+__REAL_VERSION__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules");
+ add_include_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules");
+
#if "#cflags# "[0]!='#'
cflags = "#cflags#";
24,11 → 24,11
-// master() puts the lib/modules path last.
-string system_module_path=master()->system_module_path[-1];
+
+string system_module_path="/usr/local/lib/pike"+__REAL_VERSION__+"/modules";
+string system_module_path="/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules";
// where do we install the documentation?
string system_doc_path = master()->doc_prefix;
@@ -183,7 +182,7 @@ void do_make(array(string) cmd)
@@ -184,7 +183,7 @@ void do_make(array(string) cmd)
extra_args = ({
"PIKE="+run_pike,
"SRCDIR="+fix("$src"),
37,7 → 37,7
"LOCAL_MODULE_PATH=" + lmp,
});
}
@@ -240,6 +239,7 @@ int main(int argc, array(string) argv)
@@ -241,6 +240,7 @@ int main(int argc, array(string) argv)
({"all",Getopt.NO_ARG,({"--all"}) }),
({"make",Getopt.NO_ARG,({"--make"}) }),
({"auto",Getopt.NO_ARG,({"--auto"}) }),
45,7 → 45,7
({"source",Getopt.HAS_ARG,({"--source"}) }),
({"query",Getopt.HAS_ARG,({"--query"}) }),
({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
@@ -276,6 +276,9 @@ int main(int argc, array(string) argv)
@@ -277,6 +277,9 @@ int main(int argc, array(string) argv)
case "auto":
run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
break;
55,7 → 55,7
}
}
@@ -405,7 +408,7 @@ int main(int argc, array(string) argv)
@@ -421,7 +424,7 @@ int main(int argc, array(string) argv)
run_or_fail( ([ "env":getenv()|
([
"PIKE":run_pike,
/tags/7.8.700-7/debian/patches/pcre_info_obsolete.patch
0,0 → 1,26
Description: Stop using the long-obsolete pcre_info(),
which was just recently removed from the headers but
remains in the library.
 
--- a/src/modules/_Regexp_PCRE/configure
+++ b/src/modules/_Regexp_PCRE/configure
@@ -4020,7 +4020,7 @@ EOF
-for ac_func in pcre_info pcre_fullinfo pcre_get_stringnumber
+for ac_func in pcre_fullinfo pcre_get_stringnumber
do
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--- a/src/modules/_Regexp_PCRE/configure.in
+++ b/src/modules/_Regexp_PCRE/configure.in
@@ -18,7 +18,7 @@ if test x$with_libpcre = xyes ; then
LIBS="${LIBS-} -lpcre"
PIKE_FEATURE(Regexp.PCRE,[yes (libpcre)])
- AC_CHECK_FUNCS(pcre_info pcre_fullinfo pcre_get_stringnumber)
+ AC_CHECK_FUNCS(pcre_fullinfo pcre_get_stringnumber)
])
fi
fi
/tags/7.8.700-7/debian/patches/hurd.patch
0,0 → 1,113
Description: Fixes to make Pike build on GNU/Hurd
1. Let realpath() allocate memory itself.
2. Include mach/message.h directly where mach_msg_type_number_t is used.
3. Don't build shared objects any differently than on Linux.
Forwarded: yes
 
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -411,6 +411,13 @@ void f_resolvepath(INT32 args)
#endif /* ENAMETOOLONG */
(len >= buflen - 1));
#elif defined(HAVE_REALPATH)
+#ifdef __GNU__
+ if ((buf = realpath(path, NULL))) {
+ len = strlen(buf);
+ } else if (errno == ENOMEM) {
+ Pike_error("resolvepath(): Out of memory\n");
+ }
+#else
buflen = PATH_MAX+1;
if (!(buf = alloca(buflen))) {
@@ -420,6 +427,7 @@ void f_resolvepath(INT32 args)
if ((buf = realpath(path, buf))) {
len = strlen(buf);
}
+#endif
#else /* !HAVE_RESOLVEPATH && !HAVE_REALPATH */
#error "f_resolvepath with neither resolvepath nor realpath."
#endif /* HAVE_RESOLVEPATH */
@@ -429,6 +437,9 @@ void f_resolvepath(INT32 args)
}
pop_n_elems(args);
push_string(make_shared_binary_string(buf, len));
+#ifdef __GNU__
+ free(buf);
+#endif
}
#endif /* HAVE_RESOLVEPATH || HAVE_REALPATH */
--- a/src/pike_threadlib.h
+++ b/src/pike_threadlib.h
@@ -94,6 +94,9 @@ PMOD_EXPORT extern struct program *threa
#ifdef HAVE_MACH_TASK_INFO_H
#include <mach/task_info.h>
#endif
+#ifdef HAVE_MACH_MESSAGE_H
+#include <mach/message.h>
+#endif
#ifdef HAVE_MACH_TASK_H
#include <mach/task.h>
#endif
--- a/src/configure.in
+++ b/src/configure.in
@@ -3276,7 +3276,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h mmx.h asm/mmx.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
- sys/prctl.h sys/ioctl.h mach/task_info.h mach/task.h \
+ sys/prctl.h sys/ioctl.h mach/message.h mach/task_info.h mach/task.h \
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h,,,[
@@ -7893,7 +7893,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
- GNU*) LDSHARED="$REALCC -Wl,-Bshareable";;
+ GNU*) LDSHARED="$REALCC -shared";;
FreeBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
NetBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
--- a/src/configure
+++ b/src/configure
@@ -81740,7 +81740,7 @@ for ac_header in winsock2.h sys/rusage.h
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h mmx.h asm/mmx.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
- sys/prctl.h sys/ioctl.h mach/task_info.h mach/task.h \
+ sys/prctl.h sys/ioctl.h mach/message.h mach/task_info.h mach/task.h \
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h
@@ -81886,7 +81886,7 @@ done
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h mmx.h asm/mmx.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
- sys/prctl.h sys/ioctl.h mach/task_info.h mach/task.h \
+ sys/prctl.h sys/ioctl.h mach/message.h mach/task_info.h mach/task.h \
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h
@@ -104588,7 +104588,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
- GNU*) LDSHARED="$REALCC -Wl,-Bshareable";;
+ GNU*) LDSHARED="$REALCC -shared";;
FreeBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
NetBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
--- a/src/machine.h.in
+++ b/src/machine.h.in
@@ -875,6 +875,9 @@
/* Define to 1 if you have the <mach/mach_init.h> header file. */
#undef HAVE_MACH_MACH_INIT_H
+/* Define to 1 if you have the <mach/message.h> header file. */
+#undef HAVE_MACH_MESSAGE_H
+
/* Define to 1 if you have the <mach-o/dyld.h> header file. */
#undef HAVE_MACH_O_DYLD_H
/tags/7.8.700-7/debian/patches/nettle_crypt_md5_buffer_size.patch
0,0 → 1,15
From: Arne Goedeke <el@laramies.com>
Subject: Nette.MD5: passwd array was too small
Origin: upstream, http://pike-librarian.lysator.liu.se/piff.xml?module=pike.git&file=src/post_modules/Nettle/crypt_md5.c&from=ef75d0301312d2d5603760772bcd09f16cd24c8a&to=2652ce0df4d39c09a57049b3ca0daf735b331e5b
 
--- a/src/post_modules/Nettle/crypt_md5.c
+++ b/src/post_modules/Nettle/crypt_md5.c
@@ -47,7 +47,7 @@ char *pike_crypt_md5(int pl, const char
* it this way, we can get
* better later on
*/
- static char passwd[22], *p;
+ static char passwd[23], *p;
unsigned char final[MD5_DIGEST_SIZE];
int i;
struct md5_ctx ctx;
/tags/7.8.700-7/debian/patches/dynamic_module_makefile.in-libgcc.patch
1,11 → 1,10
Author: Marek Habersack <grendel@debian.org>
Description: Figure out LIBGCC name.
 
diff -urNad trunk~/src/modules/dynamic_module_makefile.in trunk/src/modules/dynamic_module_makefile.in
--- trunk~/src/modules/dynamic_module_makefile.in 2008-01-11 01:22:27.000000000 +0100
+++ trunk/src/modules/dynamic_module_makefile.in 2009-08-16 21:49:11.000000000 +0200
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -2,6 +2,7 @@
# $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
# $Id: b9e7817a07dab41006a9b1cc92c9ce0193303874 $
#
+LIBGCC=$(shell gcc -print-libgcc-file-name)
/tags/7.8.700-7/debian/patches/undefined_htons.patch
0,0 → 1,70
Description: Include the necessary header file declaring htons() in Protocols.DNS_SD.
 
--- a/src/modules/_Protocols_DNS_SD/configure.in
+++ b/src/modules/_Protocols_DNS_SD/configure.in
@@ -12,7 +12,7 @@ if test x$with_dnssd = xyes ; then
PIKE_FEATURE(DNS-SD,[no (dns_sd.h or howl.h not found)])
- AC_CHECK_HEADERS(dns_sd.h howl.h)
+ AC_CHECK_HEADERS(dns_sd.h howl.h netinet/in.h arpa/inet.h)
if test x$ac_cv_header_dns_sd_h = xyes; then
PIKE_FEATURE(DNS-SD,[no (libdns_sd not found)])
--- a/src/modules/_Protocols_DNS_SD/sd.c
+++ b/src/modules/_Protocols_DNS_SD/sd.c
@@ -34,6 +34,12 @@
#include <signal.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif /* HAVE_ARPA_INET_H */
#ifdef THIS
#undef THIS
--- a/src/modules/_Protocols_DNS_SD/config.h.in
+++ b/src/modules/_Protocols_DNS_SD/config.h.in
@@ -10,6 +10,9 @@
#define PROTOCOLS_DNS_SD_H
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
/* Define to 1 if you have the <dns_sd.h> header file. */
#undef HAVE_DNS_SD_H
@@ -25,6 +28,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
--- a/src/modules/_Protocols_DNS_SD/configure
+++ b/src/modules/_Protocols_DNS_SD/configure
@@ -3616,7 +3616,7 @@ done
-for ac_header in dns_sd.h howl.h
+for ac_header in dns_sd.h howl.h netinet/in.h arpa/inet.h
do
@@ -3769,7 +3769,7 @@ fi
done
else
- for ac_hdr in dns_sd.h howl.h
+ for ac_hdr in dns_sd.h howl.h netinet/in.h arpa/inet.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
eval "ac_cv_header_$ac_safe=yes"
/tags/7.8.700-7/debian/changelog
1,3 → 1,83
pike7.8 (7.8.700-7) unstable; urgency=low
 
* Correct the Replaces and Breaks declarations related to moving
Tools.PV (Closes: #711593).
* Also move compatibility Image module to pike7.8-image.
* Modify package descriptions noting what modules are in each package
and that the Postgres module is deprecated.
* Update Vcs-Browser URL.
* Actually apply undefined_htons.patch.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 08 Jun 2013 20:15:11 +0200
 
pike7.8 (7.8.700-6) unstable; urgency=low
 
* hurd.patch: Add mach/message.h to one more place in src/configure and
add HAVE_MACH_MESSAGE_H to src/machine.h.in.
* nettle_crypt_md5_buffer_size.patch (new): Nette.MD5: passwd array was
too small.
* pcre_info_obsolete.patch (new): Stop using the long-obsolete
pcre_info(), which was just recently removed from the headers but
remains in the library.
* undefined_htons.patch (mew): Include the necessary header file
declaring htons() in Protocols.DNS_SD.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 08 Jun 2013 01:56:51 +0200
 
pike7.8 (7.8.700-5) unstable; urgency=low
 
* Build-depend on libtiff-dev rather than libtiff4-dev (Closes: #708365).
* Move Tools.PV from -core to -gtk and make -gtk depend on -image, since
Tools.PV requires both but is too small to make its own package
(Closes: #711060).
* hurd.patch (new): Make Pike build on Debian GNU/Hurd.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 06 Jun 2013 22:53:05 +0200
 
pike7.8 (7.8.700-4) unstable; urgency=low
 
* reg_enum_conflict.patch: The conflict is with an enum, so we have to
rename our enum constants (really Closes: #708366). Also add DEP-3
header.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 26 May 2013 21:35:09 +0200
 
pike7.8 (7.8.700-3) unstable; urgency=low
 
* Link pike7.8-odbc to unixodbc, not iodbc, since the latter is not
multiarch-aware and not capable of handling the ODBC drivers in
wheezy (Closes: #707911).
* reg_enum_conflict.patch (new): Undefine conflicting REG_* definitions
for now (Closes: #708366).
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 23 May 2013 23:10:42 +0200
 
pike7.8 (7.8.700-2) unstable; urgency=low
 
* Upload to unstable.
* module-layout.patch: Use __REAL_MAJOR__ and __REAL_MINOR__ in
version-specific include and module paths; __REAL_VERSION__, being a
float, could allegedly cause trouble.
* Bump Standards-Version to 3.9.4
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 07 May 2013 23:10:27 +0200
 
pike7.8 (7.8.700-1) experimental; urgency=low
 
* New upstream release.
* Since the upstream tarball no longer contains Nettle 1.15, which
contained non-fee IETF documents, but instead Nettle 2.5, we can ship
it unmodified.
* Override the Lintian warnings about outdated config.guess files in the
bundles directories, as they aren't used.
* Drop nettle-2.1.patch. Refresh remaining patches.
* Exclude the ZXID module for now, until zxid has been packaged for
Debian.
* No longer exclude the PV (picture viewer) tool, as it now supports
GTK+2.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 07 Oct 2012 21:54:26 +0200
 
pike7.8 (7.8.550-dfsg-1) experimental; urgency=low
 
* The latest official upstream "beta" release.
/tags/7.8.700-7/debian/rules
135,7 → 135,7
#{ADT,Array,Audio,Cache,Calendar,Calendar_I,COM,Colors,CommonLog,Crypto,Debug,Filesystem,Error,Float,Function,Geography,Getopt,Gettext,Gmp,Graphics,Gz,HTTPAccept,Int,Kerberos,Languages,Local,Locale,Mapping,Math,MIME,Mird,Multiset,Nettle,Parser,Pike,Pipe,Process,Program,Protocols,Regexp,Remote,SSL,Shuffler,Standards,Stdio,String,System,Thread,Tools,Unicode,Web,Yabu,Yp,_ADT,_Charset,_Roxen,___Gz,___MIME,___Math,___Mird,___Regexp,___Yp,____Charset,__builtin*,spider}.
#usr/lib/pike/*/modules/Sql.pmod/{module,Sql,rsql,sql_*}.*
 
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase DVB Java TTF PV.pike Gnome GDK GTKSupport
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase DVB Java TTF Gnome GDK GTKSupport ZXID
# This is tricky. Note that it's only possible for an exclusion to match the last
# component specified in an .install file or on the command line, and below.
DH_EXCLUDE:=$(addprefix -X,$(excluded_modules))
/tags/7.8.700-7/debian/source/lintian-overrides
0,0 → 1,0
pike7.8 source: outdated-autotools-helper-file bundles/patches/nettle-*/config.guess 2005-03-17
/tags/7.8.700-7/debian/pike7.8-image.install
3,5 → 3,6
usr/lib/pike?.?/modules/*Image*.pmod
usr/lib/pike?.?/modules/Graphics.pmod
usr/lib/pike?.?/modules/Colors.pmod
usr/lib/pike?.?/7.0/modules/Colors.pmod
usr/lib/pike?.?/?.?/modules/Colors.pmod
usr/lib/pike?.?/?.?/modules/Image.pmod
usr/lib/pike?.?/modules/Protocols.pmod/X.pmod/XImage.pmod
/tags/7.8.700-7/debian/pike7.8-gtk.install
1,2 → 1,3
usr/lib/pike?.?/modules/*GTK2*
#usr/share/pike?.?/modules/*GTK2*
usr/lib/pike?.?/modules/Tools.pmod/PV.pike