Bug#852993: unblock: gall/1.2-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gall
A segfault bug was found by Ian Learmonth which prevented git pushes to a
Gitano based git server with objects above a certain size. Sadly he found this
bug too late for the fix to make it into Stretch without this request.
The change is related to the fact that more modern libgit2 libraries seem to
require threads initialisation even when the client is not using threads.
The debdiff between 1.1-2 and 1.2-1 is attached to this message.
unblock gall/1.2-1
-- System Information:
Debian Release: 8.6
APT prefers stable
APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru gall-1.1/COPYING gall-1.2/COPYING
--- gall-1.1/COPYING 2016-08-29 12:42:36.000000000 +0100
+++ gall-1.2/COPYING 2017-01-25 23:55:25.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright 2012 Daniel Silverstone <dsilvers@digital-scurf.org>
+Copyright 2012-2017 Daniel Silverstone <dsilvers@digital-scurf.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -24,3 +24,26 @@
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
+
+The file test/website.tar contains content which is under the following licence
+terms:
+
+Copyright 2016 Kishan B, 2017 Ana Custura
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff -Nru gall-1.1/debian/changelog gall-1.2/debian/changelog
--- gall-1.1/debian/changelog 2016-10-27 07:21:07.000000000 +0100
+++ gall-1.2/debian/changelog 2017-01-26 00:00:16.000000000 +0000
@@ -1,3 +1,9 @@
+gall (1.2-1) unstable; urgency=medium
+
+ * New upstream version, uses git_libgit2_init()
+
+ -- Daniel Silverstone <dsilvers@digital-scurf.org> Thu, 26 Jan 2017 00:00:16 +0000
+
gall (1.1-2) unstable; urgency=medium
* Fix homepage URL to the git server for Gall.
diff -Nru gall-1.1/debian/copyright gall-1.2/debian/copyright
--- gall-1.1/debian/copyright 2016-10-14 09:21:13.000000000 +0100
+++ gall-1.2/debian/copyright 2017-01-26 00:00:16.000000000 +0000
@@ -10,6 +10,10 @@
Copyright: Copyright 2015 Daniel Silverstone <dsilvers@digital-scurf.org>
License: BSD-3-clause
+Files: test/website.tar
+Copyright: Copyright 2016 Kishan B, 2017 Ana Custura
+License: MIT
+
License: BSD-3-clause
Copyright 2012 Daniel Silverstone <dsilvers@digital-scurf.org>
All rights reserved.
@@ -37,3 +41,24 @@
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
+
+License: MIT
+ Copyright 2016 Kishan B, 2017 Ana Custura
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff -Nru gall-1.1/lib/gall/ll/git2.c gall-1.2/lib/gall/ll/git2.c
--- gall-1.1/lib/gall/ll/git2.c 2016-08-29 12:42:36.000000000 +0100
+++ gall-1.2/lib/gall/ll/git2.c 2017-01-25 23:55:25.000000000 +0000
@@ -443,5 +443,9 @@
BASIC_FUNC(get_object_type);
BASIC_FUNC(get_object_raw);
BASIC_FUNC(get_tree_table);
+
+#if LIBGIT2_SOVERSION > 22
+ git_libgit2_init();
+#endif
return 1;
}
diff -Nru gall-1.1/test/create_test_repo.sh gall-1.2/test/create_test_repo.sh
--- gall-1.1/test/create_test_repo.sh 2016-08-29 12:42:36.000000000 +0100
+++ gall-1.2/test/create_test_repo.sh 2017-01-25 23:55:25.000000000 +0000
@@ -4,3 +4,4 @@
tar xf test_repo.tar
tar xf lorries-broken.tar
+tar xf website.tar
diff -Nru gall-1.1/test/test-gall.repository.lua gall-1.2/test/test-gall.repository.lua
--- gall-1.1/test/test-gall.repository.lua 2016-08-29 12:42:36.000000000 +0100
+++ gall-1.2/test/test-gall.repository.lua 2017-01-25 23:55:25.000000000 +0000
@@ -230,6 +230,10 @@
assert(repo:merge_base(sha_1, sha_2) == sha_b)
end
+function suite.ana_website_regression()
+ assert(test_repo("website.git"))
+end
+
function suite.rev_list()
local repo = test_repo()
local sha_new = "0b65c32b6a5277ff0e75ddad9e3914148914042d"
Binary files /tmp/NJc5A1N4dR/gall-1.1/test/website.tar and /tmp/3iBOcDyo_J/gall-1.2/test/website.tar differ
diff -Nru gall-1.1/test/withrepo.lua gall-1.2/test/withrepo.lua
--- gall-1.1/test/withrepo.lua 2016-08-29 12:42:36.000000000 +0100
+++ gall-1.2/test/withrepo.lua 2017-01-25 23:55:25.000000000 +0000
@@ -8,9 +8,11 @@
function xpcall(fn, tb)
os.execute("rm -rf test/test_repo")
os.execute("rm -rf test/lorries.git")
+ os.execute("rm -rf test/website.git")
local ok, msg = _xpcall(fn, tb)
os.execute("rm -rf test/test_repo")
os.execute("rm -rf test/lorries.git")
+ os.execute("rm -rf test/website.git")
return ok, msg
end
Reply to: