rpms/sudo/F-12 sudo-1.7.2p2-loopsegv3.patch, NONE, 1.1 sources, 1.25, 1.26 sudo.spec, 1.83, 1.84

[Daniel Kopeček]

Author: mildew

Update of /cvs/pkgs/rpms/sudo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26478

Modified Files:
	sources sudo.spec 
Added Files:
	sudo-1.7.2p2-loopsegv3.patch 
Log Message:
- fixed segfault when #include directive is used in cycles (#561336)
- Add /etc/sudoers.d dir and use it in default config (#551470).
- Drop *.pod man page duplicates from docs.
 ----------------------------------------------------------------------


sudo-1.7.2p2-loopsegv3.patch:
 toke.c |    4 ++--
 toke.l |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sudo-1.7.2p2-loopsegv3.patch ---
diff -up sudo-1.7.2p2/toke.c.loop sudo-1.7.2p2/toke.c
--- sudo-1.7.2p2/toke.c.loop	2010-02-09 12:48:33.000000000 +0100
+++ sudo-1.7.2p2/toke.c	2010-02-09 16:54:17.000000000 +0100
@@ -3461,7 +3461,7 @@ init_lexer()
 	    efree(pl);
 	}
 	efree(istack[idepth].path);
-	if (!istack[idepth].keepopen)
+	if (idepth && !istack[idepth].keepopen)
 	    fclose(istack[idepth].bs->yy_input_file);
 	yy_delete_buffer(istack[idepth].bs);
     }
@@ -3486,7 +3486,7 @@ _push_include(path, isdir)
 	}
 	istacksize += SUDOERS_STACK_INCREMENT;
 	istack = (struct include_stack *) realloc(istack,
-	    sizeof(istack) * istacksize);
+	    sizeof(*istack) * istacksize);
 	if (istack == NULL) {
 	    yyerror("unable to allocate memory");
 	    return(FALSE);
diff -up sudo-1.7.2p2/toke.l.loop sudo-1.7.2p2/toke.l
--- sudo-1.7.2p2/toke.l.loop	2010-02-09 12:48:30.000000000 +0100
+++ sudo-1.7.2p2/toke.l	2010-02-09 13:18:27.000000000 +0100
@@ -869,7 +869,7 @@ _push_include(path, isdir)
 	}
 	istacksize += SUDOERS_STACK_INCREMENT;
 	istack = (struct include_stack *) realloc(istack,
-	    sizeof(istack) * istacksize);
+	    sizeof(*istack) * istacksize);
 	if (istack == NULL) {
 	    yyerror("unable to allocate memory");
 	    return(FALSE);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Jan 2010 15:58:51 -0000	1.25
+++ sources	10 Feb 2010 12:38:53 -0000	1.26
@@ -1,2 +1,2 @@
 2a19cf1ab4afc94fe19d0d0899d4cd45  sudo-1.7.2p2.tar.gz
-23f2ea124749102bcb3c404ee09dc521  sudo-1.7.2p2-sudoers
+d657d8d55ecdf88a2d11da73ac5662a4  sudo-1.7.2p2-sudoers


Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-12/sudo.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sudo.spec	7 Jan 2010 15:58:51 -0000	1.83
+++ sudo.spec	10 Feb 2010 12:38:53 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.7.2p2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -31,6 +31,8 @@ Patch4: sudo-1.7.1-libtool.patch
 Patch5: sudo-1.7.1-getgrouplist.patch
 # audit support improvement
 Patch6: sudo-1.7.2p1-audit.patch
+# segfault when #include directive is used in cycles (#561336)
+Patch7: sudo-1.7.2p2-loopsegv3.patch
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -51,6 +53,7 @@ on many different machines.
 %patch4 -p1 -b .libtool
 %patch5 -p1 -b .getgrouplist
 %patch6 -p1 -b .audit
+%patch7 -p1 -b .loopsegv3
 
 %build
 # handle newer autoconf
@@ -88,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* 
 install -p -d -m 700 $RPM_BUILD_ROOT/var/run/sudo
+install -p -d -m 750 $RPM_BUILD_ROOT/etc/sudoers.d
 install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
@@ -116,8 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc ChangeLog WHATSNEW HISTORY LICENSE README* TROUBLESHOOTING UPGRADE
-%doc *.pod schema.* sudoers2ldif sample.*
+%doc sudoers.ldap.pod schema.* sudoers2ldif sample.*
 %attr(0440,root,root) %config(noreplace) /etc/sudoers
+%attr(0750,root,root) %dir /etc/sudoers.d/
 %config(noreplace) /etc/pam.d/sudo
 %config(noreplace) /etc/pam.d/sudo-i
 %dir /var/run/sudo
@@ -136,6 +141,13 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Wed Feb 10 2010 Daniel Kopecek <dkopecek at redhat.com> - 1.7.2p2-3
+- fixed segfault when #include directive is used in cycles (#561336)
+
+* Wed Feb 10 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.7.2p2-3
+- Add /etc/sudoers.d dir and use it in default config (#551470).
+- Drop *.pod man page duplicates from docs.
+
 * Fri Jan 07 2010 Daniel Kopecek <dkopecek at redhat.com> - 1.7.2p2-2
 - commented out unused aliases in sudoers to make visudo happy (#550239)