From: Steinar H. Gunderson <sesse@debian.org>
Date: Sun, 21 Oct 2007 10:52:01 +0000 (+0200)
Subject: Imported Debian patch 1.1.1-2
X-Git-Tag: debian/1%1.1.1-2^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1f66030ebaa071c30d0057864167256f662512f5;p=nfs-utils.git

Imported Debian patch 1.1.1-2
---

diff --git a/debian/changelog b/debian/changelog
index bafed03..eeb9aa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.1-2) unstable; urgency=low
+
+  * 07-amd64-logging-segfault.patch: New patch from Steve Langasek, fixes
+    segfault in logging code on amd64. (Closes: #447407, #447451)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 21 Oct 2007 12:52:01 +0200
+
 nfs-utils (1:1.1.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/07-amd64-logging-segfault.patch b/debian/patches/07-amd64-logging-segfault.patch
new file mode 100644
index 0000000..49ebdd8
--- /dev/null
+++ b/debian/patches/07-amd64-logging-segfault.patch
@@ -0,0 +1,32 @@
+Index: nfs-utils-1.1.1/support/nfs/xlog.c
+===================================================================
+--- nfs-utils-1.1.1.orig/support/nfs/xlog.c
++++ nfs-utils-1.1.1/support/nfs/xlog.c
+@@ -133,9 +133,13 @@ xlog_enabled(int fac)
+ void
+ xlog_backend(int kind, const char *fmt, va_list args)
+ {
++	va_list args2;
++
+ 	if (!(kind & (L_ALL)) && !(logging && (kind & logmask)))
+ 		return;
+ 
++	va_copy(args2, args);
++
+ 	if (log_syslog) {
+ 		switch (kind) {
+ 		case L_FATAL:
+@@ -172,10 +176,12 @@ xlog_backend(int kind, const char *fmt, 
+ 		fprintf(stderr, "%s: ", log_name);
+ #endif
+ 
+-		vfprintf(stderr, fmt, args);
++		vfprintf(stderr, fmt, args2);
+ 		fprintf(stderr, "\n");
+ 	}
+ 
++	va_end(args2);
++
+ 	if (kind == L_FATAL)
+ 		exit(1);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 94a7f94..cce0ff4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03-sm-notify-in-sbin.patch
 05-ignore-quota-option.patch
 06-gssd-manpage-typo.patch
+07-amd64-logging-segfault.patch
diff --git a/debian/rules b/debian/rules
index dcc4513..ca12257 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ binary-arch: build
 	dh_installman
 	dh_link
 	dh_installchangelogs ChangeLog
-	dh_strip
+	#dh_strip
 	dh_compress
 	dh_fixperms -Xmount.nfs
 	dh_installdeb