[setroubleshoot/f17] Update translations
by Daniel J Walsh
commit 59cf7e1bdf51b190ca8b498b728f1ecc5ab289e6
Author: Dan Walsh <dwalsh(a)redhat.com>
Date: Thu May 31 16:29:49 2012 -0400
Update translations
- Remove /var/log/setroubleshoot /run/setroubleshoot which are no longer used
sources | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/sources b/sources
index def0b20..c3ec10a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7590d3b8c96339ae97b7363cfe52a8f8 setroubleshoot-3.1.12.tar.gz
+0a2b9ef8744680cf622594698eefe598 setroubleshoot-3.1.12.tar.gz
10Â years, 8Â months
[glibc] Fix fnmatch() when '*' wildcard is applied on a file name containing multibyte chars. (#819430/14185
by Patsy Franklin
commit 200aebfe55588c73e0235f37670d884ba2e4149f
Author: Patsy Franklin <pfrankli(a)redhat.com>
Date: Thu May 31 16:21:36 2012 -0400
Fix fnmatch() when '*' wildcard is applied on a file name containing multibyte chars. (#819430/14185)
glibc-rh819430.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
glibc.spec | 9 +++++-
2 files changed, 86 insertions(+), 1 deletions(-)
---
diff --git a/glibc-rh819430.patch b/glibc-rh819430.patch
new file mode 100644
index 0000000..8af1f78
--- /dev/null
+++ b/glibc-rh819430.patch
@@ -0,0 +1,78 @@
+diff -Nrup a/posix/fnmatch.c b/posix/fnmatch.c
+--- a/posix/fnmatch.c 2012-01-01 07:16:32.000000000 -0500
++++ b/posix/fnmatch.c 2012-05-23 14:14:29.099461189 -0400
+@@ -333,6 +333,7 @@ fnmatch (pattern, string, flags)
+ # if HANDLE_MULTIBYTE
+ if (__builtin_expect (MB_CUR_MAX, 1) != 1)
+ {
++ const char *orig_pattern = pattern;
+ mbstate_t ps;
+ size_t n;
+ const char *p;
+@@ -356,10 +357,8 @@ fnmatch (pattern, string, flags)
+ alloca_used);
+ n = mbsrtowcs (wpattern, &p, n + 1, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which mbsrtows hasn't
+- already done? */
+- return -1;
++ /* Something wrong: Fall back to single byte matching. */
++ goto try_singlebyte;
+ if (p)
+ {
+ memset (&ps, '\0', sizeof (ps));
+@@ -371,10 +370,8 @@ fnmatch (pattern, string, flags)
+ prepare_wpattern:
+ n = mbsrtowcs (NULL, &pattern, 0, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which mbsrtows hasn't
+- already done? */
+- return -1;
++ /*Something wrong: Fall back to single byte matching. */
++ goto try_singlebyte;
+ if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
+ {
+ __set_errno (ENOMEM);
+@@ -401,14 +398,8 @@ fnmatch (pattern, string, flags)
+ alloca_used);
+ n = mbsrtowcs (wstring, &p, n + 1, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- {
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which
+- mbsrtows hasn't already done? */
+- free_return:
+- free (wpattern_malloc);
+- return -1;
+- }
++ /* Something wrong: Fall back to single byte matching. */
++ goto free_and_try_singlebyte;
+ if (p)
+ {
+ memset (&ps, '\0', sizeof (ps));
+@@ -420,10 +411,8 @@ fnmatch (pattern, string, flags)
+ prepare_wstring:
+ n = mbsrtowcs (NULL, &string, 0, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which mbsrtows hasn't
+- already done? */
+- goto free_return;
++ /* Something wrong: Fall back to singlebyte matching. */
++ goto free_and_try_singlebyte;
+ if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
+ {
+ free (wpattern_malloc);
+@@ -450,6 +439,10 @@ fnmatch (pattern, string, flags)
+ free (wpattern_malloc);
+
+ return res;
++ free_and_try_singlebyte:
++ free(wpattern_malloc);
++ try_singlebyte:
++ pattern = orig_pattern;
+ }
+ # endif /* mbstate_t and mbsrtowcs or _LIBC. */
+
diff --git a/glibc.spec b/glibc.spec
index 926ea2c..c532fea 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -170,6 +170,9 @@ Patch2033: %{name}-rh788989-2.patch
# Upstream BZ 13027
Patch2034: %{name}-rh804630.patch
+# Upstream BZ 14185
+Patch2035: %{name}-rh819430.patch
+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4
Obsoletes: nss_db
@@ -419,6 +422,7 @@ rm -rf %{glibcportsdir}
%patch2033 -p1
%patch2034 -p1
%patch0035 -p1
+%patch2035 -p1
# A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at
@@ -1295,6 +1299,9 @@ rm -f *.filelist*
%endif
%changelog
+* Thu May 31 2012 Patsy Franklin <patsy(a)redhat.com> - 2.15.90-6
+- Fix fnmatch() when '*' wildcard is applied on a file name containing multibyte chars. (#819430)
+
* Wed May 30 2012 Jeff Law <law(a)redhat.com> - 2.15.90-5
- Resync with upstream sources.
10Â years, 8Â months
[glibc/f17] Resolves: sw#14185 -Fix fnmatch() fails when '*' wildcard is applied on the file name containing mul
by Patsy Franklin
commit 34e56ebeef6e7bdfbc134a49bf1773ee7a8bfcee
Author: Patsy Franklin <pfrankli(a)redhat.com>
Date: Wed May 30 17:29:53 2012 -0400
Resolves: sw#14185
-Fix fnmatch() fails when '*' wildcard is applied on the file name containing multi-byte character(s)
glibc-rh819430.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
glibc.spec | 7 ++++-
2 files changed, 84 insertions(+), 1 deletions(-)
---
diff --git a/glibc-rh819430.patch b/glibc-rh819430.patch
new file mode 100644
index 0000000..8af1f78
--- /dev/null
+++ b/glibc-rh819430.patch
@@ -0,0 +1,78 @@
+diff -Nrup a/posix/fnmatch.c b/posix/fnmatch.c
+--- a/posix/fnmatch.c 2012-01-01 07:16:32.000000000 -0500
++++ b/posix/fnmatch.c 2012-05-23 14:14:29.099461189 -0400
+@@ -333,6 +333,7 @@ fnmatch (pattern, string, flags)
+ # if HANDLE_MULTIBYTE
+ if (__builtin_expect (MB_CUR_MAX, 1) != 1)
+ {
++ const char *orig_pattern = pattern;
+ mbstate_t ps;
+ size_t n;
+ const char *p;
+@@ -356,10 +357,8 @@ fnmatch (pattern, string, flags)
+ alloca_used);
+ n = mbsrtowcs (wpattern, &p, n + 1, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which mbsrtows hasn't
+- already done? */
+- return -1;
++ /* Something wrong: Fall back to single byte matching. */
++ goto try_singlebyte;
+ if (p)
+ {
+ memset (&ps, '\0', sizeof (ps));
+@@ -371,10 +370,8 @@ fnmatch (pattern, string, flags)
+ prepare_wpattern:
+ n = mbsrtowcs (NULL, &pattern, 0, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which mbsrtows hasn't
+- already done? */
+- return -1;
++ /*Something wrong: Fall back to single byte matching. */
++ goto try_singlebyte;
+ if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
+ {
+ __set_errno (ENOMEM);
+@@ -401,14 +398,8 @@ fnmatch (pattern, string, flags)
+ alloca_used);
+ n = mbsrtowcs (wstring, &p, n + 1, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- {
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which
+- mbsrtows hasn't already done? */
+- free_return:
+- free (wpattern_malloc);
+- return -1;
+- }
++ /* Something wrong: Fall back to single byte matching. */
++ goto free_and_try_singlebyte;
+ if (p)
+ {
+ memset (&ps, '\0', sizeof (ps));
+@@ -420,10 +411,8 @@ fnmatch (pattern, string, flags)
+ prepare_wstring:
+ n = mbsrtowcs (NULL, &string, 0, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+- /* Something wrong.
+- XXX Do we have to set `errno' to something which mbsrtows hasn't
+- already done? */
+- goto free_return;
++ /* Something wrong: Fall back to singlebyte matching. */
++ goto free_and_try_singlebyte;
+ if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
+ {
+ free (wpattern_malloc);
+@@ -450,6 +439,10 @@ fnmatch (pattern, string, flags)
+ free (wpattern_malloc);
+
+ return res;
++ free_and_try_singlebyte:
++ free(wpattern_malloc);
++ try_singlebyte:
++ pattern = orig_pattern;
+ }
+ # endif /* mbstate_t and mbsrtowcs or _LIBC. */
+
diff --git a/glibc.spec b/glibc.spec
index c32fdbf..1b8408a 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 37%{?dist}
+Release: 38%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -114,6 +114,7 @@ Patch1046: %{name}-rh806403.patch
Patch1048: %{name}-rh804792.patch
Patch1052: %{name}-sw13979.patch
Patch1053: %{name}-rh817276.patch
+Patch1054: %{name}-rh819430.patch
#
# Patches submitted, but not yet approved upstream.
@@ -460,6 +461,7 @@ rm -rf %{glibcportsdir}
%patch2051 -p1
%patch1052 -p1
%patch2054 -p1
+%patch1054 -p1
pushd ../%{glibcportsdir}
%patch1053 -p1
@@ -1319,6 +1321,9 @@ rm -f *.filelist*
%endif
%changelog
+* Thu May 24 2012 Patsy Franklin <pfrankli(a)redhat.com> - 2.15-38
+ - Fix fnmatch() when '*' wildcard is applied on a file name containing multibyte chars. (#819430)
+
* Thu May 10 2012 Jeff Law <law(a)redhat.com> - 2.15-37
- Try again to fix AVX testing (#801650)
10Â years, 8Â months
[setroubleshoot/f17] Update translations
by Daniel J Walsh
commit 464221e405c3c9b0a237e0b4938ee89589e26877
Author: Dan Walsh <dwalsh(a)redhat.com>
Date: Thu May 31 16:14:19 2012 -0400
Update translations
- Remove /var/log/setroubleshoot /run/setroubleshoot which are no longer used
.gitignore | 1 +
setroubleshoot.spec | 13 +++++--------
sources | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9ffcf0..3bb9fc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,3 +154,4 @@ setroubleshoot-2.2.93.tar.gz
/setroubleshoot-3.1.8.tar.gz
/setroubleshoot-3.1.9.tar.gz
/setroubleshoot-3.1.11.tar.gz
+/setroubleshoot-3.1.12.tar.gz
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index 3e2cd18..a9126df 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,6 +1,6 @@
Summary: Helps troubleshoot SELinux problems
Name: setroubleshoot
-Version: 3.1.11
+Version: 3.1.12
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
@@ -8,7 +8,6 @@ URL: https://fedorahosted.org/setroubleshoot
# git clone git://git.fedorahosted.org/git/setroubleshoot.git; cd setroubleshoot
# git archive --prefix setroubleshoot-3.0.10/426cf8ea7a38e8c5179981219d831368161b65f2 > setroubleshoot-3.0.10.tar.gz
Source0: %{name}-%{version}.tar.gz
-Source2: setroubleshoot.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl-XML-Parser
BuildRequires: libcap-ng-devel
@@ -40,9 +39,7 @@ Requires: xdg-utils
%define pkgdatadir %{_datadir}/%{name}
%define pkglibexecdir %{_prefix}/libexec/%{name}
%define pkgvardatadir %{_localstatedir}/lib/%{name}
-%define pkgrundir %{_localstatedir}/run/%{name}
%define pkgconfigdir %{_sysconfdir}/%{name}
-%define pkglogdir %{_localstatedir}/log/%{name}
%global pkgdatabase %{pkgvardatadir}/setroubleshoot_database.xml
%description
@@ -89,7 +86,6 @@ make
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-%{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop
touch %{buildroot}%{pkgdatabase}
touch %{buildroot}%{pkgvardatadir}/email_alert_recipients
@@ -174,10 +170,7 @@ rm -rf %{buildroot}
%{pkgdatadir}/SetroubleshootFixit.py*
%{pkgdatadir}/updater.py*
%config(noreplace) %{pkgconfigdir}/%{name}.conf
-%dir %{pkglogdir}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Setroubleshootd.conf
-%dir %{pkgrundir}
%dir %{pkgvardatadir}
%ghost %attr(0600,root,root) %{pkgdatabase}
%ghost %attr(0644,root,root) %{pkgvardatadir}/email_alert_recipients
@@ -203,6 +196,10 @@ Setroubleshoot documentation package
%{pkgdocdir}/setroubleshoot*
%changelog
+* Fri May 11 2012 Dan Walsh <dwalsh(a)redhat.com> - 3.1.12-1
+- Update translations
+- Remove /var/log/setroubleshoot /run/setroubleshoot which are no longer used
+
* Wed May 9 2012 Dan Walsh <dwalsh(a)redhat.com> - 3.1.11-1
- Update translations
- Only check for rpm on target process if is still exists
diff --git a/sources b/sources
index 7f64a46..def0b20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3dc22662cc125981bccdcd6949187b5 setroubleshoot-3.1.11.tar.gz
+7590d3b8c96339ae97b7363cfe52a8f8 setroubleshoot-3.1.12.tar.gz
10Â years, 8Â months
[e2fsprogs/f17] update sources file...
by Eric Sandeen
commit 738676c2791b7274dfa9141b24c1c3c0c319f1ba
Author: Eric Sandeen <sandeen(a)redhat.com>
Date: Thu May 31 14:52:13 2012 -0500
update sources file...
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37d40ea..1ab3a0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ e2fsprogs-1.41.12.tar.gz
/e2fsprogs-1.42-WIP-1016.tar.gz
/e2fsprogs-1.42-WIP-1120.tar.gz
/e2fsprogs-1.42.tar.gz
+/e2fsprogs-1.42.3.tar.gz
diff --git a/sources b/sources
index 02c937a..a0105e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3c4ffd7352310ab5e9412965d575610 e2fsprogs-1.42.tar.gz
+73431146f58d40fe1375aba2060f0da8 e2fsprogs-1.42.3.tar.gz
10Â years, 8Â months