diff -Nru plv8-1.4.6.ds/Changes plv8-1.4.8.ds/Changes --- plv8-1.4.6.ds/Changes 2016-03-27 19:49:02.000000000 +0000 +++ plv8-1.4.8.ds/Changes 2016-04-21 09:00:49.000000000 +0000 @@ -1,5 +1,8 @@ Revision history for plv8 +1.4.8 2016-04-20 + - better management of resources + 1.4.4 2015-05-26 - Add jsonb type coercion in function boundary. - Fix crash related to FLEXIBLE_ARRAY_MEMBER changes. diff -Nru plv8-1.4.6.ds/debian/changelog plv8-1.4.8.ds/debian/changelog --- plv8-1.4.6.ds/debian/changelog 2016-03-28 14:48:07.000000000 +0000 +++ plv8-1.4.8.ds/debian/changelog 2016-04-21 09:13:43.000000000 +0000 @@ -1,3 +1,16 @@ +plv8 (1:1.4.8.ds-1) unstable; urgency=medium + + * New upstream version. + * Makefile: Add CXXFLAGS so we get hardening and debug symbols. + + -- Christoph Berg Thu, 21 Apr 2016 11:01:14 +0200 + +plv8 (1:1.4.7.ds-1) unstable; urgency=medium + + * New upstream version. + + -- Christoph Berg Sat, 16 Apr 2016 23:32:00 +0200 + plv8 (1:1.4.6.ds-1) unstable; urgency=medium * New 1.4 upstream release supporting v8 3.14. Thanks to Jerry Sievert! diff -Nru plv8-1.4.6.ds/debian/patches/cflags plv8-1.4.8.ds/debian/patches/cflags --- plv8-1.4.6.ds/debian/patches/cflags 1970-01-01 00:00:00.000000000 +0000 +++ plv8-1.4.8.ds/debian/patches/cflags 2016-04-21 09:13:14.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -65,7 +65,7 @@ plv8_config.h: plv8_config.h.in Makefile + sed -e 's/^#undef PLV8_VERSION/#define PLV8_VERSION "$(PLV8_VERSION)"/' $< > $@ + + %.o : %.cc plv8_config.h plv8.h +- $(CUSTOM_CC) $(CCFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $< ++ $(CUSTOM_CC) $(CXXFLAGS) $(CCFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $< + + # Convert .js to .cc + $(JSCS): %.cc: %.js diff -Nru plv8-1.4.6.ds/debian/patches/series plv8-1.4.8.ds/debian/patches/series --- plv8-1.4.6.ds/debian/patches/series 2016-03-28 14:33:27.000000000 +0000 +++ plv8-1.4.8.ds/debian/patches/series 2016-04-21 09:06:36.000000000 +0000 @@ -1,2 +1,3 @@ dummy-scripts regression +cflags diff -Nru plv8-1.4.6.ds/debian/rules plv8-1.4.8.ds/debian/rules --- plv8-1.4.6.ds/debian/rules 2016-03-28 14:33:27.000000000 +0000 +++ plv8-1.4.8.ds/debian/rules 2016-04-21 09:12:34.000000000 +0000 @@ -27,7 +27,7 @@ %: dh $@ -VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*.ds\).*/\1/p') +VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: 1:\(.*.ds\).*/\1/p') DIR = $(shell basename $(CURDIR)) origtargz: clean ! test -f .pc/applied-patches diff -Nru plv8-1.4.6.ds/debian/watch plv8-1.4.8.ds/debian/watch --- plv8-1.4.6.ds/debian/watch 2016-03-27 18:49:47.000000000 +0000 +++ plv8-1.4.8.ds/debian/watch 2016-04-21 08:59:10.000000000 +0000 @@ -1,3 +1,6 @@ version=3 + +# at the moment we are interested in 1.4 releases only + opts="dversionmangle=s/\.ds//" \ -https://github.com/plv8/plv8/releases .*/v(\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) +https://github.com/plv8/plv8/releases .*/v(1.4.\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) diff -Nru plv8-1.4.6.ds/Makefile plv8-1.4.8.ds/Makefile --- plv8-1.4.6.ds/Makefile 2016-03-27 19:49:02.000000000 +0000 +++ plv8-1.4.8.ds/Makefile 2016-04-21 09:00:49.000000000 +0000 @@ -12,7 +12,7 @@ # 'make static' will download v8 and build, then statically link to it. # #-----------------------------------------------------------------------------# -PLV8_VERSION = 1.4.6 +PLV8_VERSION = 1.4.8 PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) diff -Nru plv8-1.4.6.ds/META.json plv8-1.4.8.ds/META.json --- plv8-1.4.6.ds/META.json 2016-03-27 19:49:02.000000000 +0000 +++ plv8-1.4.8.ds/META.json 2016-04-21 09:00:49.000000000 +0000 @@ -2,7 +2,7 @@ "name": "plv8", "abstract": "A procedural language in JavaScript powered by V8", "description": "plv8 is a trusted procedural language that is safe to use, fast to run and easy to develop.", - "version": "1.4.6", + "version": "1.4.8", "maintainer": [ "Jerry Sievert ", "Hitoshi Harada " @@ -24,21 +24,21 @@ }, "provides": { "plv8": { - "file": "plv8--1.4.6.sql", + "file": "plv8--1.4.8.sql", "docfile": "doc/plv8.md", - "version": "1.4.6", + "version": "1.4.8", "abstract": "A procedural language in JavaScript" }, "plcoffee": { - "file": "plcoffee--1.4.6.sql", + "file": "plcoffee--1.4.8.sql", "docfile": "doc/plv8.md", - "version": "1.4.6", + "version": "1.4.8", "abstract": "A procedural language in CoffeeScript" }, "plls": { - "file": "plls--1.4.6.sql", + "file": "plls--1.4.8.sql", "docfile": "doc/plv8.md", - "version": "1.4.6", + "version": "1.4.8", "abstract": "A procedural language in LiveScript" } }, diff -Nru plv8-1.4.6.ds/plv8_func.cc plv8-1.4.8.ds/plv8_func.cc --- plv8-1.4.6.ds/plv8_func.cc 2016-03-27 19:49:02.000000000 +0000 +++ plv8-1.4.8.ds/plv8_func.cc 2016-04-21 09:00:49.000000000 +0000 @@ -113,6 +113,9 @@ class SubTranBlock { +private: + ResourceOwner m_resowner; + MemoryContext m_mcontext; public: SubTranBlock(); void enter(); @@ -123,6 +126,7 @@ Persistent CursorTemplate; Persistent WindowObjectTemplate; + static Handle SPIResultToValue(int status) { @@ -165,8 +169,11 @@ if (!IsTransactionOrTransactionBlock()) throw js_error("out of transaction"); - BeginInternalSubTransaction(NULL); + m_resowner = CurrentResourceOwner; + m_mcontext = CurrentMemoryContext; + BeginInternalSubTransaction(NULL); + MemoryContextSwitchTo(m_mcontext); } void @@ -177,7 +184,8 @@ else RollbackAndReleaseCurrentSubTransaction(); - + MemoryContextSwitchTo(m_mcontext); + CurrentResourceOwner = m_resowner; } JSONObject::JSONObject()