[apparmor] [2.5.1 nomination] pull warnings fixes from rev 1437

[Steve Beattie]

The following patch is cherry-picked out of rev 1437 from trunk;
it fixes the most serious of the compile time warnings as well as
silencing an error in non-rpm build environments.

=== modified file 'common/Make.rules'
--- common/Make.rules	2010-09-13 08:37:04 +0000
+++ common/Make.rules	2010-09-15 16:36:01 +0000
@@ -48,7 +48,7 @@
 		    echo "/tmp/${NAME}"  ; \
 		  fi ;)
 endif
-RPMHOSTVENDOR=$(shell rpm --eval "%{_host_vendor}")
+RPMHOSTVENDOR=$(shell which rpm && rpm --eval "%{_host_vendor}")
 ifndef DISTRO
 DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \
 		  echo slackware ; \

=== modified file 'parser/parser_main.c'
--- parser/parser_main.c	2010-08-26 18:24:41 +0000
+++ parser/parser_main.c	2010-09-15 16:35:21 +0000
@@ -34,6 +34,8 @@
 
 #include <unistd.h>
 #include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "parser.h"
 #include "parser_version.h"

=== modified file 'parser/parser_yacc.y'
--- parser/parser_yacc.y	2010-06-25 19:58:17 +0000
+++ parser/parser_yacc.y	2010-09-15 16:35:21 +0000
@@ -412,7 +412,7 @@
 
 flagval:	TOK_FLAG_ID
 	{
-		struct flagval fv = {0, 0, 0};
+		struct flagval fv = { 0, 0, 0, 0 };
 		if (strcmp($1, "debug") == 0) {
 			yyerror(_("Profile flag 'debug' is no longer valid."));
 		} else if (strcmp($1, "complain") == 0) {


-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/apparmor/attachments/20100915/c9a1bdcf/attachment.pgp