Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Daniel Kopecek
616f66b6eb added patch for CVE-2012-2337 2012-05-17 15:03:57 +02:00
Daniel Kopecek
7c3226ee27 build with RELPRO 2011-06-03 15:22:37 +02:00
2 changed files with 38 additions and 2 deletions

View file

@ -0,0 +1,27 @@
diff -up sudo-1.7.4p5/match.c.CVE-2012-2337 sudo-1.7.4p5/match.c
--- sudo-1.7.4p5/match.c.CVE-2012-2337 2012-05-17 14:48:49.570465186 +0200
+++ sudo-1.7.4p5/match.c 2012-05-17 14:53:12.812736038 +0200
@@ -646,6 +646,7 @@ addr_matches_if(n)
}
if (j == sizeof(addr.ip6.s6_addr))
return(TRUE);
+ break;
#endif
}
}
@@ -711,6 +712,7 @@ addr_matches_if_netmask(n, m)
case AF_INET:
if ((ifp->addr.ip4.s_addr & mask.ip4.s_addr) == addr.ip4.s_addr)
return(TRUE);
+ break;
#ifdef HAVE_IN6_ADDR
case AF_INET6:
for (j = 0; j < sizeof(addr.ip6.s6_addr); j++) {
@@ -719,6 +721,7 @@ addr_matches_if_netmask(n, m)
}
if (j == sizeof(addr.ip6.s6_addr))
return(TRUE);
+ break;
#endif /* HAVE_IN6_ADDR */
}
}

View file

@ -1,7 +1,7 @@
Summary: Allows restricted root access for specified users
Name: sudo
Version: 1.7.4p5
Release: 3%{?dist}
Release: 5%{?dist}
License: ISC
Group: Applications/System
URL: http://www.courtesan.com/sudo/
@ -31,6 +31,8 @@ Patch3: sudo-1.7.4p3-m4path.patch
Patch4: sudo-1.7.4p4-getgrouplist-fixed.patch
# reset HOME when using the `-i' option (#635250)
Patch5: sudo-1.7.4p4-sudoi.patch
# CVE-2012-2337
Patch6: sudo-1.7.4p5-CVE-2012-2337.patch
%description
Sudo (superuser do) allows a system administrator to give certain
@ -51,6 +53,7 @@ on many different machines.
%patch3 -p1 -b .m4path
%patch4 -p1 -b .getgrouplist-fixed
%patch5 -p0 -b .sudoi
%patch6 -p1 -b .CVE-2012-2337
%build
# handle newer autoconf
@ -64,7 +67,7 @@ F_PIE=-fPIE
F_PIE=-fpie
%endif
export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie"
export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
%configure \
--prefix=%{_prefix} \
@ -147,6 +150,12 @@ rm -rf $RPM_BUILD_ROOT
/bin/chmod 0440 /etc/sudoers || :
%changelog
* Thu May 17 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p5-5
- added patch for CVE-2012-2337
* Fri Jun 3 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p5-4
- build with RELPRO
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.4p5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild