[quota/f14] Make dirname static to work with nss_db

[Petr Pisar]

commit 29191e53f10535fe76298efdb8befe865fcf6104
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu May 12 14:00:32 2011 +0200

    Make dirname static to work with nss_db

 quota-4.00_pre1-Make-dirname-static.patch |   28 ++++++++++++++++++++++++++++
 quota.spec                                |    8 +++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/quota-4.00_pre1-Make-dirname-static.patch b/quota-4.00_pre1-Make-dirname-static.patch
new file mode 100644
index 0000000..c9e368c
--- /dev/null
+++ b/quota-4.00_pre1-Make-dirname-static.patch
@@ -0,0 +1,28 @@
+From 41974689e041dbe9625a2e1435b195ed5e94d40f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 12 May 2011 13:44:26 +0200
+Subject: [PATCH] Make dirname static
+
+The `dirname' variable name clashes with libc dirname(3). This could
+cause edquota to segfault if name server switch is configured to use
+`db' back-end that attempts to call dirname(3).
+---
+ edquota.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/edquota.c b/edquota.c
+index 4d247fa..0d72882 100644
+--- a/edquota.c
++++ b/edquota.c
+@@ -69,7 +69,7 @@ char *progname;
+ int flags, quotatype;
+ int fmt = -1;
+ char *protoname;
+-char *dirname;
++static char *dirname;
+ 
+ void usage(void)
+ {
+-- 
+1.7.4.4
+
diff --git a/quota.spec b/quota.spec
index a4634a7..6476782 100644
--- a/quota.spec
+++ b/quota.spec
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -31,6 +31,8 @@ Patch9: quota-3.17-quotactl_null_corruption.patch
 Patch10: quota-3.17-add-gfs2-support.patch
 # Bug #657379, included in upstream 4.00_pre1
 Patch11: quota-3.17-use-proc-mounts-for-mountpoint-scanning.patch
+# Submitted to upstream (SF#3300978), bug #703567
+Patch12: quota-4.00_pre1-Make-dirname-static.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -65,6 +67,7 @@ on remote machines.
 %patch9 -p1 -b .quotactl_null_corruption
 %patch10 -p1 -b .gfs2
 %patch11 -p1 -b .use_proc_mounts
+%patch12 -p1 -b .static_dirname
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -134,6 +137,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Thu May 12 2011 Petr Pisar <ppisar at redhat.com> - 1:3.17-16
+- Make dirname static to work with nss_db (bug #703567)
+
 * Tue Dec 14 2010 Petr Pisar <ppisar at redhat.com> - 1:3.17-15
 - Comment example quotatab to silent warnquota