diff --git a/dietlibc-insecure-defpath.patch b/dietlibc-insecure-defpath.patch new file mode 100644 index 0000000..340d5f3 --- /dev/null +++ b/dietlibc-insecure-defpath.patch @@ -0,0 +1,11 @@ +--- include/paths.h~ 2008-02-22 18:09:54.000000000 -0600 ++++ include/paths.h 2016-07-25 12:03:25.144058895 -0500 +@@ -2,7 +2,7 @@ + #define _PATHS_H + + #define _PATH_BSHELL "/bin/sh" +-#define _PATH_DEFPATH "/bin:/usr/bin:" ++#define _PATH_DEFPATH "/bin:/usr/bin" + + #define _PATH_DEVNULL "/dev/null" + diff --git a/dietlibc.spec b/dietlibc.spec index fed4a2d..c4016f7 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -24,7 +24,7 @@ Summary: Small libc implementation Name: dietlibc Version: 0.33 -Release: 7.1%{?dist} +Release: 8%{?dist} #Release: 0.1904.%%prerelease%%{?dist} License: GPLv2 Group: Development/Libraries @@ -40,10 +40,11 @@ Source0: dietlibc.tar.gz %endif ## CVS..master diff from https://github.com/ensc/dietlibc #Patch0: dietlibc-github-%githubref.patch.gz +Patch1: dietlibc-insecure-defpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot #Requires: dietlibc-lib = %{version}-%{release}} Obsoletes: dietlibc-lib < %{version}-%{release}} -ExcludeArch: ppc64 +ExcludeArch: ppc64 Requires: %{name}-devel = %{version}-%{release} BuildRequires: gdb @@ -87,6 +88,7 @@ This package contains the dynamic libraries for dietlibc. %setup -qn dietlibc #%apply -n0 -p1 +%patch1 -p0 %if %{without ssp} sed -i -e 's!^#define WANT_SSP$!// \0!g; @@ -159,8 +161,8 @@ rm -rf $RPM_BUILD_ROOT %pkglibdir %changelog -* Thu Apr 07 2016 Jon Ciesla - 0.33-7.1 -- ExcludeArch ppc64 +* Mon Jul 25 2016 Jon Ciesla - 0.33-8 +- Patch for insecure defpath, BZ 1359768. * Thu Apr 07 2016 Jon Ciesla - 0.33-7 - Spec cleanup.