#6 Use separate patches instead of one big fedora-selinux.patch
Closed 3 months ago by plautrba. Opened 3 months ago by plautrba.
rpms/ plautrba/libselinux master-split-patches  into  master

@@ -0,0 +1,31 @@ 

+ From f71fc47524bef3c4cd8a412e43d13daebd1c418b Mon Sep 17 00:00:00 2001

+ From: Miroslav Grepl <mgrepl@redhat.com>

+ Date: Wed, 16 Jul 2014 08:28:03 +0200

+ Subject: [PATCH 1/3] Fix selinux man page to refer seinfo and sesearch tools.

+ 

+ ---

+  libselinux/man/man8/selinux.8 | 4 +++-

+  1 file changed, 3 insertions(+), 1 deletion(-)

+ 

+ diff --git a/libselinux/man/man8/selinux.8 b/libselinux/man/man8/selinux.8

+ index e37aee68..bf23b655 100644

+ --- a/libselinux/man/man8/selinux.8

+ +++ b/libselinux/man/man8/selinux.8

+ @@ -91,11 +91,13 @@ This manual page was written by Dan Walsh <dwalsh@redhat.com>.

+  .BR sepolicy (8),

+  .BR system-config-selinux (8),

+  .BR togglesebool (8),

+ -.BR restorecon (8),

+  .BR fixfiles (8),

+ +.BR restorecon (8),

+  .BR setfiles (8),

+  .BR semanage (8),

+  .BR sepolicy (8)

+ +.BR seinfo (8),

+ +.BR sesearch (8)

+  

+  Every confined service on the system has a man page in the following format:

+  .br

+ -- 

+ 2.21.0

+ 

file renamed
+72 -83

@@ -1,26 +1,32 @@ 

- diff --git libselinux-2.9/man/man8/selinux.8 libselinux-2.9/man/man8/selinux.8

- index e37aee6..bf23b65 100644

- --- libselinux-2.9/man/man8/selinux.8

- +++ libselinux-2.9/man/man8/selinux.8

- @@ -91,11 +91,13 @@ This manual page was written by Dan Walsh <dwalsh@redhat.com>.

-  .BR sepolicy (8),

-  .BR system-config-selinux (8),

-  .BR togglesebool (8),

- -.BR restorecon (8),

-  .BR fixfiles (8),

- +.BR restorecon (8),

-  .BR setfiles (8),

-  .BR semanage (8),

-  .BR sepolicy (8)

- +.BR seinfo (8),

- +.BR sesearch (8)

-  

-  Every confined service on the system has a man page in the following format:

-  .br

- diff --git libselinux-2.9/src/avc_sidtab.c libselinux-2.9/src/avc_sidtab.c

- index 9669264..c775430 100644

- --- libselinux-2.9/src/avc_sidtab.c

- +++ libselinux-2.9/src/avc_sidtab.c

+ From ad3d3a0bf819f5895a6884357c2d0e18ea1ef314 Mon Sep 17 00:00:00 2001

+ From: Dan Walsh <dwalsh@redhat.com>

+ Date: Mon, 23 Dec 2013 09:50:54 -0500

+ Subject: [PATCH 2/3] Verify context input to funtions to make sure the context

+  field is not null.

+ 

+ Return errno EINVAL, to prevent segfault.

+ 

+ Rejected by upstream https://marc.info/?l=selinux&m=145036088424584&w=2

+ 

+ FIXME: use __attribute__(nonnull (arg-index, ...))

+ ---

+  libselinux/src/avc_sidtab.c           | 5 +++++

+  libselinux/src/canonicalize_context.c | 5 +++++

+  libselinux/src/check_context.c        | 5 +++++

+  libselinux/src/compute_av.c           | 5 +++++

+  libselinux/src/compute_create.c       | 5 +++++

+  libselinux/src/compute_member.c       | 5 +++++

+  libselinux/src/compute_relabel.c      | 5 +++++

+  libselinux/src/compute_user.c         | 5 +++++

+  libselinux/src/fsetfilecon.c          | 8 ++++++--

+  libselinux/src/lsetfilecon.c          | 9 +++++++--

+  libselinux/src/setfilecon.c           | 8 ++++++--

+  11 files changed, 59 insertions(+), 6 deletions(-)

+ 

+ diff --git a/libselinux/src/avc_sidtab.c b/libselinux/src/avc_sidtab.c

+ index 9669264d..c7754305 100644

+ --- a/libselinux/src/avc_sidtab.c

+ +++ b/libselinux/src/avc_sidtab.c

  @@ -81,6 +81,11 @@ sidtab_context_to_sid(struct sidtab *s,

   	int hvalue, rc = 0;

   	struct sidtab_node *cur;

@@ -33,10 +39,10 @@ 

   	*sid = NULL;

   	hvalue = sidtab_hash(ctx);

   

- diff --git libselinux-2.9/src/canonicalize_context.c libselinux-2.9/src/canonicalize_context.c

- index ba4c9a2..c815872 100644

- --- libselinux-2.9/src/canonicalize_context.c

- +++ libselinux-2.9/src/canonicalize_context.c

+ diff --git a/libselinux/src/canonicalize_context.c b/libselinux/src/canonicalize_context.c

+ index ba4c9a2c..c8158725 100644

+ --- a/libselinux/src/canonicalize_context.c

+ +++ b/libselinux/src/canonicalize_context.c

  @@ -17,6 +17,11 @@ int security_canonicalize_context_raw(const char * con,

   	size_t size;

   	int fd, ret;

@@ -49,10 +55,10 @@ 

   	if (!selinux_mnt) {

   		errno = ENOENT;

   		return -1;

- diff --git libselinux-2.9/src/check_context.c libselinux-2.9/src/check_context.c

- index 8a7997f..5be8434 100644

- --- libselinux-2.9/src/check_context.c

- +++ libselinux-2.9/src/check_context.c

+ diff --git a/libselinux/src/check_context.c b/libselinux/src/check_context.c

+ index 8a7997f0..5be84348 100644

+ --- a/libselinux/src/check_context.c

+ +++ b/libselinux/src/check_context.c

  @@ -14,6 +14,11 @@ int security_check_context_raw(const char * con)

   	char path[PATH_MAX];

   	int fd, ret;

@@ -65,10 +71,10 @@ 

   	if (!selinux_mnt) {

   		errno = ENOENT;

   		return -1;

- diff --git libselinux-2.9/src/compute_av.c libselinux-2.9/src/compute_av.c

- index a47cffe..6d285a2 100644

- --- libselinux-2.9/src/compute_av.c

- +++ libselinux-2.9/src/compute_av.c

+ diff --git a/libselinux/src/compute_av.c b/libselinux/src/compute_av.c

+ index a47cffe9..6d285a2e 100644

+ --- a/libselinux/src/compute_av.c

+ +++ b/libselinux/src/compute_av.c

  @@ -27,6 +27,11 @@ int security_compute_av_flags_raw(const char * scon,

   		return -1;

   	}

@@ -81,10 +87,10 @@ 

   	snprintf(path, sizeof path, "%s/access", selinux_mnt);

   	fd = open(path, O_RDWR | O_CLOEXEC);

   	if (fd < 0)

- diff --git libselinux-2.9/src/compute_create.c libselinux-2.9/src/compute_create.c

- index 0975aea..3e6a48c 100644

- --- libselinux-2.9/src/compute_create.c

- +++ libselinux-2.9/src/compute_create.c

+ diff --git a/libselinux/src/compute_create.c b/libselinux/src/compute_create.c

+ index 0975aeac..3e6a48c1 100644

+ --- a/libselinux/src/compute_create.c

+ +++ b/libselinux/src/compute_create.c

  @@ -64,6 +64,11 @@ int security_compute_create_name_raw(const char * scon,

   		return -1;

   	}

@@ -97,10 +103,10 @@ 

   	snprintf(path, sizeof path, "%s/create", selinux_mnt);

   	fd = open(path, O_RDWR | O_CLOEXEC);

   	if (fd < 0)

- diff --git libselinux-2.9/src/compute_member.c libselinux-2.9/src/compute_member.c

- index 4e2d221..d1dd977 100644

- --- libselinux-2.9/src/compute_member.c

- +++ libselinux-2.9/src/compute_member.c

+ diff --git a/libselinux/src/compute_member.c b/libselinux/src/compute_member.c

+ index 4e2d221e..d1dd9772 100644

+ --- a/libselinux/src/compute_member.c

+ +++ b/libselinux/src/compute_member.c

  @@ -25,6 +25,11 @@ int security_compute_member_raw(const char * scon,

   		return -1;

   	}

@@ -113,10 +119,10 @@ 

   	snprintf(path, sizeof path, "%s/member", selinux_mnt);

   	fd = open(path, O_RDWR | O_CLOEXEC);

   	if (fd < 0)

- diff --git libselinux-2.9/src/compute_relabel.c libselinux-2.9/src/compute_relabel.c

- index 49f77ef..c3db7c0 100644

- --- libselinux-2.9/src/compute_relabel.c

- +++ libselinux-2.9/src/compute_relabel.c

+ diff --git a/libselinux/src/compute_relabel.c b/libselinux/src/compute_relabel.c

+ index 49f77ef3..c3db7c0a 100644

+ --- a/libselinux/src/compute_relabel.c

+ +++ b/libselinux/src/compute_relabel.c

  @@ -25,6 +25,11 @@ int security_compute_relabel_raw(const char * scon,

   		return -1;

   	}

@@ -129,10 +135,10 @@ 

   	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);

   	fd = open(path, O_RDWR | O_CLOEXEC);

   	if (fd < 0)

- diff --git libselinux-2.9/src/compute_user.c libselinux-2.9/src/compute_user.c

- index 7b88121..401fd10 100644

- --- libselinux-2.9/src/compute_user.c

- +++ libselinux-2.9/src/compute_user.c

+ diff --git a/libselinux/src/compute_user.c b/libselinux/src/compute_user.c

+ index 7b881215..401fd107 100644

+ --- a/libselinux/src/compute_user.c

+ +++ b/libselinux/src/compute_user.c

  @@ -24,6 +24,11 @@ int security_compute_user_raw(const char * scon,

   		return -1;

   	}

@@ -145,10 +151,10 @@ 

   	snprintf(path, sizeof path, "%s/user", selinux_mnt);

   	fd = open(path, O_RDWR | O_CLOEXEC);

   	if (fd < 0)

- diff --git libselinux-2.9/src/fsetfilecon.c libselinux-2.9/src/fsetfilecon.c

- index 52707d0..0cbe12d 100644

- --- libselinux-2.9/src/fsetfilecon.c

- +++ libselinux-2.9/src/fsetfilecon.c

+ diff --git a/libselinux/src/fsetfilecon.c b/libselinux/src/fsetfilecon.c

+ index 52707d05..0cbe12d8 100644

+ --- a/libselinux/src/fsetfilecon.c

+ +++ b/libselinux/src/fsetfilecon.c

  @@ -9,8 +9,12 @@

   

   int fsetfilecon_raw(int fd, const char * context)

@@ -164,10 +170,10 @@ 

   	if (rc < 0 && errno == ENOTSUP) {

   		char * ccontext = NULL;

   		int err = errno;

- diff --git libselinux-2.9/src/lsetfilecon.c libselinux-2.9/src/lsetfilecon.c

- index 1d3b28a..ea6d70b 100644

- --- libselinux-2.9/src/lsetfilecon.c

- +++ libselinux-2.9/src/lsetfilecon.c

+ diff --git a/libselinux/src/lsetfilecon.c b/libselinux/src/lsetfilecon.c

+ index 1d3b28a1..ea6d70b7 100644

+ --- a/libselinux/src/lsetfilecon.c

+ +++ b/libselinux/src/lsetfilecon.c

  @@ -9,8 +9,13 @@

   

   int lsetfilecon_raw(const char *path, const char * context)

@@ -184,30 +190,10 @@ 

   	if (rc < 0 && errno == ENOTSUP) {

   		char * ccontext = NULL;

   		int err = errno;

- diff --git libselinux-2.9/src/procattr.c libselinux-2.9/src/procattr.c

- index c6799ef..cbb6824 100644

- --- libselinux-2.9/src/procattr.c

- +++ libselinux-2.9/src/procattr.c

- @@ -24,6 +24,7 @@ static __thread char destructor_initialized;

-  

-  /* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and

-   * has a definition for it */

- +#ifndef OVERRIDE_GETTID

-  #ifdef __BIONIC__

-    #define OVERRIDE_GETTID 0

-  #elif !defined(__GLIBC_PREREQ)

- @@ -33,6 +34,7 @@ static __thread char destructor_initialized;

-  #else

-    #define OVERRIDE_GETTID 0

-  #endif

- +#endif

-  

-  #if OVERRIDE_GETTID

-  static pid_t gettid(void)

- diff --git libselinux-2.9/src/setfilecon.c libselinux-2.9/src/setfilecon.c

- index d05969c..3f0200e 100644

- --- libselinux-2.9/src/setfilecon.c

- +++ libselinux-2.9/src/setfilecon.c

+ diff --git a/libselinux/src/setfilecon.c b/libselinux/src/setfilecon.c

+ index d05969c6..3f0200e8 100644

+ --- a/libselinux/src/setfilecon.c

+ +++ b/libselinux/src/setfilecon.c

  @@ -9,8 +9,12 @@

   

   int setfilecon_raw(const char *path, const char * context)

@@ -223,3 +209,6 @@ 

   	if (rc < 0 && errno == ENOTSUP) {

   		char * ccontext = NULL;

   		int err = errno;

+ -- 

+ 2.21.0

+ 

@@ -0,0 +1,39 @@ 

+ From 431f72836d6c02450725cf6ffb1c7223b9fa6acc Mon Sep 17 00:00:00 2001

+ From: Petr Lautrbach <plautrba@redhat.com>

+ Date: Mon, 11 Mar 2019 15:26:43 +0100

+ Subject: [PATCH 3/3] libselinux: Allow to override OVERRIDE_GETTID from

+  command line

+ 

+ $ make CFLAGS="$CFLAGS -DOVERRIDE_GETTID=0" ...

+ 

+ Drop this as soon as glibc-2.30 will become real 2.30 version, see

+ https://bugzilla.redhat.com/show_bug.cgi?id=1685594

+ 

+ Signed-off-by: Petr Lautrbach <plautrba@redhat.com>

+ ---

+  libselinux/src/procattr.c | 2 ++

+  1 file changed, 2 insertions(+)

+ 

+ diff --git a/libselinux/src/procattr.c b/libselinux/src/procattr.c

+ index c6799ef2..cbb6824e 100644

+ --- a/libselinux/src/procattr.c

+ +++ b/libselinux/src/procattr.c

+ @@ -24,6 +24,7 @@ static __thread char destructor_initialized;

+  

+  /* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and

+   * has a definition for it */

+ +#ifndef OVERRIDE_GETTID

+  #ifdef __BIONIC__

+    #define OVERRIDE_GETTID 0

+  #elif !defined(__GLIBC_PREREQ)

+ @@ -33,6 +34,7 @@ static __thread char destructor_initialized;

+  #else

+    #define OVERRIDE_GETTID 0

+  #endif

+ +#endif

+  

+  #if OVERRIDE_GETTID

+  static pid_t gettid(void)

+ -- 

+ 2.21.0

+ 

@@ -0,0 +1,166 @@ 

+ From bb5a63a3e6e19556419a486a00e008ae6af62fc3 Mon Sep 17 00:00:00 2001

+ From: Petr Lautrbach <plautrba@redhat.com>

+ Date: Thu, 16 May 2019 15:01:59 +0200

+ Subject: [PATCH] libselinux: Use Python distutils to install SELinux python

+  bindings

+ 

+ SWIG-4.0 changed its behavior so that it uses: from . import _selinux  which

+ looks for _selinux module in the same directory as where __init__.py is -

+ $(PYLIBDIR)/site-packages/selinux. But _selinux module is installed into

+ $(PYLIBDIR)/site-packages/ since a9604c30a5e2f ("libselinux: Change the location

+ of _selinux.so").

+ 

+ In order to prevent such breakage in future use Python's distutils instead of

+ building and installing python bindings manually in Makefile.

+ 

+ Fixes:

+ >>> import selinux

+ Traceback (most recent call last):

+   File "<stdin>", line 1, in <module>

+   File "/usr/lib64/python3.7/site-packages/selinux/__init__.py", line 13, in <module>

+     from . import _selinux

+ ImportError: cannot import name '_selinux' from 'selinux' (/usr/lib64/python3.7/site-packages/selinux/__init__.py)

+ >>>

+ 

+ Signed-off-by: Petr Lautrbach <plautrba@redhat.com>

+ ---

+  libselinux/src/Makefile | 37 ++++++++-----------------------------

+  libselinux/src/setup.py | 24 ++++++++++++++++++++++++

+  2 files changed, 32 insertions(+), 29 deletions(-)

+  create mode 100644 libselinux/src/setup.py

+ 

+ diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile

+ index e9ed0383..826c830c 100644

+ --- a/libselinux/src/Makefile

+ +++ b/libselinux/src/Makefile

+ @@ -36,7 +36,7 @@ TARGET=libselinux.so

+  LIBPC=libselinux.pc

+  SWIGIF= selinuxswig_python.i selinuxswig_python_exception.i

+  SWIGRUBYIF= selinuxswig_ruby.i

+ -SWIGCOUT= selinuxswig_wrap.c

+ +SWIGCOUT= selinuxswig_python_wrap.c

+  SWIGPYOUT= selinux.py

+  SWIGRUBYCOUT= selinuxswig_ruby_wrap.c

+  SWIGLOBJ:= $(patsubst %.c,$(PYPREFIX)%.lo,$(SWIGCOUT))

+ @@ -55,7 +55,7 @@ ifeq ($(LIBSEPOLA),)

+          LDLIBS_LIBSEPOLA := -l:libsepol.a

+  endif

+  

+ -GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i

+ +GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) $(SWIGCOUT) selinuxswig_python_exception.i

+  SRCS= $(filter-out $(GENERATED) audit2why.c, $(sort $(wildcard *.c)))

+  

+  MAX_STACK_SIZE=32768

+ @@ -125,25 +125,18 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND

+  SRCS:= $(filter-out label_backends_android.c, $(SRCS))

+  endif

+  

+ -SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS)

+ -

+  SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS)

+  

+  all: $(LIBA) $(LIBSO) $(LIBPC)

+  

+ -pywrap: all $(SWIGFILES) $(AUDIT2WHYSO)

+ +pywrap: all selinuxswig_python_exception.i

+ +	CFLAGS="$(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR)

+  

+  rubywrap: all $(SWIGRUBYSO)

+  

+ -$(SWIGLOBJ): $(SWIGCOUT)

+ -	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $<

+ -

+  $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)

+  	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<

+  

+ -$(SWIGSO): $(SWIGLOBJ)

+ -	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lselinux $(PYLIBS)

+ -

+  $(SWIGRUBYSO): $(SWIGRUBYLOBJ)

+  	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(RUBYLIBS)

+  

+ @@ -161,29 +154,15 @@ $(LIBPC): $(LIBPC).in ../VERSION

+  selinuxswig_python_exception.i: ../include/selinux/selinux.h

+  	bash -e exception.sh > $@ || (rm -f $@ ; false)

+  

+ -$(AUDIT2WHYLOBJ): audit2why.c

+ -	$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<

+ -

+ -$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA)

+ -	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(LDLIBS_LIBSEPOLA) $(PYLIBS) -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs

+ -

+  %.o:  %.c policy.h

+  	$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<

+  

+  %.lo:  %.c policy.h

+  	$(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $<

+  

+ -$(SWIGCOUT): $(SWIGIF)

+ -	$(SWIG) $<

+ -

+ -$(SWIGPYOUT): $(SWIGCOUT)

+ -

+  $(SWIGRUBYCOUT): $(SWIGRUBYIF)

+  	$(SWIGRUBY) $<

+  

+ -swigify: $(SWIGIF)

+ -	$(SWIG) $<

+ -

+  install: all 

+  	test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR)

+  	install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR)

+ @@ -194,10 +173,8 @@ install: all

+  	ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET)

+  

+  install-pywrap: pywrap

+ -	test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux

+ -	install -m 755 $(SWIGSO) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT)

+ -	install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYTHONLIBDIR)/selinux/audit2why$(PYCEXT)

+ -	install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py

+ +	$(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`

+ +	install -m 644 selinux.py $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py

+  

+  install-rubywrap: rubywrap

+  	test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) 

+ @@ -208,6 +185,8 @@ relabel:

+  

+  clean-pywrap:

+  	-rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO)

+ +	$(PYTHON) setup.py clean

+ +	-rm -rf build *~ \#* *pyc .#*

+  

+  clean-rubywrap:

+  	-rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO)

+ diff --git a/libselinux/src/setup.py b/libselinux/src/setup.py

+ new file mode 100644

+ index 00000000..b12e7869

+ --- /dev/null

+ +++ b/libselinux/src/setup.py

+ @@ -0,0 +1,24 @@

+ +#!/usr/bin/python3

+ +

+ +from distutils.core import Extension, setup

+ +

+ +setup(

+ +    name="selinux",

+ +    version="2.9",

+ +    description="SELinux python 3 bindings",

+ +    author="SELinux Project",

+ +    author_email="selinux@vger.kernel.org",

+ +    ext_modules=[

+ +        Extension('selinux._selinux',

+ +                  sources=['selinuxswig_python.i'],

+ +                  include_dirs=['../include'],

+ +                  library_dirs=['.'],

+ +                  libraries=['selinux']),

+ +        Extension('selinux.audit2why',

+ +                  sources=['audit2why.c'],

+ +                  include_dirs=['../include'],

+ +                  library_dirs=['.'],

+ +                  libraries=['selinux'],

+ +                  extra_link_args=['-l:libsepol.a'])

+ +    ],

+ +)

+ -- 

+ 2.21.0

+ 

file modified
+11 -8

@@ -11,11 +11,14 @@ 

  Source1: selinuxconlist.8

  Source2: selinuxdefcon.8

  Url: https://github.com/SELinuxProject/selinux/wiki

- # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh

- # run:

- # $ VERSION=2.9 ./make-fedora-selinux-patch.sh libselinux

- # HEAD https://github.com/fedora-selinux/selinux/commit/431f72836d6c02450725cf6ffb1c7223b9fa6acc

- Patch1: libselinux-fedora.patch

+ # $ git clone https://github.com/SELinuxProject/selinux.git

+ # $ cd selinux

+ # $ git format-patch libselinux-2.9 -- libselinux

+ # $ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done

+ Patch0001: 0001-Fix-selinux-man-page-to-refer-seinfo-and-sesearch-to.patch

+ Patch0002: 0002-Verify-context-input-to-funtions-to-make-sure-the-co.patch

+ Patch0003: 0003-libselinux-Allow-to-override-OVERRIDE_GETTID-from-co.patch

+ Patch0004: 0004-libselinux-Use-Python-distutils-to-install-SELinux-p.patch

  BuildRequires: gcc

  BuildRequires: python2 python2-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre2-devel xz-devel

  BuildRequires: python3 python3-devel

@@ -98,7 +101,7 @@ 

  needed for developing SELinux applications. 

  

  %prep

- %autosetup -p 1 -n libselinux-%{version}

+ %autosetup -p 2 -n libselinux-%{version}

  

  %build

  export DISABLE_RPM="y"

@@ -224,11 +227,11 @@ 

  

  %files -n python2-libselinux

  %{python2_sitearch}/selinux/

- %{python2_sitearch}/_selinux.so

+ %{python2_sitearch}/selinux-%{version}-*

  

  %files -n python3-libselinux

  %{python3_sitearch}/selinux/

- %{python3_sitearch}/_selinux.*.so

+ %{python3_sitearch}/selinux-%{version}-*

  

  %files ruby

  %{ruby_vendorarchdir}/selinux.so

1 new commit added

  • Use Python distutils to install SELinux python bindings
3 months ago

2 new commits added

  • Use Python distutils to install SELinux python bindings
  • Use separate patches instead of one big fedora-selinux.patch
3 months ago

2 new commits added

  • Use Python distutils to install SELinux python bindings
  • Use separate patches instead of one big fedora-selinux.patch
3 months ago

2 new commits added

  • Use Python distutils to install SELinux python bindings
  • Use separate patches instead of one big fedora-selinux.patch
3 months ago

2 new commits added

  • Use Python distutils to install SELinux python bindings
  • Use separate patches instead of one big fedora-selinux.patch
3 months ago

2 new commits added

  • Use Python distutils to install SELinux python bindings
  • Use separate patches instead of one big fedora-selinux.patch
3 months ago

Pull-Request has been closed by plautrba

3 months ago