Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 124 → Rev 133

/tags/7.8.550-dfsg-1/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.1
Standards-Version: 3.9.2
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,
/tags/7.8.550-dfsg-1/debian/patches/dumping_problems.patch
File deleted
/tags/7.8.550-dfsg-1/debian/patches/misplaced_MAXPATHLEN.patch
2,10 → 2,9
Subject: Move reserve MAXPATHLEN definition up.
 
@DPATCH@
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 @@
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -118,6 +118,10 @@ LINKFUNC(BOOL, movefileex, (
#endif /* __NT__ */
16,7 → 15,7
struct array *encode_stat(PIKE_STAT_T *s)
{
struct array *a;
@@ -1443,9 +1447,6 @@
@@ -1520,9 +1524,6 @@ void f_getcwd(INT32 args)
size*=2;
} while (size < 10000);
#else
/tags/7.8.550-dfsg-1/debian/patches/smartlink_rpath.patch
5,10 → 5,9
## DP: Make smartlink not use -rpath
 
@DPATCH@
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 @@
--- a/bin/smartlink
+++ b/bin/smartlink
@@ -162,9 +162,8 @@ if test x$# != x0 ; then
LDOPTS="$LDOPTS -R$RPATH"
;;
Linux\ 2.*)
20,10 → 19,9
;;
UnixWare\ 7.*)
if test x$LINKING != xno -a "x$RPATH" != x ; then
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 @@
--- a/src/smartlink.c
+++ b/src/smartlink.c
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
full_rpath = rpath;
#ifdef USE_Wl
32,7 → 30,7
#elif defined(USE_Wl_R)
strcat(rpath, "-Wl,-R");
#elif defined(USE_R)
@@ -310,7 +310,7 @@
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
}
rpath_in_use |= add_path(rpath, ld_lib_path);
}
41,7 → 39,7
if (rpath_in_use) {
/* Delete the terminating ':' */
rpath[strlen(rpath) - 1] = 0;
@@ -357,6 +357,7 @@
@@ -357,6 +357,7 @@ int main(int argc, char **argv)
#error Unknown method
#endif
}
/tags/7.8.550-dfsg-1/debian/patches/pthread_stub.patch
1,7 → 1,7
--- a/src/configure
+++ b/src/configure
@@ -90901,6 +90901,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
@@ -62495,6 +62495,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* 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
@@ -3929,6 +3929,9 @@ pthread_t gazonk;
@@ -3953,6 +3953,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.550-dfsg-1/debian/patches/no_dump_modules.patch
1,10 → 1,9
Author: Magnus Holmgren <holmgren@debian.org>
Description: Make install.pike not dump modules; we do that in postinst
 
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 @@
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -2945,7 +2945,6 @@ the PRIVATE_CRT stuff in install.pike.\n
{
do_export();
}else{
/tags/7.8.550-dfsg-1/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
@@ -323,7 +323,8 @@ void dump_files() {
@@ -325,7 +325,8 @@ void dump_files() {
#if constant(alarm)
// Dumping shouldn't take more than a minute per file.
/tags/7.8.550-dfsg-1/debian/patches/series
7,6 → 7,5
misplaced_MAXPATHLEN.patch
pthread_stub.patch
unbreak_cross_compilation.patch
dumping_problems.patch
nettle-2.1.patch
dump_timeout.patch
/tags/7.8.550-dfsg-1/debian/patches/unbreak_cross_compilation.patch
4,43 → 4,25
## 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 2009-09-22 20:37:45.000000000 +0000
+++ b/src/configure 2010-05-04 09:44:55.000000000 +0000
@@ -8855,7 +8855,7 @@
--- a/src/configure
+++ b/src/configure
@@ -7348,7 +7348,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
- RUNPIKE="DEFAULT_RUNPIKE"
+ RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
else
if test "x$cross_compiling" = "xyes"; then
- RUNPIKE="DEFAULT_RUNPIKE"
+ RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -106926,7 +106926,7 @@
RUNPIKE="DEFAULT_RUNPIKE"
@@ -73133,7 +73133,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 >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. */
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/tags/7.8.550-dfsg-1/debian/patches/module-layout.patch
1,10 → 1,9
Author: Magnus Holmgren <holmgren@debian.org>
Description: Add local site-pike directories to master.pike.in
 
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 @@
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -2113,6 +2113,10 @@ protected void create()
add_module_path("#lib_prefix#/modules");
#endif
15,10 → 14,9
#if "#cflags# "[0]!='#'
cflags = "#cflags#";
#endif
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 @@
--- 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;
// 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;
30,7 → 28,7
// where do we install the documentation?
string system_doc_path = master()->doc_prefix;
@@ -183,7 +182,7 @@
@@ -183,7 +182,7 @@ void do_make(array(string) cmd)
extra_args = ({
"PIKE="+run_pike,
"SRCDIR="+fix("$src"),
39,7 → 37,7
"LOCAL_MODULE_PATH=" + lmp,
});
}
@@ -240,6 +239,7 @@
@@ -240,6 +239,7 @@ int main(int argc, array(string) argv)
({"all",Getopt.NO_ARG,({"--all"}) }),
({"make",Getopt.NO_ARG,({"--make"}) }),
({"auto",Getopt.NO_ARG,({"--auto"}) }),
47,7 → 45,7
({"source",Getopt.HAS_ARG,({"--source"}) }),
({"query",Getopt.HAS_ARG,({"--query"}) }),
({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
@@ -276,6 +276,9 @@
@@ -276,6 +276,9 @@ int main(int argc, array(string) argv)
case "auto":
run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
break;
57,7 → 55,7
}
}
@@ -405,7 +408,7 @@
@@ -405,7 +408,7 @@ int main(int argc, array(string) argv)
run_or_fail( ([ "env":getenv()|
([
"PIKE":run_pike,
66,10 → 64,9
"LOCAL_MODULE_PATH":local_module_path,
])
]),
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 @@
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -90,13 +90,13 @@ $(OBJS): propagated_variables
#
install: $(MODULE_INSTALL)
@if test "x$(OBJS)" != "x" ; then \
/tags/7.8.550-dfsg-1/debian/watch
1,4 → 1,4
version=3
 
opts=dversionmangle=s/-dfsg$// \
http://pike.ida.liu.se/download/pub/pike/all/(7\.8\.\d+)/ .*/Pike-v(7\.8\.\d+)\.tar\.gz
http://pike.ida.liu.se/download/pub/pike/beta/(7\.8\.\d+)/ .*/Pike-v(7\.8\.\d+)\.tar\.gz
/tags/7.8.550-dfsg-1/debian/changelog
1,3 → 1,13
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).