[PATCH] sepolicy/manpage.py: make output deterministic

[PATCH] sepolicy/manpage.py: make output deterministic

[Cathy Hu]

The list entries in the alphabetically grouped dict are
not sorted, which results in non-deterministic output for
index.html.

Sort entries of those lists to make the output deterministic
to be able to have reproducible builds.

See https://reproducible-builds.org/ for reasoning.
This patch was done while working on reproducible builds for openSUSE.
---
 python/sepolicy/sepolicy/manpage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
index a488dcbf..62999019 100755
--- a/python/sepolicy/sepolicy/manpage.py
+++ b/python/sepolicy/sepolicy/manpage.py
@@ -156,7 +156,7 @@ def get_alphabet_manpages(manpage_list):
             if j.split("/")[-1][0] == i:
                 temp.append(j.split("/")[-1])
 
-        alphabet_manpages[i] = temp
+        alphabet_manpages[i] = sorted(temp)
 
     return alphabet_manpages
 
-- 
2.42.0

Re: [PATCH] sepolicy/manpage.py: make output deterministic

[Petr Lautrbach]

Cathy Hu <cahu@suse.de> writes:

> The list entries in the alphabetically grouped dict are
> not sorted, which results in non-deterministic output for
> index.html.
>
> Sort entries of those lists to make the output deterministic
> to be able to have reproducible builds.
>
> See https://reproducible-builds.org/ for reasoning.
> This patch was done while working on reproducible builds for openSUSE.

Looks good to me, thanks.

We just need you to provide Signed-off-by: tag, see
https://github.com/SELinuxProject/selinux/blob/main/CONTRIBUTING.md#contributing-code
and Developer Certificate of Origin


> ---
>  python/sepolicy/sepolicy/manpage.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
> index a488dcbf..62999019 100755
> --- a/python/sepolicy/sepolicy/manpage.py
> +++ b/python/sepolicy/sepolicy/manpage.py
> @@ -156,7 +156,7 @@ def get_alphabet_manpages(manpage_list):
>              if j.split("/")[-1][0] == i:
>                  temp.append(j.split("/")[-1])
>  
> -        alphabet_manpages[i] = temp
> +        alphabet_manpages[i] = sorted(temp)
>  
>      return alphabet_manpages
>  
> -- 
> 2.42.0

[PATCH v2] sepolicy/manpage.py: make output deterministic

[Cathy Hu]

The list entries in the alphabetically grouped dict are
not sorted, which results in non-deterministic output for
index.html.

Sort entries of those lists to make the output deterministic
to be able to have reproducible builds.

See https://reproducible-builds.org/ for reasoning.
This patch was done while working on reproducible builds for openSUSE.

Signed-off-by: Cathy Hu <cahu@suse.de>
---
 python/sepolicy/sepolicy/manpage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
index a488dcbf..62999019 100755
--- a/python/sepolicy/sepolicy/manpage.py
+++ b/python/sepolicy/sepolicy/manpage.py
@@ -156,7 +156,7 @@ def get_alphabet_manpages(manpage_list):
             if j.split("/")[-1][0] == i:
                 temp.append(j.split("/")[-1])
 
-        alphabet_manpages[i] = temp
+        alphabet_manpages[i] = sorted(temp)
 
     return alphabet_manpages
 
-- 
2.42.0

Re: [PATCH v2] sepolicy/manpage.py: make output deterministic

[Petr Lautrbach]

Cathy Hu <cahu@suse.de> writes:

> The list entries in the alphabetically grouped dict are
> not sorted, which results in non-deterministic output for
> index.html.
>
> Sort entries of those lists to make the output deterministic
> to be able to have reproducible builds.
>
> See https://reproducible-builds.org/ for reasoning.
> This patch was done while working on reproducible builds for openSUSE.
>
> Signed-off-by: Cathy Hu <cahu@suse.de>

Acked-by: Petr Lautrbach <lautrbach@redhat.com>

> ---
>  python/sepolicy/sepolicy/manpage.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
> index a488dcbf..62999019 100755
> --- a/python/sepolicy/sepolicy/manpage.py
> +++ b/python/sepolicy/sepolicy/manpage.py
> @@ -156,7 +156,7 @@ def get_alphabet_manpages(manpage_list):
>              if j.split("/")[-1][0] == i:
>                  temp.append(j.split("/")[-1])
>  
> -        alphabet_manpages[i] = temp
> +        alphabet_manpages[i] = sorted(temp)
>  
>      return alphabet_manpages
>  
> -- 
> 2.42.0

Re: [PATCH v2] sepolicy/manpage.py: make output deterministic

[James Carter]

On Tue, Oct 31, 2023 at 6:12 AM Petr Lautrbach <lautrbach@redhat.com> wrote:
>
> Cathy Hu <cahu@suse.de> writes:
>
> > The list entries in the alphabetically grouped dict are
> > not sorted, which results in non-deterministic output for
> > index.html.
> >
> > Sort entries of those lists to make the output deterministic
> > to be able to have reproducible builds.
> >
> > See https://reproducible-builds.org/ for reasoning.
> > This patch was done while working on reproducible builds for openSUSE.
> >
> > Signed-off-by: Cathy Hu <cahu@suse.de>
>
> Acked-by: Petr Lautrbach <lautrbach@redhat.com>
>

Merged.
Thanks,
Jim

> > ---
> >  python/sepolicy/sepolicy/manpage.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
> > index a488dcbf..62999019 100755
> > --- a/python/sepolicy/sepolicy/manpage.py
> > +++ b/python/sepolicy/sepolicy/manpage.py
> > @@ -156,7 +156,7 @@ def get_alphabet_manpages(manpage_list):
> >              if j.split("/")[-1][0] == i:
> >                  temp.append(j.split("/")[-1])
> >
> > -        alphabet_manpages[i] = temp
> > +        alphabet_manpages[i] = sorted(temp)
> >
> >      return alphabet_manpages
> >
> > --
> > 2.42.0
>