/trunk/debian/control |
---|
3,7 → 3,7 |
Priority: optional |
Maintainer: Magnus Holmgren <holmgren@debian.org> |
Uploaders: Henrik Andreasson <debian@han.pp.se> |
Standards-Version: 3.9.2 |
Standards-Version: 3.9.1 |
Build-Depends: 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, |
/trunk/debian/changelog |
---|
1,13 → 1,3 |
pike7.8 (7.8.550-dfsg-1) experimental; urgency=low |
* The latest official upstream "beta" release. |
- Dropped dumping_problems.patch; incorporated upstream. |
- unbreak_cross_compilation.patch partially incorporated upstream. |
* Update debian/watch to point to |
http://pike.ida.liu.se/download/pub/pike/beta/. |
-- Magnus Holmgren <holmgren@debian.org> Mon, 25 Apr 2011 00:28:05 +0200 |
pike7.8 (7.8.352-dfsg-4) unstable; urgency=low |
* Correct description of pike7.8-pcre (Closes: #597867). |
/trunk/debian/patches/dump_timeout.patch |
---|
1,6 → 1,6 |
--- 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. |
/trunk/debian/patches/series |
---|
7,5 → 7,6 |
misplaced_MAXPATHLEN.patch |
pthread_stub.patch |
unbreak_cross_compilation.patch |
dumping_problems.patch |
nettle-2.1.patch |
dump_timeout.patch |
/trunk/debian/patches/misplaced_MAXPATHLEN.patch |
---|
2,9 → 2,10 |
Subject: Move reserve MAXPATHLEN definition up. |
@DPATCH@ |
--- 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__ */ |
15,7 → 16,7 |
struct array *encode_stat(PIKE_STAT_T *s) |
{ |
struct array *a; |
@@ -1520,9 +1524,6 @@ void f_getcwd(INT32 args) |
@@ -1443,9 +1447,6 @@ |
size*=2; |
} while (size < 10000); |
#else |
/trunk/debian/patches/smartlink_rpath.patch |
---|
5,9 → 5,10 |
## DP: Make smartlink not use -rpath |
@DPATCH@ |
--- a/bin/smartlink |
+++ b/bin/smartlink |
@@ -162,9 +162,8 @@ if test x$# != x0 ; then |
diff -urNad trunk~/bin/smartlink trunk/bin/smartlink |
--- trunk~/bin/smartlink 2008-08-19 13:51:08.000000000 +0200 |
+++ trunk/bin/smartlink 2009-08-16 17:18:26.000000000 +0200 |
@@ -162,9 +162,8 @@ |
LDOPTS="$LDOPTS -R$RPATH" |
;; |
Linux\ 2.*) |
19,9 → 20,10 |
;; |
UnixWare\ 7.*) |
if test x$LINKING != xno -a "x$RPATH" != x ; then |
--- a/src/smartlink.c |
+++ b/src/smartlink.c |
@@ -160,7 +160,7 @@ int main(int argc, char **argv) |
diff -urNad trunk~/src/smartlink.c trunk/src/smartlink.c |
--- trunk~/src/smartlink.c 2008-08-19 17:57:34.000000000 +0200 |
+++ trunk/src/smartlink.c 2009-08-16 17:18:26.000000000 +0200 |
@@ -160,7 +160,7 @@ |
full_rpath = rpath; |
#ifdef USE_Wl |
30,7 → 32,7 |
#elif defined(USE_Wl_R) |
strcat(rpath, "-Wl,-R"); |
#elif defined(USE_R) |
@@ -310,7 +310,7 @@ int main(int argc, char **argv) |
@@ -310,7 +310,7 @@ |
} |
rpath_in_use |= add_path(rpath, ld_lib_path); |
} |
39,7 → 41,7 |
if (rpath_in_use) { |
/* Delete the terminating ':' */ |
rpath[strlen(rpath) - 1] = 0; |
@@ -357,6 +357,7 @@ int main(int argc, char **argv) |
@@ -357,6 +357,7 @@ |
#error Unknown method |
#endif |
} |
/trunk/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 |
@@ -90901,6 +90901,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; |
@@ -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> |
/trunk/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) |
/trunk/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 |
@@ -2945,7 +2945,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{ |
/trunk/debian/patches/unbreak_cross_compilation.patch |
---|
4,25 → 4,43 |
## 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 |
@@ -7348,7 +7348,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" |
@@ -73133,7 +73133,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 : |
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. */ |
--- 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. */ |
/trunk/debian/patches/module-layout.patch |
---|
1,9 → 1,10 |
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 |
@@ -2113,6 +2113,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 |
14,9 → 15,10 |
#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; |
28,7 → 30,7 |
// where do we install the documentation? |
string system_doc_path = master()->doc_prefix; |
@@ -183,7 +182,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, |
}); |
} |
@@ -240,6 +239,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"}) }), |
@@ -276,6 +276,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 |
} |
} |
@@ -405,7 +408,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 \ |
/trunk/debian/watch |
---|
1,4 → 1,4 |
version=3 |
opts=dversionmangle=s/-dfsg$// \ |
http://pike.ida.liu.se/download/pub/pike/beta/(7\.8\.\d+)/ .*/Pike-v(7\.8\.\d+)\.tar\.gz |
http://pike.ida.liu.se/download/pub/pike/all/(7\.8\.\d+)/ .*/Pike-v(7\.8\.\d+)\.tar\.gz |