[global] New version (#1164712,#1081123)
Pavel Zhukov
landgraf at fedoraproject.org
Wed Nov 26 22:15:50 UTC 2014
commit 5b8b6c878d2c055e0da7fe19aff29c0734101443
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date: Wed Nov 26 23:15:40 2014 +0100
New version (#1164712,#1081123)
.gitignore | 1 +
global-6.2.12-format-security.patch | 97 --------------------------
global-6.3.3-format-security.patch | 129 +++++++++++++++++++++++++++++++++++
global.spec | 11 ++-
sources | 2 +-
5 files changed, 138 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bde7b9b..76e5504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ global-5.7.5.tar.gz
/global-5.9.3.tar.gz
/global-6.2.9.tar.gz
/global-6.2.12.tar.gz
+/global-6.3.3.tar.gz
diff --git a/global-6.3.3-format-security.patch b/global-6.3.3-format-security.patch
new file mode 100644
index 0000000..80ebf3a
--- /dev/null
+++ b/global-6.3.3-format-security.patch
@@ -0,0 +1,129 @@
+diff --git a/libutil/dbop.c b/libutil/dbop.c
+index 584e4ea..fdbcabc 100644
+--- a/libutil/dbop.c
++++ b/libutil/dbop.c
+@@ -90,7 +90,7 @@ void dbop3_close(DBOP *);
+ */
+ static void start_sort_process(DBOP *);
+ static void terminate_sort_process(DBOP *);
+-static char *sortnotfound = "POSIX sort program not found. If available, the program will be speed up.\nPlease see ./configure --help.";
++static const char *sortnotfound[] = "POSIX sort program not found. If available, the program will be speed up.\nPlease see ./configure --help.";
+ /*
+ * 1. DJGPP/Windows
+ */
+diff --git a/libutil/dbop.c b/libutil/dbop.c
+index 584e4ea..764492b 100644
+--- a/libutil/dbop.c
++++ b/libutil/dbop.c
+@@ -372,7 +372,7 @@ dbop_put(DBOP *dbop, const char *name, const char *data)
+ break;
+ case RET_ERROR:
+ case RET_SPECIAL:
+- die(dbop->put_errmsg ? dbop->put_errmsg : "dbop_put failed.");
++ die("%s", dbop->put_errmsg ? dbop->put_errmsg : "dbop_put failed.");
+ }
+ }
+ /**
+diff --git a/libutil/dbop.c b/libutil/dbop.c
+index 09c598e..d3623b4 100644
+--- a/libutil/dbop.c
++++ b/libutil/dbop.c
+@@ -90,7 +90,7 @@ void dbop3_close(DBOP *);
+ */
+ static void start_sort_process(DBOP *);
+ static void terminate_sort_process(DBOP *);
+-static const char *sortnotfound[] = "POSIX sort program not found. If available, the program will be speed up.\nPlease see ./configure --help.";
++static const char sortnotfound[] = "POSIX sort program not found. If available, the program will be speed up.\nPlease see ./configure --help.";
+ /*
+ * 1. DJGPP/Windows
+ */
+diff --git a/libutil/dbop.c b/libutil/dbop.c
+index d3623b4..beb16b0 100644
+--- a/libutil/dbop.c
++++ b/libutil/dbop.c
+@@ -372,7 +372,7 @@ dbop_put(DBOP *dbop, const char *name, const char *data)
+ break;
+ case RET_ERROR:
+ case RET_SPECIAL:
+- die("%s", dbop->put_errmsg ? dbop->put_errmsg : "dbop_put failed.");
++ die("%s", dbop->put_errmsg ? dbop->put_errmsg : "dbop_put_withlen failed.");
+ }
+ }
+ /**
+@@ -459,7 +459,7 @@ dbop_put_path(DBOP *dbop, const char *name, const char *data, const char *flag)
+ break;
+ case RET_ERROR:
+ case RET_SPECIAL:
+- die(dbop->put_errmsg ? dbop->put_errmsg : "dbop_put_path failed.");
++ die("%s", dbop->put_errmsg ? dbop->put_errmsg : "dbop_put failed.");
+ }
+ }
+ /**
+diff --git a/global/global.c b/global/global.c
+index ca8ddcc..a67b151 100644
+--- a/global/global.c
++++ b/global/global.c
+@@ -521,7 +521,7 @@ main(int argc, char **argv)
+ case OPT_FROM_HERE:
+ {
+ char *p = optarg;
+- const char *usage = "usage: global --from-here=lineno:path.";
++ const char usage[] = "usage: global --from-here=lineno:path.";
+
+ context_lineno = p;
+ while (*p && isdigit(*p))
+@@ -595,7 +595,8 @@ main(int argc, char **argv)
+ if (show_help)
+ help();
+ if (dbpath == NULL)
+- die_with_code(-status, gtags_dbpath_error);
++ die_with_code(-status, "%s", gtags_dbpath_error);
++
+ /*
+ * decide format.
+ * The --result option is given to priority more than the -t and -x option.
+diff --git a/htags/cflowindex.c b/htags/cflowindex.c
+index 87a008a..6912c2b 100644
+--- a/htags/cflowindex.c
++++ b/htags/cflowindex.c
+@@ -163,7 +163,7 @@ makecflowindex(const char *output, const char *cflow_file)
+ /*
+ * print anchor
+ */
+- fprintf(op, gen_name_number(atoi(anchor)));
++ fprintf(op, "%s", gen_name_number(atoi(anchor)));
+ /*
+ * print until name
+ */
+@@ -178,7 +178,7 @@ makecflowindex(const char *output, const char *cflow_file)
+
+ *path_end = *lineno_end = 0;
+ if (test("f", path) && (fid = path2fid_readonly(path)) != NULL)
+- fprintf(op, gen_href_begin(SRCS, fid, HTML, lineno));
++ fprintf(op, "%s", gen_href_begin(SRCS, fid, HTML, lineno));
+ else
+ path = lineno = NULL; /* not to print </a> */
+ *path_end = path_save;
+@@ -187,7 +187,8 @@ makecflowindex(const char *output, const char *cflow_file)
+ int lineno_save = *lineno_end;
+
+ *lineno_end = 0;
+- fprintf(op, gen_href_begin(NULL, NULL, NULL, lineno));
++ fprintf(op, "%s", gen_href_begin(NULL, NULL, NULL, lineno));
++
+ *lineno_end = lineno_save;
+ }
+ fwrite(name, name_end - name, 1, op);
+diff --git a/htags/htags.c b/htags/htags.c
+index 52f7f51..72871e8 100644
+--- a/htags/htags.c
++++ b/htags/htags.c
+@@ -1620,7 +1620,7 @@ main(int argc, char **argv)
+ } else {
+ int status = setupdbpath(0);
+ if (status < 0)
+- die_with_code(-status, gtags_dbpath_error);
++ die_with_code(-status, "%s", gtags_dbpath_error);
+ strlimcpy(dbpath, get_dbpath(), sizeof(dbpath));
+ }
+ if (cflag && !usable("gzip")) {
diff --git a/global.spec b/global.spec
index 09b0df4..b1c7993 100644
--- a/global.spec
+++ b/global.spec
@@ -1,12 +1,12 @@
Name: global
-Version: 6.2.12
-Release: 4%{?dist}
+Version: 6.3.3
+Release: 1%{?dist}
Summary: Source code tag system
Group: Development/Tools
License: GPLv2+ and BSD
URL: http://www.gnu.org/software/global
Source: ftp://ftp.gnu.org/pub/gnu/global/global-%{version}.tar.gz
-Patch0: global-6.2.12-format-security.patch
+Patch0: global-%{version}-format-security.patch
BuildRequires: ncurses-devel, ctags-etags
%description
@@ -46,7 +46,7 @@ Requires: %{name} = %{version}-%{release}, ctags-etags
%patch0 -p1
%build
-%configure --with-posix-sort=/bin/sort --with-exuberant-ctags=/bin/ctags
+%configure --with-posix-sort=/bin/sort --with-exuberant-ctags=/bin/ctags --localstatedir=/var/tmp/
make %{?_smp_mflags}
%{_emacs_bytecompile} gtags.el
@@ -100,6 +100,9 @@ fi
%{_libdir}/gtags/*
%changelog
+* Wed Nov 26 2014 Pavel Zhukov <landgraf at fedoraproject.org> - 6.3.3-1
+- New version
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 528271a..b11abc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a526e9542b95ee5549b9aa40704bb7bd global-6.2.12.tar.gz
+bef48c9e6bd7aa78eef984932df1bc6c global-6.3.3.tar.gz
More information about the scm-commits
mailing list