Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 181 → Rev 180

/branches/7.8-stable/debian/patches/hurd.patch
File deleted
/branches/7.8-stable/debian/patches/pcre_info_obsolete.patch
File deleted
/branches/7.8-stable/debian/patches/nettle_crypt_md5_buffer_size.patch
File deleted
/branches/7.8-stable/debian/patches/undefined_htons.patch
File deleted
/branches/7.8-stable/debian/patches/reg_enum_conflict.patch
File deleted
/branches/7.8-stable/debian/patches/misplaced_MAXPATHLEN.patch
1,9 → 1,10
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: Move reserve MAXPATHLEN definition up.
 
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -118,6 +118,10 @@ LINKFUNC(BOOL, movefileex, (
diff -urNad pike7.8-7.8.316~/src/modules/files/efuns.c pike7.8-7.8.316/src/modules/files/efuns.c
--- pike7.8-7.8.316~/src/modules/files/efuns.c 2009-08-15 01:01:23.000000000 +0200
+++ pike7.8-7.8.316/src/modules/files/efuns.c 2009-08-15 01:02:21.000000000 +0200
@@ -109,6 +109,10 @@
#endif /* __NT__ */
14,7 → 15,7
struct array *encode_stat(PIKE_STAT_T *s)
{
struct array *a;
@@ -1524,9 +1528,6 @@ void f_getcwd(INT32 args)
@@ -1443,9 +1447,6 @@
size*=2;
} while (size < 10000);
#else
/branches/7.8-stable/debian/patches/dump_timeout.patch
5,7 → 5,7
 
--- a/lib/modules/Tools.pmod/Standalone.pmod/dump.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/dump.pike
@@ -325,7 +325,8 @@ void dump_files() {
@@ -323,7 +323,8 @@ void dump_files() {
#if constant(alarm)
// Dumping shouldn't take more than a minute per file.
/branches/7.8-stable/debian/patches/series
7,9 → 7,6
misplaced_MAXPATHLEN.patch
pthread_stub.patch
unbreak_cross_compilation.patch
dumping_problems.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
/branches/7.8-stable/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
@@ -90901,6 +90901,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;
@@ -3929,6 +3929,9 @@ pthread_t gazonk;
AC_MSG_CHECKING(for pthread_atfork)
AC_CACHE_VAL(pike_cv_have_pthread_atfork,[
AC_TRY_LINK([#include <pthread.h>
/branches/7.8-stable/debian/patches/dumping_problems.patch
0,0 → 1,133
From: Martin Stjernholm <mast@roxen.com>
Subject: Encode references to all ex-masters as if they are to the current master.
 
That since we cannot hope to eradicate all references to the old
master when replacing it, and in any case the decoder cannot hope to
find the same ex-master again.
 
If this creates a problem for someone using replace_master then it's
always possible to clear the is_pike_master variable in the old
master.
 
--- trunk/lib/master.pike.in 28 Jul 2010 10:29:59 -0000 1.474
+++ cvs/lib/master.pike.in 28 Jul 2010 22:58:01 -0000 1.476
@@ -85,6 +85,13 @@
//!
int show_if_constant_errors = 0;
+int is_pike_master = 0;
+// This integer variable should exist in any object that aspires to be
+// the master. It gets set to 1 when the master is installed, and is
+// therefore set in any object that is or has been the master. That
+// makes the Encoder class encode references to the master and all
+// ex-masters as references to the current master object.
+
// --- Functions begin here.
// Have to access some stuff without going through the resolver.
@@ -5092,6 +5099,11 @@
}
}
+ else if (what->is_pike_master) {
+ ENC_MSG (" is a master object\n");
+ ENC_RETURN ("o/master");
+ }
+
program prog;
if ((prog = objects_reverse_lookup (what)))
ENC_MSG (" found program in objects: %O\n", prog);
--- trunk/src/builtin_functions.c 27 Jul 2010 16:46:01 -0000 1.704
+++ cvs/src/builtin_functions.c 28 Jul 2010 22:51:00 -0000 1.705
@@ -7364,22 +7364,28 @@
*/
PMOD_EXPORT void f_replace_master(INT32 args)
{
+ struct object *new_master;
ASSERT_SECURITY_ROOT("replace_master");
if(!args)
SIMPLE_TOO_FEW_ARGS_ERROR("replace_master", 1);
if(Pike_sp[-args].type != T_OBJECT)
SIMPLE_BAD_ARG_ERROR("replace_master", 1, "object");
- if(!Pike_sp[-args].u.object->prog)
+ new_master = Pike_sp[-args].u.object;
+ if(!new_master->prog)
bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
"Called with destructed object.\n");
if (Pike_sp[-args].subtype)
bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
"Subtyped master objects are not supported yet.\n");
-
+
+ push_constant_text ("is_pike_master");
+ args++;
+ object_set_index (new_master, 0, Pike_sp - 1, &svalue_int_one);
+
free_object(master_object);
- master_object=Pike_sp[-args].u.object;
+ master_object=new_master;
add_ref(master_object);
free_program(master_program);
--- trunk/src/object.c 11 Jul 2010 10:08:02 -0000 1.310
+++ cvs/src/object.c 28 Jul 2010 22:50:59 -0000 1.311
@@ -658,6 +658,7 @@
}
{
+ int f;
ONERROR uwp;
/* fprintf(stderr, "Cloning master...\n"); */
@@ -673,7 +674,11 @@
call_c_initializers(master_object);
call_pike_initializers(master_object,0);
-
+
+ f = find_identifier ("is_pike_master", master_program);
+ if (f >= 0)
+ object_low_set_index (master_object, f, &svalue_int_one);
+
/* fprintf(stderr, "Master loaded.\n"); */
UNSET_ONERROR (uwp);
--- trunk/src/svalue.c 11 Jul 2010 12:39:10 -0000 1.261
+++ cvs/src/svalue.c 28 Jul 2010 22:46:39 -0000 1.262
@@ -30,14 +30,10 @@
#define sp Pike_sp
-PMOD_EXPORT const struct svalue svalue_undefined =
+PMOD_EXPORT struct svalue svalue_undefined =
SVALUE_INIT (T_INT, NUMBER_UNDEFINED, 0);
-PMOD_EXPORT const struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
-#ifdef HAVE_UNION_INIT
-PMOD_EXPORT const struct svalue svalue_int_one = SVALUE_INIT_INT (1);
-#else
+PMOD_EXPORT struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
PMOD_EXPORT struct svalue svalue_int_one = SVALUE_INIT_INT (1);
-#endif
#ifdef PIKE_DEBUG
PMOD_EXPORT const char msg_type_error[] =
--- trunk/src/svalue.h 18 Feb 2010 08:52:55 -0000 1.172
+++ cvs/src/svalue.h 28 Jul 2010 22:46:40 -0000 1.173
@@ -323,13 +323,8 @@
#define FUNCTION_BUILTIN USHRT_MAX
-extern PMOD_EXPORT const struct svalue svalue_undefined, svalue_int_zero;
-#ifdef HAVE_UNION_INIT
-extern PMOD_EXPORT const struct svalue svalue_int_one;
-#else
-/* The value 1 is initialized first thing in init_pike. */
-extern PMOD_EXPORT struct svalue svalue_int_one;
-#endif
+extern PMOD_EXPORT struct svalue svalue_undefined,
+ svalue_int_zero, svalue_int_one;
#define is_gt(a,b) is_lt(b,a)
#define is_ge(a,b) is_le(b,a)
/branches/7.8-stable/debian/patches/no_dump_modules.patch
1,9 → 1,10
Author: Magnus Holmgren <holmgren@debian.org>
Description: Make install.pike not dump modules; we do that in postinst
 
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -2980,7 +2980,6 @@ the PRIVATE_CRT stuff in install.pike.\n
diff -urNad trunk~/bin/install.pike trunk/bin/install.pike
--- trunk~/bin/install.pike 2008-08-19 13:51:08.000000000 +0200
+++ trunk/bin/install.pike 2010-07-28 16:12:19.000000000 +0200
@@ -2942,7 +2942,6 @@
{
do_export();
}else{
/branches/7.8-stable/debian/patches/dynamic_module_makefile.in-libgcc.patch
1,10 → 1,11
Author: Marek Habersack <grendel@debian.org>
Description: Figure out LIBGCC name.
 
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
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
@@ -2,6 +2,7 @@
# $Id: b9e7817a07dab41006a9b1cc92c9ce0193303874 $
# $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
#
+LIBGCC=$(shell gcc -print-libgcc-file-name)
/branches/7.8-stable/debian/patches/unbreak_cross_compilation.patch
4,20 → 4,21
## DP: Fix various breakage preventing cross compilation:
## DP: * Use the installed pike when needed, not the newly built one.
## DP: * Don't disable dynamic module loading just because we're cross-compiling
## DP: * Don't freak out because a test program cannot be run
 
@DPATCH@
--- a/src/configure
+++ b/src/configure
@@ -8718,7 +8718,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
--- a/src/configure 2009-09-22 20:37:45.000000000 +0000
+++ b/src/configure 2010-05-04 09:44:55.000000000 +0000
@@ -8855,7 +8855,7 @@
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
- RUNPIKE="DEFAULT_RUNPIKE"
+ RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -106150,7 +106150,7 @@ EOF
if test "x$cross_compiling" = "xyes"; then
- RUNPIKE="DEFAULT_RUNPIKE"
+ RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -106926,7 +106926,7 @@
;;
esac
if test "$cross_compiling" = yes; then
26,3 → 27,20
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
--- a/src/modules/Mysql/configure 2010-05-19 10:20:10.745552500 +0000
+++ b/src/modules/Mysql/configure 2009-09-22 20:38:35.000000000 +0000
@@ -7018,13 +7018,7 @@
$as_echo "yes" >&6; }
if test "$cross_compiling" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+:
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
/branches/7.8-stable/debian/patches/module-layout.patch
1,22 → 1,24
Author: Magnus Holmgren <holmgren@debian.org>
Description: Add local site-pike directories to master.pike.in
 
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -2137,6 +2137,10 @@ protected void create()
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/master.pike.in trunk/lib/master.pike.in
--- trunk~/lib/master.pike.in 2009-09-19 12:08:35.000000000 +0200
+++ trunk/lib/master.pike.in 2010-04-11 21:02:58.000000000 +0200
@@ -2094,6 +2094,10 @@
add_module_path("#lib_prefix#/modules");
#endif
+ // Debian paths
+ add_include_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules");
+ add_include_path("/usr/local/lib/pike"+__REAL_VERSION__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules");
+
#if "#cflags# "[0]!='#'
cflags = "#cflags#";
#endif
--- a/lib/modules/Tools.pmod/Standalone.pmod/module.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/module.pike
@@ -25,9 +25,8 @@ string bin_path=include_path;
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike
--- trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2008-07-08 14:59:17.000000000 +0200
+++ trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2010-04-11 21:35:20.000000000 +0200
@@ -25,9 +25,8 @@
// this is not the ideal location for all systems, but it's a start.
string local_module_path=combine_path(getenv("HOME")||"","lib/pike/modules");
bool old_style_module = false;
24,11 → 26,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_MAJOR__+"."+__REAL_MINOR__+"/modules";
+string system_module_path="/usr/local/lib/pike"+__REAL_VERSION__+"/modules";
// where do we install the documentation?
string system_doc_path = master()->doc_prefix;
@@ -184,7 +183,7 @@ void do_make(array(string) cmd)
@@ -183,7 +182,7 @@
extra_args = ({
"PIKE="+run_pike,
"SRCDIR="+fix("$src"),
37,7 → 39,7
"LOCAL_MODULE_PATH=" + lmp,
});
}
@@ -241,6 +240,7 @@ int main(int argc, array(string) argv)
@@ -240,6 +239,7 @@
({"all",Getopt.NO_ARG,({"--all"}) }),
({"make",Getopt.NO_ARG,({"--make"}) }),
({"auto",Getopt.NO_ARG,({"--auto"}) }),
45,7 → 47,7
({"source",Getopt.HAS_ARG,({"--source"}) }),
({"query",Getopt.HAS_ARG,({"--query"}) }),
({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
@@ -277,6 +277,9 @@ int main(int argc, array(string) argv)
@@ -276,6 +276,9 @@
case "auto":
run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
break;
55,7 → 57,7
}
}
@@ -421,7 +424,7 @@ int main(int argc, array(string) argv)
@@ -405,7 +408,7 @@
run_or_fail( ([ "env":getenv()|
([
"PIKE":run_pike,
64,9 → 66,10
"LOCAL_MODULE_PATH":local_module_path,
])
]),
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -90,13 +90,13 @@ $(OBJS): propagated_variables
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 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 2010-04-11 22:37:28.000000000 +0200
@@ -90,13 +90,13 @@
#
install: $(MODULE_INSTALL)
@if test "x$(OBJS)" != "x" ; then \