Small patch to allow semodule_deps to build

Small patch to allow semodule_deps to build

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: semod.patch --]
[-- Type: text/x-patch, Size: 415 bytes --]

--- nsapolicycoreutils/semodule_deps/semodule_deps.c	2007-02-07 12:11:49.000000000 -0500
+++ policycoreutils-2.0.0/semodule_deps/semodule_deps.c	2007-02-07 16:46:18.000000000 -0500
@@ -16,7 +16,7 @@
  * of avrule_blocks - even in an ABI safe way - seems undesirable.
  */
 #include <sepol/module.h>
-#include <sepol/errno.h>
+#include <sepol/errcodes.h>
 #include <sepol/policydb/policydb.h>
 
 #include <getopt.h>

Re: Small patch to allow semodule_deps to build

[Karl MacMillan]

Daniel J Walsh wrote:
> 
> 
> ------------------------------------------------------------------------
> 
> --- nsapolicycoreutils/semodule_deps/semodule_deps.c	2007-02-07 12:11:49.000000000 -0500
> +++ policycoreutils-2.0.0/semodule_deps/semodule_deps.c	2007-02-07 16:46:18.000000000 -0500
> @@ -16,7 +16,7 @@
>   * of avrule_blocks - even in an ABI safe way - seems undesirable.
>   */
>  #include <sepol/module.h>
> -#include <sepol/errno.h>
> +#include <sepol/errcodes.h>
>  #include <sepol/policydb/policydb.h>
>  
>  #include <getopt.h>

This shouldn't be necessary - errcodes.h should be included via 
policydb.h -> symtab.h -> hashtab.h. Also, I can't reproduce this locally.

Karl

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: Small patch to allow semodule_deps to build

[Stephen Smalley]

On Thu, 2007-02-08 at 10:16 -0500, Karl MacMillan wrote:
> Daniel J Walsh wrote:
> > 
> > 
> > ------------------------------------------------------------------------
> > 
> > --- nsapolicycoreutils/semodule_deps/semodule_deps.c	2007-02-07 12:11:49.000000000 -0500
> > +++ policycoreutils-2.0.0/semodule_deps/semodule_deps.c	2007-02-07 16:46:18.000000000 -0500
> > @@ -16,7 +16,7 @@
> >   * of avrule_blocks - even in an ABI safe way - seems undesirable.
> >   */
> >  #include <sepol/module.h>
> > -#include <sepol/errno.h>
> > +#include <sepol/errcodes.h>
> >  #include <sepol/policydb/policydb.h>
> >  
> >  #include <getopt.h>
> 
> This shouldn't be necessary - errcodes.h should be included via 
> policydb.h -> symtab.h -> hashtab.h. Also, I can't reproduce this locally.

Actually, Dan is correct at least in removing #include <sepol/errno.h> -
that was what you had originally called the header, but renamed to
errcodes.h in response to my comments.  So you (and I) had a lingering
errno.h left around from previous builds that obscured the broken build.
cd trunk/
rm -rf ~/obj
make DESTDIR=~/obj install
to reproduce.

-- 
Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: Small patch to allow semodule_deps to build

[Karl MacMillan]

Stephen Smalley wrote:
> On Thu, 2007-02-08 at 10:16 -0500, Karl MacMillan wrote:
>> Daniel J Walsh wrote:
>>>
>>> ------------------------------------------------------------------------
>>>
>>> --- nsapolicycoreutils/semodule_deps/semodule_deps.c	2007-02-07 12:11:49.000000000 -0500
>>> +++ policycoreutils-2.0.0/semodule_deps/semodule_deps.c	2007-02-07 16:46:18.000000000 -0500
>>> @@ -16,7 +16,7 @@
>>>   * of avrule_blocks - even in an ABI safe way - seems undesirable.
>>>   */
>>>  #include <sepol/module.h>
>>> -#include <sepol/errno.h>
>>> +#include <sepol/errcodes.h>
>>>  #include <sepol/policydb/policydb.h>
>>>  
>>>  #include <getopt.h>
>> This shouldn't be necessary - errcodes.h should be included via 
>> policydb.h -> symtab.h -> hashtab.h. Also, I can't reproduce this locally.
> 
> Actually, Dan is correct at least in removing #include <sepol/errno.h> -
> that was what you had originally called the header, but renamed to
> errcodes.h in response to my comments.  So you (and I) had a lingering
> errno.h left around from previous builds that obscured the broken build.
> cd trunk/
> rm -rf ~/obj
> make DESTDIR=~/obj install
> to reproduce.
> 

Yep - guess my process needs a little fixing.

Acked-by: Karl MacMillan <kmacmillan@mentalrootkit.com> and merged as 
policycoreutils 2.0.1.

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.