diff -r 4481d72bca2d -r 4c6e1d5e1470 usr/src/cmd/samba/Makefile.sfw --- a/usr/src/cmd/samba/Makefile.sfw Fri Jun 11 23:41:07 2010 -0700 +++ b/usr/src/cmd/samba/Makefile.sfw Sat Jun 26 23:31:21 2010 -0700 @@ -20,7 +20,7 @@ # # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # -#ident "@(#)Makefile.sfw 1.36 10/06/07 SMI" +#ident "@(#)Makefile.sfw 1.37 10/06/18 SMI" SAMBAVER=samba-3.0.37 @@ -109,7 +109,8 @@ $(SAMBAVER)/source/configure.in: $(SAMBAVER).tar.gz gzip -dc $(SAMBAVER).tar.gz | gtar xopf - find $(SAMBAVER) -type d | xargs chmod 755 - (cd $(SAMBAVER) ; gpatch -p1 < ../swat.c-diff \ + (cd $(SAMBAVER) ; gpatch -p1 < ../samba-3.0.37-CVE-2010-2063.patch \ + ; gpatch -p1 < ../swat.c-diff \ ; gpatch -p1 < ../configure.in-diff \ ; gpatch -p1 < ../makefile.in-diff \ ; gpatch -p1 < ../login_cache-diff \