From: Andre Noll <maan@systemlinux.org>
Date: Sun, 26 Aug 2012 12:26:00 +0000 (+0200)
Subject: Merge branch 't/releases_branch'
X-Git-Tag: v0.4.12~36
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=fd2ef6eb6b306415f3e3d9ed5004cf982e757656;hp=18d2c384bdfafc0a389b8821c45a96099ea45228;p=paraslash.git

Merge branch 't/releases_branch'

	18d2c3 Remove all release tarballs from the master branch.
	f82ac2 web: Rename tarball download directory.

Was cooking since 2012-07-28, tested also on athcx.
---

diff --git a/NEWS b/NEWS
index 84d68d82..65a5ca44 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
 0.?.? (to be announced) "volatile relativity"
 ---------------------------------------------
 
+	- The "versions" directory has been removed from the master
+	  branch. The tarballs of the old releases are now available
+	  in the new "releases" branch.
+
 --------------------------------------
 0.4.11 (2012-07-20) "mutual diversity"
 --------------------------------------
diff --git a/exec.c b/exec.c
index 8eb0599f..89d96bb9 100644
--- a/exec.c
+++ b/exec.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 
 #include "para.h"
-#include "close_on_fork.h"
 #include "error.h"
 #include "fd.h"
 #include "string.h"
diff --git a/ggo/makefile b/ggo/makefile
index 9c01ae65..84a257c3 100644
--- a/ggo/makefile
+++ b/ggo/makefile
@@ -51,7 +51,8 @@ $(ggo_dir)/server.ggo $(ggo_dir)/audiod.ggo: \
 	$(ggo_dir)/loglevel.m4 $(ggo_dir)/color.m4 \
 	$(ggo_dir)/config_file.m4 $(ggo_dir)/logfile.m4 \
 	$(ggo_dir)/daemon.m4 $(ggo_dir)/user.m4 \
-	$(ggo_dir)/group.m4 $(ggo_dir)/log_timing.m4
+	$(ggo_dir)/group.m4 $(ggo_dir)/log_timing.m4 \
+	$(ggo_dir)/config_file.m4
 
 $(ggo_dir)/afh.ggo: $(ggo_dir)/loglevel.m4
 $(ggo_dir)/audioc.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/history_file.m4 $(ggo_dir)/complete.m4
diff --git a/sideband.h b/sideband.h
index 4f4ed0ac..8ae3e4ef 100644
--- a/sideband.h
+++ b/sideband.h
@@ -114,7 +114,7 @@ typedef void (*sb_transformation)(struct iovec *src, struct iovec *dst,
 /** Initialize a sideband buffer. */
 #define SBB_INIT(_band, _buf, _numbytes) \
 	{ \
-		.band = band, \
+		.band = _band, \
 		.iov = { \
 			.iov_base = _buf, \
 			.iov_len = _numbytes \
diff --git a/signal.c b/signal.c
index 0b7b47fa..b2317c9b 100644
--- a/signal.c
+++ b/signal.c
@@ -22,15 +22,15 @@ static int signal_pipe[2];
  * during the application's startup part, followed by subsequent calls
  * to para_install_sighandler() for each signal that should be caught.
  *
- * para_signal_init() installs a generic signal handler which is used for all
- * signals simultaneously. When a signal arrives, this generic signal handler
- * writes the corresponding signal number to the signal pipe so that the
- * application can test for pending signals simply by checking the signal pipe
- * for reading, e.g. by using the select(2) system call.
- *
- * \return This function either succeeds or calls exit(2) to terminate
- * the current process. On success, the file descriptor of the signal pipe is
- * returned.
+ * A generic signal handler is used for all signals simultaneously. When a
+ * signal arrives, the signal handler writes the number of the signal received
+ * to one end of the signal pipe. The application can test for pending signals
+ * by checking if the file descriptor of the other end of the signal pipe is
+ * ready for reading, see select(2).
+ *
+ * \return This function either succeeds or calls exit(2) to terminate the
+ * current process. On success, the file descriptor of the read end of the
+ * signal pipe is returned.
  */
 int para_signal_init(void)
 {