Compare commits
No commits in common. "c9-beta" and "c8s" have entirely different histories.
@ -1 +0,0 @@
|
|||||||
9d75b47baed1a612c0120991c4b6d9cf95e0d430 SOURCES/gettext-0.21.tar.xz
|
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/gettext-0.21.tar.xz
|
/gettext-0.*.tar.xz
|
||||||
|
|||||||
@ -1,68 +0,0 @@
|
|||||||
diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c
|
|
||||||
index 990d39e..9814502 100644
|
|
||||||
--- a/gettext-tools/src/msgl-cat.c
|
|
||||||
+++ b/gettext-tools/src/msgl-cat.c
|
|
||||||
@@ -306,6 +306,7 @@ catenate_msgdomain_list (string_list_ty *file_list,
|
|
||||||
mp->msgid);
|
|
||||||
multiline_error (xstrdup (""),
|
|
||||||
xasprintf ("%s\n", errormsg));
|
|
||||||
+ free (errormsg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
|
|
||||||
index 5cf72ad..7a0e5d3 100644
|
|
||||||
--- a/gettext-tools/src/x-csharp.c
|
|
||||||
+++ b/gettext-tools/src/x-csharp.c
|
|
||||||
@@ -560,6 +560,7 @@ comment_line_end (size_t chars_to_remove)
|
|
||||||
buffer[buflen] = '\0';
|
|
||||||
savable_comment_add (buffer);
|
|
||||||
lexical_context = lc_outside;
|
|
||||||
+ free (buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c
|
|
||||||
index eff1e6f..7e1bb78 100644
|
|
||||||
--- a/gettext-tools/src/x-java.c
|
|
||||||
+++ b/gettext-tools/src/x-java.c
|
|
||||||
@@ -460,6 +460,7 @@ comment_line_end (size_t chars_to_remove)
|
|
||||||
--buflen;
|
|
||||||
buffer[buflen] = '\0';
|
|
||||||
savable_comment_add (buffer);
|
|
||||||
+ free (buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
|
|
||||||
index cde1ee6..fca441e 100644
|
|
||||||
--- a/gettext-tools/src/x-rst.c
|
|
||||||
+++ b/gettext-tools/src/x-rst.c
|
|
||||||
@@ -651,6 +651,7 @@ extract_rsj (FILE *f,
|
|
||||||
else
|
|
||||||
goto invalid_rsj;
|
|
||||||
|
|
||||||
+ free (s1);
|
|
||||||
/* Parse a comma. */
|
|
||||||
c = phase2_getc ();
|
|
||||||
if (c == '}')
|
|
||||||
@@ -667,6 +668,7 @@ extract_rsj (FILE *f,
|
|
||||||
|
|
||||||
fp = NULL;
|
|
||||||
real_file_name = NULL;
|
|
||||||
+ free (logical_file_name);
|
|
||||||
logical_file_name = NULL;
|
|
||||||
line_number = 0;
|
|
||||||
|
|
||||||
diff --git a/gettext-tools/src/xg-arglist-callshape.c b/gettext-tools/src/xg-arglist-callshape.c
|
|
||||||
index 06b7076..2189aac 100644
|
|
||||||
--- a/gettext-tools/src/xg-arglist-callshape.c
|
|
||||||
+++ b/gettext-tools/src/xg-arglist-callshape.c
|
|
||||||
@@ -118,6 +118,7 @@ split_keywordspec (const char *spec,
|
|
||||||
memcpy (xcomment, xcomment_start, xcomment_len);
|
|
||||||
xcomment[xcomment_len] = '\0';
|
|
||||||
string_list_append (&xcomments, xcomment);
|
|
||||||
+ free (xcomment);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
@ -1,128 +0,0 @@
|
|||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index 815e3c7..e897de7 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
|
||||||
|
|
||||||
-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
|
|
||||||
+SUBDIRS = gnulib-local gettext-runtime gettext-tools
|
|
||||||
|
|
||||||
changelog_etc = \
|
|
||||||
gettext-runtime/ChangeLog.0 \
|
|
||||||
@@ -123,7 +123,6 @@ distcheck-hook:
|
|
||||||
test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
|
|
||||||
cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
|
|
||||||
cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
|
|
||||||
- cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
|
|
||||||
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
|
|
||||||
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
|
|
||||||
test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 49689fb..2d23b44 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
|
|
||||||
|
|
||||||
dnl Checks for library functions.
|
|
||||||
|
|
||||||
-AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
|
|
||||||
+AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
|
|
||||||
|
|
||||||
AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
|
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ AC_CANONICAL_HOST
|
|
||||||
dnl Optional Features: AC_ARG_ENABLE calls
|
|
||||||
dnl Optional Packages: AC_ARG_WITH calls
|
|
||||||
dnl Some influential environment variables: AC_ARG_VAR calls
|
|
||||||
-esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
|
|
||||||
+esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
|
||||||
|
|
||||||
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
|
|
||||||
index 449a797..c5719c2 100644
|
|
||||||
--- a/gettext-tools/Makefile.am
|
|
||||||
+++ b/gettext-tools/Makefile.am
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
|
||||||
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
|
|
||||||
|
|
||||||
-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
|
||||||
+SUBDIRS = intl gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
|
||||||
|
|
||||||
EXTRA_DIST = misc/DISCLAIM
|
|
||||||
MOSTLYCLEANFILES = core *.stackdump
|
|
||||||
diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
|
|
||||||
index 536b51b..585ce66 100644
|
|
||||||
--- a/gettext-tools/libgettextpo/textstyle.in.h
|
|
||||||
+++ b/gettext-tools/libgettextpo/textstyle.in.h
|
|
||||||
@@ -213,7 +213,8 @@ typedef ostream_t file_ostream_t;
|
|
||||||
static inline file_ostream_t
|
|
||||||
file_ostream_create (FILE *fp)
|
|
||||||
{
|
|
||||||
- return fp;
|
|
||||||
+ /* Closing the stream we return should not close 'fp'. */
|
|
||||||
+ return fdopen (dup (fileno (fp)), "w");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* --------------------------- From fd-ostream.h --------------------------- */
|
|
||||||
@@ -413,6 +414,30 @@ html_styled_ostream_create (ostream_t destination _GL_UNUSED,
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* ----------------------- From noop-styled-ostream.h ----------------------- */
|
|
||||||
+
|
|
||||||
+/* noop_styled_ostream_t is a subtype of ostream_t. */
|
|
||||||
+typedef ostream_t noop_styled_ostream_t;
|
|
||||||
+
|
|
||||||
+#define noop_styled_ostream_write_mem ostream_write_mem
|
|
||||||
+#define noop_styled_ostream_flush ostream_flush
|
|
||||||
+#define noop_styled_ostream_free ostream_free
|
|
||||||
+#define noop_styled_ostream_begin_use_class styled_ostream_begin_use_class
|
|
||||||
+#define noop_styled_ostream_end_use_class styled_ostream_end_use_class
|
|
||||||
+#define noop_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
|
|
||||||
+#define noop_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
|
|
||||||
+#define noop_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
|
|
||||||
+#define noop_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style
|
|
||||||
+
|
|
||||||
+static inline ostream_t
|
|
||||||
+noop_styled_ostream_create (ostream_t destination, bool pass_ownership)
|
|
||||||
+{
|
|
||||||
+ if (pass_ownership)
|
|
||||||
+ return destination;
|
|
||||||
+ else
|
|
||||||
+ return fdopen (dup (fileno (destination)), "w");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* ------------------------------ From color.h ------------------------------ */
|
|
||||||
|
|
||||||
#define color_test_mode false
|
|
||||||
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
|
|
||||||
index 764ffad..eccfbbd 100644
|
|
||||||
--- a/gettext-tools/src/Makefile.am
|
|
||||||
+++ b/gettext-tools/src/Makefile.am
|
|
||||||
@@ -292,19 +292,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
|
|
||||||
cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
|
|
||||||
cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
|
|
||||||
|
|
||||||
-if USE_INSTALLED_LIBTEXTSTYLE
|
|
||||||
-LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@
|
|
||||||
-else
|
|
||||||
-# How to get the include files of libtextstyle.
|
|
||||||
-textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
|
|
||||||
- here=`pwd`; \
|
|
||||||
- cd ../../libtextstyle/lib && \
|
|
||||||
- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
|
|
||||||
-BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
|
|
||||||
-MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
|
|
||||||
-# Where to find the built libtextstyle library.
|
|
||||||
-LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
|
|
||||||
-endif
|
|
||||||
+# Use the dummy libtextstyle from gnulib, as libgettextpo does.
|
|
||||||
+LT_LIBTEXTSTYLE =
|
|
||||||
+AM_CPPFLAGS += -I../libgettextpo -I$(top_srcdir)/libgettextpo
|
|
||||||
|
|
||||||
# How to build libgettextsrc.la.
|
|
||||||
# Need ../gnulib-lib/libgettextlib.la.
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
|
||||||
Date: Thu, 27 Aug 2020 17:52:58 -0700
|
|
||||||
Subject: [PATCH] perror, strerror_r: remove unportable tests
|
|
||||||
|
|
||||||
Problem reported by Florian Weimer in:
|
|
||||||
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
|
|
||||||
* tests/test-perror2.c (main):
|
|
||||||
* tests/test-strerror_r.c (main): Omit unportable tests.
|
|
||||||
---
|
|
||||||
ChangeLog | 8 ++++++++
|
|
||||||
tests/test-perror2.c | 3 ---
|
|
||||||
tests/test-strerror_r.c | 3 ---
|
|
||||||
3 files changed, 8 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gettext-tools/gnulib-tests/test-perror2.c b/gettext-tools/gnulib-tests/test-perror2.c
|
|
||||||
index 1d14eda7b..c6214dd25 100644
|
|
||||||
--- a/gettext-tools/gnulib-tests/test-perror2.c
|
|
||||||
+++ b/gettext-tools/gnulib-tests/test-perror2.c
|
|
||||||
@@ -79,9 +79,6 @@ main (void)
|
|
||||||
errno = -5;
|
|
||||||
perror ("");
|
|
||||||
ASSERT (!ferror (stderr));
|
|
||||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
|
||||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
|
||||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
|
||||||
ASSERT (STREQ (msg4, str4));
|
|
||||||
|
|
||||||
free (str1);
|
|
||||||
diff --git a/gettext-tools/gnulib-tests/test-strerror_r.c b/gettext-tools/gnulib-tests/test-strerror_r.c
|
|
||||||
index b11d6fd9f..c1dbcf837 100644
|
|
||||||
--- a/gettext-tools/gnulib-tests/test-strerror_r.c
|
|
||||||
+++ b/gettext-tools/gnulib-tests/test-strerror_r.c
|
|
||||||
@@ -165,9 +165,6 @@ main (void)
|
|
||||||
|
|
||||||
strerror_r (EACCES, buf, sizeof buf);
|
|
||||||
strerror_r (-5, buf, sizeof buf);
|
|
||||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
|
||||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
|
||||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
|
||||||
ASSERT (STREQ (msg4, str4));
|
|
||||||
|
|
||||||
free (str1);
|
|
||||||
|
|
||||||
@ -1,116 +0,0 @@
|
|||||||
diff -urp '--exclude=*~' gettext-0.21.orig/gettext-tools/gnulib-lib/javacomp.c gettext-0.21/gettext-tools/gnulib-lib/javacomp.c
|
|
||||||
--- gettext-0.21.orig/gettext-tools/gnulib-lib/javacomp.c 2022-03-09 12:22:05.000000000 +0900
|
|
||||||
+++ gettext-0.21/gettext-tools/gnulib-lib/javacomp.c 2022-03-20 18:23:53.636052943 +0900
|
|
||||||
@@ -116,9 +116,8 @@ default_target_version (void)
|
|
||||||
&& (java_version_cache[1] >= '2'
|
|
||||||
&& java_version_cache[1] <= '7')
|
|
||||||
&& java_version_cache[2] == '\0')
|
|
||||||
- /* Assume that these (not yet released) Java versions will behave
|
|
||||||
- like the preceding ones. */
|
|
||||||
- java_version_cache = "11";
|
|
||||||
+ /* It's one of the valid target version values. */
|
|
||||||
+ ;
|
|
||||||
else
|
|
||||||
java_version_cache = "1.1";
|
|
||||||
}
|
|
||||||
@@ -128,7 +127,7 @@ default_target_version (void)
|
|
||||||
/* ======================= Source version dependent ======================= */
|
|
||||||
|
|
||||||
/* Convert a source version to an index. */
|
|
||||||
-#define SOURCE_VERSION_BOUND 8 /* exclusive upper bound */
|
|
||||||
+#define SOURCE_VERSION_BOUND 14 /* exclusive upper bound */
|
|
||||||
static unsigned int
|
|
||||||
source_version_index (const char *source_version)
|
|
||||||
{
|
|
||||||
@@ -144,7 +143,7 @@ source_version_index (const char *source
|
|
||||||
else if (source_version[0] == '9' && source_version[1] == '\0')
|
|
||||||
return 5;
|
|
||||||
else if (source_version[0] == '1'
|
|
||||||
- && (source_version[1] >= '0' && source_version[1] <= '1')
|
|
||||||
+ && (source_version[1] >= '0' && source_version[1] <= '7')
|
|
||||||
&& source_version[2] == '\0')
|
|
||||||
return source_version[1] - '0' + 6;
|
|
||||||
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
|
|
||||||
@@ -171,6 +170,10 @@ get_goodcode_snippet (const char *source
|
|
||||||
return "class conftest { public void m() { var i = new Integer(0); } }\n";
|
|
||||||
if (strcmp (source_version, "11") == 0)
|
|
||||||
return "class conftest { Readable r = (var b) -> 0; }\n";
|
|
||||||
+ if (source_version[0] == '1'
|
|
||||||
+ && (source_version[1] >= '2' && source_version[1] <= '7')
|
|
||||||
+ && source_version[2] == '\0')
|
|
||||||
+ return "class conftest { Readable r = (var b) -> 0; }\n";
|
|
||||||
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
@@ -197,6 +200,10 @@ get_failcode_snippet (const char *source
|
|
||||||
return "class conftestfail { Readable r = (var b) -> 0; }\n";
|
|
||||||
if (strcmp (source_version, "11") == 0)
|
|
||||||
return NULL;
|
|
||||||
+ if (source_version[0] == '1'
|
|
||||||
+ && (source_version[1] >= '2' && source_version[1] <= '7')
|
|
||||||
+ && source_version[2] == '\0')
|
|
||||||
+ return NULL;
|
|
||||||
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
@@ -204,7 +211,7 @@ get_failcode_snippet (const char *source
|
|
||||||
/* ======================= Target version dependent ======================= */
|
|
||||||
|
|
||||||
/* Convert a target version to an index. */
|
|
||||||
-#define TARGET_VERSION_BOUND 11 /* exclusive upper bound */
|
|
||||||
+#define TARGET_VERSION_BOUND 17 /* exclusive upper bound */
|
|
||||||
static unsigned int
|
|
||||||
target_version_index (const char *target_version)
|
|
||||||
{
|
|
||||||
@@ -215,7 +222,7 @@ target_version_index (const char *target
|
|
||||||
else if (target_version[0] == '9' && target_version[1] == '\0')
|
|
||||||
return 8;
|
|
||||||
else if (target_version[0] == '1'
|
|
||||||
- && (target_version[1] >= '0' && target_version[1] <= '1')
|
|
||||||
+ && (target_version[1] >= '0' && target_version[1] <= '7')
|
|
||||||
&& target_version[2] == '\0')
|
|
||||||
return target_version[1] - '0' + 9;
|
|
||||||
error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class"));
|
|
||||||
@@ -245,10 +252,10 @@ corresponding_classfile_version (const c
|
|
||||||
return 52;
|
|
||||||
if (strcmp (target_version, "9") == 0)
|
|
||||||
return 53;
|
|
||||||
- if (strcmp (target_version, "10") == 0)
|
|
||||||
- return 54;
|
|
||||||
- if (strcmp (target_version, "11") == 0)
|
|
||||||
- return 55;
|
|
||||||
+ if (target_version[0] == '1'
|
|
||||||
+ && (target_version[1] >= '0' && target_version[1] <= '7')
|
|
||||||
+ && target_version[2] == '\0')
|
|
||||||
+ return target_version[1] + 54;
|
|
||||||
error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class"));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -2439,7 +2446,7 @@ compile_java_class (const char * const *
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC"));
|
|
||||||
+ /* error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC")); */
|
|
||||||
err = true;
|
|
||||||
|
|
||||||
done2:
|
|
||||||
diff -urp '--exclude=*~' gettext-0.21.orig/gettext-tools/src/write-java.c gettext-0.21/gettext-tools/src/write-java.c
|
|
||||||
--- gettext-0.21.orig/gettext-tools/src/write-java.c 2022-03-09 12:17:21.000000000 +0900
|
|
||||||
+++ gettext-0.21/gettext-tools/src/write-java.c 2022-03-20 18:26:06.941734979 +0900
|
|
||||||
@@ -1209,8 +1209,14 @@ msgdomain_write_java (message_list_ty *m
|
|
||||||
Java compilers create the class files in the source file's directory -
|
|
||||||
which is in a temporary directory in our case. */
|
|
||||||
java_sources[0] = java_file_name;
|
|
||||||
- if (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory,
|
|
||||||
+ if (1
|
|
||||||
+ && (compile_java_class (java_sources, 1, NULL, 0, "17", "17", directory,
|
|
||||||
+ true, false, true, verbose > 0)) /* assume JDK 17 */
|
|
||||||
+ && (compile_java_class (java_sources, 1, NULL, 0, "11", "11", directory,
|
|
||||||
+ true, false, true, verbose > 0)) /* assume JDK 11 */
|
|
||||||
+ && (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory,
|
|
||||||
true, false, true, verbose > 0))
|
|
||||||
+ )
|
|
||||||
{
|
|
||||||
if (!verbose)
|
|
||||||
error (0, 0,
|
|
||||||
9
STAGE2-gettext
Normal file
9
STAGE2-gettext
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
#requires bison
|
||||||
|
#requires libtool
|
||||||
|
|
||||||
|
mcd $BUILDDIR/gettext
|
||||||
|
|
||||||
|
$SRC/gettext-*/configure $TCONFIGARGS --disable-static --enable-shared --with-pic-=yes --disable-csharp --disable-rpath
|
||||||
|
|
||||||
|
make $J
|
||||||
|
make $J install
|
||||||
47
disable-gettext-runtime-test-lock.patch
Normal file
47
disable-gettext-runtime-test-lock.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
commit bd2c6ca2b7ae0be02d4bb85db79def454f3153fb
|
||||||
|
Author: rpm-build <rpm-build>
|
||||||
|
AuthorDate: Wed Dec 21 12:50:54 2016 +0100
|
||||||
|
Commit: rpm-build <rpm-build>
|
||||||
|
CommitDate: Wed Dec 21 12:52:36 2016 +0100
|
||||||
|
|
||||||
|
disable-gettext-runtime-test-lock.patch
|
||||||
|
|
||||||
|
diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am
|
||||||
|
index 88a0684..3a27b79 100644
|
||||||
|
--- a/gettext-runtime/tests/Makefile.am
|
||||||
|
+++ b/gettext-runtime/tests/Makefile.am
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
|
||||||
|
EXTRA_DIST =
|
||||||
|
|
||||||
|
-TESTS = test-lock
|
||||||
|
+TESTS =
|
||||||
|
|
||||||
|
AM_CPPFLAGS = \
|
||||||
|
-I.. \
|
||||||
|
diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in
|
||||||
|
index 4327733..5879146 100644
|
||||||
|
--- a/gettext-runtime/tests/Makefile.in
|
||||||
|
+++ b/gettext-runtime/tests/Makefile.in
|
||||||
|
@@ -86,7 +86,7 @@ PRE_UNINSTALL = :
|
||||||
|
POST_UNINSTALL = :
|
||||||
|
build_triplet = @build@
|
||||||
|
host_triplet = @host@
|
||||||
|
-TESTS = test-lock$(EXEEXT)
|
||||||
|
+TESTS =
|
||||||
|
check_PROGRAMS = test-lock$(EXEEXT)
|
||||||
|
subdir = tests
|
||||||
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
|
diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in
|
||||||
|
index 26becd9..4b9d0e4 100644
|
||||||
|
--- a/gettext-tools/gnulib-tests/Makefile.in
|
||||||
|
+++ b/gettext-tools/gnulib-tests/Makefile.in
|
||||||
|
@@ -143,7 +143,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \
|
||||||
|
test-isnanl-nolibm$(EXEEXT) test-isnanl$(EXEEXT) \
|
||||||
|
test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
|
||||||
|
test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \
|
||||||
|
- test-localename$(EXEEXT) test-lock$(EXEEXT) \
|
||||||
|
+ test-localename$(EXEEXT) \
|
||||||
|
test-log10$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \
|
||||||
|
test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
|
||||||
|
test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
|
||||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-8
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||||
43
gettext-0.19.8-its-segfault.patch
Normal file
43
gettext-0.19.8-its-segfault.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
From a0cab23332a254e3500cac2a3a984472d02180e5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bruno Haible <bruno@clisp.org>
|
||||||
|
Date: Fri, 9 Dec 2016 21:04:31 +0100
|
||||||
|
Subject: [PATCH] Fix crash of xgettext with --its option.
|
||||||
|
|
||||||
|
* gettext-tools/src/xgettext.c (main): Free contents of its_dirs only when it
|
||||||
|
was initialized. Fixes bug introduced on 2016-05-16.
|
||||||
|
---
|
||||||
|
gettext-tools/src/xgettext.c | 11 +++++++----
|
||||||
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
|
||||||
|
index f848d76d1..a80ee51ac 100644
|
||||||
|
--- a/gettext-tools/src/xgettext.c
|
||||||
|
+++ b/gettext-tools/src/xgettext.c
|
||||||
|
@@ -330,7 +330,7 @@ main (int argc, char *argv[])
|
||||||
|
bool sort_by_msgid = false;
|
||||||
|
bool sort_by_filepos = false;
|
||||||
|
char **dirs;
|
||||||
|
- char **its_dirs;
|
||||||
|
+ char **its_dirs = NULL;
|
||||||
|
char *explicit_its_filename = NULL;
|
||||||
|
const char *file_name;
|
||||||
|
const char *files_from = NULL;
|
||||||
|
@@ -1016,9 +1016,12 @@ warning: file '%s' extension '%s' is unknown; will try C"), filename, extension)
|
||||||
|
if (its_locating_rules)
|
||||||
|
locating_rule_list_free (its_locating_rules);
|
||||||
|
|
||||||
|
- for (i = 0; its_dirs[i] != NULL; i++)
|
||||||
|
- free (its_dirs[i]);
|
||||||
|
- free (its_dirs);
|
||||||
|
+ if (its_dirs != NULL)
|
||||||
|
+ {
|
||||||
|
+ for (i = 0; its_dirs[i] != NULL; i++)
|
||||||
|
+ free (its_dirs[i]);
|
||||||
|
+ free (its_dirs);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
exit (EXIT_SUCCESS);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
||||||
445
gettext-0.19.8.1-CVE-2018-18751.patch
Normal file
445
gettext-0.19.8.1-CVE-2018-18751.patch
Normal file
@ -0,0 +1,445 @@
|
|||||||
|
From dce3a16e5e9368245735e29bf498dcd5e3e474a4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daiki Ueno <ueno@gnu.org>
|
||||||
|
Date: Thu, 15 Sep 2016 13:57:24 +0200
|
||||||
|
Subject: [PATCH] xgettext: Fix crash with *.po file input
|
||||||
|
|
||||||
|
When xgettext was given two *.po files with the same msgid_plural, it
|
||||||
|
crashed with double-free. Problem reported by Davlet Panech in:
|
||||||
|
http://lists.gnu.org/archive/html/bug-gettext/2016-09/msg00001.html
|
||||||
|
|
||||||
|
praiskup:
|
||||||
|
- I dropped the testsuite part, otherwise we'd have to 'autoreconf -vif' the
|
||||||
|
sources
|
||||||
|
- I'm patching manually the po-gram-gen.c file to avoid 'bison' BR
|
||||||
|
|
||||||
|
diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y
|
||||||
|
index becf5e607..4428e7725 100644
|
||||||
|
--- a/gettext-tools/src/po-gram-gen.y
|
||||||
|
+++ b/gettext-tools/src/po-gram-gen.y
|
||||||
|
@@ -221,14 +221,11 @@ message
|
||||||
|
check_obsolete ($1, $3);
|
||||||
|
check_obsolete ($1, $4);
|
||||||
|
if (!$1.obsolete || pass_obsolete_entries)
|
||||||
|
- {
|
||||||
|
- do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
|
||||||
|
- $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
|
||||||
|
- $1.prev_ctxt,
|
||||||
|
- $1.prev_id, $1.prev_id_plural,
|
||||||
|
- $1.obsolete);
|
||||||
|
- free ($3.string);
|
||||||
|
- }
|
||||||
|
+ do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
|
||||||
|
+ $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
|
||||||
|
+ $1.prev_ctxt,
|
||||||
|
+ $1.prev_id, $1.prev_id_plural,
|
||||||
|
+ $1.obsolete);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
free_message_intro ($1);
|
||||||
|
diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
|
||||||
|
index 571d18e1b..6af6d2025 100644
|
||||||
|
--- a/gettext-tools/src/read-catalog.c
|
||||||
|
+++ b/gettext-tools/src/read-catalog.c
|
||||||
|
@@ -397,6 +397,8 @@ default_add_message (default_catalog_reader_ty *this,
|
||||||
|
appropriate. */
|
||||||
|
mp = message_alloc (msgctxt, msgid, msgid_plural, msgstr, msgstr_len,
|
||||||
|
msgstr_pos);
|
||||||
|
+ if (msgid_plural != NULL)
|
||||||
|
+ free (msgid_plural);
|
||||||
|
mp->prev_msgctxt = prev_msgctxt;
|
||||||
|
mp->prev_msgid = prev_msgid;
|
||||||
|
mp->prev_msgid_plural = prev_msgid_plural;
|
||||||
|
diff --git a/gettext-tools/src/po-gram-gen.c b/gettext-tools/src/po-gram-gen.c
|
||||||
|
--- a/gettext-tools/src/po-gram-gen.c
|
||||||
|
+++ b/gettext-tools/src/po-gram-gen.c
|
||||||
|
@@ -1,8 +1,8 @@
|
||||||
|
-/* A Bison parser, made by GNU Bison 3.0.4. */
|
||||||
|
+/* A Bison parser, made by GNU Bison 3.0.5. */
|
||||||
|
|
||||||
|
/* Bison implementation for Yacc-like parsers in C
|
||||||
|
|
||||||
|
- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
|
||||||
|
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
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
|
||||||
|
@@ -44,7 +44,7 @@
|
||||||
|
#define YYBISON 1
|
||||||
|
|
||||||
|
/* Bison version. */
|
||||||
|
-#define YYBISON_VERSION "3.0.4"
|
||||||
|
+#define YYBISON_VERSION "3.0.5"
|
||||||
|
|
||||||
|
/* Skeleton name. */
|
||||||
|
#define YYSKELETON_NAME "yacc.c"
|
||||||
|
@@ -568,9 +568,9 @@
|
||||||
|
static const yytype_uint16 yyrline[] =
|
||||||
|
{
|
||||||
|
0, 169, 169, 171, 172, 173, 174, 179, 187, 195,
|
||||||
|
- 216, 240, 249, 258, 269, 278, 292, 301, 315, 321,
|
||||||
|
- 332, 338, 350, 361, 372, 376, 391, 414, 422, 434,
|
||||||
|
- 442
|
||||||
|
+ 216, 237, 246, 255, 266, 275, 289, 298, 312, 318,
|
||||||
|
+ 329, 335, 347, 358, 369, 373, 388, 411, 419, 431,
|
||||||
|
+ 439
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -1054,6 +1054,7 @@
|
||||||
|
case N: \
|
||||||
|
yyformat = S; \
|
||||||
|
break
|
||||||
|
+ default: /* Avoid compiler warnings. */
|
||||||
|
YYCASE_(0, YY_("syntax error"));
|
||||||
|
YYCASE_(1, YY_("syntax error, unexpected %s"));
|
||||||
|
YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
|
||||||
|
@@ -1370,23 +1371,23 @@
|
||||||
|
switch (yyn)
|
||||||
|
{
|
||||||
|
case 7:
|
||||||
|
-#line 180 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 180 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
po_callback_comment_dispatcher ((yyvsp[0].string).string);
|
||||||
|
}
|
||||||
|
-#line 1378 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1379 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 8:
|
||||||
|
-#line 188 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 188 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
po_callback_domain ((yyvsp[0].string).string);
|
||||||
|
}
|
||||||
|
-#line 1386 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1387 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 9:
|
||||||
|
-#line 196 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 196 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
char *string2 = string_list_concat_destroy (&(yyvsp[-2].stringlist).stringlist);
|
||||||
|
char *string4 = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist);
|
||||||
|
@@ -1407,11 +1408,11 @@
|
||||||
|
free (string4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-#line 1411 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1412 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 10:
|
||||||
|
-#line 217 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 217 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
char *string2 = string_list_concat_destroy (&(yyvsp[-2].stringlist).stringlist);
|
||||||
|
|
||||||
|
@@ -1419,14 +1420,11 @@
|
||||||
|
check_obsolete ((yyvsp[-3].message_intro), (yyvsp[-1].string));
|
||||||
|
check_obsolete ((yyvsp[-3].message_intro), (yyvsp[0].rhs));
|
||||||
|
if (!(yyvsp[-3].message_intro).obsolete || pass_obsolete_entries)
|
||||||
|
- {
|
||||||
|
- do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
|
||||||
|
- (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
|
||||||
|
- (yyvsp[-3].message_intro).prev_ctxt,
|
||||||
|
- (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
|
||||||
|
- (yyvsp[-3].message_intro).obsolete);
|
||||||
|
- free ((yyvsp[-1].string).string);
|
||||||
|
- }
|
||||||
|
+ do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
|
||||||
|
+ (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
|
||||||
|
+ (yyvsp[-3].message_intro).prev_ctxt,
|
||||||
|
+ (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
|
||||||
|
+ (yyvsp[-3].message_intro).obsolete);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
free_message_intro ((yyvsp[-3].message_intro));
|
||||||
|
@@ -1435,11 +1433,11 @@
|
||||||
|
free ((yyvsp[0].rhs).rhs.msgstr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-#line 1439 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1437 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 11:
|
||||||
|
-#line 241 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 238 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
|
||||||
|
check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].string));
|
||||||
|
@@ -1448,11 +1446,11 @@
|
||||||
|
string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
|
||||||
|
free ((yyvsp[0].string).string);
|
||||||
|
}
|
||||||
|
-#line 1452 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1450 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 12:
|
||||||
|
-#line 250 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 247 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
|
||||||
|
check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].rhs));
|
||||||
|
@@ -1461,22 +1459,22 @@
|
||||||
|
string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
|
||||||
|
free ((yyvsp[0].rhs).rhs.msgstr);
|
||||||
|
}
|
||||||
|
-#line 1465 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1463 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 13:
|
||||||
|
-#line 259 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 256 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].message_intro), (yyvsp[0].stringlist));
|
||||||
|
po_gram_error_at_line (&(yyvsp[-1].message_intro).pos, _("missing 'msgstr' section"));
|
||||||
|
free_message_intro ((yyvsp[-1].message_intro));
|
||||||
|
string_list_destroy (&(yyvsp[0].stringlist).stringlist);
|
||||||
|
}
|
||||||
|
-#line 1476 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1474 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 14:
|
||||||
|
-#line 270 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 267 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
(yyval.message_intro).prev_ctxt = NULL;
|
||||||
|
(yyval.message_intro).prev_id = NULL;
|
||||||
|
@@ -1485,11 +1483,11 @@
|
||||||
|
(yyval.message_intro).pos = (yyvsp[0].string).pos;
|
||||||
|
(yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1489 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1487 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 15:
|
||||||
|
-#line 279 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 276 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].prev), (yyvsp[0].string));
|
||||||
|
(yyval.message_intro).prev_ctxt = (yyvsp[-1].prev).ctxt;
|
||||||
|
@@ -1499,11 +1497,11 @@
|
||||||
|
(yyval.message_intro).pos = (yyvsp[0].string).pos;
|
||||||
|
(yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1503 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1501 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 16:
|
||||||
|
-#line 293 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 290 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].string), (yyvsp[0].stringlist));
|
||||||
|
(yyval.prev).ctxt = (yyvsp[-1].string).string;
|
||||||
|
@@ -1512,11 +1510,11 @@
|
||||||
|
(yyval.prev).pos = (yyvsp[-1].string).pos;
|
||||||
|
(yyval.prev).obsolete = (yyvsp[-1].string).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1516 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1514 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 17:
|
||||||
|
-#line 302 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 299 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-2].string), (yyvsp[-1].stringlist));
|
||||||
|
check_obsolete ((yyvsp[-2].string), (yyvsp[0].string));
|
||||||
|
@@ -1526,21 +1524,21 @@
|
||||||
|
(yyval.prev).pos = (yyvsp[-2].string).pos;
|
||||||
|
(yyval.prev).obsolete = (yyvsp[-2].string).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1530 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1528 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 18:
|
||||||
|
-#line 316 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 313 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
(yyval.string).string = NULL;
|
||||||
|
(yyval.string).pos = (yyvsp[0].pos).pos;
|
||||||
|
(yyval.string).obsolete = (yyvsp[0].pos).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1540 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1538 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 19:
|
||||||
|
-#line 322 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 319 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
|
||||||
|
check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
|
||||||
|
@@ -1548,21 +1546,21 @@
|
||||||
|
(yyval.string).pos = (yyvsp[0].pos).pos;
|
||||||
|
(yyval.string).obsolete = (yyvsp[0].pos).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1552 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1550 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 20:
|
||||||
|
-#line 333 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 330 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
(yyval.string).string = NULL;
|
||||||
|
(yyval.string).pos = (yyvsp[0].pos).pos;
|
||||||
|
(yyval.string).obsolete = (yyvsp[0].pos).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1562 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1560 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 21:
|
||||||
|
-#line 339 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 336 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
|
||||||
|
check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
|
||||||
|
@@ -1570,11 +1568,11 @@
|
||||||
|
(yyval.string).pos = (yyvsp[0].pos).pos;
|
||||||
|
(yyval.string).obsolete = (yyvsp[0].pos).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1574 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1572 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 22:
|
||||||
|
-#line 351 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 348 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
|
||||||
|
plural_counter = 0;
|
||||||
|
@@ -1582,30 +1580,30 @@
|
||||||
|
(yyval.string).pos = (yyvsp[-1].pos).pos;
|
||||||
|
(yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1586 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1584 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 23:
|
||||||
|
-#line 362 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 359 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
|
||||||
|
(yyval.string).string = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist);
|
||||||
|
(yyval.string).pos = (yyvsp[-1].pos).pos;
|
||||||
|
(yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1597 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1595 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 24:
|
||||||
|
-#line 373 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 370 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
(yyval.rhs) = (yyvsp[0].rhs);
|
||||||
|
}
|
||||||
|
-#line 1605 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1603 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 25:
|
||||||
|
-#line 377 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 374 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].rhs), (yyvsp[0].rhs));
|
||||||
|
(yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[-1].rhs).rhs.msgstr_len + (yyvsp[0].rhs).rhs.msgstr_len, char);
|
||||||
|
@@ -1617,11 +1615,11 @@
|
||||||
|
(yyval.rhs).pos = (yyvsp[-1].rhs).pos;
|
||||||
|
(yyval.rhs).obsolete = (yyvsp[-1].rhs).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1621 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1619 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 26:
|
||||||
|
-#line 392 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 389 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-4].pos), (yyvsp[-3].pos));
|
||||||
|
check_obsolete ((yyvsp[-4].pos), (yyvsp[-2].number));
|
||||||
|
@@ -1640,11 +1638,11 @@
|
||||||
|
(yyval.rhs).pos = (yyvsp[-4].pos).pos;
|
||||||
|
(yyval.rhs).obsolete = (yyvsp[-4].pos).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1644 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1642 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 27:
|
||||||
|
-#line 415 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 412 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
string_list_init (&(yyval.stringlist).stringlist);
|
||||||
|
string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
|
||||||
|
@@ -1652,11 +1650,11 @@
|
||||||
|
(yyval.stringlist).pos = (yyvsp[0].string).pos;
|
||||||
|
(yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1656 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1654 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 28:
|
||||||
|
-#line 423 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 420 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
|
||||||
|
(yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
|
||||||
|
@@ -1665,11 +1663,11 @@
|
||||||
|
(yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
|
||||||
|
(yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1669 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1667 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 29:
|
||||||
|
-#line 435 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 432 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
string_list_init (&(yyval.stringlist).stringlist);
|
||||||
|
string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
|
||||||
|
@@ -1677,11 +1675,11 @@
|
||||||
|
(yyval.stringlist).pos = (yyvsp[0].string).pos;
|
||||||
|
(yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1681 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1679 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 30:
|
||||||
|
-#line 443 "po-gram-gen.y" /* yacc.c:1646 */
|
||||||
|
+#line 440 "po-gram-gen.y" /* yacc.c:1648 */
|
||||||
|
{
|
||||||
|
check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
|
||||||
|
(yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
|
||||||
|
@@ -1690,11 +1688,11 @@
|
||||||
|
(yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
|
||||||
|
(yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
|
||||||
|
}
|
||||||
|
-#line 1694 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1692 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
-#line 1698 "po-gram-gen.c" /* yacc.c:1646 */
|
||||||
|
+#line 1696 "po-gram-gen.c" /* yacc.c:1648 */
|
||||||
|
default: break;
|
||||||
|
}
|
||||||
|
/* User semantic actions sometimes alter yychar, and that requires
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
21
gettext-po-send-mail.patch
Normal file
21
gettext-po-send-mail.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
Index: gettext-0.19.8.1/gettext-tools/misc/po-mode.el
|
||||||
|
===================================================================
|
||||||
|
--- gettext-0.19.8.1.orig/gettext-tools/misc/po-mode.el
|
||||||
|
+++ gettext-0.19.8.1/gettext-tools/misc/po-mode.el
|
||||||
|
@@ -3518,10 +3518,12 @@ Write to your team? ('n' if writing to
|
||||||
|
(re-search-forward
|
||||||
|
(concat "^" (regexp-quote mail-header-separator) "\n"))
|
||||||
|
(save-excursion
|
||||||
|
- (insert-buffer-substring buffer)
|
||||||
|
- (shell-command-on-region
|
||||||
|
- (region-beginning) (region-end)
|
||||||
|
- (concat po-gzip-uuencode-command " " name ".gz") t t))))))
|
||||||
|
+ (save-restriction
|
||||||
|
+ (narrow-to-region (point) (point))
|
||||||
|
+ (insert-buffer-substring buffer)
|
||||||
|
+ (shell-command-on-region
|
||||||
|
+ (point-min) (point-max)
|
||||||
|
+ (concat po-gzip-uuencode-command " " name ".gz") t t)))))))
|
||||||
|
(message ""))
|
||||||
|
|
||||||
|
(defun po-confirm-and-quit ()
|
||||||
@ -1,41 +1,35 @@
|
|||||||
%bcond_with jar
|
%bcond_with jar
|
||||||
%bcond_with java
|
%bcond_with java
|
||||||
|
%bcond_without check
|
||||||
|
|
||||||
|
%global tarversion 0.19.8.1
|
||||||
|
%global archiveversion 0.19.8
|
||||||
|
|
||||||
Summary: GNU libraries and utilities for producing multi-lingual messages
|
Summary: GNU libraries and utilities for producing multi-lingual messages
|
||||||
Name: gettext
|
Name: gettext
|
||||||
Version: 0.21
|
Version: 0.19.8.1
|
||||||
Release: 8%{?dist}
|
Release: 17%{?dist}
|
||||||
# The following are licensed under LGPLv2+:
|
License: GPLv3+ and LGPLv2+
|
||||||
# - libintl and its headers
|
Group: Development/Tools
|
||||||
# - libasprintf and its headers
|
URL: http://www.gnu.org/software/gettext/
|
||||||
# - libintl.jar
|
Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{tarversion}.tar.xz
|
||||||
# - GNU.Gettext.dll
|
# Disable the test_lock test as it often hangs on a number of arches
|
||||||
# - gettext.sh
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1155291
|
||||||
# The following are licensed under GFDL:
|
# http://savannah.gnu.org/bugs/?43487
|
||||||
# - gettext-tools/doc/FAQ.html
|
Patch0: disable-gettext-runtime-test-lock.patch
|
||||||
# - gettext-tools/doc/tutorial.html
|
# Upstreamed patch:
|
||||||
# - gettext info files
|
# http://lists.gnu.org/archive/html/bug-gettext/2016-08/msg00006.html
|
||||||
# - libasprintf info files
|
Patch1: gettext-po-send-mail.patch
|
||||||
# - libtextstyle info files
|
# Rhbz#1531476, upstream a0cab23332a254e3500cac2a3a984472d02180e5
|
||||||
# Everything else is GPLv3+
|
Patch2: gettext-0.19.8-its-segfault.patch
|
||||||
License: GPLv3+ and LGPLv2+ and GFDL
|
# rhbz#1647044
|
||||||
URL: https://www.gnu.org/software/gettext/
|
Patch3: gettext-0.19.8.1-CVE-2018-18751.patch
|
||||||
Source: https://ftp.gnu.org/pub/gnu/gettext/%{name}-%{version}.tar.xz
|
|
||||||
Source2: msghack.py
|
Source2: msghack.py
|
||||||
Source3: msghack.1
|
Source3: msghack.1
|
||||||
|
|
||||||
# this patch has merged upstream
|
|
||||||
# Patch1: gettext-msgmerge-for-msgfmt.patch
|
|
||||||
|
|
||||||
# https://lists.gnu.org/archive/html/bug-gnulib/2020-07/msg00195.html
|
|
||||||
Patch1: gettext-0.21-gnulib-perror-tests.patch
|
|
||||||
Patch2: gettext-0.21-disable-libtextstyle.patch
|
|
||||||
Patch3: gettext-0.21-covscan.patch
|
|
||||||
Patch4: gettext-java17-2062407.patch
|
|
||||||
|
|
||||||
# for bootstrapping
|
# for bootstrapping
|
||||||
# BuildRequires: autoconf >= 2.62
|
# BuildRequires: autoconf >= 2.62
|
||||||
BuildRequires: automake
|
# BuildRequires: automake
|
||||||
# BuildRequires: libtool
|
# BuildRequires: libtool
|
||||||
# BuildRequires: bison
|
# BuildRequires: bison
|
||||||
|
|
||||||
@ -57,31 +51,22 @@ BuildRequires: emacs
|
|||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
# ensure 'ARCHIVE_FORMAT=dirxz'
|
# ensure 'ARCHIVE_FORMAT=dirxz'
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
# for documentation
|
BuildRequires: chrpath
|
||||||
BuildRequires: teckit
|
|
||||||
BuildRequires: texlive-dvips
|
|
||||||
BuildRequires: texlive-dvipdfmx
|
|
||||||
BuildRequires: texinfo-tex
|
|
||||||
BuildRequires: texlive-xetex
|
|
||||||
# following suggested by DEPENDENCIES:
|
# following suggested by DEPENDENCIES:
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: libacl-devel
|
BuildRequires: libcroco-devel
|
||||||
BuildRequires: libunistring-devel
|
BuildRequires: libunistring-devel
|
||||||
# for the tests
|
Requires(post): info
|
||||||
BuildRequires: glibc-langpack-de
|
Requires(preun): info
|
||||||
BuildRequires: glibc-langpack-en
|
|
||||||
BuildRequires: glibc-langpack-fa
|
|
||||||
BuildRequires: glibc-langpack-fr
|
|
||||||
BuildRequires: glibc-langpack-ja
|
|
||||||
BuildRequires: glibc-langpack-tr
|
|
||||||
BuildRequires: glibc-langpack-zh
|
|
||||||
BuildRequires: make
|
|
||||||
# Depend on the exact version of the library sub package
|
# Depend on the exact version of the library sub package
|
||||||
Requires: %{name}-libs%{_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{_isa} = %{version}-%{release}
|
||||||
|
# for F17 UsrMove
|
||||||
|
Conflicts: filesystem < 3
|
||||||
|
Provides: /bin/gettext
|
||||||
|
# exception for bundled gnulib copylib
|
||||||
Provides: bundled(gnulib)
|
Provides: bundled(gnulib)
|
||||||
Provides: bundled(libcroco) = 0.6.12
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The GNU gettext package provides a set of tools and documentation for
|
The GNU gettext package provides a set of tools and documentation for
|
||||||
@ -98,6 +83,7 @@ programs.
|
|||||||
|
|
||||||
%package common-devel
|
%package common-devel
|
||||||
Summary: Common development files for %{name}
|
Summary: Common development files for %{name}
|
||||||
|
Group: Development/Tools
|
||||||
# autopoint archive
|
# autopoint archive
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -108,18 +94,19 @@ This package contains common architecture independent gettext development files.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
|
Group: Development/Tools
|
||||||
# autopoint is GPLv3+
|
# autopoint is GPLv3+
|
||||||
# libasprintf is LGPLv2+
|
# libasprintf is LGPLv2+
|
||||||
# libgettextpo is GPLv3+
|
# libgettextpo is GPLv3+
|
||||||
License: LGPLv2+ and GPLv3+ and GFDL
|
License: LGPLv2+ and GPLv3+
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
Requires: %{name}-common-devel = %{version}-%{release}
|
Requires: %{name}-common-devel = %{version}-%{release}
|
||||||
|
Requires(post): info
|
||||||
|
Requires(preun): info
|
||||||
Requires: xz
|
Requires: xz
|
||||||
Requires: diffutils
|
|
||||||
Obsoletes: gettext-autopoint < 0.18.1.1-3
|
Obsoletes: gettext-autopoint < 0.18.1.1-3
|
||||||
Provides: gettext-autopoint = %{version}-%{release}
|
Provides: gettext-autopoint = %{version}-%{release}
|
||||||
Obsoletes: libtextstyle-devel < %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package contains all development related files necessary for
|
This package contains all development related files necessary for
|
||||||
@ -130,10 +117,10 @@ want to add gettext support for your project.
|
|||||||
|
|
||||||
%package libs
|
%package libs
|
||||||
Summary: Libraries for %{name}
|
Summary: Libraries for %{name}
|
||||||
|
Group: System Environment/Libraries
|
||||||
# libasprintf is LGPLv2+
|
# libasprintf is LGPLv2+
|
||||||
# libgettextpo is GPLv3+
|
# libgettextpo is GPLv3+
|
||||||
License: LGPLv2+ and GPLv3+
|
License: LGPLv2+ and GPLv3+
|
||||||
Obsoletes: libtextstyle < %{version}-%{release}
|
|
||||||
|
|
||||||
%description libs
|
%description libs
|
||||||
This package contains libraries used internationalization support.
|
This package contains libraries used internationalization support.
|
||||||
@ -141,6 +128,7 @@ This package contains libraries used internationalization support.
|
|||||||
|
|
||||||
%package -n emacs-%{name}
|
%package -n emacs-%{name}
|
||||||
Summary: Support for editing po files within GNU Emacs
|
Summary: Support for editing po files within GNU Emacs
|
||||||
|
Group: Applications/Editors
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
# help users find po-mode.el
|
# help users find po-mode.el
|
||||||
Provides: emacs-po-mode
|
Provides: emacs-po-mode
|
||||||
@ -161,14 +149,7 @@ think about.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -S git
|
%autosetup -n %{name}-%{tarversion} -S git
|
||||||
|
|
||||||
# Defeat libtextstyle attempt to bundle libxml2. The comments
|
|
||||||
# indicate this is done because the libtextstyle authors do not want
|
|
||||||
# applications using their code to suffer startup delays due to the
|
|
||||||
# relocations. This is not a sufficient reason for Fedora.
|
|
||||||
sed -e 's/\(gl_cv_libxml_force_included=\)yes/\1no/' \
|
|
||||||
-i libtextstyle/configure
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -182,12 +163,9 @@ export JAR=fastjar
|
|||||||
# prevent test-isinf from failing with gcc-5.3.1 on ppc64le (#1294016)
|
# prevent test-isinf from failing with gcc-5.3.1 on ppc64le (#1294016)
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
|
export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
|
||||||
%endif
|
%endif
|
||||||
# Fedora's libxml2-devel package has an extra "libxml2" path component.
|
# --disable-rpath doesn't work properly on lib64
|
||||||
export CPPFLAGS="-I%{_includedir}/libxml2"
|
|
||||||
# Side effect of unbundling libxml2 from libtextstyle.
|
|
||||||
export LIBS="-lxml2"
|
|
||||||
%configure --without-included-gettext --enable-nls --disable-static \
|
%configure --without-included-gettext --enable-nls --disable-static \
|
||||||
--enable-shared --disable-csharp --disable-rpath \
|
--enable-shared --with-pic --disable-csharp --disable-rpath \
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
--enable-java \
|
--enable-java \
|
||||||
%else
|
%else
|
||||||
@ -195,24 +173,17 @@ export LIBS="-lxml2"
|
|||||||
%endif
|
%endif
|
||||||
--with-xz
|
--with-xz
|
||||||
|
|
||||||
# Eliminate hardcoded rpaths; workaround libtool reordering -Wl,--as-needed
|
make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
|
||||||
# after all the libraries.
|
|
||||||
sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
|
|
||||||
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
|
|
||||||
-e 's|CC=.g..|& -Wl,--as-needed|' \
|
|
||||||
-i $(find . -name libtool)
|
|
||||||
|
|
||||||
%make_build %{?with_java:GCJFLAGS="-findirect-dispatch"}
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install \
|
make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p" \
|
||||||
lispdir=%{_datadir}/emacs/site-lisp/gettext \
|
lispdir=%{_datadir}/emacs/site-lisp/gettext \
|
||||||
aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
|
aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
|
||||||
|
|
||||||
|
|
||||||
install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_bindir}/msghack
|
install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
|
||||||
install -pm 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_mandir}/man1/msghack.1
|
install -pm 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_mandir}/man1/msghack.1
|
||||||
|
|
||||||
|
|
||||||
# make preloadable_libintl.so executable
|
# make preloadable_libintl.so executable
|
||||||
@ -230,7 +201,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/examples
|
|||||||
|
|
||||||
rm -rf htmldoc
|
rm -rf htmldoc
|
||||||
mkdir htmldoc
|
mkdir htmldoc
|
||||||
mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf/* htmldoc
|
mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}/%{_datadir}/doc/libasprintf/* htmldoc
|
||||||
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
|
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
|
||||||
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
|
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
|
||||||
|
|
||||||
@ -268,48 +239,52 @@ rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.elc
|
|||||||
%find_lang %{name}-tools
|
%find_lang %{name}-tools
|
||||||
cat %{name}-*.lang > %{name}.lang
|
cat %{name}-*.lang > %{name}.lang
|
||||||
|
|
||||||
|
# cleanup rpaths
|
||||||
|
for i in $RPM_BUILD_ROOT%{_bindir}/* `find $RPM_BUILD_ROOT%{_libdir} -type f`; do
|
||||||
|
if file $i | grep "ELF 64-bit" >/dev/null; then
|
||||||
|
chrpath -l $i && chrpath --delete $i
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
%if %{with check}
|
||||||
%check
|
%check
|
||||||
# this takes quite a lot of time to run
|
# this takes quite a lot of time to run
|
||||||
|
|
||||||
# adapt to rpath removal
|
|
||||||
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$PWD/gettext-tools/intl/.libs
|
|
||||||
|
|
||||||
# override LIBUNISTRING to prevent reordering of lib objects
|
# override LIBUNISTRING to prevent reordering of lib objects
|
||||||
make check LIBUNISTRING=-lunistring
|
make check LIBUNISTRING=-lunistring
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%post
|
||||||
|
/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir || :
|
||||||
|
|
||||||
|
%preun
|
||||||
|
if [ "$1" = 0 ]; then
|
||||||
|
/sbin/install-info --delete %{_infodir}/gettext.info.gz %{_infodir}/dir || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post devel
|
||||||
|
/sbin/install-info %{_infodir}/autosprintf.info %{_infodir}/dir || :
|
||||||
|
|
||||||
|
%preun devel
|
||||||
|
if [ "$1" = 0 ]; then
|
||||||
|
/sbin/install-info --delete %{_infodir}/autosprintf.info %{_infodir}/dir || :
|
||||||
|
fi
|
||||||
|
|
||||||
%ldconfig_scriptlets libs
|
%ldconfig_scriptlets libs
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%license COPYING
|
|
||||||
%doc AUTHORS gettext-runtime/BUGS
|
%doc AUTHORS gettext-runtime/BUGS
|
||||||
%doc gettext-tools/misc/DISCLAIM README
|
%doc COPYING gettext-tools/misc/DISCLAIM README
|
||||||
%doc NEWS THANKS
|
%doc NEWS THANKS
|
||||||
%doc gettext-runtime/man/*.1.html
|
%doc gettext-runtime/man/*.1.html
|
||||||
%doc gettext-runtime/intl/COPYING*
|
%doc gettext-runtime/intl/COPYING*
|
||||||
%{_bindir}/envsubst
|
%{_bindir}/*
|
||||||
%{_bindir}/gettext
|
%exclude %{_bindir}/autopoint
|
||||||
%{_bindir}/gettext.sh
|
%exclude %{_bindir}/gettextize
|
||||||
%{_bindir}/msgattrib
|
%exclude %{_bindir}/msghack
|
||||||
%{_bindir}/msgcat
|
|
||||||
%{_bindir}/msgcmp
|
|
||||||
%{_bindir}/msgcomm
|
|
||||||
%{_bindir}/msgconv
|
|
||||||
%{_bindir}/msgen
|
|
||||||
%{_bindir}/msgexec
|
|
||||||
%{_bindir}/msgfilter
|
|
||||||
%{_bindir}/msgfmt
|
|
||||||
%{_bindir}/msggrep
|
|
||||||
%{_bindir}/msginit
|
|
||||||
%{_bindir}/msgmerge
|
|
||||||
%{_bindir}/msgunfmt
|
|
||||||
%{_bindir}/msguniq
|
|
||||||
%{_bindir}/ngettext
|
|
||||||
%{_bindir}/recode-sr-latin
|
|
||||||
%{_bindir}/xgettext
|
|
||||||
%{_infodir}/gettext*
|
%{_infodir}/gettext*
|
||||||
%exclude %{_mandir}/man1/autopoint.1*
|
%exclude %{_mandir}/man1/autopoint.1*
|
||||||
%exclude %{_mandir}/man1/gettextize.1*
|
|
||||||
%exclude %{_mandir}/man1/msghack.1*
|
%exclude %{_mandir}/man1/msghack.1*
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%{_libdir}/%{name}
|
%{_libdir}/%{name}
|
||||||
@ -321,8 +296,8 @@ make check LIBUNISTRING=-lunistring
|
|||||||
%{_datadir}/%{name}/ABOUT-NLS
|
%{_datadir}/%{name}/ABOUT-NLS
|
||||||
%{_datadir}/%{name}/po
|
%{_datadir}/%{name}/po
|
||||||
%{_datadir}/%{name}/styles
|
%{_datadir}/%{name}/styles
|
||||||
%dir %{_datadir}/%{name}-%{version}
|
%dir %{_datadir}/%{name}-%{archiveversion}
|
||||||
%{_datadir}/%{name}-%{version}/its
|
%{_datadir}/%{name}-%{archiveversion}/its
|
||||||
|
|
||||||
%files common-devel
|
%files common-devel
|
||||||
%{_datadir}/%{name}/archive.*.tar.xz
|
%{_datadir}/%{name}/archive.*.tar.xz
|
||||||
@ -336,15 +311,14 @@ make check LIBUNISTRING=-lunistring
|
|||||||
%{_datadir}/%{name}/*.h
|
%{_datadir}/%{name}/*.h
|
||||||
%{_datadir}/%{name}/msgunfmt.tcl
|
%{_datadir}/%{name}/msgunfmt.tcl
|
||||||
%{_datadir}/aclocal/*
|
%{_datadir}/aclocal/*
|
||||||
%{_includedir}/autosprintf.h
|
%{_includedir}/*
|
||||||
%{_includedir}/gettext-po.h
|
|
||||||
%{_infodir}/autosprintf*
|
%{_infodir}/autosprintf*
|
||||||
%{_libdir}/libasprintf.so
|
%{_libdir}/libasprintf.so
|
||||||
%{_libdir}/libgettextpo.so
|
%{_libdir}/libgettextpo.so
|
||||||
%{_libdir}/preloadable_libintl.so
|
%{_libdir}/preloadable_libintl.so
|
||||||
%{_mandir}/man1/autopoint.1*
|
%{_mandir}/man1/autopoint.1*
|
||||||
%{_mandir}/man1/gettextize.1*
|
|
||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
%{_datadir}/%{name}/intl
|
||||||
%{_datadir}/%{name}/javaversion.class
|
%{_datadir}/%{name}/javaversion.class
|
||||||
%doc gettext-runtime/intl-java/javadoc*
|
%doc gettext-runtime/intl-java/javadoc*
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
@ -372,92 +346,14 @@ make check LIBUNISTRING=-lunistring
|
|||||||
%{_mandir}/man1/msghack.1*
|
%{_mandir}/man1/msghack.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Mar 30 2023 Jens Petersen <petersen@redhat.com> - 0.21-8
|
* Fri Jun 14 2019 Sundeep Anand <suanand@redhat.com> - 0.19.8.1-17
|
||||||
- add Java 17 support patch from Mamoru Tasaka (rhbz#2182696)
|
- Ported CI gating tests to Python 3.6
|
||||||
|
|
||||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.21-7
|
* Fri Jun 14 2019 Sundeep Anand <suanand@redhat.com> - 0.19.8.1-16
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- add CI gating tests
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Mon May 17 2021 Sundeep Anand <suanand@redhat.com> - 0.21-6
|
* Fri May 3 2019 Jens Petersen <petersen@redhat.com> - 0.19.8.1-15
|
||||||
- Add gettext-0.21-covscan.patch to fix issues detected by static analyzers
|
- fix CVE-2018-18751: double-free in xgettext (rhbz#1647049)
|
||||||
Add gettext-0.21-disable-libtextstyle.patch
|
|
||||||
Do not build libtextstyle, as it depends on libcroco
|
|
||||||
which is now unmaintained and has known security bugs.
|
|
||||||
Obsolete libtextstyle and libtextstyle-devel packages.
|
|
||||||
|
|
||||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.21-5
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Sep 7 2020 Sundeep Anand <suanand@redhat.com> - 0.21-3
|
|
||||||
- include patch to fix gnulib perror tests (rhbz#1867021)
|
|
||||||
|
|
||||||
* Thu Aug 6 2020 Jens Petersen <petersen@redhat.com> - 0.21-2
|
|
||||||
- reenable testsuite except for armv7hl which is failing
|
|
||||||
|
|
||||||
* Mon Aug 03 2020 Sundeep Anand <suanand@redhat.com> - 0.21-1
|
|
||||||
- gettext-0.21 is available (rhbz#1860728)
|
|
||||||
|
|
||||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-4
|
|
||||||
- Second attempt - Rebuilt for
|
|
||||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 0.20.2-3
|
|
||||||
- Bundle libcroco so we can remove the system package
|
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Apr 14 2020 Sundeep Anand <suanand@redhat.com> - 0.20.2-1
|
|
||||||
- gettext-0.20.2 is available (rhbz#1823721)
|
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 06 2020 Sundeep Anand <suanand@redhat.com> - 0.20.1-3
|
|
||||||
- Add diffutils dependency on gettext-devel (rhbz#1774899)
|
|
||||||
|
|
||||||
* Tue Aug 20 2019 Daiki Ueno <dueno@redhat.com> - 0.20.1-2
|
|
||||||
- Fix misbehavior of msgmerge --for-msgfmt
|
|
||||||
|
|
||||||
* Fri Aug 9 2019 Jerry James <loganjerry@gmail.com> - 0.20.1-1
|
|
||||||
- update to 0.20.1 release, all patches upstreamed
|
|
||||||
- add GFDL to License fields due to info files
|
|
||||||
- add libtextstyle{,-devel} subpackages
|
|
||||||
- reenable testsuite
|
|
||||||
- build with libacl support
|
|
||||||
- BR various glibc langpacks wanted by the tests
|
|
||||||
- drop ancient Conflicts due to UsrMove
|
|
||||||
- prevent rpaths rather than removing them
|
|
||||||
- explicitly list binaries in the main package to avoid extra build-ids
|
|
||||||
|
|
||||||
* Fri Aug 9 2019 Jens Petersen <petersen@redhat.com> - 0.19.8.1-22
|
|
||||||
- temporarily disable testsuite (#1735245)
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-21
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Mar 7 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 0.19.8.1-20
|
|
||||||
- Remove obsolete requirements for %%post/%%preun scriptlets
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-19
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Nov 08 2018 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-18
|
|
||||||
- fix CVE-2018-18751 (rhbz#1647044)
|
|
||||||
- put gettextize man page into gettext-devel (man page scan, rhbz#1611303)
|
|
||||||
|
|
||||||
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.19.8.1-17
|
|
||||||
- Rebuild with fixed binutils
|
|
||||||
|
|
||||||
* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.19.8.1-16
|
|
||||||
- Replace obsolete scriptlets
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-15
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-14
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-14
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
|||||||
|
SHA512 (gettext-0.19.8.1.tar.xz) = 3553227b62f2a7d9b67c881ef889c030a6a21d5ecd210c4bf3d649df0b37193a99a68cf8fd5f2c69b6a87e847035dd9576f9bcb9363422866e26b04f4f6dd431
|
||||||
62
tests/gettext-tests/Makefile
Normal file
62
tests/gettext-tests/Makefile
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Makefile of /CoreOS/python/gettext-tests
|
||||||
|
# Description: Functional tests for gettext.
|
||||||
|
# Author: Pooja Yadav <poyadav@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2019 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# 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, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|
||||||
|
export TEST=/CoreOS/python/gettext-tests
|
||||||
|
export TESTVERSION=1.0
|
||||||
|
|
||||||
|
BUILT_FILES=
|
||||||
|
|
||||||
|
FILES=$(METADATA) Makefile runtest.sh test_gettext.py test_i18n.py
|
||||||
|
|
||||||
|
.PHONY: all install download clean
|
||||||
|
|
||||||
|
run: $(FILES) build
|
||||||
|
./runtest.sh
|
||||||
|
|
||||||
|
build: $(BUILT_FILES)
|
||||||
|
test -x runtest.sh || chmod a+x runtest.sh
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *~ $(BUILT_FILES)
|
||||||
|
|
||||||
|
include /usr/share/rhts/lib/rhts-make.include
|
||||||
|
|
||||||
|
$(METADATA): Makefile
|
||||||
|
@echo "Owner: Pooja Yadav <poyadav@redhat.com>" > $(METADATA)
|
||||||
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
|
@echo "Description: Functional test for the gettext module" >> $(METADATA)
|
||||||
|
@echo "Type: Functional" >> $(METADATA)
|
||||||
|
@echo "TestTime: 5m" >> $(METADATA)
|
||||||
|
@echo "RunFor: python3" >> $(METADATA)
|
||||||
|
@echo "Requires: python3" >> $(METADATA)
|
||||||
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
|
@echo "License: GPLv2" >> $(METADATA)
|
||||||
|
@echo "Confidential: no" >> $(METADATA)
|
||||||
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
|
||||||
|
rhts-lint $(METADATA)
|
||||||
53
tests/gettext-tests/runtest.sh
Normal file
53
tests/gettext-tests/runtest.sh
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /CoreOS/python/gettext-tests
|
||||||
|
# Description: Functional tests for gettext to check i18n features.
|
||||||
|
# Author: Pooja Yadav <poyadav@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
|
||||||
|
#
|
||||||
|
# This copyrighted material is made available to anyone wishing
|
||||||
|
# to use, modify, copy, or redistribute it subject to the terms
|
||||||
|
# and conditions of the GNU General Public License version 2.
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
# Include Beaker environment
|
||||||
|
[ -e /usr/bin/rhts-environment.sh ] && . /usr/bin/rhts-environment.sh
|
||||||
|
. /usr/lib/beakerlib/beakerlib.sh
|
||||||
|
|
||||||
|
PACKAGE="gettext"
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlAssertRpm $PACKAGE
|
||||||
|
rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
|
||||||
|
rlRun "cp test_i18n.py test_gettext.py $TmpDir"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest
|
||||||
|
rlLog "Run test_gettext.py"
|
||||||
|
rlRun "python3 test_gettext.py"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalPrintText
|
||||||
|
rlJournalEnd
|
||||||
227
tests/gettext-tests/test_gettext.py
Normal file
227
tests/gettext-tests/test_gettext.py
Normal file
@ -0,0 +1,227 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
|
||||||
|
# Saving logs
|
||||||
|
logging.basicConfig(level=logging.INFO)
|
||||||
|
|
||||||
|
DECORATE_STR = "************************************"
|
||||||
|
logging.info("TEST RESULTS FOR GETTEXT\n{0}".format(DECORATE_STR))
|
||||||
|
|
||||||
|
# CONSTANTS
|
||||||
|
PACKAGE_TO_TEST = "gettext"
|
||||||
|
DOMAIN_TO_BIND = "testdomain"
|
||||||
|
PYTHON_INTERPRETER = "python3"
|
||||||
|
TEST_I18N_FILE = "test_i18n.py"
|
||||||
|
|
||||||
|
LOG_INFO_PASS = "[ PASS ]"
|
||||||
|
LOG_INFO_FAIL = "[ FAIL ]"
|
||||||
|
LOG_INFO_OS_ERROR = "[ OS Error ]"
|
||||||
|
|
||||||
|
# Test Data
|
||||||
|
TEST_DATA = {"fr_FR": '''msgstr "Bonjour le monde!"''',
|
||||||
|
"de_DE": '''msgstr "Hallo Welt!"''',
|
||||||
|
"es_ES": '''msgstr "Hola Mundo!"''',
|
||||||
|
"it_IT": '''msgstr "Ciao mondo!"''',
|
||||||
|
"pt_BR": '''msgstr "Olá Mundo!"''',
|
||||||
|
"ja_JP": '''msgstr "「こんにちは世界」"''',
|
||||||
|
"ko_KR": '''msgstr "안녕하세요!"''',
|
||||||
|
"ru_RU": '''msgstr "Привет мир!"''',
|
||||||
|
"zh_CN": '''msgstr "你好，世界！"''',
|
||||||
|
"zh_TW": '''msgstr "你好，世界！"'''}
|
||||||
|
|
||||||
|
|
||||||
|
def test_locale():
|
||||||
|
"""
|
||||||
|
Check common files for locale support
|
||||||
|
"""
|
||||||
|
|
||||||
|
subject = "Locale Support Test"
|
||||||
|
|
||||||
|
try:
|
||||||
|
all_locales = subprocess.Popen(["locale", "-a"], stdout=subprocess.PIPE)
|
||||||
|
all_locales_data = all_locales.communicate()
|
||||||
|
|
||||||
|
if all_locales_data:
|
||||||
|
actual = all_locales_data[0].decode().split('\n')
|
||||||
|
else:
|
||||||
|
logging.error("{0}: ERROR\n".format(subject))
|
||||||
|
return
|
||||||
|
|
||||||
|
expected_locales = ['en_US', 'en_US.iso88591',
|
||||||
|
'en_US.iso885915', 'en_US.utf8']
|
||||||
|
if set(expected_locales).issubset(set(actual)):
|
||||||
|
logging.info("{0}: {1}\n".format(subject, LOG_INFO_PASS))
|
||||||
|
else:
|
||||||
|
logging.error("{0}: {1}\n".format(subject, LOG_INFO_FAIL))
|
||||||
|
|
||||||
|
except OSError as e:
|
||||||
|
logging.error("{0}: {1}\n".format(subject, LOG_INFO_OS_ERROR))
|
||||||
|
|
||||||
|
|
||||||
|
def test_gettext():
|
||||||
|
"""
|
||||||
|
Check if gettext is present
|
||||||
|
"""
|
||||||
|
|
||||||
|
subject = "GNU Internationalization Utilities Test"
|
||||||
|
|
||||||
|
try:
|
||||||
|
cmd_check_gettext = ['rpm', '-q', PACKAGE_TO_TEST]
|
||||||
|
p1 = subprocess.Popen(cmd_check_gettext, stdout=subprocess.PIPE)
|
||||||
|
std_data, stderr = p1.communicate()
|
||||||
|
std_data = std_data.decode()
|
||||||
|
logging.info("Found {0} NVR: {1}".format(PACKAGE_TO_TEST, std_data))
|
||||||
|
if PACKAGE_TO_TEST in std_data:
|
||||||
|
logging.info("{0}: {1}\n".format(subject, LOG_INFO_PASS))
|
||||||
|
else:
|
||||||
|
logging.error("{0}: {1}\n".format(subject, LOG_INFO_FAIL))
|
||||||
|
except OSError as e:
|
||||||
|
logging.error("{0}: {1}\n".format(subject, LOG_INFO_OS_ERROR))
|
||||||
|
|
||||||
|
|
||||||
|
def test_pot_creation():
|
||||||
|
"""
|
||||||
|
Creates hello.pot file using test_i18n.py file
|
||||||
|
"""
|
||||||
|
|
||||||
|
subject = "POT file Creation Test"
|
||||||
|
|
||||||
|
try:
|
||||||
|
pot_file = subprocess.Popen(
|
||||||
|
"xgettext -d '{0}' -o {1}.pot {2}".format(DOMAIN_TO_BIND,
|
||||||
|
DOMAIN_TO_BIND,
|
||||||
|
TEST_I18N_FILE),
|
||||||
|
shell=True
|
||||||
|
)
|
||||||
|
pot_file.communicate()
|
||||||
|
except OSError as e:
|
||||||
|
logging.error("{0}: {1}\n".format(subject, LOG_INFO_OS_ERROR))
|
||||||
|
else:
|
||||||
|
logging.info("{0}: {1}\n".format(subject, LOG_INFO_PASS))
|
||||||
|
|
||||||
|
|
||||||
|
def make_dir(locale_dir):
|
||||||
|
path = "./locale/{0}/LC_MESSAGES".format(locale_dir)
|
||||||
|
os.makedirs(path)
|
||||||
|
|
||||||
|
|
||||||
|
def create_po_files(active_locale):
|
||||||
|
"""
|
||||||
|
creates .po file using POT file
|
||||||
|
"""
|
||||||
|
|
||||||
|
subject = "PO file Creation"
|
||||||
|
|
||||||
|
try:
|
||||||
|
cmd_po_files = subprocess.Popen(
|
||||||
|
"msginit --no-translator -l {0} -i {1}.pot -o ./locale/{2}/LC_MESSAGES/{3}.po".format(
|
||||||
|
active_locale, DOMAIN_TO_BIND, active_locale, active_locale), shell=True
|
||||||
|
)
|
||||||
|
cmd_po_files.communicate()
|
||||||
|
except OSError as e:
|
||||||
|
logging.error("{0} failed: {1}\n".format(subject, LOG_INFO_OS_ERROR))
|
||||||
|
else:
|
||||||
|
logging.info("{0} Succeed.".format(subject))
|
||||||
|
|
||||||
|
|
||||||
|
def translate(active_locale):
|
||||||
|
"""
|
||||||
|
Updates .po file with the translations for respective language
|
||||||
|
"""
|
||||||
|
|
||||||
|
data = TEST_DATA.get(active_locale)
|
||||||
|
if not data:
|
||||||
|
return
|
||||||
|
with open('./locale/{0}/LC_MESSAGES/{1}.po'.format(active_locale,
|
||||||
|
active_locale),
|
||||||
|
'r', encoding='latin-1') as f1:
|
||||||
|
data1 = f1.readlines()
|
||||||
|
data1.pop()
|
||||||
|
data1.append(data)
|
||||||
|
for index, data in enumerate(data1):
|
||||||
|
if "Content-Type" in data:
|
||||||
|
data1[index] = '"Content-Type: text/plain; charset=UTF-8\\n"\n'
|
||||||
|
|
||||||
|
with open('./locale/{0}/LC_MESSAGES/{1}'.format(active_locale,
|
||||||
|
active_locale) + ".po", 'w') as f2:
|
||||||
|
for line in data1:
|
||||||
|
f2.write(line)
|
||||||
|
|
||||||
|
|
||||||
|
def create_mo_files(active_locale):
|
||||||
|
"""
|
||||||
|
Creates .mo file for different locale form .po file
|
||||||
|
"""
|
||||||
|
|
||||||
|
subject = "MO file Creation"
|
||||||
|
|
||||||
|
try:
|
||||||
|
mo_files = subprocess.Popen(
|
||||||
|
"msgfmt ./locale/{0}/LC_MESSAGES/{1}.po --output-file ./locale/{2}/LC_MESSAGES/{3}.mo".format(
|
||||||
|
active_locale, active_locale, active_locale, active_locale
|
||||||
|
), shell=True
|
||||||
|
)
|
||||||
|
mo_files.communicate()
|
||||||
|
except OSError as e:
|
||||||
|
logging.error("{0} failed: {1}\n".format(subject, LOG_INFO_OS_ERROR))
|
||||||
|
else:
|
||||||
|
logging.info("{0} Succeed.".format(subject))
|
||||||
|
|
||||||
|
|
||||||
|
def test_translations(active_locale):
|
||||||
|
"""
|
||||||
|
Verify if the output is correct for different language
|
||||||
|
"""
|
||||||
|
|
||||||
|
subject = "Translation Test"
|
||||||
|
|
||||||
|
try:
|
||||||
|
cmd_translation_test = subprocess.check_output(
|
||||||
|
'LANGUAGE={0} {1} {2} {3}'.format(active_locale,
|
||||||
|
PYTHON_INTERPRETER,
|
||||||
|
TEST_I18N_FILE,
|
||||||
|
active_locale),
|
||||||
|
encoding='UTF-8', shell=True
|
||||||
|
)
|
||||||
|
if cmd_translation_test.strip() == TEST_DATA[active_locale].strip('msgstr "'):
|
||||||
|
logging.info("{0} for {1}: {2}\n".format(subject, active_locale, LOG_INFO_PASS))
|
||||||
|
else:
|
||||||
|
logging.error("{0} for {1}: {2}\n".format(subject, active_locale, LOG_INFO_FAIL))
|
||||||
|
except OSError as e:
|
||||||
|
logging.error("{0} for {1}: {2}\n".format(subject, active_locale, LOG_INFO_OS_ERROR))
|
||||||
|
|
||||||
|
|
||||||
|
def tear_off():
|
||||||
|
try:
|
||||||
|
subprocess.call(['rm', '-rf', './locale', '{0}.pot'.format(DOMAIN_TO_BIND)])
|
||||||
|
except OSError as e:
|
||||||
|
logging.error("OSError\n")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
"""
|
||||||
|
Gettext Tests
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Prepare tests
|
||||||
|
env_tests = [test_locale,
|
||||||
|
test_gettext,
|
||||||
|
test_pot_creation]
|
||||||
|
|
||||||
|
translation_tests = [make_dir,
|
||||||
|
create_po_files,
|
||||||
|
translate,
|
||||||
|
create_mo_files,
|
||||||
|
test_translations]
|
||||||
|
|
||||||
|
# Execute tests
|
||||||
|
[env_test() for env_test in env_tests]
|
||||||
|
|
||||||
|
for locale in TEST_DATA.keys():
|
||||||
|
[test(locale) for test in translation_tests]
|
||||||
|
|
||||||
|
tear_off()
|
||||||
14
tests/gettext-tests/test_i18n.py
Normal file
14
tests/gettext-tests/test_i18n.py
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
import gettext
|
||||||
|
import sys
|
||||||
|
|
||||||
|
|
||||||
|
def print_message(locale):
|
||||||
|
# Set up message catalog access
|
||||||
|
t = gettext.translation('%s' % locale, 'locale', fallback=True)
|
||||||
|
_ = t.gettext
|
||||||
|
|
||||||
|
s = _('Hello World!')
|
||||||
|
print(s)
|
||||||
|
|
||||||
|
|
||||||
|
print_message(sys.argv[1])
|
||||||
13
tests/tests.yml
Normal file
13
tests/tests.yml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
# Tests run on Atomic, Classic and Container
|
||||||
|
- hosts: localhost
|
||||||
|
roles:
|
||||||
|
- role: standard-test-beakerlib
|
||||||
|
tags:
|
||||||
|
- atomic
|
||||||
|
- classic
|
||||||
|
- container
|
||||||
|
tests:
|
||||||
|
- gettext-tests
|
||||||
|
required_packages:
|
||||||
|
- gettext
|
||||||
Loading…
Reference in New Issue
Block a user