Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 181 → Rev 197

/tags/7.8.866-2/debian/patches/nettle-2.1.patch
File deleted
/tags/7.8.866-2/debian/patches/nettle_crypt_md5_buffer_size.patch
File deleted
/tags/7.8.866-2/debian/patches/reg_enum_conflict.patch
File deleted
/tags/7.8.866-2/debian/patches/series
8,8 → 8,7
pthread_stub.patch
unbreak_cross_compilation.patch
dump_timeout.patch
reg_enum_conflict.patch
hurd.patch
nettle_crypt_md5_buffer_size.patch
pcre_info_obsolete.patch
undefined_htons.patch
bad_size_t_redef.patch
/tags/7.8.866-2/debian/patches/undefined_htons.patch
50,7 → 50,7
--- a/src/modules/_Protocols_DNS_SD/configure
+++ b/src/modules/_Protocols_DNS_SD/configure
@@ -3616,7 +3616,7 @@ done
@@ -3077,7 +3077,7 @@ done
59,7 → 59,7
do
@@ -3769,7 +3769,7 @@ fi
@@ -3240,7 +3240,7 @@ fi
done
else
/tags/7.8.866-2/debian/patches/unbreak_cross_compilation.patch
8,7 → 8,7
@DPATCH@
--- a/src/configure
+++ b/src/configure
@@ -8718,7 +8718,7 @@ if test "x$enable_binary" = "xno"; then
@@ -8037,7 +8037,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
17,7 → 17,7
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -106150,7 +106150,7 @@ EOF
@@ -106079,7 +106079,7 @@ EOF
;;
esac
if test "$cross_compiling" = yes; then
/tags/7.8.866-2/debian/patches/pcre_info_obsolete.patch
4,7 → 4,7
 
--- a/src/modules/_Regexp_PCRE/configure
+++ b/src/modules/_Regexp_PCRE/configure
@@ -4020,7 +4020,7 @@ EOF
@@ -3504,7 +3504,7 @@ EOF
12,7 → 12,7
+for ac_func in pcre_fullinfo pcre_get_stringnumber
do
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
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
/tags/7.8.866-2/debian/patches/hurd.patch
52,7 → 52,7
#endif
--- a/src/configure.in
+++ b/src/configure.in
@@ -3276,7 +3276,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h
@@ -3308,7 +3308,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 \
61,7 → 61,7
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
@@ -7933,7 +7933,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
72,7 → 72,7
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
--- a/src/configure
+++ b/src/configure
@@ -81740,7 +81740,7 @@ for ac_header in winsock2.h sys/rusage.h
@@ -79597,7 +79597,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 \
81,7 → 81,7
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
@@ -79746,7 +79746,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 \
90,7 → 90,7
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
@@ -104594,7 +104594,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
/tags/7.8.866-2/debian/patches/pthread_stub.patch
1,6 → 1,6
--- a/src/configure
+++ b/src/configure
@@ -90560,6 +90560,9 @@ cat confdefs.h >>conftest.$ac_ext
@@ -90980,6 +90980,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pthread.h>
12,7 → 12,7
int
--- a/src/configure.in
+++ b/src/configure.in
@@ -3977,6 +3977,9 @@ pthread_t gazonk;
@@ -4014,6 +4014,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.866-2/debian/patches/bad_size_t_redef.patch
0,0 → 1,26
Bug-Debian: https://bugs.debian.org/750430
Description: Fix undefined behaviour/buffer overruns on 64-bit architectures caused by broken redefinition of size_t.
Basically the same change as was made to image_jpeg.c in 2008.
Origin: upstream, http://pike-librarian.lysator.liu.se/piff.xml?module=pike.git&file=src/modules/_Image_JPEG/image_jpeg.c&from=adc0e9374373e1ba10c5984038267f600322099c&to=4e36f92cfa282f0b673b0087e50708a5f41c3e24
 
--- a/src/modules/_Image_JPEG/transupp.c
+++ b/src/modules/_Image_JPEG/transupp.c
@@ -36,17 +36,7 @@
* of internals, and added inclusion of jerror.h
*/
-#define FILE void
-#define size_t unsigned int
-/* NOTE: INT32 and INT16 are redefined by <jmorecfg.h>. */
-#if 0
-#ifdef INT16
-#undef INT16
-#endif /* INT16 */
-#ifdef INT32
-#undef INT32
-#endif
-#endif /* 0 */
+#include <stdio.h>
#define XMD_H /* Avoid INT16 / INT32 being redefined */