[wireshark/f18] move default temporary directory to /var/tmp
Peter Hatina
phatina at fedoraproject.org
Tue Sep 24 13:45:44 UTC 2013
commit 07c3da5dc613c7d6844511643745a1585bbaf7f4
Author: Peter Hatina <phatina at redhat.com>
Date: Tue Sep 24 15:14:37 2013 +0200
move default temporary directory to /var/tmp
wireshark-0008-tmp-dir.patch | 225 ++++++++++++++++++++++++++++++++++++++++++
wireshark.spec | 8 ++-
2 files changed, 232 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-0008-tmp-dir.patch b/wireshark-0008-tmp-dir.patch
new file mode 100644
index 0000000..bbd3dd4
--- /dev/null
+++ b/wireshark-0008-tmp-dir.patch
@@ -0,0 +1,225 @@
+diff --git a/epan/filesystem.c b/epan/filesystem.c
+index 89edb8a..00acdd9 100644
+--- a/epan/filesystem.c
++++ b/epan/filesystem.c
+@@ -74,6 +74,8 @@
+
+ #include <wiretap/wtap.h> /* for WTAP_ERR_SHORT_WRITE */
+
++#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
++
+ #define PROFILES_DIR "profiles"
+ #define PLUGINS_DIR_NAME "plugins"
+
+@@ -1574,7 +1576,7 @@ deletefile(const char *path)
+ */
+ char *get_tempfile_path(const char *filename)
+ {
+- return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), filename);
++ return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), filename);
+ }
+
+ /*
+diff --git a/tempfile.c b/tempfile.c
+index 9a236df..ab6d1dc 100644
+--- a/tempfile.c
++++ b/tempfile.c
+@@ -50,6 +50,7 @@
+
+ #include "tempfile.h"
+ #include <wsutil/file_util.h>
++#include <wsutil/wstmpdir.h> /* For get_tmp_dir() */
+
+ #ifndef __set_errno
+ #define __set_errno(x) errno=(x)
+@@ -203,7 +204,7 @@ create_tempfile(char **namebuf, const char *pfx)
+ /*
+ * We can't use get_tempfile_path here because we're called from dumpcap.c.
+ */
+- tmp_dir = g_get_tmp_dir();
++ tmp_dir = get_tmp_dir();
+
+ #ifdef _WIN32
+ _tzset();
+@@ -237,7 +238,7 @@ create_tempfile(char **namebuf, const char *pfx)
+
+ /**
+ * Create a directory with the given prefix (e.g. "wireshark"). The path
+- * is created using g_get_tmp_dir and mkdtemp.
++ * is created using get_tmp_dir and mkdtemp.
+ *
+ * @param namebuf
+ * @param pfx A prefix for the temporary directory.
+@@ -265,7 +266,7 @@ create_tempdir(char **namebuf, const char *pfx)
+ /*
+ * We can't use get_tempfile_path here because we're called from dumpcap.c.
+ */
+- tmp_dir = g_get_tmp_dir();
++ tmp_dir = get_tmp_dir();
+
+ while (g_snprintf(td_path[idx], td_path_len[idx], "%s%c%s" TMP_FILE_SUFFIX, tmp_dir, G_DIR_SEPARATOR, pfx) > td_path_len[idx]) {
+ td_path_len[idx] *= 2;
+diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c
+index 16dc24e..fe12c81 100644
+--- a/ui/gtk/proto_help.c
++++ b/ui/gtk/proto_help.c
+@@ -44,6 +44,8 @@
+ #include <epan/strutil.h>
+ #include <epan/proto.h>
+
++#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
++
+ #include "ui/gtk/proto_help.h"
+
+ /*
+@@ -162,7 +164,7 @@ void proto_help_init(void)
+ /* Start loop */
+
+ #ifdef PH_DEBUG_LOG
+- ph_log_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), PH_FILE_LOG);
++ ph_log_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), PH_FILE_LOG);
+ #endif
+
+ for (i = 0; i < PH_CONF_DIRS; i++) {
+diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
+index 93efa0f..ab8ce7d 100644
+--- a/wsutil/Makefile.common
++++ b/wsutil/Makefile.common
+@@ -43,7 +43,8 @@ LIBWSUTIL_SRC = \
+ mpeg-audio.c \
+ privileges.c \
+ str_util.c \
+- type_util.c
++ type_util.c \
++ wstmpdir.c
+
+ # Header files that are not generated from other files
+ LIBWSUTIL_INCLUDES = \
+@@ -60,4 +61,5 @@ LIBWSUTIL_INCLUDES = \
+ mpeg-audio.h \
+ privileges.h \
+ str_util.h \
+- type_util.h
++ type_util.h \
++ wstmpdir.h
+diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c
+new file mode 100644
+index 0000000..d8b733b
+--- /dev/null
++++ b/wsutil/wstmpdir.c
+@@ -0,0 +1,70 @@
++/* wstmpdir.c
++ *
++ * Copyright (C) 2013 Red Hat, Inc. All right reserved.
++ *
++ * Temporary directory routine
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Author: Peter Hatina <phatina at redhat.com>
++ */
++
++#include "config.h"
++
++#include <glib.h>
++#include "wstmpdir.h"
++
++/**
++ * Gets the directory to use for temporary files.
++ *
++ * Inspired by glib-2.0. If no TMP, TEMP or TMPDIR is set,
++ * /var/tmp is returned (Fedora specific).
++ *
++ * Returns: the directory to use for temporary files.
++ */
++const char *get_tmp_dir(void)
++{
++ static gchar *tmp_dir;
++
++ if (g_once_init_enter(&tmp_dir)) {
++ gchar *tmp;
++
++ tmp = g_strdup(g_getenv("TEMP"));
++ if (tmp == NULL || *tmp == '\0') {
++ g_free(tmp);
++ tmp = g_strdup(g_getenv("TMPDIR"));
++ }
++
++#ifdef P_tmpdir
++ if (tmp == NULL || *tmp == '\0') {
++ gsize k;
++ g_free(tmp);
++ tmp = g_strdup(P_tmpdir);
++ k = strlen(tmp);
++ if (k > 1 && G_IS_DIR_SEPARATOR(tmp[k - 1]))
++ tmp[k - 1] = '\0';
++ }
++#endif /* P_tmpdir */
++
++ if (tmp == NULL || *tmp == '\0') {
++ g_free(tmp);
++ tmp = g_strdup("/var/tmp");
++ }
++
++ g_once_init_leave(&tmp_dir, tmp);
++ }
++
++ return tmp_dir;
++}
+diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h
+new file mode 100644
+index 0000000..021b615
+--- /dev/null
++++ b/wsutil/wstmpdir.h
+@@ -0,0 +1,39 @@
++/* wstmpdir.c
++ *
++ * Copyright (C) 2013 Red Hat, Inc. All right reserved.
++ *
++ * Temporary directory routine
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Author: Peter Hatina <phatina at redhat.com>
++ */
++
++#ifndef __WS_TMP_DIR_H__
++#define __WS_TMP_DIR_H__
++
++#include "ws_symbol_export.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif // __cplusplus
++
++WS_DLL_PUBLIC const char *get_tmp_dir(void);
++
++#ifdef __cplusplus
++}
++#endif // __cplusplus
++
++#endif // __WS_TMP_DIR_H__
diff --git a/wireshark.spec b/wireshark.spec
index 666540b..24b41d9 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -21,7 +21,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.10.2
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL+
Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -45,6 +45,8 @@ Patch5: wireshark-0005-fix-string-overrun-in-plugins-profinet.patch
Patch6: wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch
# Backported from upstream. See also https://bugzilla.redhat.com/1007139
Patch7: wireshark-0007-The-beginning-of-an-openflow-dissector.patch
+# Fedora specific
+Patch8: wireshark-0008-tmp-dir.patch
Url: http://www.wireshark.org/
BuildRequires: libpcap-devel >= 0.9
@@ -146,6 +148,7 @@ and plugins.
%patch5 -p1 -b .profinet_crash
%patch6 -p1 -b .rtpproxy
%patch7 -p1 -b .openflow
+%patch8 -p1 -b .tmp_dir
%build
%ifarch s390 s390x sparcv9 sparc64
@@ -372,6 +375,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/*
%changelog
+* Tue Sep 24 2013 Peter Hatina <phatina at redhat.com> - 1.10.2-4
+- move default temporary directory to /var/tmp
+
* Thu Sep 12 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.10.2-3
- Fix building on Fedora 18 (no perl-podlators)
More information about the scm-commits
mailing list