From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 6/7] libsepol: bump version to 2.5
Date: Sat, 25 Jun 2016 00:27:04 +0200 [thread overview]
Message-ID: <20160624222704.GH4157@free.fr> (raw)
In-Reply-To: <1466803929-5513-6-git-send-email-Aduskett@gmail.com>
Adam, All,
On 2016-06-24 17:32 -0400, Adam Duskett spake thusly:
> I also updated the patches to work with the new version.
>
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> ---
> package/libsepol/0001-support-static-only.patch | 25 +++++++++++-----------
> .../libsepol/0002-workaround-blackfin-issue.patch | 7 +++---
> package/libsepol/libsepol.hash | 2 +-
> package/libsepol/libsepol.mk | 4 ++--
> 4 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/package/libsepol/0001-support-static-only.patch b/package/libsepol/0001-support-static-only.patch
> index b974680..02ae994 100644
> --- a/package/libsepol/0001-support-static-only.patch
> +++ b/package/libsepol/0001-support-static-only.patch
> @@ -10,34 +10,33 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Since you changed that patch, you should add your own Signed-off-by
line, just below Thomas' own SoB-line.
>
> Index: b/src/Makefile
> ===================================================================
> +
> +diff --git a/src/Makefile b/src/Makefile
> +index db6c2ba..0006285 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> -@@ -17,7 +17,12 @@
> - CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute
> - override CFLAGS += -I. -I../include -D_GNU_SOURCE
> +@@ -30,8 +30,12 @@ LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATE
> + override CFLAGS += -I$(CILDIR)/include
> + endif
>
> --all: $(LIBA) $(LIBSO) $(LIBPC)
> +ALL_TARGETS = $(LIBA) $(LIBPC)
> +ifeq ($(STATIC),)
> +ALL_TARGETS += $(LIBSO)
> +endif
> -+
> +
> +-all: $(LIBA) $(LIBSO) $(LIBPC)
> +all: $(ALL_TARGETS)
>
> +
> $(LIBA): $(OBJS)
> - $(AR) rcs $@ $^
> -@@ -39,11 +44,13 @@
> - install: all
> - test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
> - install -m 644 $(LIBA) $(LIBDIR)
> -- test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
> -- install -m 755 $(LIBSO) $(SHLIBDIR)
> +@@ -70,7 +74,11 @@ install: all
> + install -m 755 $(LIBSO) $(SHLIBDIR)
> test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
> install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
> +ifeq ($(STATIC),)
> + test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
> + install -m 755 $(LIBSO) $(SHLIBDIR)
> - cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
> + ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
> +endif
>
> relabel:
> diff --git a/package/libsepol/0002-workaround-blackfin-issue.patch b/package/libsepol/0002-workaround-blackfin-issue.patch
> index 5d00c69..b6809fe 100644
> --- a/package/libsepol/0002-workaround-blackfin-issue.patch
> +++ b/package/libsepol/0002-workaround-blackfin-issue.patch
Ditto.
Regards,
Yann E. MORIN.
> @@ -13,12 +13,13 @@ Index: b/src/dso.h
> ===================================================================
> --- a/src/dso.h
> +++ b/src/dso.h
> -@@ -1,7 +1,7 @@
> - #ifndef _SELINUX_DSO_H
> - #define _SELINUX_DSO_H 1
> +@@ -5,7 +5,7 @@
> + #define DISABLE_SYMVER 1
> + #endif
>
> -#ifdef SHARED
> +#if defined(SHARED) && !defined(__bfin__)
> # define hidden __attribute__ ((visibility ("hidden")))
> # define hidden_proto(fct) __hidden_proto (fct, fct##_internal)
> # define __hidden_proto(fct, internal) \
> +
> diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash
> index df5dabd..266ce43 100644
> --- a/package/libsepol/libsepol.hash
> +++ b/package/libsepol/libsepol.hash
> @@ -1,2 +1,2 @@
> # From https://github.com/SELinuxProject/selinux/wiki/Releases
> -sha256 290d17f583635a4a5d8a2141511272adf0571c4205cdea38b5a68df20d58a70b libsepol-2.1.9.tar.gz
> +sha256 2bdeec56d0a08b082b93b40703b4b3329cc5562152f7254d8f6ef6b56afe850a libsepol-2.5.tar.gz
> diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
> index 1e709c6..93896cf 100644
> --- a/package/libsepol/libsepol.mk
> +++ b/package/libsepol/libsepol.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -LIBSEPOL_VERSION = 2.1.9
> -LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20130423
> +LIBSEPOL_VERSION = 2.5
> +LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
> LIBSEPOL_LICENSE = LGPLv2.1+
> LIBSEPOL_LICENSE_FILES = COPYING
>
> --
> 2.7.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2016-06-24 22:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 21:32 [Buildroot] [PATCH 1/7] audit: bump to version 2.5.2 Adam Duskett
2016-06-24 21:32 ` [Buildroot] [PATCH 2/7] checkpolicy: bump to version 2.5 Adam Duskett
2016-06-24 22:11 ` Yann E. MORIN
2016-06-24 21:32 ` [Buildroot] [PATCH 3/7] Add host-libcap-ng capabilities Adam Duskett
2016-06-24 22:13 ` Yann E. MORIN
2016-06-24 21:32 ` [Buildroot] [PATCH 4/7] v3-libselinux: bump to version 2.5 Adam Duskett
2016-06-24 22:21 ` Yann E. MORIN
2016-06-24 21:32 ` [Buildroot] [PATCH 5/7] libsemanage: " Adam Duskett
2016-06-24 22:24 ` Yann E. MORIN
2016-06-24 21:32 ` [Buildroot] [PATCH 6/7] libsepol: bump version to 2.5 Adam Duskett
2016-06-24 22:27 ` Yann E. MORIN [this message]
2016-06-24 21:32 ` [Buildroot] [PATCH 7/7] setools: Added 0003-fix-compile-against-new-selinux-libraries.patch Adam Duskett
2016-06-24 22:30 ` Yann E. MORIN
2016-06-24 22:02 ` [Buildroot] [PATCH 1/7] audit: bump to version 2.5.2 Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160624222704.GH4157@free.fr \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox