Merge lp:~vibhavp/ubuntu/raring/spl/merge-from-debian into lp:ubuntu/raring/spl

[Vibhav Pant]

[Andrew Starr-Bochicchio (andrewsomething)]

What does this mean:

  - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need
    to reverse-apply it in the actual source so that the patch will
    apply upon `quilt push -a'.

Looking at the history, AFAICT this doesn't actually seem to be a remaining Ubuntu change, just a changelog entry that has been carried over for no real reason. Am I missing something?

review: Needs Information

[Vibhav Pant (vibhavp)]

Yes, I have added a wrong entry.

[Daniel T Chen (crimsun)]

Thanks. There was likely some cruft in my source directory when I first generated the source package in 2011. In any case, I've uploaded a tweaked version of this merge (added a missing versioned build-dep on dpkg-dev to pick up the multiarch var).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-26 12:27:29 +0000
+++ debian/changelog	2013-03-26 11:11:29 +0000
@@ -1,3 +1,19 @@
+spl (1.0~pre6-4ubuntu1) raring; urgency=low
+
+  *  Merge from Debian unstable. Remaining changes:
+    + Add 03_ubuntu_multiarch:
+      debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606)
+
+ -- Vibhav Pant <[e-mail]>  Thu, 20 Dec 2012 22:47:49 +0530
+
+spl (1.0~pre6-4) unstable; urgency=low
+
+  * Add new patch fix-hurd-ftbfs provided by Svante Signell to fix FTBFS on
+    hurd (closes: #686162)
+  * Bump Standards-Version to 3.9.3.
+
+ -- Gerfried Fuchs <[e-mail]>  Fri, 07 Sep 2012 10:31:58 +0200
+
 spl (1.0~pre6-3.1ubuntu1) quantal; urgency=low
 
   * Merge from Debian unstable. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2012-07-26 12:27:29 +0000
+++ debian/control	2013-03-26 11:11:29 +0000
@@ -10,7 +10,7 @@
 # libsmokeqt4-dev, libqt4-dev,
 # qt3-dev-tools, libqt3-headers, libqt3-mt-dev,
 Build-Conflicts: libsmokeqt4-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.clifford.at/spl/
 Vcs-Browser: http://git.deb.at/w/pkg/spl.git
 Vcs-Git: git://git.deb.at/g/pkg/spl.git

=== added file 'debian/patches/03_fix-hurd-ftbfs'
--- debian/patches/03_fix-hurd-ftbfs	1970-01-01 00:00:00 +0000
+++ debian/patches/03_fix-hurd-ftbfs	2013-03-26 11:11:29 +0000
@@ -0,0 +1,49 @@
+Author: Svante Signell <[e-mail]>	vim:ft=diff:
+Description: Fix FTBFS issue for hurd-i386
+Bug-Debian: http://bugs.debian.org/686162
+
+--- a/webspld.c
++++ b/webspld.c
+@@ -62,7 +62,11 @@
+ static int pool_size = 32;
+ static struct pool_entry *pool = 0;
+ 
++#if (_POSIX_VERSION >= 200809L)
++static char *daemon_basedir = ".";
++#else
+ static char daemon_basedir[PATH_MAX] = ".";
++#endif
+ 
+ struct code_cache {
+ 	char *filename;
+@@ -475,7 +479,7 @@
+ 
+ 	printf("\nConnection from %s:%u.\n",
+ 		inet_ntoa(args->addr.sin_addr), ntohs(args->addr.sin_port));
+- 
++
+ 	PROFILE_INC(requests);
+ 	handle_http_request(args->fd,
+ 			webspld_vm_pool_get, webspld_vm_pool_put,
+@@ -640,7 +644,11 @@
+ 	struct sockaddr_in addr;
+ 	struct linger sl = { 1, 5 };
+ 
++#if (_POSIX_VERSION >= 200809L)
++	daemon_basedir = getcwd(NULL, 0);
++#else
+ 	getcwd(daemon_basedir, PATH_MAX);
++#endif
+ 
+ 	printf("Loading SPL CGI module.\n");
+ 	SPL_REGISTER_BUILTIN_MODULE(cgi);
+@@ -708,6 +716,9 @@
+ 	SPL_FREE_BUILTIN_MODULES();
+ 	free(pool);
+ 
++#if (_POSIX_VERSION >= 200809L)
++	free(daemon_basedir);
++#endif
+ 	if (code_cache_size) {
+ 		for (int i=0; i<code_cache_size; i++)
+ 			free_code_cache(code_cache_list + i);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-22 23:11:08 +0000
+++ debian/patches/series	2013-03-26 11:11:29 +0000
@@ -1,3 +1,4 @@
 01_fix-kfreebsd-ftbfs
 02_fix-ld---as-needed-ftbfs
 03_ubuntu_multiarch
+03_fix-hurd-ftbfs